diff options
author | Alberto Ruiz <aruiz@gnome.org> | 2008-03-08 07:32:08 +0000 |
---|---|---|
committer | Alberto Ruiz <aruiz@src.gnome.org> | 2008-03-08 07:32:08 +0000 |
commit | 080557e033b8ca40e88f2645de7be8d122efbf1f (patch) | |
tree | 2949ac0aa27dc9f41bdd091f6aa9b2ddc648a12c | |
parent | f6e00fcc3bd33a5985cc60e873849f665e6e27e7 (diff) | |
download | gdk-pixbuf-080557e033b8ca40e88f2645de7be8d122efbf1f.tar.gz |
Merged from trunk:
2008-03-07 Alberto Ruiz <aruiz@gnome.org>
Merged from trunk:
* modules/engines/ms-windows/msw_style.c (draw_shadow):
Do not draw frame if parent if combobox.
(draw_box):
Uses scrollbar width system metrics for combobox button.
Fixes #461805 for XP theme engine.
svn path=/branches/gtk-2-12/; revision=19734
-rw-r--r-- | ChangeLog | 10 | ||||
-rwxr-xr-x | modules/engines/ms-windows/msw_style.c | 7 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2008-03-07 Alberto Ruiz <aruiz@gnome.org> + + Merged from trunk: + + * modules/engines/ms-windows/msw_style.c (draw_shadow): + Do not draw frame if parent if combobox. + (draw_box): + Uses scrollbar width system metrics for combobox button. + Fixes #461805 for XP theme engine. + 2008-03-06 Federico Mena Quintero <federico@novell.com> Merged from trunk: diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index ad17d9b6c..087f29f8a 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -1977,7 +1977,7 @@ draw_box (GtkStyle *style, FillRect (dc, &rect, GetSysColorBrush (COLOR_WINDOW)); release_window_dc (style, window, state_type); - cx = 2 * GetSystemMetrics (SM_CXEDGE) + 16; /* TODO evaluate arrow width */ + cx = GetSystemMetrics(SM_CXVSCROLL); x += width - cx; width = cx; @@ -2933,8 +2933,13 @@ draw_shadow (GtkStyle *style, if (detail && !strcmp (detail, "frame")) { + HDC dc; RECT rect; + + if (is_combo_box_child (widget)) + return; + dc = get_window_dc (style, window, state_type, x, y, width, height, &rect); if (is_popup_window_child (widget)) |