fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 4dd96d850ad44d84fd8ad243cf869943f479bebe..313865986ceddfb36942ef4b5c8cf60e5c7584cd 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -26,6 +26,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
 #endif //WX_PRECOMP
 
 #include "wx/renderer.h"
@@ -60,13 +62,15 @@ public:
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
-                                    const wxRect& rect);
+                                    const wxRect& rect,
+                                    int flags = 0);
     virtual void DrawSplitterSash(wxWindow *win,
                                   wxDC& dc,
                                   const wxSize& size,
                                   wxCoord position,
-                                  wxOrientation orient);
-    virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+                                  wxOrientation orient,
+                                  int flags = 0);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 private:
     DECLARE_NO_COPY_CLASS(wxRendererXP)
@@ -80,8 +84,8 @@ private:
 wxRendererNative& wxRendererNative::GetDefault()
 {
     wxUxThemeEngine *themeEngine = wxUxThemeEngine::Get();
-    return themeEngine && themeEngine->IsThemeActive() ? wxRendererXP::Get()
-                                                       : wxRendererMSW::Get();
+    return themeEngine && themeEngine->IsAppThemed() ? wxRendererXP::Get()
+                                                     : wxRendererMSW::Get();
 }
 
 /* static */
@@ -111,15 +115,17 @@ wxRendererNative& wxRendererXP::Get()
 // the width of the sash: this is the same as used by Explorer...
 static const wxCoord SASH_WIDTH = 4;
 
-wxPoint wxRendererXP::GetSplitterSashAndBorder(const wxWindow * WXUNUSED(win))
+wxSplitterRenderParams
+wxRendererXP::GetSplitterParams(const wxWindow * WXUNUSED(win))
 {
-    return wxPoint(SASH_WIDTH, 0);
+    return wxSplitterRenderParams(SASH_WIDTH, 0, false);
 }
 
 void
 wxRendererXP::DrawSplitterBorder(wxWindow * WXUNUSED(win),
                                  wxDC& WXUNUSED(dc),
-                                 const wxRect& WXUNUSED(rect))
+                                 const wxRect& WXUNUSED(rect),
+                                 int WXUNUSED(flags))
 {
 }
 
@@ -128,7 +134,8 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
                                wxDC& dc,
                                const wxSize& size,
                                wxCoord position,
-                               wxOrientation orient)
+                               wxOrientation orient,
+                               int WXUNUSED(flags))
 {
     // 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
@@ -153,7 +160,7 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 
         wxUxThemeEngine::Get()->DrawThemeBackground
                                 (
-                                    hTheme,
+                                    (WXHTHEME)hTheme,
                                     dc.GetHDC(),
                                     3 /* RP_BAND */,
                                     0 /* no state */ ,