X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2edef6f2f587d957eabbc17364382293707340f..4946a942d77cf51e00aa56404756e124d7c11411:/include/wx/object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 54df87ed09..dc7a6a729e 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -72,7 +72,7 @@ public:
         , m_baseInfo1(0)
         , m_baseInfo2(0)
         , m_next(sm_first)
-    { sm_first = this; }
+        { sm_first = this; }
 
     wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
@@ -132,6 +132,8 @@ public:
 private:
     // InitializeClasses() helper
     static wxClassInfo *GetBaseByName(const wxChar *name);
+
+    DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
 WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
@@ -366,7 +368,7 @@ inline void wxCheckCast(void *ptr)
 #endif
 
 // Only VC++ 6.0 and CodeWarrior compilers get overloaded delete that matches new
-#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
     #define _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 
@@ -399,11 +401,29 @@ inline void wxCheckCast(void *ptr)
 
 class WXDLLEXPORT wxObject
 {
-DECLARE_ABSTRACT_CLASS(wxObject)
+    DECLARE_ABSTRACT_CLASS(wxObject)
 
+private:
+    void InitFrom(const wxObject& other);
+    
 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }
+    
+    wxObject(const wxObject& other)
+        {
+            InitFrom(other);
+        }
+    
+    wxObject& operator=(const wxObject& other)
+    {
+        if ( this != &other )
+        {
+            UnRef();
+            InitFrom(other);
+        }
+        return *this;
+    }
 
     bool IsKindOf(wxClassInfo *info) const;
 
@@ -411,7 +431,7 @@ public:
     // Turn on the correct set of new and delete operators
 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
-    void *operator new ( size_t size, wxChar *fileName = NULL, int lineNum = 0 );
+    void *operator new ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 );
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID
@@ -423,11 +443,11 @@ public:
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
-    void operator delete ( void *buf, wxChar*, int );
+    void operator delete ( void *buf, const wxChar*, int );
 #endif
 
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
-    void *operator new[] ( size_t size, wxChar *fileName = NULL, int lineNum = 0 );
+    void *operator new[] ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 );
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID
@@ -435,7 +455,7 @@ public:
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
-    void operator delete[] (void* buf, wxChar*, int );
+    void operator delete[] (void* buf, const wxChar*, int );
 #endif