X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62dc9cb4f159e2d4cac08308b96e63238935e6bb..c15fd9fba8844fe0e7d21ffca744c053e84f7c52:/src/generic/renderg.cpp

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 252bfccc14..3fefc8eba4 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -59,16 +59,18 @@ 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);
+                                  wxOrientation orient,
+                                  int flags = 0);
 
 
-    virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 
 protected:
@@ -100,17 +102,6 @@ wxRendererNative& wxRendererNative::GetGeneric()
     return s_rendererGeneric;
 }
 
-// some platforms have their own renderers
-#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__)
-
-/* static */
-wxRendererNative& wxRendererNative::Get()
-{
-    return GetGeneric();
-}
-
-#endif // platforms using their own renderers
-
 wxRendererGeneric::wxRendererGeneric()
     : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)),
       m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)),
@@ -208,17 +199,32 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),
 // sash drawing
 // ----------------------------------------------------------------------------
 
-wxPoint
-wxRendererGeneric::GetSplitterSashAndBorder(const wxWindow *win)
+wxSplitterRenderParams
+wxRendererGeneric::GetSplitterParams(const wxWindow *win)
 {
     // see below
-    return win->HasFlag(wxSP_3D) ? wxPoint(7, 2) : wxPoint(3, 0);
+    wxCoord sashWidth,
+            border;
+
+    if ( win->HasFlag(wxSP_3D) )
+    {
+        sashWidth = 7;
+        border = 2;
+    }
+    else // no 3D effect
+    {
+        sashWidth = 3;
+        border = 0;
+    }
+
+    return wxSplitterRenderParams(sashWidth, border, false);
 }
 
 void
 wxRendererGeneric::DrawSplitterBorder(wxWindow *win,
                                       wxDC& dc,
-                                      const wxRect& rectOrig)
+                                      const wxRect& rectOrig,
+                                      int WXUNUSED(falgs))
 {
     if ( win->HasFlag(wxSP_3D) )
     {
@@ -233,7 +239,8 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
                                     wxDC& dcReal,
                                     const wxSize& sizeReal,
                                     wxCoord position,
-                                    wxOrientation orient)
+                                    wxOrientation orient,
+                                    int WXUNUSED(flags))
 {
     // to avoid duplicating the same code for horizontal and vertical sashes,
     // simply mirror the DC instead if needed (i.e. if horz splitter)
@@ -260,28 +267,36 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
     // only the middle 3 columns are drawn unless wxSP_3D is specified
 
     const wxCoord h = size.y;
+    wxCoord offset = 0;
+    
+    // If we're not drawing the border, droppings will
+    // be left unless we make the sash shorter
+    if ( !win->HasFlag(wxSP_3DBORDER) )
+    {
+        offset = 3;
+    }
 
     // from left to right
     if ( win->HasFlag(wxSP_3D) )
     {
         dc.SetPen(m_penLightGrey);
-        dc.DrawLine(position, 1, position, h - 1);
+        dc.DrawLine(position, 1 + offset, position, h - 1 - offset);
 
         dc.SetPen(m_penHighlight);
-        dc.DrawLine(position + 1, 0, position + 1, h);
+        dc.DrawLine(position + 1, offset, position + 1, h - offset);
     }
 
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
-    dc.DrawRectangle(position + 2, 0, 3, h);
+    dc.DrawRectangle(position + 2, offset, 3, h - 2*offset);
 
     if ( win->HasFlag(wxSP_3D) )
     {
         dc.SetPen(m_penDarkGrey);
-        dc.DrawLine(position + 5, 0, position + 5, h);
+        dc.DrawLine(position + 5, offset, position + 5, h - offset);
 
         dc.SetPen(m_penBlack);
-        dc.DrawLine(position + 6, 1, position + 6, h - 1);
+        dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset);
     }
 }