win32: Fix up theme for menus on XP

diff --git a/gtk/gtk-win32-base.css b/gtk/gtk-win32-base.css
index 7dd6e7e700fe7098a1806dc7720cd92875ea4985..cf73cabd3e0b98f378a79a0bb859302593259c45 100644 (file)
--- a/gtk/gtk-win32-base.css
+++ b/gtk/gtk-win32-base.css
@@ -730,4 +730,22 @@ GtkSwitch.trough {
 
 GtkSwitch.trough:active {
     background-image: -gtk-win32-theme-part(button, 1 2);
-}
\ No newline at end of file
+}
+
+/* Menus */
+
+.menu {
+    background-color: -gtk-win32-color(button, 4);
+    border-color: shade (-gtk-win32-color(button, 4), 0.6);
+    border-style: solid;
+    border-width: 1px;
+    padding: 2px;
+}
+
+.menuitem {
+    color: -gtk-win32-color(button, 7);
+}
+
+.menubar > .menuitem {
+    padding: 3px 5px;
+}

diff --git a/gtk/gtk-win32-xp.css b/gtk/gtk-win32-xp.css
index d07fcf796d4a5ac0b2cf0dc95e82e62bf7dec9b7..70ee8628d53b511eae3a45c6b1590e9bdcfb0750 100644 (file)
--- a/gtk/gtk-win32-xp.css
+++ b/gtk/gtk-win32-xp.css
@@ -1,5 +1,23 @@
 @import url("gtk-win32-base.css");
 
+.menubar {
+    background-color: #f7f7f7;
+    /*background-color: -gtk-win32-color(button, 30);*/
+
+    border-width: 0 0 1px 0;
+    border-style: solid;
+    border-color: #ded3bd;
+}
+
+.menu > .menuitem:prelight {
+    background-color: -gtk-win32-color(button, 29);
+}
+
+.menubar > .menuitem:prelight,
+.menubar > .menuitem:prelight:focused {
+    background-image: -gtk-win32-theme-part(toolbar, 1 2);
+}
+
 .notebook {
     background-image: -gtk-win32-theme-part(tab, 9 1, margins(-1 -3 -3 -1));
     border-image: -gtk-win32-theme-part(tab, 9 1, margins(0 -2 -2 0)) 1 1 1 1 repeat;

diff --git a/gtk/gtk-win32.css b/gtk/gtk-win32.css
index c3a216e9afd355479281103d03c1d6b1919982aa..f8d774fcce0aedd330dafc94e5fa38c693ec7cfc 100644 (file)
--- a/gtk/gtk-win32.css
+++ b/gtk/gtk-win32.css
@@ -2,18 +2,6 @@
 
 /* Menus */
 
-.menu {
-    background-color: -gtk-win32-color(button, 4);
-    border-color: shade (-gtk-win32-color(button, 4), 0.6);
-    border-style: solid;
-    border-width: 1px;
-    padding: 2px;
-}
-
-.menuitem {
-    color: -gtk-win32-color(button, 7);
-}
-
 .menubar {
     background-color: transparent;
     border-width: 0;
@@ -24,12 +12,9 @@
     background-color: transparent;
     border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 8 1);
-    padding: 3px 5px;
 }
 
 .menubar > .menuitem:prelight {
-    background-color: transparent;
-    border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 8 3);
 }