showing a bevel button for a multiline label (is not multline on the OS level, but...

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

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 313865986ceddfb36942ef4b5c8cf60e5c7584cd..d4c36549f859fe9be01424d5c8da4ce77d757798 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -30,8 +30,8 @@
     #include "wx/dc.h"
 #endif //WX_PRECOMP
 
     #include "wx/dc.h"
 #endif //WX_PRECOMP
 

+#include "wx/splitter.h"

 #include "wx/renderer.h"
 #include "wx/renderer.h"

-

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


@@ -116,17 +116,24 @@ wxRendererNative& wxRendererXP::Get()
 static const wxCoord SASH_WIDTH = 4;
 
 wxSplitterRenderParams
 static const wxCoord SASH_WIDTH = 4;
 
 wxSplitterRenderParams

-wxRendererXP::GetSplitterParams(const wxWindow * WXUNUSED(win))
+wxRendererXP::GetSplitterParams(const wxWindow * win)

 {
 {

-    return wxSplitterRenderParams(SASH_WIDTH, 0, false);
+    if (win->GetWindowStyle() & wxSP_NO_XP_THEME)
+        return m_rendererNative.GetSplitterParams(win);
+    else
+        return wxSplitterRenderParams(SASH_WIDTH, 0, false);

 }
 
 void
 }
 
 void

-wxRendererXP::DrawSplitterBorder(wxWindow * WXUNUSED(win),
-                                 wxDC& WXUNUSED(dc),
-                                 const wxRect& WXUNUSED(rect),
-                                 int WXUNUSED(flags))
+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
 }
 
 void


@@ -135,8 +142,15 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
                                const wxSize& size,
                                wxCoord position,
                                wxOrientation orient,
                                const wxSize& size,
                                wxCoord position,
                                wxOrientation orient,

-                               int WXUNUSED(flags))
+                               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");
     // 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");