unicode for mac fixes

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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 15af1286b6e85ef8f59c4c96de952d41dccce287..5f7f0074c3274a8a91019278d8389d8105c6689f 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -33,9 +33,8 @@
 
 #include "wx/settings.h"
 #include "wx/splitter.h"
-
 #include "wx/dcmirror.h"
-
+#include "wx/module.h"
 #include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------
@@ -59,17 +58,31 @@ 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);
+
+    virtual wxRendererVersion GetVersion() const
+    {
+        return wxRendererVersion(wxRendererVersion::Current_Version,
+                                 wxRendererVersion::Current_Age);
+    }
+
 
+    // Cleanup by deleting standard renderer
+    static void Cleanup();
+
+    // Get the generic object
+    static wxRendererGeneric* DoGetGeneric();
 
 protected:
     // draw the rectange using the first pen for the left and top sides and
@@ -82,12 +95,22 @@ protected:
           m_penDarkGrey,
           m_penLightGrey,
           m_penHighlight;
+
+    static wxRendererGeneric* sm_rendererGeneric;
 };
 
 // ============================================================================
 // wxRendererGeneric implementation
 // ============================================================================
 
+// Get the generic object
+wxRendererGeneric* wxRendererGeneric::DoGetGeneric()
+{
+    if (!sm_rendererGeneric)
+        sm_rendererGeneric = new wxRendererGeneric;
+    return sm_rendererGeneric;
+}
+
 // ----------------------------------------------------------------------------
 // wxRendererGeneric creation
 // ----------------------------------------------------------------------------
@@ -95,11 +118,19 @@ protected:
 /* static */
 wxRendererNative& wxRendererNative::GetGeneric()
 {
-    static wxRendererGeneric s_rendererGeneric;
+    return * wxRendererGeneric::DoGetGeneric();
+}
 
-    return s_rendererGeneric;
+void wxRendererGeneric::Cleanup()
+{
+    if (sm_rendererGeneric)
+        delete sm_rendererGeneric;
+    
+    sm_rendererGeneric = NULL;
 }
 
+wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;
+
 wxRendererGeneric::wxRendererGeneric()
     : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)),
       m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)),
@@ -178,18 +209,24 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),
     // white background
     dc.SetPen(*wxGREY_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);
-    dc.DrawRectangle(rect.Deflate(1, 2));
+    dc.DrawRectangle(rect);
 
     // black lines
     const wxCoord xMiddle = rect.x + rect.width/2;
     const wxCoord yMiddle = rect.y + rect.height/2;
 
+    // half of the length of the horz lines in "-" and "+"
+    const wxCoord halfWidth = rect.width/2 - 2;
     dc.SetPen(*wxBLACK_PEN);
-    dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle);
+    dc.DrawLine(xMiddle - halfWidth, yMiddle,
+                xMiddle + halfWidth + 1, yMiddle);
+
     if ( !(flags & wxCONTROL_EXPANDED) )
     {
         // turn "-" into "+"
-        dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3);
+        const wxCoord halfHeight = rect.height/2 - 2;
+        dc.DrawLine(xMiddle, yMiddle - halfHeight,
+                    xMiddle, yMiddle + halfHeight + 1);
     }
 }
 
@@ -197,17 +234,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) )
     {
@@ -222,7 +274,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)
@@ -249,28 +302,48 @@ 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);
     }
 }
 
+// A module to allow cleanup of generic renderer.
+class wxGenericRendererModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
+public:
+    wxGenericRendererModule() {}
+    bool OnInit() { return true; };
+    void OnExit() { wxRendererGeneric::Cleanup(); };
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
+