diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-29 23:23:44 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-08-29 23:23:44 +0000 |
| commit | e430c2439af13ca56f0234f33ddbda6c1154a651 (patch) | |
| tree | 881d7361e6936ef0e8747dbf84d0f40bf4ffa027 | |
| parent | d536cdde0294a2bb25b1cbcc4477de9dfd75bb25 (diff) | |
| download | gtk+-e430c2439af13ca56f0234f33ddbda6c1154a651.tar.gz | |
Put toolbars in handleboxes.
* tests/testmerge.c (add_widget): Put toolbars in handleboxes.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 2 | ||||
| -rw-r--r-- | tests/testmerge.c | 14 |
6 files changed, 23 insertions, 1 deletions
@@ -1,5 +1,7 @@ 2003-08-30 Matthias Clasen <maclas@gmx.de> + * tests/testmerge.c (add_widget): Put toolbars in handleboxes. + * gtk/gtkuimanager.[hc]: Add a boolean property, "add_tearoffs" with setter and getter. If it is set, add tearoff menu items to regular menus, but not to popups. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ecf27dacd6..c828fb2f31 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2003-08-30 Matthias Clasen <maclas@gmx.de> + * tests/testmerge.c (add_widget): Put toolbars in handleboxes. + * gtk/gtkuimanager.[hc]: Add a boolean property, "add_tearoffs" with setter and getter. If it is set, add tearoff menu items to regular menus, but not to popups. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ecf27dacd6..c828fb2f31 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,7 @@ 2003-08-30 Matthias Clasen <maclas@gmx.de> + * tests/testmerge.c (add_widget): Put toolbars in handleboxes. + * gtk/gtkuimanager.[hc]: Add a boolean property, "add_tearoffs" with setter and getter. If it is set, add tearoff menu items to regular menus, but not to popups. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ecf27dacd6..c828fb2f31 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,7 @@ 2003-08-30 Matthias Clasen <maclas@gmx.de> + * tests/testmerge.c (add_widget): Put toolbars in handleboxes. + * gtk/gtkuimanager.[hc]: Add a boolean property, "add_tearoffs" with setter and getter. If it is set, add tearoff menu items to regular menus, but not to popups. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ecf27dacd6..c828fb2f31 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,7 @@ 2003-08-30 Matthias Clasen <maclas@gmx.de> + * tests/testmerge.c (add_widget): Put toolbars in handleboxes. + * gtk/gtkuimanager.[hc]: Add a boolean property, "add_tearoffs" with setter and getter. If it is set, add tearoff menu items to regular menus, but not to popups. diff --git a/tests/testmerge.c b/tests/testmerge.c index 4359778dcb..0aff7a69e1 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -103,7 +103,19 @@ add_widget (GtkUIManager *merge, GtkWidget *widget, GtkBox *box) { - gtk_box_pack_start (box, widget, FALSE, FALSE, 0); + GtkWidget *handle_box; + + if (GTK_IS_TOOLBAR (widget)) + { + handle_box = gtk_handle_box_new (); + gtk_widget_show (handle_box); + gtk_container_add (GTK_CONTAINER (handle_box), widget); + gtk_box_pack_start (box, handle_box, FALSE, FALSE, 0); + g_signal_connect (handle_box, "remove", gtk_widget_destroy, 0); + } + else + gtk_box_pack_start (box, widget, FALSE, FALSE, 0); + gtk_widget_show (widget); } |