Warning fixes.

[wxWidgets.git] / src / msw / renderer.cpp

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index d045a5ee8eeddf0a73df35850efcc79f8a6fc892..9b83f013381dc6304a798416876404f54c8d9ede 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -144,43 +144,40 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
                                wxOrientation orient,
                                int flags)
 {
                                wxOrientation orient,
                                int flags)
 {

-    if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
-    {
-        m_rendererNative.DrawSplitterSash(
-                   win, dc, size, position, orient, flags);
-        return;
-    }
-    
-    // I don't know if it is correct to use the rebar background for the
-    // splitter but it least this works ok in the default theme
-    wxUxThemeHandle hTheme(win, L"REBAR");
-    if ( hTheme )
+    if ( !win->HasFlag(wxSP_NO_XP_THEME) )

     {
     {

-        RECT rect;
-        if ( orient == wxVERTICAL )
+        wxUxThemeHandle hTheme(win, L"WINDOW");
+        if ( hTheme )

         {
         {

-            rect.left = position;
-            rect.right = position + SASH_WIDTH; 
-            rect.top = 0;
-            rect.bottom = size.y;
+            RECT rect;
+            if ( orient == wxVERTICAL )
+            {
+                rect.left = position;
+                rect.right = position + SASH_WIDTH;
+                rect.top = 0;
+                rect.bottom = size.y;
+            }
+            else // wxHORIZONTAL
+            {
+                rect.left = 0;
+                rect.right = size.x;
+                rect.top = position;
+                rect.bottom = position + SASH_WIDTH;
+            }
+
+            wxUxThemeEngine::Get()->DrawThemeBackground
+                                    (
+                                        (WXHTHEME)hTheme,
+                                        dc.GetHDC(),
+                                        29, // WP_DIALOG: dlg background
+                                        0, // no particular state
+                                        &rect,
+                                        NULL
+                                    );
+            return;

         }
         }

-        else // wxHORIZONTAL
-        {
-            rect.left = 0;
-            rect.right = size.x;
-            rect.top = position;
-            rect.bottom = position + SASH_WIDTH;
-        }
-
-        wxUxThemeEngine::Get()->DrawThemeBackground
-                                (
-                                    (WXHTHEME)hTheme,
-                                    dc.GetHDC(),
-                                    3 /* RP_BAND */,
-                                    0 /* no state */ ,
-                                    &rect,
-                                    NULL
-                                );       

     }
     }

+
+    m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags);

 }
 
 }