Fix combobox theming regression noted in bug 321301 Ditto

* modules/engines/ms-windows/msw_style.c: Fix combobox theming
	regression noted in bug 321301
	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: Ditto
This commit is contained in:
Dom Lachowicz 2006-03-03 03:32:39 +00:00
parent 75606909f1
commit 91336be9b3
4 changed files with 39 additions and 23 deletions

View File

@ -1,3 +1,9 @@
2006-03-02 Dom Lachowicz <cinamod@hotmail.com>
* modules/engines/ms-windows/msw_style.c: Fix combobox theming
regression noted in bug 321301
* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: Ditto
2006-03-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_layout)

View File

@ -1,3 +1,9 @@
2006-03-02 Dom Lachowicz <cinamod@hotmail.com>
* modules/engines/ms-windows/msw_style.c: Fix combobox theming
regression noted in bug 321301
* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: Ditto
2006-03-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_layout)

View File

@ -38,16 +38,3 @@ style "msw-default"
}
class "*" style "msw-default"
style "msw-combobox-toggle" = "msw-default"
{
xthickness = 0
ythickness = 0
GtkButton::default-border = { 0, 0, 0, 0 }
GtkButton::default-outside-border = { 0, 0, 0, 0 }
GtkButton::child-displacement-x = 0
GtkButton::child-displacement-y = 0
GtkWidget::focus-padding = 0
GtkWidget::focus-line-width = 0
}
widget_class "*ComboBox*ToggleButton*" style "msw-combobox-toggle"

View File

@ -804,6 +804,23 @@ setup_msw_rc_style (void)
"}widget_class \"*CheckButton*\" style \"msw-checkbutton\"\n"
"widget_class \"*RadioButton*\" style \"msw-checkbutton\"\n");
gtk_rc_parse_string (buf);
if(xp_theme_is_active()) {
g_snprintf (buf, sizeof(buf),
"style \"msw-combobox-toggle\" = \"msw-default\"\n"
"{\n"
"xthickness = 0\n"
"ythickness = 0\n"
"GtkButton::default-border = { 0, 0, 0, 0 }\n"
"GtkButton::default-outside-border = { 0, 0, 0, 0 }\n"
"GtkButton::child-displacement-x = 0\n"
"GtkButton::child-displacement-y = 0\n"
"GtkWidget::focus-padding = 0\n"
"GtkWidget::focus-line-width = 0\n"
"}\n"
"widget_class \"*ComboBox*ToggleButton*\" style \"msw-combobox-toggle\"\n");
gtk_rc_parse_string (buf);
}
}
static void