Make tear-off menuitems obey the "selected_shadow_type" style property.

Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
	tear-off menuitems obey the "selected_shadow_type" style property.

diff --git a/ChangeLog b/ChangeLog
index d69137af5c34efce2c491e54d86099683be3c17f..34680743ed8f339f58f84d46268ab5509e9d99ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
+       tear-off menuitems obey the "selected_shadow_type" style property.
+
 Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/gtkimcontextxim.c (get_im): Don't use 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d69137af5c34efce2c491e54d86099683be3c17f..34680743ed8f339f58f84d46268ab5509e9d99ed 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
+       tear-off menuitems obey the "selected_shadow_type" style property.
+
 Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/gtkimcontextxim.c (get_im): Don't use 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d69137af5c34efce2c491e54d86099683be3c17f..34680743ed8f339f58f84d46268ab5509e9d99ed 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
+       tear-off menuitems obey the "selected_shadow_type" style property.
+
 Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/gtkimcontextxim.c (get_im): Don't use 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d69137af5c34efce2c491e54d86099683be3c17f..34680743ed8f339f58f84d46268ab5509e9d99ed 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
+       tear-off menuitems obey the "selected_shadow_type" style property.
+
 Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/gtkimcontextxim.c (get_im): Don't use 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d69137af5c34efce2c491e54d86099683be3c17f..34680743ed8f339f58f84d46268ab5509e9d99ed 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
+       tear-off menuitems obey the "selected_shadow_type" style property.
+
 Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/gtkimcontextxim.c (get_im): Don't use 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d69137af5c34efce2c491e54d86099683be3c17f..34680743ed8f339f58f84d46268ab5509e9d99ed 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Oct 16 17:11:46 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Make
+       tear-off menuitems obey the "selected_shadow_type" style property.
+
 Tue Oct 15 17:25:47 2002  Owen Taylor  <otaylor@redhat.com>
 
        * modules/input/gtkimcontextxim.c (get_im): Don't use 

diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index 8ca1dccf93743e96e5b786ada57c4c1fe810727d..c087ad0e5abea6352d1617d106c855b7d0e5ffe5 100644 (file)
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -145,14 +145,21 @@ gtk_tearoff_menu_item_paint (GtkWidget   *widget,
       right_max = x + width;
 
       if (widget->state == GTK_STATE_PRELIGHT)
-       gtk_paint_box (widget->style,
-                      widget->window,
-                      GTK_STATE_PRELIGHT,
-                      GTK_SHADOW_OUT,
-                      area, widget, "menuitem",
-                      x, y, width, height);
-       else
-        gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height);
+       {
+         gint selected_shadow_type;
+         
+         gtk_widget_style_get (widget,
+                               "selected_shadow_type", &selected_shadow_type,
+                               NULL);
+         gtk_paint_box (widget->style,
+                        widget->window,
+                        GTK_STATE_PRELIGHT,
+                        selected_shadow_type,
+                        area, widget, "menuitem",
+                        x, y, width, height);
+       }
+      else
+       gdk_window_clear_area (widget->window, area->x, area->y, area->width, area->height);
 
       if (tearoff_item->torn_off)
        {