gtk+ r19734 - in branches/gtk-2-12: . modules/engines/ms-windows

[aruiz svn gnome org]

Author: aruiz
Date: Sat Mar  8 07:32:08 2008
New Revision: 19734
URL: http://svn.gnome.org/viewvc/gtk+?rev=19734&view=rev

Log:

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.



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/modules/engines/ms-windows/msw_style.c

Modified: branches/gtk-2-12/modules/engines/ms-windows/msw_style.c
==============================================================================
--- branches/gtk-2-12/modules/engines/ms-windows/msw_style.c	(original)
+++ branches/gtk-2-12/modules/engines/ms-windows/msw_style.c	Sat Mar  8 07:32:08 2008
@@ -1977,7 +1977,7 @@
       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 @@
 
   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))