summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-11-11 15:45:08 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-11-11 15:45:08 +0000
commit4d8f9d2ef380f9158e0611df6f791042d0ebae76 (patch)
tree0f2df67e89dfd6dd1cc593b708602c23dcad45d2 /gtk
parent8004fcbfc11c6fff1d65eff7d103a00e18ee6438 (diff)
downloadgtk+-4d8f9d2ef380f9158e0611df6f791042d0ebae76.tar.gz
move deprecated functions together, move setters and getters together,
2008-11-11 Michael Natterer <mitch@imendio.com> * gtk/gtktoolbar.h: move deprecated functions together, move setters and getters together, some indentation cleanup. svn path=/trunk/; revision=21778
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtktoolbar.h33
1 files changed, 19 insertions, 14 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index fb78095ccd..333b328871 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -138,34 +138,33 @@ 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);
GtkToolItem * gtk_toolbar_get_nth_item (GtkToolbar *toolbar,
gint n);
+
gboolean gtk_toolbar_get_show_arrow (GtkToolbar *toolbar);
void gtk_toolbar_set_show_arrow (GtkToolbar *toolbar,
gboolean show_arrow);
-#ifndef GTK_DISABLE_DEPRECATED
-GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar);
-void gtk_toolbar_set_orientation (GtkToolbar *toolbar,
- GtkOrientation orientation);
-gboolean gtk_toolbar_get_tooltips (GtkToolbar *toolbar);
-void gtk_toolbar_set_tooltips (GtkToolbar *toolbar,
- gboolean enable);
-#endif /* GTK_DISABLE_DEPRECATED */
-
GtkToolbarStyle gtk_toolbar_get_style (GtkToolbar *toolbar);
void gtk_toolbar_set_style (GtkToolbar *toolbar,
GtkToolbarStyle style);
void gtk_toolbar_unset_style (GtkToolbar *toolbar);
+
GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar);
+void gtk_toolbar_set_icon_size (GtkToolbar *toolbar,
+ GtkIconSize icon_size);
+void gtk_toolbar_unset_icon_size (GtkToolbar *toolbar);
+
GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar);
gint gtk_toolbar_get_drop_index (GtkToolbar *toolbar,
gint x,
@@ -174,6 +173,7 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
GtkToolItem *tool_item,
gint index_);
+
/* internal functions */
gchar * _gtk_toolbar_elide_underscores (const gchar *original);
void _gtk_toolbar_paint_space_line (GtkWidget *widget,
@@ -183,11 +183,16 @@ void _gtk_toolbar_paint_space_line (GtkWidget *widget
gint _gtk_toolbar_get_default_space_size (void);
-void gtk_toolbar_set_icon_size (GtkToolbar *toolbar,
- GtkIconSize icon_size);
-void gtk_toolbar_unset_icon_size (GtkToolbar *toolbar);
#ifndef GTK_DISABLE_DEPRECATED
+
+GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar);
+void gtk_toolbar_set_orientation (GtkToolbar *toolbar,
+ GtkOrientation orientation);
+gboolean gtk_toolbar_get_tooltips (GtkToolbar *toolbar);
+void gtk_toolbar_set_tooltips (GtkToolbar *toolbar,
+ gboolean enable);
+
/* Simple button items */
GtkWidget* gtk_toolbar_append_item (GtkToolbar *toolbar,
const char *text,