Do not draw frame if parent if combobox. (draw_box): Uses scrollbar width

2008-03-08  Alberto Ruiz  <aruiz@gnome.org>

	* 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=/trunk/; revision=19733
This commit is contained in:
Alberto Ruiz 2008-03-08 07:20:33 +00:00 committed by Alberto Ruiz
parent 424cc287f1
commit b60e426719
2 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2008-03-08 Alberto Ruiz <aruiz@gnome.org>
* 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-07 Johan Dahlin <johan@gnome.org>
* gtk/gtkbuilder.c:

View File

@ -1980,7 +1980,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;
@ -2946,8 +2946,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))