X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8aa528db54735f2a37dd6556a7b548e6e30fada2..f4d3253b5923de972846b09814623d7b05e9d4d1:/src/generic/renderg.cpp?ds=sidebyside

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 31314d11b8..5f7f0074c3 100644
--- 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"
 
 // ----------------------------------------------------------------------------
@@ -72,6 +71,18 @@ public:
 
     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
@@ -84,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
 // ----------------------------------------------------------------------------
@@ -97,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)),
@@ -180,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);
     }
 }
 
@@ -209,11 +244,11 @@ wxRendererGeneric::GetSplitterParams(const wxWindow *win)
     if ( win->HasFlag(wxSP_3D) )
     {
         sashWidth = 7;
-        border = 3;
+        border = 2;
     }
     else // no 3D effect
     {
-        sashWidth = 2;
+        sashWidth = 3;
         border = 0;
     }
 
@@ -300,3 +335,15 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
     }
 }
 
+// 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)
+