summaryrefslogtreecommitdiff
path: root/gtk/gtktoolbar.h
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2003-10-25 19:58:51 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2003-10-25 19:58:51 +0000
commit356df7f65002a47516b542ace1fe88badf9d4965 (patch)
treeeffb19a2188dff1b081eb353c61afa2539db64fa /gtk/gtktoolbar.h
parent3a7a64aa46ea1c312c06e17a177c81fddfa93683 (diff)
downloadgtk+-356df7f65002a47516b542ace1fe88badf9d4965.tar.gz
Make this function take an index and a GtkToolItem.
Thu Oct 23 21:55:10 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make this function take an index and a GtkToolItem. * tests/testtoolbar.c (main): Make "Show Arrow" default to true. Make one of the separators !draw and expand. Update for new highlight_drop_location() API. * gtk/gtktoolitem.[ch]: Remove "pack_end" property * gtk/gtktoolbar.h: Formatting fixes. * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow separator tool items to expand. (logical_to_physical, physical_to_logical): Fix off-by-one errors (Fix #125472, Marco Pesenti Gritti) * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also return FALSE, not TRUE. (gtk_separator_too_item_{set|get}_property, (gtk_separator_tool_item_{set|get}_draw): new functions
Diffstat (limited to 'gtk/gtktoolbar.h')
-rw-r--r--gtk/gtktoolbar.h25
1 files changed, 12 insertions, 13 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 0e0f50d557..ec61e8f609 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -45,7 +45,7 @@
#include <gtk/gtkpixmap.h>
#include <gtk/gtksignal.h>
-#endif
+#endif /* GTK_DISABLE_DEPRECATED */
G_BEGIN_DECLS
@@ -91,7 +91,8 @@ typedef struct _GtkToolbarPrivate GtkToolbarPrivate;
struct _GtkToolbar
{
GtkContainer container;
-
+
+ /*< private >*/
gint num_children;
GList *children;
GtkOrientation orientation;
@@ -115,9 +116,9 @@ struct _GtkToolbarClass
GtkContainerClass parent_class;
/* signals */
- void (* orientation_changed) (GtkToolbar *toolbar,
+ void (* orientation_changed) (GtkToolbar *toolbar,
GtkOrientation orientation);
- void (* style_changed) (GtkToolbar *toolbar,
+ void (* style_changed) (GtkToolbar *toolbar,
GtkToolbarStyle style);
gboolean (* popup_context_menu) (GtkToolbar *toolbar,
gint x,
@@ -140,29 +141,27 @@ gint gtk_toolbar_get_item_index (GtkToolbar *toolbar,
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);
+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);
-gboolean gtk_toolbar_get_show_arrow (GtkToolbar *toolbar);
-GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar);
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);
+GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar);
+GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar);
gint gtk_toolbar_get_drop_index (GtkToolbar *toolbar,
gint x,
gint y);
void gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar,
- gint x,
- gint y,
- gint width,
- gint height);
+ gint index,
+ GtkToolItem *tool_item);
void gtk_toolbar_unhighlight_drop_location (GtkToolbar *toolbar);