Drop duplicate declarations

[~andy/gtk] / gtk / gtktoolbutton.h

diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 8a78a11fb8250ae2336f45e37fb9fbff0cbfbcd3..cacabe1700c1ca53d798d2826efc1343b8ce51b3 100644 (file)
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -20,10 +20,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_TOOL_BUTTON_H__
 #define __GTK_TOOL_BUTTON_H__
 
-#include "gtktoolitem.h"
+#include <gtk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
@@ -43,13 +47,13 @@ struct _GtkToolButton
   GtkToolItem parent;
 
   /*< private >*/
-  GtkToolButtonPrivate *priv;
+  GtkToolButtonPrivate *GSEAL (priv);
 };
 
 struct _GtkToolButtonClass
 {
   GtkToolItemClass parent_class;
- 
+
   GType button_type;
 
   /* signal */
@@ -76,6 +80,9 @@ gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
 void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
                                                         const gchar   *stock_id);
 G_CONST_RETURN gchar *gtk_tool_button_get_stock_id      (GtkToolButton *button);
+void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
+                                                        const gchar   *icon_name);
+G_CONST_RETURN gchar *gtk_tool_button_get_icon_name     (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
                                                         GtkWidget     *icon_widget);
 GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
@@ -83,7 +90,7 @@ void                  gtk_tool_button_set_label_widget  (GtkToolButton *button,
                                                         GtkWidget     *label_widget);
 GtkWidget *           gtk_tool_button_get_label_widget  (GtkToolButton *button);
 
-                                                                  
+
 /* internal function */
 GtkWidget *_gtk_tool_button_get_button (GtkToolButton *button);