X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtk-win32.css;h=f8d774fcce0aedd330dafc94e5fa38c693ec7cfc;hb=32aa7f0582febb614c41e4130ad34ac44ef6efd2;hp=215d1f3fe2c2c75c7071f92b807f59a791ca6c29;hpb=7c092be0cef084fa52ab44ce322b57974d831d00;p=~andy%2Fgtk

diff --git a/gtk/gtk-win32.css b/gtk/gtk-win32.css
index 215d1f3fe..f8d774fcc 100644
--- a/gtk/gtk-win32.css
+++ b/gtk/gtk-win32.css
@@ -1,508 +1,35 @@
-@define-color bg_color -gtk-win32-color(button, 15);
-
-/* Buttons */
-
-.button {
-    background-color: none;
-    background-image: -gtk-win32-theme-part(button, 1 1);
-    border-width: 0;
-    -GtkWidget-focus-line-width: 1;
-    -GtkWidget-focus-padding: 3;
-    -GtkButton-interior-focuse: true;
-}
-
-.button:insensitive {
-    background-image: -gtk-win32-theme-part(button, 1 4);
-}
-
-.button:focused {
-    background-image: -gtk-win32-theme-part(button, 1 5);
-}
-
-.button:prelight, .button:prelight:focused {
-    background-image: -gtk-win32-theme-part(button, 1 2);
-    color: #000000;
-}
-
-.button:active, .button:active:focused, .button:active:focused:prelight {
-    background-image: -gtk-win32-theme-part(button, 1 3);
-}
-
-/* Check buttons */
-
-.check {
-    background-color: none;
-    background-image: -gtk-win32-theme-part(button, 3 1);
-    border-width: 0;
-}
-
-.check:insensitive {
-    background-image: -gtk-win32-theme-part(button, 3 4);
-}
-
-.check:prelight {
-    background-image: -gtk-win32-theme-part(button, 3 2);
-}
-
-.check:active {
-    background-image: -gtk-win32-theme-part(button, 3 5);
-}
-
-.check:active:insensitive {
-    background-image: -gtk-win32-theme-part(button, 3 8);
-}
-
-.check:active:prelight {
-    background-image: -gtk-win32-theme-part(button, 3 6);
-}
-
-.check:inconsistent {
-    background-image: -gtk-win32-theme-part(button, 3 9);
-}
-
-.check:inconsistent:insensitive {
-    background-image: -gtk-win32-theme-part(button, 3 12);
-}
-
-.check:inconsistent:prelight {
-    background-image: -gtk-win32-theme-part(button, 3 10);
-}
-
-/* Radio buttons */
-
-.radio {
-    background-color: none;
-    background-image: -gtk-win32-theme-part(button, 2 1);
-    border-width: 0;
-}
-
-.radio:insensitive {
-    background-image: -gtk-win32-theme-part(button, 2 4);
-}
-
-.radio:prelight {
-    background-image: -gtk-win32-theme-part(button, 2 2);
-}
-
-.radio:active {
-    background-image: -gtk-win32-theme-part(button, 2 5);
-}
-
-.radio:active:insensitive {
-    background-image: -gtk-win32-theme-part(button, 2 8);
-}
-
-.radio:active:prelight {
-    background-image: -gtk-win32-theme-part(button, 2 6);
-}
-
-.radio:inconsistent {
-    background-image: -gtk-win32-theme-part(button, 2 1, over (2 5, 0.3));
-}
-
-.radio:inconsistent:insensitive {
-    background-image: -gtk-win32-theme-part(button, 2 4, over (2 8, 0.3));
-}
-
-.radio:inconsistent:prelight {
-    background-image: -gtk-win32-theme-part(button, 2 4, over(2 6, 0.3));
-}
-
-/* Scrollbars */
-
-/* TODO: Win32 has different concept for upper and lower trough, we
-   don't use this atm */
-
-.scrollbar {
-    background-color: none;
-    -GtkRange-trough-border: 0;
-    -GtkRange-arrow-scaling: 0.0;
-    -GtkRange-slider-width: -gtk-win32-size(scrollbar, 3);
-}
-
-.scrollbar.vertical {
-    -GtkRange-slider-width: -gtk-win32-size(scrollbar, 2);
-}
-
-.scrollbar.button.bottom {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 5);
-}
-
-.scrollbar.button.bottom:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 6);
-}
-
-.scrollbar.button.bottom:active,
-.scrollbar.button.bottom:active:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 7);
-}
-
-.scrollbar.button.bottom:insensitive {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 8);
-}
-
-.scrollbar.button.top {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 1);
-}
-
-.scrollbar.button.top:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 2);
-}
-
-.scrollbar.button.top:active,
-.scrollbar.button.top:active:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 3);
-}
-
-.scrollbar.button.top:insensitive {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 4);
-}
-
-.scrollbar.button.left {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 9);
-}
-
-.scrollbar.button.left:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 10);
-}
-
-.scrollbar.button.left:active,
-.scrollbar.button.left:active:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 11);
-}
-
-.scrollbar.button.left:insensitive {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 12);
-}
-
-.scrollbar.button.right {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 13);
-}
-
-.scrollbar.button.right:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 14);
-}
-
-.scrollbar.button.right:active,
-.scrollbar.button.right:active:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 15);
-}
-
-.scrollbar.button.right:insensitive {
-    background-image: -gtk-win32-theme-part(scrollbar, 1 16);
-}
-
-.scrollbar.trough {
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(scrollbar, 2 1, over (4 1));
-}
-
-.scrollbar.trough.vertical {
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(scrollbar, 2 1, over (6 1));
-}
-
-.scrollbar.slider {
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(scrollbar, 2 1, over (8 1));
-}
-
-.scrollbar.slider:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 2 2, over (8 2));
-}
-
-.scrollbar.slider.vertical {
-    background-image: -gtk-win32-theme-part(scrollbar, 3 1, over (9 1));
-}
-
-.scrollbar.slider.vertical:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 3 2, over (9 2));
-}
-
-/* Entry */
-
-/* TODO: For entries with set_has_frame FALSE we should use 'edit, 3 1', not 
-   sure how to select for this though */
-.entry {
-    background-color: black;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(edit, 1 1);
-}
-.entry:insensitive {
-    background-image: -gtk-win32-theme-part(edit, 1 4);
-}
-.entry:prelight {
-    background-image: -gtk-win32-theme-part(edit, 1 4);
-}
-
-/* Spinbuttons */
-
-.spinbutton.button,
-.spinbutton.button:focused {
-    background-color: none;
-    border-width: 1 1 0 0;
-    border-style: none;
-    background-image: -gtk-win32-theme-part(spin, 1 1);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button:prelight,
-.spinbutton.button:prelight:focused {
-    background-image: -gtk-win32-theme-part(spin, 1 2);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button:active,
-.spinbutton.button:active:prelight {
-    background-image: -gtk-win32-theme-part(spin, 1 3);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button:insensitive {
-    background-image: -gtk-win32-theme-part(spin, 1 4);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button.bottom,
-.spinbutton.button.bottom:focused {
-    border-width: 0 1 1 0;
-    background-image: -gtk-win32-theme-part(spin, 2 1);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button.bottom:prelight,
-.spinbutton.button.bottom:prelight:focused {
-    background-image: -gtk-win32-theme-part(spin, 2 2);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button.bottom:active,
-.spinbutton.button.bottom:active:prelight {
-    background-image: -gtk-win32-theme-part(spin, 2 3);
-    color: rgba(0, 0, 0, 0);
-}
-
-.spinbutton.button.bottom:insensitive {
-    background-image: -gtk-win32-theme-part(spin, 2 4);
-    color: rgba(0, 0, 0, 0);
-}
-
-/* Ranges */
-
-/* TODO: The trough is not quite right, it covers everything,
-   but in win32 the slider 'sticks out' on the sides of the
-   trough */
-
-.scale {
-    background-color: none;
-    -GtkScale-value-spacing: 0;
-    -GtkScale-slider-length: 9;
-    -GtkRange-slider-width: 20;
-    -GtkRange-trough-border: 0;
-}
-
-.scale.trough {
-    border-style: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(trackbar, 1 1);
-}
-
-.scale.slider {
-    background-color: none;
-    border-width: 0;
-    color: rgba(0,0,0,0);
-    background-image: -gtk-win32-theme-part(trackbar, 3 1);
-}
-
-.scale.slider:prelight {
-    background-image: -gtk-win32-theme-part(trackbar, 3 2);
-}
-
-.scale.slider:active,
-.scale.slider:prelight:active {
-    background-image: -gtk-win32-theme-part(trackbar, 3 3);
-}
-
-.scale.slider:focus {
-    background-image: -gtk-win32-theme-part(trackbar, 3 4);
-}
-
-.scale.slider:insensitive {
-    background-image: -gtk-win32-theme-part(trackbar, 3 5);
-}
-
-.scale.slider.vertical {
-    background-image: -gtk-win32-theme-part(trackbar, 6 1);
-}
-
-.scale.slider.vertical:prelight {
-    background-image: -gtk-win32-theme-part(trackbar, 6 2);
-}
-
-.scale.slider.vertical:active,
-.scale.slider.vertical:prelight:active {
-    background-image: -gtk-win32-theme-part(trackbar, 6 3);
-}
-
-.scale.slider.vertical:focus {
-    background-image: -gtk-win32-theme-part(trackbar, 6 4);
-}
-
-.scale.slider.vertical:insensitive {
-    background-image: -gtk-win32-theme-part(trackbar, 6 5);
-}
-
-.scale.slider.scale-has-marks-below {
-    background-image: -gtk-win32-theme-part(trackbar, 4 1);
-}
-
-.scale.slider.scale-has-marks-below:prelight {
-    background-image: -gtk-win32-theme-part(trackbar, 4 2);
-}
-
-.scale.slider.scale-has-marks-below:active,
-.scale.slider.scale-has-marks-below:prelight:active {
-    background-image: -gtk-win32-theme-part(trackbar, 4 3);
-}
-
-.scale.slider.scale-has-marks-below:focus {
-    background-image: -gtk-win32-theme-part(trackbar, 4 4);
-}
-
-.scale.slider.scale-has-marks-below:insensitive {
-    background-image: -gtk-win32-theme-part(trackbar, 4 5);
-}
-
-.scale.slider.scale-has-marks-below.vertical {
-    background-image: -gtk-win32-theme-part(trackbar, 8 1);
-}
-
-.scale.slider.scale-has-marks-below.vertical:prelight {
-    background-image: -gtk-win32-theme-part(trackbar, 8 2);
-}
-
-.scale.slider.scale-has-marks-below.vertical:active,
-.scale.slider.scale-has-marks-below.vertical:prelight:active {
-    background-image: -gtk-win32-theme-part(trackbar, 8 3);
-}
-
-.scale.slider.scale-has-marks-below.vertical:focus {
-    background-image: -gtk-win32-theme-part(trackbar, 8 4);
-}
-
-.scale.slider.scale-has-marks-below.vertical:insensitive {
-    background-image: -gtk-win32-theme-part(trackbar, 8 5);
-}
-
-
-
-.scale.slider.scale-has-marks-above {
-    background-image: -gtk-win32-theme-part(trackbar, 5 1);
-}
-
-.scale.slider.scale-has-marks-above:prelight {
-    background-image: -gtk-win32-theme-part(trackbar, 5 2);
-}
-
-.scale.slider.scale-has-marks-above:active,
-.scale.slider.scale-has-marks-above:prelight:active {
-    background-image: -gtk-win32-theme-part(trackbar, 5 3);
-}
-
-.scale.slider.scale-has-marks-above:focus {
-    background-image: -gtk-win32-theme-part(trackbar, 5 4);
-}
-
-.scale.slider.scale-has-marks-above:insensitive {
-    background-image: -gtk-win32-theme-part(trackbar, 5 5);
-}
-
-.scale.slider.scale-has-marks-above.vertical {
-    background-image: -gtk-win32-theme-part(trackbar, 7 1);
-}
-
-.scale.slider.scale-has-marks-above.vertical:prelight {
-    background-image: -gtk-win32-theme-part(trackbar, 7 2);
-}
-
-.scale.slider.scale-has-marks-above.vertical:active,
-.scale.slider.scale-has-marks-above.vertical:prelight:active {
-    background-image: -gtk-win32-theme-part(trackbar, 7 3);
-}
-
-.scale.slider.scale-has-marks-above.vertical:focus {
-    background-image: -gtk-win32-theme-part(trackbar, 7 4);
-}
-
-.scale.slider.scale-has-marks-above.vertical:insensitive {
-    background-image: -gtk-win32-theme-part(trackbar, 7 5);
-}
-
-/* Progress bars */
-
-GtkProgressBar {
-    background-color: none;
-    padding: 0;
-}
-
-GtkProgressBar.trough {
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(progress, 1 1);
-}
-
-GtkProgressBar.progressbar,
-GtkEntry.progressbar {
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(progress, 5 1);
-}
-
-GtkProgressBar.progressbar.pulse,
-GtkEntry.progressbar.pulse {
-    background-image: -gtk-win32-theme-part(progress, 8 1);
-}
-
-GtkProgressBar.trough.vertical {
-    background-image: -gtk-win32-theme-part(progress, 2 1);
-}
-
-.progressbar.vertical {
-    background-image: -gtk-win32-theme-part(progress, 6 1);
-}
-
-.progressbar.pulse.vertical {
-    background-image: -gtk-win32-theme-part(progress, 10 1);
-}
+@import url("gtk-win32-base.css");
 
 /* Menus */
 
 .menubar {
-    background-color: none;
+    background-color: transparent;
     border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 7 1);
 }
 
-.menubar .menuitem {
-    background-color: none;
+.menubar > .menuitem {
+    background-color: transparent;
     border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 8 1);
 }
 
-.menubar .menuitem:prelight {
-    background-color: none;
-    border-width: 0;
+.menubar > .menuitem:prelight {
     background-image: -gtk-win32-theme-part(menu, 8 3);
 }
 
 .menuitem:prelight {
-    background-color: none;
     background-image: -gtk-win32-theme-part(menu, 14 2);
+}
 
+.menuitem:prelight:insensitive {
+    background-image: -gtk-win32-theme-part(menu, 14 4);
 }
 
 .menuitem.radio,
 .menuitem.radio:prelight,
 .menuitem.radio:insensitive {
-    background-color: none;
+    background-color: transparent;
     background-image: none;
     border-width: 0;
 }
@@ -555,105 +82,3 @@ GtkProgressBar.trough.vertical {
     background-image: -gtk-win32-theme-part(menu, 11 2);
     border-width: 0;
 }
-
-/* Combobox */
-
-
-GtkComboBox.combobox-entry .button {
-    background-color: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(combobox, 1 1);
-    color: rgba(0, 0, 0, 0);
-}
-
-GtkComboBox.combobox-entry .button:prelight,
-GtkComboBox.combobox-entry .button:focused,
-GtkComboBox.combobox-entry .button:prelight:focused {
-    background-image: -gtk-win32-theme-part(combobox, 1 2);
-}
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:focused,
-GtkComboBox.combobox-entry .button:active:prelight,
-GtkComboBox.combobox-entry .button:active:focused:prelight {
-    background-image: -gtk-win32-theme-part(combobox, 1 3);
-}
-GtkComboBox.combobox-entry .button:insensitive {
-    background-image: -gtk-win32-theme-part(combobox, 1 4);
-}
-
-/* Notebook */
-
-.notebook {
-    background-color: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(tab, 9 1);
-    -GtkNotebook-tab-overlap: 1;
-    -GtkNotebook-tab-curvature: 1;
-}
-
-.notebook tab {
-    background-color: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(tab, 1 1);
-}
-
-.notebook tab:active {
-    background-image: -gtk-win32-theme-part(tab, 1 3);
-    padding: 4;
-}
-
-.notebook {
-    background-color: #ffffff;
-}
-
-/* Toolbar */
-
-.toolbar {
-    background-color: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(rebar, 6 1);
-}
-
-.toolbar .button,
-.toolbar .button:focused {
-    background-color: none;
-    background-image: -gtk-win32-theme-part(toolbar, 1 1);
-}
-
-.toolbar .button:prelight,
-.toolbar .button:prelight:focused {
-    background-image: -gtk-win32-theme-part(toolbar, 1 2);
-}
-
-.toolbar .button:active {
-    background-image: -gtk-win32-theme-part(toolbar, 1 3);
-}
-
-.toolbar .button:active:prelight {
-    background-image: -gtk-win32-theme-part(toolbar, 1 6);
-}
-
-.toolbar .button:insensitive {
-    background-image: -gtk-win32-theme-part(toolbar, 1 4);
-}
-
-/* Column headers */
-
-column-header .button,
-column-header .button:focus {
-    background-color: none;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(header, 1 1);
-}
-
-column-header .button:prelight,
-column-header .button:prelight:focus {
-    background-image: -gtk-win32-theme-part(header, 1 2);
-}
-
-column-header .button:active,
-column-header .button:active:prelight,
-column-header .button:active:focus,
-column-header .button:active:prelight:focus {
-    background-image: -gtk-win32-theme-part(header, 1 3);
-}