diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2003-07-04 16:48:40 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2003-07-04 16:48:40 +0000 |
| commit | f91ae4ed6f22a9b530d8d253bcdb36bdc10f3395 (patch) | |
| tree | 46315455cdb707aa3a2b8c9f9abeeddcf8445aba /gtk/gtktoolbar.h | |
| parent | aac21b6f6a2ac87a5577306a5c777ae980a3c4e5 (diff) | |
| download | gtk+-f91ae4ed6f22a9b530d8d253bcdb36bdc10f3395.tar.gz | |
new test for removing items
Fri Jul 4 19:06:31 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* tests/stresstest-toolbar.c: new test for removing items
* tests/testtoolbar.c: add a popup menu
* gtk/gtkcontainer.c (gtk_container_remove): add hack to avoid
assert widget->parent == container when the container is a
toolbar.
* gtk/gtktoolbar.c (gtk_toolbar_remove_tool_item): Make much
simpler. Also make correct.
* gtk/gtktoolbar.c (gtk_toolbar_button_press): make
popup_context_menu a boolean handled signal.
Diffstat (limited to 'gtk/gtktoolbar.h')
| -rw-r--r-- | gtk/gtktoolbar.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index b8170705c9..5741782a53 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -57,7 +57,6 @@ G_BEGIN_DECLS #define GTK_TOOLBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass)) #define GTK_TOOLBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOLBAR, GtkToolbarPrivate)) - #ifndef GTK_DISABLE_DEPRECATED typedef enum { @@ -117,14 +116,14 @@ struct _GtkToolbarClass GtkContainerClass parent_class; /* signals */ - void (* orientation_changed) (GtkToolbar *toolbar, - GtkOrientation orientation); - void (* style_changed) (GtkToolbar *toolbar, - GtkToolbarStyle style); - void (* popup_context_menu) (GtkToolbar *toolbar, - gint x, - gint y, - gint button_number); + void (* orientation_changed) (GtkToolbar *toolbar, + GtkOrientation orientation); + void (* style_changed) (GtkToolbar *toolbar, + GtkToolbarStyle style); + gboolean (* popup_context_menu) (GtkToolbar *toolbar, + gint x, + gint y, + gint button_number); /* Padding for future expansion */ void (*_gtk_reserved1) (void); |