Put toolbars in handleboxes.

	* tests/testmerge.c (add_widget): Put toolbars in handleboxes.

diff --git a/ChangeLog b/ChangeLog
index ecf27dacd65aa2e50669a380508a13f33030311b..c828fb2f316faba6ae1e3d67c1485b601985c21c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ecf27dacd65aa2e50669a380508a13f33030311b..c828fb2f316faba6ae1e3d67c1485b601985c21c 100644 (file)
--- 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 ecf27dacd65aa2e50669a380508a13f33030311b..c828fb2f316faba6ae1e3d67c1485b601985c21c 100644 (file)
--- 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 ecf27dacd65aa2e50669a380508a13f33030311b..c828fb2f316faba6ae1e3d67c1485b601985c21c 100644 (file)
--- 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 ecf27dacd65aa2e50669a380508a13f33030311b..c828fb2f316faba6ae1e3d67c1485b601985c21c 100644 (file)
--- 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 4359778dcba1be72313388359d45baf9374b61ce..0aff7a69e1ee9ecc03028fec944392444e230506 100644 (file)
--- 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);
 }