Add new toolbar headers

Wed Jul  2 15:42:26 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtk.h: Add new toolbar headers

	* tests/testtoolbar.c: new file

	* tests/Makefile.am (noinst_PROGRAMS): Add testtoolbar.c

	* gtk/gtkexpander.c (gtk_expander_class_init): Make it compile

Tue Jul  1 22:49:25 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c:
	(gtk_toolbar_remove_tool_item): Fix bug where list is changed
	inside a for loop (pointed out by Morten Welinder).
	(gtk_toolbar_focus_home_or_end): Minor formatting change

	Comments from Owen:

	* gtk/gtktoolbutton.c: remove copy of elide_underscores(). Use
	gtk_toolbar_elide_underscores instead.

	* gtk/gtktoolbar.c: rename signal from focus_ends to
	focus_home_or_end.
	(_gtk_toolbar_elide_underscores): export this as an internal
	function.
	(gtk_toolbar_move_focus): add comment explaining difference to
	gtk_toolbar_focus();
	(gtk_toolbar_list_children_in_focus_order): Make TAB_FORWARD and
	TAB_BACKWARD focus the right widgets in RTL mode

	* gtk/gtktoolbutton.c (gtk_tool_button_new): Change to take
	"label" and "icon" parameters

	* gtk/gtktoolbutton.[ch]: remove icon_set property.

6 files changed, 95 insertions, 153 deletions

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 3bafe27bc9..2c7ffe5d72 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -35,18 +35,18 @@
 #include <gtk/gtkaccessible.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkalignment.h>
-#include <gtk/gtkaspectframe.h>
 #include <gtk/gtkarrow.h>
+#include <gtk/gtkaspectframe.h>
+#include <gtk/gtkbbox.h>
 #include <gtk/gtkbin.h>
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkbox.h>
-#include <gtk/gtkbbox.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkcalendar.h>
 #include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkclipboard.h>
@@ -74,8 +74,8 @@
 #include <gtk/gtkgamma.h>
 #include <gtk/gtkgc.h>
 #include <gtk/gtkhandlebox.h>
-#include <gtk/gtkhbox.h>
 #include <gtk/gtkhbbox.h>
+#include <gtk/gtkhbox.h>
 #include <gtk/gtkhpaned.h>
 #include <gtk/gtkhruler.h>
 #include <gtk/gtkhscale.h>
@@ -115,6 +115,7 @@
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtkradiobutton.h>
 #include <gtk/gtkradiomenuitem.h>
+#include <gtk/gtkradiotoolbutton.h>
 #include <gtk/gtkrange.h>
 #include <gtk/gtkrc.h>
 #include <gtk/gtkruler.h>
@@ -124,14 +125,15 @@
 #include <gtk/gtkselection.h>
 #include <gtk/gtkseparator.h>
 #include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtkseparatortoolitem.h>
 #include <gtk/gtksettings.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtksizegroup.h>
 #include <gtk/gtksocket.h>
 #include <gtk/gtkspinbutton.h>
+#include <gtk/gtkstatusbar.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkstyle.h>
-#include <gtk/gtkstatusbar.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtktearoffmenuitem.h>
 #include <gtk/gtktext.h>
@@ -139,7 +141,11 @@
 #include <gtk/gtktextview.h>
 #include <gtk/gtktipsquery.h>
 #include <gtk/gtktogglebutton.h>
+#include <gtk/gtktoggletoolbutton.h>
 #include <gtk/gtktoolbar.h>
+#include <gtk/gtktoolbar.h>
+#include <gtk/gtktoolbutton.h>
+#include <gtk/gtktoolitem.h>
 #include <gtk/gtktooltips.h>
 #include <gtk/gtktree.h>
 #include <gtk/gtktreednd.h>
@@ -151,8 +157,8 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include <gtk/gtktypeutils.h>
-#include <gtk/gtkvbox.h>
 #include <gtk/gtkvbbox.h>
+#include <gtk/gtkvbox.h>
 #include <gtk/gtkversion.h>
 #include <gtk/gtkviewport.h>
 #include <gtk/gtkvpaned.h>
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 06948807f2..cef9dc6427 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -246,9 +246,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
 		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		  G_STRUCT_OFFSET (GtkExpanderClass, activate),
 		  NULL, NULL,
