wxVariant <-> wxAny conversion functionality. Includes implicit construction of wxAny...

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

diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 86e02ce8b9fe301aeb5f0392d3cc846af3999f5c..6cbdbb9d5a10b8132f1309e6f0834d73d4338c04 100644 (file)
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -32,7 +32,7 @@
 #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"
@@ -42,8 +42,7 @@
 // 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
 {
@@ -83,7 +82,7 @@ private:
     // 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