When setting relief, also affect toggle buttons.

1998-11-23  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
	(gtk_toolbar_insert_element): When setting relief, also affect
	toggle buttons.

diff --git a/ChangeLog b/ChangeLog
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f197a6566c4555b9fdd21095a1d45d15bd68e6b3..b2fb6c420d1fb1c8c4b97e5a7f5814b7d6a5917a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1998-11-23  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktoolbar.c: (gtk_toolbar_set_relief):
+       (gtk_toolbar_insert_element): When setting relief, also affect
+       toggle buttons.
+
 Sun Nov 22 20:37:06 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gtk/gtkobject.h: remove extraneous comma

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 4970cbabd7a0534eff3dff1d0eade245f166b5fb..a35e73c1006fb885de267c4d9cbd5a5bdfcd74d8 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -772,6 +772,7 @@ gtk_toolbar_insert_element (GtkToolbar          *toolbar,
       else if (type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
        {
          child->widget = gtk_toggle_button_new ();
+         gtk_button_set_relief (GTK_BUTTON (child->widget), toolbar->relief);
          gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (child->widget),
                                      FALSE);
        }
@@ -909,7 +910,8 @@ gtk_toolbar_set_button_relief (GtkToolbar *toolbar,
       for (children = toolbar->children; children; children = children->next)
        {
          child = children->data;
-         if (child->type == GTK_TOOLBAR_CHILD_BUTTON)
+         if (child->type == GTK_TOOLBAR_CHILD_BUTTON ||
+             child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON)
            gtk_button_set_relief (GTK_BUTTON (child->widget), relief);
        }