Added wxRadioButton::MSWWindowProc to reset m_focusJustSet -- otherwise,

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 5b06ab786fcd2f660046297ec862561c3da4e5a2..dc7a6a729e4d2aa8b56182d0c314cbba68db009c 100644 (file)
--- 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;