some menubar theming improvements

diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 3a866db869bc81c444859880e8f81845d99115c4..19f7a38e56d77c98282c0e3ed1ffc9881fefa5ba 100755 (executable)
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -7,7 +7,6 @@ style "msw-default"
   GtkWidget::interior_focus = 1
   GtkOptionMenu::indicator_size = { 9, 5 }
   GtkOptionMenu::indicator_spacing = { 7, 5, 2, 2 }
-  GtkMenuBar::shadow-type = etched-in
   GtkToolbar::shadow-type = etched-in
   GtkHandleBox::shadow-type = etched-in
   GtkSpinButton::shadow-type = in

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index e0050af15835d09b7e4429dcae51d4c08340f0b0..80a5c3d737dd252b041172ca1c27aca3de29b9b8 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -633,6 +633,7 @@ setup_msw_rc_style(void)
             "style \"msw-menu-bar\" = \"msw-menu\"\n"
             "{\n"
             "bg[NORMAL] = { %d, %d, %d }\n"
+            "GtkMenuBar::shadow-type = etched-in\n"
             "}widget_class \"*MenuBar*\" style \"msw-menu-bar\"\n",
             btn_face.red,
             btn_face.green,

diff --git a/modules/engines/ms-windows/msw_theme_main.c b/modules/engines/ms-windows/msw_theme_main.c
index ea399bec9985a008433c5325d95e0d5bebfeef44..e1baf905be6433d2700100d3a795bb8953e38536 100755 (executable)
--- a/modules/engines/ms-windows/msw_theme_main.c
+++ b/modules/engines/ms-windows/msw_theme_main.c
@@ -32,7 +32,7 @@
 #endif\r
 \r
 static GModule * this_module = NULL;\r
-static void (*msw_reset_rc_styles) (GtkSettings * settings) = NULL;\r
+static void (*msw_rc_reset_styles) (GtkSettings * settings) = NULL;\r
 \r
 static GdkFilterReturn\r
 global_filter_func (void     *xevent,\r
@@ -47,13 +47,13 @@ global_filter_func (void     *xevent,
     case WM_THEMECHANGED:\r
     case WM_SYSCOLORCHANGE:\r
 \r
-      if(msw_reset_rc_styles != NULL) {\r
-       xp_theme_reset ();\r
-       msw_style_init ();\r
+      if(msw_rc_reset_styles != NULL) {\r
+               xp_theme_reset ();\r
+               msw_style_init ();\r
 \r
-       /* force all gtkwidgets to redraw */\r
-       (*msw_reset_rc_styles) (gtk_settings_get_default());\r
-      }\r
+               /* force all gtkwidgets to redraw */\r
+               (*msw_rc_reset_styles) (gtk_settings_get_default());\r
+         }\r
 \r
       return GDK_FILTER_REMOVE;\r
 \r
@@ -81,7 +81,7 @@ theme_init (GTypeModule *module)
 \r
     if(this_module)\r
       g_module_symbol (this_module, "gtk_rc_reset_styles",\r
-                      (gpointer *)(&msw_reset_rc_styles));\r
+                      (gpointer *)(&msw_rc_reset_styles));\r
   }\r
 \r
   msw_style_init ();\r
@@ -109,8 +109,7 @@ theme_create_rc_style (void)
  * is loaded and checks to see if we are compatible with the\r
  * version of GTK+ that loads us.\r
  */\r
-G_MODULE_EXPORT const gchar* g_module_check_init (GModule *module);\r
-const gchar*\r
+G_MODULE_EXPORT const gchar*\r
 g_module_check_init (GModule *module)\r
 {\r
   return gtk_check_version (2,0,0);\r