Use proper border style when drawing shadow of scrolled windows on Windows

2007-03-08  Mathias Hasselmann <mathias.hasselmann@gmx.de>

	* modules/engines/ms-windows/msw_style.c: Use proper border style
	when drawing shadow of scrolled windows on Windows XP (#168326)
	* modules/engines/ms-windows/xp_theme.c: Explicitly set size of
	element_part_map array to ensure it always is large enough.

svn path=/trunk/; revision=17429

diff --git a/ChangeLog b/ChangeLog
index 4b672a60880790aa10d9c8d75d9a2c03a6e111d8..7a8a6179fe4033a4ccf510a2b77bcebfc5960457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-03-08  Mathias Hasselmann <mathias.hasselmann@gmx.de>
 
+       * modules/engines/ms-windows/msw_style.c: Use proper border style
+       when drawing shadow of scrolled windows on Windows XP (#168326)
+       * modules/engines/ms-windows/xp_theme.c: Explicitly set size of
+       element_part_map array to ensure it always is large enough.
+       
+2007-03-08  Mathias Hasselmann <mathias.hasselmann@gmx.de>     
+
        * gtk/gtkcombobox.c: Add shadow-type style property, set shadow-type
        property of GtkEntry accordingly, unify size-allocation of toggle
        button (#411123, patch from Mathias Hasselmann).

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 07a53ce89d6965a4b0d0bace5baffd2f84da9e28..49ab0fb801950b1ad2533afb3c584f028a55d122 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -2692,10 +2692,13 @@ draw_shadow (GtkStyle * style,
            return;
        }
 
-    if( detail && !strcmp( detail, "spinbutton" ) )
-               {
+    if (detail && !strcmp (detail, "scrolled_window") &&
+        xp_theme_draw (window, XP_THEME_ELEMENT_EDIT_TEXT, style,
+                       x, y, width, height, state_type, area))
+        return;
+
+    if (detail && !strcmp (detail, "spinbutton"))
         return;
-    }
 
     if (detail && !strcmp (detail, "menu"))
                        {

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index b96467b6af86bf5ae142c0765daf7da8536cdf74..187069d0d9d065f19801aa10b3c87e29dd6cb21a 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -96,7 +96,7 @@ static const LPCWSTR class_descriptors[] = {
     L"Trackbar"                        /* XP_THEME_CLASS_TRACKBAR */
 };
 
-static const short element_part_map[] = {
+static const short element_part_map[XP_THEME_ELEMENT__SIZEOF] = {
     BP_CHECKBOX,
     BP_CHECKBOX,
     BP_PUSHBUTTON,