summaryrefslogtreecommitdiff
path: root/gtk/gtktoolbar.h
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2003-07-30 18:35:08 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2003-07-30 18:35:08 +0000
commitdfca5a2aacceff5436c7c3bdeb6708a258571fcd (patch)
treefb9191c4d83ae66e4981bec8d96d4bd5f243b9e6 /gtk/gtktoolbar.h
parent1144aa35a52a3fba30bb618f7e91ed106cd8d31f (diff)
downloadgtk+-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/gtktoolbar.h')
-rw-r--r--gtk/gtktoolbar.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 5b569547a7..fce9b7b2a0 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -131,15 +131,14 @@ struct _GtkToolbarClass
void (*_gtk_reserved3) (void);
};
-GType gtk_toolbar_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_toolbar_new (void);
-
+GType gtk_toolbar_get_type (void) G_GNUC_CONST;
+GtkWidget* gtk_toolbar_new (void);
void gtk_toolbar_insert (GtkToolbar *toolbar,
GtkToolItem *item,
gint pos);
gint gtk_toolbar_get_item_index (GtkToolbar *toolbar,
GtkToolItem *item);
-gint gtk_toolbar_get_n_items (GtkToolbar *toolbar);
+gint gtk_toolbar_get_n_items (GtkToolbar *toolbar);
GtkToolItem * gtk_toolbar_get_nth_item (GtkToolbar *toolbar,
gint n);
gint gtk_toolbar_get_drop_index (GtkToolbar *toolbar,
@@ -157,16 +156,18 @@ GtkToolbarStyle gtk_toolbar_get_style (GtkToolbar *toolbar);
GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar);
gboolean gtk_toolbar_get_tooltips (GtkToolbar *toolbar);
GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar);
+void gtk_toolbar_set_style (GtkToolbar *toolbar,
+ GtkToolbarStyle style);
+void gtk_toolbar_unset_style (GtkToolbar *toolbar);
+
+
/* internal function */
gchar * _gtk_toolbar_elide_underscores (const gchar *original);
#ifndef GTK_DISABLE_DEPRECATED
-void gtk_toolbar_set_style (GtkToolbar *toolbar,
- GtkToolbarStyle style);
void gtk_toolbar_set_icon_size (GtkToolbar *toolbar,
GtkIconSize icon_size);
-void gtk_toolbar_unset_style (GtkToolbar *toolbar);
void gtk_toolbar_unset_icon_size (GtkToolbar *toolbar);
/* Simple button items */