-		  _gtk_marsha  /**
-
-l_VOID__VOID,
+		  _gtk_marshal_VOID__VOID,
 		  G_TYPE_NONE, 0);
 }
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 8b4096ed1b..7ec12c706d 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -78,7 +78,7 @@ enum {
   STYLE_CHANGED,
   POPUP_CONTEXT_MENU,
   MOVE_FOCUS,
-  FOCUS_ENDS,
+  FOCUS_HOME_OR_END,
   LAST_SIGNAL
 };
 
@@ -147,10 +147,10 @@ static void gtk_toolbar_real_orientation_changed (GtkToolbar      *toolbar,
 static void gtk_toolbar_real_style_changed       (GtkToolbar      *toolbar,
 						  GtkToolbarStyle  style);
 
-static gboolean gtk_toolbar_move_focus     (GtkToolbar       *toolbar,
-					    GtkDirectionType  dir);
-static gboolean gtk_toolbar_focus_ends     (GtkToolbar       *toolbar,
-					    gboolean	       home);
+static gboolean gtk_toolbar_move_focus        (GtkToolbar       *toolbar,
+					       GtkDirectionType  dir);
+static gboolean gtk_toolbar_focus_home_or_end (GtkToolbar       *toolbar,
+					       gboolean          focus_home);
 
 static gboolean             gtk_toolbar_button_press         (GtkWidget      *toolbar,
 							      GdkEventButton *event);
@@ -343,11 +343,11 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
 			     _gtk_marshal_BOOLEAN__ENUM,
 			     G_TYPE_BOOLEAN, 1,
 			     GTK_TYPE_DIRECTION_TYPE);
-  toolbar_signals[FOCUS_ENDS] =
-    _gtk_binding_signal_new ("focus_ends",
+  toolbar_signals[FOCUS_HOME_OR_END] =
+    _gtk_binding_signal_new ("focus_home_or_end",
 			     G_OBJECT_CLASS_TYPE (klass),
 			     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			     G_CALLBACK (gtk_toolbar_focus_ends),
+			     G_CALLBACK (gtk_toolbar_focus_home_or_end),
 			     NULL, NULL,
 			     _gtk_marshal_BOOLEAN__BOOLEAN,
 			     G_TYPE_BOOLEAN, 1,
@@ -468,20 +468,20 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
   add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
 
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Home, 0,
-                                "focus_ends", 1,
+                                "focus_home_or_end", 1,
 				G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_Home, 0,
-                                "focus_ends", 1,
+                                "focus_home_or_end", 1,
 				G_TYPE_BOOLEAN, TRUE);
   gtk_binding_entry_add_signal (binding_set, GDK_KP_End, 0,
-                                "focus_ends", 1,
+                                "focus_home_or_end", 1,
 				G_TYPE_BOOLEAN, FALSE);
   gtk_binding_entry_add_signal (binding_set, GDK_End, 0,
-                                "focus_ends", 1,
+                                "focus_home_or_end", 1,
 				G_TYPE_BOOLEAN, FALSE);
 
-  add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_RIGHT);
-  add_ctrl_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_LEFT);
+  add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
+  add_ctrl_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
   g_type_class_add_private (gobject_class, sizeof (GtkToolbarPrivate));  
 }
@@ -1271,7 +1271,10 @@ gtk_toolbar_list_children_in_focus_order (GtkToolbar       *toolbar,
   GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
   GList *result = NULL;
   GList *list;
+  gboolean rtl;
 
+  /* generate list of children in reverse logical order */
+  
   for (list = priv->items; list != NULL; list = list->next)
     {
       GtkToolItem *item = list->data;
@@ -1288,32 +1291,41 @@ gtk_toolbar_list_children_in_focus_order (GtkToolbar       *toolbar,
     }
 
   result = g_list_prepend (result, priv->arrow_button);
-  
-  if (dir == GTK_DIR_RIGHT || dir == GTK_DIR_DOWN || dir == GTK_DIR_TAB_FORWARD)
-    result = g_list_reverse (result);
 
-  if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL)
-    result = g_list_reverse (result);
+  rtl = (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL);
+  
+  /* move in logical order when
+   *
+   *	- dir is TAB_FORWARD
+   *
+   *	- in RTL mode and moving left or up
+   *
+   *    - in LTR mode and moving right or down
+   */
+  if (dir == GTK_DIR_TAB_FORWARD                                        ||
+      (rtl  && (dir == GTK_DIR_UP   || dir == GTK_DIR_LEFT))		||
+      (!rtl && (dir == GTK_DIR_DOWN || dir == GTK_DIR_RIGHT)))
+    {
+      result = g_list_reverse (result);
+    }
 
   return result;
 }
 
 static gboolean
