(blind) fix for keyboard cues display under XP (bug 1298512)

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 44cef6df14c893a3357f20c9594fc1521cdf1ac5..eb278ab3c20c88531ee0bd8d2cdc0d4cab97f4c1 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"

+#include "wx/settings.h"

 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 


@@ -244,36 +245,18 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->HasFlag(wxSP_NO_XP_THEME) )
     {
 {
     if ( !win->HasFlag(wxSP_NO_XP_THEME) )
     {

-        wxUxThemeHandle hTheme(win, L"REBAR");
-        if ( hTheme )
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)));
+        if ( orient == wxVERTICAL )

         {
         {

-            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
-                                    (
-                                        hTheme,
-                                        (HDC) dc.GetHDC(),
-                                        29, // WP_DIALOG: dlg background
-                                        0, // no particular state
-                                        &rect,
-                                        NULL
-                                    );
-            return;
+            dc.DrawRectangle(position, 0, SASH_WIDTH, size.y);

         }
         }

+        else // wxHORIZONTAL
+        {
+            dc.DrawRectangle(0, position, size.x, SASH_WIDTH);
+        }
+
+        return;

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