added the possibility to rescale the image during loading, especially useful with...

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

diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index b95f586fb40ec2c497114982edfdb71d8e54f83b..b44fcf3a7528fdbfa17decda0034a570e0b5c320 100644 (file)
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRendererNative common functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.07.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     wxRendererNative common functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.07.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWidgets license
+// License:     wxWindows license

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -42,8 +42,7 @@
 // wxRendererPtr: auto pointer holding the global renderer
 // ----------------------------------------------------------------------------
 
 // wxRendererPtr: auto pointer holding the global renderer
 // ----------------------------------------------------------------------------
 

-wxDECLARE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
-wxDEFINE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase);
+typedef wxScopedPtr<wxRendererNative> wxRendererPtrBase;

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


@@ -63,12 +62,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 +85,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
 
 // ----------------------------------------------------------------------------


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

-