-gtk_toolbar_focus_ends (GtkToolbar *toolbar,
-			gboolean    home)
+gtk_toolbar_focus_home_or_end (GtkToolbar *toolbar,
+			       gboolean    focus_home)
 {
   GList *children, *list;
-  GtkDirectionType dir = home? GTK_DIR_RIGHT : GTK_DIR_LEFT;
+  GtkDirectionType dir = focus_home? GTK_DIR_RIGHT : GTK_DIR_LEFT;
 
   children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
 
   if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL)
     {
       children = g_list_reverse (children);
-      if (dir == GTK_DIR_RIGHT)
-	dir = GTK_DIR_LEFT;
-      else
-	dir = GTK_DIR_RIGHT;
+      
+      dir = (dir == GTK_DIR_RIGHT)? GTK_DIR_LEFT : GTK_DIR_RIGHT;
     }
 
   for (list = children; list != NULL; list = list->next)
@@ -1332,13 +1344,25 @@ gtk_toolbar_focus_ends (GtkToolbar *toolbar,
   return TRUE;
 }   
 
+/* Keybinding handler. This function is called when the user presses
+ * Ctrl TAB or an arrow key.
+ */
 static gboolean
 gtk_toolbar_move_focus (GtkToolbar       *toolbar,
 			GtkDirectionType  dir)
 {
   GList *list;
   gboolean try_focus = FALSE;
-  GList *children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
+  GList *children;
+  GtkContainer *container = GTK_CONTAINER (toolbar);
+
+  if (container->focus_child &&
+      gtk_widget_child_focus (container->focus_child, dir))
+    {
+      return TRUE;
+    }
+  
+  children = gtk_toolbar_list_children_in_focus_order (toolbar, dir);
 
   for (list = children; list != NULL; list = list->next)
     {
@@ -1356,8 +1380,8 @@ gtk_toolbar_move_focus (GtkToolbar       *toolbar,
   return TRUE;
 }
 
-/* The focus handler for the toolbar. It called when the user presses TAB or otherwise
- * tries to focus the toolbar.
+/* The focus handler for the toolbar. It called when the user presses
+ * TAB or otherwise tries to focus the toolbar.
  */
 static gboolean
 gtk_toolbar_focus (GtkWidget        *widget,
@@ -2078,9 +2102,11 @@ gtk_toolbar_remove_tool_item (GtkToolbar  *toolbar,
   g_return_if_fail (GTK_IS_TOOL_ITEM (item));
   
   priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-  
-  for (tmp = priv->items; tmp != NULL; tmp = tmp->next)
+
+  tmp = priv->items;
+  while (tmp)
     {
+      GList *next = tmp->next;
       GtkWidget *child = tmp->data;
       
       if (child == GTK_WIDGET (item))
@@ -2098,6 +2124,8 @@ gtk_toolbar_remove_tool_item (GtkToolbar  *toolbar,
 
 	  break;
 	}
+      
+      tmp = next;
     }
 }
 
@@ -2588,8 +2616,8 @@ gtk_toolbar_insert_element (GtkToolbar          *toolbar,
 					      icon, callback, user_data, position, FALSE);
 }
 
-static gchar *
-elide_underscores (const gchar *original)
+gchar *
+_gtk_toolbar_elide_underscores (const gchar *original)
 {
   gchar *q, *result;
   const gchar *p;
@@ -2660,7 +2688,7 @@ gtk_toolbar_internal_insert_element (GtkToolbar          *toolbar,
       break;
 
     case GTK_TOOLBAR_CHILD_BUTTON:
-      item = gtk_tool_button_new ();
+      item = gtk_tool_button_new (NULL, NULL);
       child->widget = GTK_TOOL_BUTTON (item)->button;
       break;
       
@@ -2693,7 +2721,7 @@ gtk_toolbar_internal_insert_element (GtkToolbar          *toolbar,
 	      gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (item), text);
 
 	      gtk_stock_lookup (text, &stock_item);
-	      label_text = elide_underscores (stock_item.label);
+	      label_text = _gtk_toolbar_elide_underscores (stock_item.label);
 	      child->label = GTK_WIDGET (gtk_label_new (label_text));
 	      g_free (label_text);
 	    }
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 87d570383a..49162e3011 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -157,6 +157,9 @@ GtkIconSize     gtk_toolbar_get_icon_size    (GtkToolbar      *toolbar);
 gboolean        gtk_toolbar_get_tooltips     (GtkToolbar      *toolbar);
 GtkReliefStyle  gtk_toolbar_get_relief_style (GtkToolbar      *toolbar);
 
+/* internal function */
+gchar *	_gtk_toolbar_elide_underscores (const gchar *original);
+
 #ifndef GTK_DISABLE_DEPRECATED
 /* Simple button items */
 void       gtk_toolbar_set_style     (GtkToolbar      *toolbar,
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index a5fa3be88e..6deab67e4c 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -30,6 +30,7 @@
 #include "gtkstock.h"
 #include "gtkvbox.h"
 #include "gtkintl.h"
+#include "gtktoolbar.h"
 
 #include <string.h>
 
@@ -46,7 +47,6 @@ enum {
   PROP_USE_UNDERLINE,
   PROP_LABEL_WIDGET,
   PROP_STOCK_ID,
-  PROP_ICON_SET,
   PROP_ICON_WIDGET,
 };
 
@@ -158,13 +158,6 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass)
 							NULL,
 							G_PARAM_READWRITE));
   g_object_class_install_property (object_class,
-				   PROP_ICON_SET,
-				   g_param_spec_boxed ("icon_set",
-						       _("Icon set"),
-						       _("Icon set to use to draw the item's icon"),
-						       GTK_TYPE_ICON_SET,
-						       G_PARAM_READWRITE));
-  g_object_class_install_property (object_class,
 				   PROP_ICON_WIDGET,
 				   g_param_spec_object ("icon_widget",
 							_("Icon widget"),
@@ -192,7 +185,7 @@ gtk_tool_button_init (GtkToolButton      *button,
 
   /* create button */
   button->button = g_object_new (klass->button_type, NULL);
-  gtk_button_set_focus_on_click (button->button, FALSE);
+  gtk_button_set_focus_on_click (GTK_BUTTON (button->button), FALSE);
   g_signal_connect_object (button->button, "clicked",
 			   G_CALLBACK (button_clicked), button, 0);
 
@@ -250,32 +243,6 @@ gtk_tool_button_size_allocate (GtkWidget     *widget,
     }
 }
 
-static gchar *
-elide_underscores (const gchar *original)
-{
-  gchar *q, *result;
-  const gchar *p;
-  gboolean last_underscore;
-
-  q = result = g_malloc (strlen (original) + 1);
-  last_underscore = FALSE;
-  
-  for (p = original; *p; p++)
-    {
-      if (!last_underscore && *p == '_')
-	last_underscore = TRUE;
-      else
-	{
-	  last_underscore = FALSE;
-	  *q++ = *p;
-	}
-    }
-  
-  *q = '\0';
-  
-  return result;
-}
-
 static void
 gtk_tool_button_construct_contents (GtkToolItem *tool_item)
 {
@@ -345,7 +312,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
 	    label_text = "";
 
 	  if (elide)
-	    label_text = elide_underscores (label_text);
+	    label_text = _gtk_toolbar_elide_underscores (label_text);
 	  else
 	    label_text = g_strdup (label_text);
 
@@ -360,12 +327,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
   icon_size = gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (button));
   if (need_icon)
     {
-      if (button->icon_set)
-	{
-	  icon = gtk_image_new_from_icon_set (button->icon_set, icon_size);
-	  gtk_widget_show (icon);
-	}
-      else if (button->icon_widget)
+      if (button->icon_widget)
 	{
 	  icon = button->icon_widget;
 	  
@@ -456,9 +418,6 @@ gtk_tool_button_set_property (GObject         *object,
     case PROP_STOCK_ID:
       gtk_tool_button_set_stock_id (button, g_value_get_string (value));
       break;
-    case PROP_ICON_SET:
-      gtk_tool_button_set_icon_set (button, g_value_get_boxed (value));
-      break;
     case PROP_ICON_WIDGET:
       gtk_tool_button_set_icon_widget (button, g_value_get_object (value));
       break;
@@ -489,9 +448,6 @@ gtk_tool_button_get_property (GObject         *object,
     case PROP_STOCK_ID:
       g_value_set_string (value, button->stock_id);
       break;
-    case PROP_ICON_SET:
-      g_value_set_boxed (value, gtk_tool_button_get_icon_set (button));
-      break;
     case PROP_ICON_WIDGET:
       g_value_set_object (value, button->icon_widget);
       break;
@@ -536,11 +492,7 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item)
   else
     menu_item = gtk_image_menu_item_new_with_label (label);
 
-  if (button->icon_set)
-    {
-      menu_image = gtk_image_new_from_icon_set (button->icon_set, GTK_ICON_SIZE_MENU);
-    }
-  else if (button->icon_widget && GTK_IS_IMAGE (button->icon_widget))
+  if (button->icon_widget && GTK_IS_IMAGE (button->icon_widget))
     {
       GtkImage *image = GTK_IMAGE (button->icon_widget);
       GtkImageType storage_type = gtk_image_get_storage_type (image);
@@ -605,12 +557,19 @@ gtk_tool_button_new_from_stock (const gchar *stock_id)
 }
 
 GtkToolItem *
-gtk_tool_button_new (void)
+gtk_tool_button_new (const gchar *label,
+		     GtkWidget	 *icon_widget)
 {
   GtkToolButton *button;
-  
+
   button = g_object_new (GTK_TYPE_TOOL_BUTTON,
 			 NULL);
+  
+  if (label)
+    gtk_tool_button_set_label (button, label);
+
+  if (icon_widget)
+    gtk_tool_button_set_icon_widget (button, icon_widget);
 
   return GTK_TOOL_ITEM (button);  
 }
@@ -703,8 +662,6 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button,
 
   if (icon != button->icon_widget)
     {
-      g_object_freeze_notify (G_OBJECT (button));
-      
       if (button->icon_widget)
 	g_object_unref (G_OBJECT (button->icon_widget));
 
@@ -715,19 +672,10 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button,
 	}
 
       button->icon_widget = icon;
-	
-      if (button->icon_widget && button->icon_set)
-	{
-	  gtk_icon_set_unref (button->icon_set);
-	  button->icon_set = NULL;
-	  
-	  g_object_notify (G_OBJECT (button), "icon_set");
-	}
 
       gtk_tool_button_construct_contents (GTK_TOOL_ITEM (button));
       
       g_object_notify (G_OBJECT (button), "icon_widget");
-      g_object_thaw_notify (G_OBJECT (button));
     }
 }
 
@@ -772,41 +720,3 @@ gtk_tool_button_get_icon_widget (GtkToolButton *button)
 
   return button->icon_widget;
 }
-
-void
-gtk_tool_button_set_icon_set (GtkToolButton *button,
-			      GtkIconSet    *icon_set)
-{
-  g_return_if_fail (GTK_IS_TOOL_BUTTON (button));
-
-  if (icon_set != button->icon_set)
-    {
-      g_object_freeze_notify (G_OBJECT (button));
-
-      if (button->icon_set)
-	gtk_icon_set_unref (button->icon_set);
-
-      button->icon_set = icon_set;
-
-      if (button->icon_set && button->icon_widget)
-	{
-	  g_object_unref (button->icon_widget);
-	  button->icon_widget = NULL;
-
-	  g_object_notify (G_OBJECT (button->icon_widget), "icon_widget");
-	}
-
-      gtk_tool_button_construct_contents (GTK_TOOL_ITEM (button));
-      
-      g_object_notify (G_OBJECT (button), "icon_set");
-      g_object_thaw_notify (G_OBJECT (button));
-    }
-}
-
-GtkIconSet *
-gtk_tool_button_get_icon_set (GtkToolButton *button)
-{
-  g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
-  
-  return button->icon_set;
-}
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 72456e894e..e2c6efbfe7 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -48,7 +48,6 @@ struct _GtkToolButton
   gchar *label_text;
   GtkWidget *label_widget;
   GtkWidget *icon_widget;
-  GtkIconSet *icon_set;
   
   guint use_underline : 1;
 };
@@ -64,7 +63,8 @@ struct _GtkToolButtonClass
 };
 
 GType        gtk_tool_button_get_type       (void);
-GtkToolItem *gtk_tool_button_new            (void);
+GtkToolItem *gtk_tool_button_new            (const gchar *label,
+					     GtkWidget   *icon_widget);
 GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
 
 void                  gtk_tool_button_set_label       (GtkToolButton *button,
@@ -76,9 +76,6 @@ 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_set      (GtkToolButton *button,
-							 GtkIconSet    *icon_set);
-GtkIconSet *          gtk_tool_button_get_icon_set      (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_widget (GtkToolButton *button,
 						       GtkWidget     *icon);
 GtkWidget *           gtk_tool_button_get_icon_widget (GtkToolButton *button);