The reinit of the stock objects shoudl not happen when wxPython is

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 095403939d21f0f313185cc3ae98eedcb010e5fe..d4c36549f859fe9be01424d5c8da4ce77d757798 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -26,27 +26,161 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
 #endif //WX_PRECOMP
 
+#include "wx/splitter.h"
 #include "wx/renderer.h"
+#include "wx/msw/uxtheme.h"
 
 // ----------------------------------------------------------------------------
-// wxRendererMSW: our wxRendererNative implementation
+// wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererNative
 {
+public:
+    wxRendererMSW() { }
+
+    static wxRendererNative& Get();
+
+private:
+    DECLARE_NO_COPY_CLASS(wxRendererMSW)
+};
+
+// ----------------------------------------------------------------------------
+// wxRendererXP: wxRendererNative implementation for Windows XP and later
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative
+{
+public:
+    wxRendererXP() : wxDelegateRendererNative(wxRendererMSW::Get()) { }
+
+    static wxRendererNative& Get();
+
+    virtual void DrawSplitterBorder(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    int flags = 0);
+    virtual void DrawSplitterSash(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxSize& size,
+                                  wxCoord position,
+                                  wxOrientation orient,
+                                  int flags = 0);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxRendererXP)
 };
 
 // ============================================================================
-// implementation
+// wxRendererNative and wxRendererMSW implementation
 // ============================================================================
 
 /* static */
-wxRendererNative& wxRendererNative::Get()
+wxRendererNative& wxRendererNative::GetDefault()
+{
+    wxUxThemeEngine *themeEngine = wxUxThemeEngine::Get();
+    return themeEngine && themeEngine->IsAppThemed() ? wxRendererXP::Get()
+                                                     : wxRendererMSW::Get();
+}
+
+/* static */
+wxRendererNative& wxRendererMSW::Get()
 {
     static wxRendererMSW s_rendererMSW;
 
     return s_rendererMSW;
 }
 
+// ============================================================================
+// wxRendererXP implementation
+// ============================================================================
+
+/* static */
+wxRendererNative& wxRendererXP::Get()
+{
+    static wxRendererXP s_rendererXP;
+
+    return s_rendererXP;
+}
+
+// ----------------------------------------------------------------------------
+// splitter drawing
+// ----------------------------------------------------------------------------
+
+// the width of the sash: this is the same as used by Explorer...
+static const wxCoord SASH_WIDTH = 4;
+
+wxSplitterRenderParams
+wxRendererXP::GetSplitterParams(const wxWindow * win)
+{
+    if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+        return m_rendererNative.GetSplitterParams(win);
+    else
+        return wxSplitterRenderParams(SASH_WIDTH, 0, false);
+}
+
+void
+wxRendererXP::DrawSplitterBorder(wxWindow * win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags)
+{
+    if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+    {
+        m_rendererNative.DrawSplitterBorder(win, dc, rect, flags);
+    }
+}
+
+void
+wxRendererXP::DrawSplitterSash(wxWindow *win,
+                               wxDC& dc,
+                               const wxSize& size,
+                               wxCoord position,
+                               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 )
+    {
+        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(),
+                                    3 /* RP_BAND */,
+                                    0 /* no state */ ,
+                                    &rect,
+                                    NULL
+                                );       
+    }
+}
+