X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cf3223a80adede7cf8524d29b9b5fab8621eff4..b8af111fa5d3916e6f42fee3af0ab1bec0ace7b6:/src/msw/renderer.cpp

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 0b54ae2c1f..eb278ab3c2 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -32,6 +32,7 @@
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"
+#include "wx/settings.h"
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 
@@ -126,6 +127,10 @@ wxRendererNative& wxRendererMSW::Get()
     return s_rendererMSW;
 }
 
+#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
+#define DFCS_FLAT 0
+#endif
+
 void
 wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       wxDC& dc,
@@ -192,7 +197,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
         wxUxThemeEngine::Get()->DrawThemeBackground
                                 (
                                     hTheme,
-                                    dc.GetHDC(),
+                                    (HDC) dc.GetHDC(),
                                     CP_DROPDOWNBUTTON,
                                     state,
                                     &r,
@@ -240,36 +245,18 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->HasFlag(wxSP_NO_XP_THEME) )
     {
-        wxUxThemeHandle hTheme(win, L"WINDOW");
-        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
-                                    (
-                                        (WXHTHEME)hTheme,
-                                        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);