fix toolbar button hilite in Luna theme

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 5c59963356609095f48b37b4d05ea7b3bec6928d..191a035dab9508251661a7d826b0252c64d694e6 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -5,6 +5,7 @@
        * src/Makefile.am:
        * src/Makefile.msc:
        * src/Theme/gtk-2.0/gtkrc: Rename DLL back to "wimp"
+       * src/wimp_style.c: Fix hilite around toolbar buttons in the Luna theme
        
 2004-03-20  Raymond Penners  <raymond@dotsphinx.com>
 

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 0cb22b4ab6a1faa77acb00cd6436c9dbe835d303..8d72ab6d61d59bfacb7a281c4a28976a866aba34 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -1476,6 +1476,19 @@ option_menu_get_props (GtkWidget      *widget,
     *indicator_spacing = default_option_indicator_spacing;
 }
 
+static gboolean is_toolbar_child(GtkWidget * wid)
+{
+       while(wid)
+       {
+               if(GTK_IS_TOOLBAR(wid))
+                       return TRUE;
+               else
+                       wid = wid->parent;
+       }
+
+       return FALSE;
+}
+
 static void
 draw_box (GtkStyle      *style,
          GdkWindow     *window,
@@ -1499,7 +1512,7 @@ draw_box (GtkStyle      *style,
                             width, height, state_type, area))
             return;
         }
-      else if (GTK_IS_TOOLBAR (widget->parent))
+      else if (is_toolbar_child (widget->parent))
       {
                    if (xp_theme_draw(window, XP_THEME_ELEMENT_TOOLBAR_BUTTON, style, x, y,
                                              width, height, state_type, area))