diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2003-07-30 18:35:08 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2003-07-30 18:35:08 +0000 |
| commit | dfca5a2aacceff5436c7c3bdeb6708a258571fcd (patch) | |
| tree | fb9191c4d83ae66e4981bec8d96d4bd5f243b9e6 /gtk/gtktoolbutton.c | |
| parent | 1144aa35a52a3fba30bb618f7e91ed106cd8d31f (diff) | |
| download | gtk+-dfca5a2aacceff5436c7c3bdeb6708a258571fcd.tar.gz | |
swap icon_widget and label arguments to match BonoboUIToolbarButton.
Wed Jul 30 17:03:58 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbutton.[ch]:
(gtk_tool_button_new): swap icon_widget and label arguments to
match BonoboUIToolbarButton.
* gtk/gtktoolbar.h: un-deprecate gtk_toolbar_{set|unset}_style().
Diffstat (limited to 'gtk/gtktoolbutton.c')
| -rw-r--r-- | gtk/gtktoolbutton.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 75b4cb4883..93c241ce5f 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -278,10 +278,10 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) if (style != GTK_TOOLBAR_TEXT) need_icon = TRUE; - + if (style != GTK_TOOLBAR_ICONS) need_label = TRUE; - + if (need_label) { if (button->priv->label_widget) @@ -586,8 +586,8 @@ gtk_tool_button_new_from_stock (const gchar *stock_id) } GtkToolItem * -gtk_tool_button_new (const gchar *label, - GtkWidget *icon_widget) +gtk_tool_button_new (GtkWidget *icon_widget, + const gchar *label) { GtkToolButton *button; @@ -757,3 +757,4 @@ _gtk_tool_button_get_button (GtkToolButton *button) return button->priv->button; } + |