Improved wxDCPen/BrushChangers.

[wxWidgets.git] / src / common / rendcmn.cpp

diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 2cedd7f4de8d788831a5e6a63b3692ff5b299d37..572600a9bdfea58890ffbdc5fab99426e4cf1225 100644 (file)
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -42,8 +42,8 @@
 // wxRendererPtr: auto pointer holding the global renderer
 // ----------------------------------------------------------------------------
 
 // wxRendererPtr: auto pointer holding the global renderer
 // ----------------------------------------------------------------------------
 

-wxDECLARE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
-wxDEFINE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
+wxDECLARE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase)
+wxDEFINE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase)

 
 class wxRendererPtr : public wxRendererPtrBase
 {
 
 class wxRendererPtr : public wxRendererPtrBase
 {


@@ -63,12 +63,7 @@ public:
     }
 
     // return the global and unique wxRendererPtr
     }
 
     // return the global and unique wxRendererPtr

-    static wxRendererPtr& Get()
-    {
-        static wxRendererPtr s_renderer;
-
-        return s_renderer;
-    }
+    static wxRendererPtr& Get();

 
 private:
     wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }
 
 private:
     wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }


@@ -91,6 +86,14 @@ private:
     DECLARE_NO_COPY_CLASS(wxRendererPtr)
 };
 
     DECLARE_NO_COPY_CLASS(wxRendererPtr)
 };
 

+// return the global and unique wxRendererPtr
+/*static*/ wxRendererPtr& wxRendererPtr::Get()
+{
+    static wxRendererPtr s_renderer;
+
+    return s_renderer;
+}
+

 #if wxUSE_DYNLIB_CLASS
 
 // ----------------------------------------------------------------------------
 #if wxUSE_DYNLIB_CLASS
 
 // ----------------------------------------------------------------------------