more samples makefiles fixes

[wxWidgets.git] / src / generic / renderg.cpp

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 19a4777f64b722ad0f1d5ff6111e4794ade3b58f..3fefc8eba4dc6c8936840fd2bc064550723fbefa 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -32,6 +32,9 @@
 #include "wx/dc.h"
 
 #include "wx/settings.h"
+#include "wx/splitter.h"
+
+#include "wx/dcmirror.h"
 
 #include "wx/renderer.h"
 
@@ -56,15 +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);
+                                  wxCoord position,
+                                  wxOrientation orient,
+                                  int flags = 0);
 
 
-    virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win);
+    virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
 
 protected:
@@ -96,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)),
@@ -146,10 +141,10 @@ wxRendererGeneric::DrawShadedRect(wxDC& dc,
 // ----------------------------------------------------------------------------
 
 void
-wxRendererGeneric::DrawHeaderButton(wxWindow *win,
+wxRendererGeneric::DrawHeaderButton(wxWindow * WXUNUSED(win),
                                     wxDC& dc,
                                     const wxRect& rect,
-                                    int flags)
+                                    int WXUNUSED(flags))
 {
     const int CORNER = 1;
 
@@ -177,7 +172,7 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win,
 
 // draw the plus or minus sign
 void
-wxRendererGeneric::DrawTreeItemButton(wxWindow *win,
+wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),
                                       wxDC& dc,
                                       const wxRect& rect,
                                       int flags)
@@ -204,30 +199,56 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *win,
 // sash drawing
 // ----------------------------------------------------------------------------
 
-wxPoint
-wxRendererGeneric::GetSplitterSashAndBorder(const wxWindow * WXUNUSED(win))
+wxSplitterRenderParams
+wxRendererGeneric::GetSplitterParams(const wxWindow *win)
 {
     // see below
-    return wxPoint(7, 2);
+    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 * WXUNUSED(win),
+wxRendererGeneric::DrawSplitterBorder(wxWindow *win,
                                       wxDC& dc,
-                                      const wxRect& rectOrig)
+                                      const wxRect& rectOrig,
+                                      int WXUNUSED(falgs))
 {
-    wxRect rect = rectOrig;
-    DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
-    DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey);
+    if ( win->HasFlag(wxSP_3D) )
+    {
+        wxRect rect = rectOrig;
+        DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
+        DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey);
+    }
 }
 
 void
-wxRendererGeneric::DrawSplitterSash(wxWindow * WXUNUSED(win),
-                                    wxDC& dc,
-                                    const wxSize& size,
-                                    wxCoord position)
+wxRendererGeneric::DrawSplitterSash(wxWindow *win,
+                                    wxDC& dcReal,
+                                    const wxSize& sizeReal,
+                                    wxCoord position,
+                                    wxOrientation orient,
+                                    int WXUNUSED(flags))
 {
-    // we draw a Win32-like sash here:
+    // to avoid duplicating the same code for horizontal and vertical sashes,
+    // simply mirror the DC instead if needed (i.e. if horz splitter)
+    wxMirrorDC dc(dcReal, orient != wxVERTICAL);
+    wxSize size = dc.Reflect(sizeReal);
+
+
+    // we draw a Win32-like grey sash with possible 3D border here:
     //
     //   ---- this is position
     //  /
@@ -242,24 +263,40 @@ wxRendererGeneric::DrawSplitterSash(wxWindow * WXUNUSED(win),
     // GWGGGDB  and lower letters are our border (already drawn)
     // GWGGGDB
     // wWGGGDd
+    //
+    // 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
-    dc.SetPen(m_penLightGrey);
-    dc.DrawLine(position, 1, position, h - 1);
+    if ( win->HasFlag(wxSP_3D) )
+    {
+        dc.SetPen(m_penLightGrey);
+        dc.DrawLine(position, 1 + offset, position, h - 1 - offset);
 
-    dc.SetPen(m_penHighlight);
-    dc.DrawLine(position + 1, 0, position + 1, h);
+        dc.SetPen(m_penHighlight);
+        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);
 
-    dc.SetPen(m_penDarkGrey);
-    dc.DrawLine(position + 5, 0, position + 5, h);
+    if ( win->HasFlag(wxSP_3D) )
+    {
+        dc.SetPen(m_penDarkGrey);
+        dc.DrawLine(position + 5, offset, position + 5, h - offset);
 
-    dc.SetPen(m_penBlack);
-    dc.DrawLine(position + 6, 1, position + 6, h - 1);
+        dc.SetPen(m_penBlack);
+        dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset);
+    }
 }