Add some version checks to help compiling on OSX.

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

diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 86e02ce8b9fe301aeb5f0392d3cc846af3999f5c..09878563565fcb2c8f548fd7e832cb40abf5f9cd 100644 (file)
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     28.07.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     28.07.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -32,7 +32,7 @@
 #include "wx/apptrait.h"
 #include "wx/renderer.h"
 
 #include "wx/apptrait.h"
 #include "wx/renderer.h"
 

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 
 #if wxUSE_DYNLIB_CLASS
     #include "wx/dynlib.h"
 
 #if wxUSE_DYNLIB_CLASS
     #include "wx/dynlib.h"


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


@@ -83,7 +82,7 @@ private:
     // just to suppress a gcc warning
     friend class wxRendererPtrDummyFriend;
 
     // just to suppress a gcc warning
     friend class wxRendererPtrDummyFriend;
 

-    DECLARE_NO_COPY_CLASS(wxRendererPtr)
+    wxDECLARE_NO_COPY_CLASS(wxRendererPtr);

 };
 
 // return the global and unique wxRendererPtr
 };
 
 // return the global and unique wxRendererPtr