Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added

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

diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index b97c769e7fc614e3008d084552ab0fb3e5b61686..86e02ce8b9fe301aeb5f0392d3cc846af3999f5c 100644 (file)
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/rendcmn.cpp
+// Name:        src/common/rendcmn.cpp

 // Purpose:     wxRendererNative common functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxRendererNative common functions
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,6 +25,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"
+    #include "wx/intl.h"

 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"


@@ -40,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
 {


@@ -61,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; }


@@ -89,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
 
 // ----------------------------------------------------------------------------


@@ -201,4 +206,3 @@ wxRendererNative *wxRendererNative::Load(const wxString& name)
 }
 
 #endif // wxUSE_DYNLIB_CLASS
 }
 
 #endif // wxUSE_DYNLIB_CLASS

-