Include dateevt.h from datectrl.h

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 35ff626b4e3cf67a245543d54aedfdc0d2320dc5..17e4682d6d3b5c31c86225441b5c013229a44c55 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -34,15 +34,6 @@ class WXDLLIMPEXP_BASE wxObject;
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-// this shouldn't be needed any longer as <wx/msw/private.h> does it but it
-// doesn't hurt neither
-#ifdef GetClassName
-#undef GetClassName
-#endif
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-

 class WXDLLIMPEXP_BASE wxClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;
 class WXDLLIMPEXP_BASE wxObjectRefData;


@@ -389,6 +380,24 @@ inline void* wxCheckCast(void *ptr)
 
 #endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
 
 
 #endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
 

+// ----------------------------------------------------------------------------
+// wxObjectRefData: ref counted data meant to be stored in wxObject
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxObjectRefData
+{
+    friend class WXDLLIMPEXP_BASE wxObject;
+
+public:
+    wxObjectRefData() : m_count(1) { }
+    virtual ~wxObjectRefData() { }
+
+    int GetRefCount() const { return m_count; }
+
+private:
+    int m_count;
+};
+

 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWidgets object hierarchy
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxObject: the root class of wxWidgets object hierarchy
 // ----------------------------------------------------------------------------


@@ -397,24 +406,22 @@ class WXDLLIMPEXP_BASE 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)
     {
 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }
 
     wxObject(const wxObject& other)
     {

-        InitFrom(other);
+         m_refData = other.m_refData;
+         if (m_refData)
+             m_refData->m_count++;

     }
 
     wxObject& operator=(const wxObject& other)
     {
         if ( this != &other )
         {
     }
 
     wxObject& operator=(const wxObject& other)
     {
         if ( this != &other )
         {

-            UnRef();
-            InitFrom(other);
+            Ref(other);

         }
         return *this;
     }
         }
         return *this;
     }


@@ -494,25 +501,6 @@ protected:
     wxObjectRefData *m_refData;
 };
 
     wxObjectRefData *m_refData;
 };
 

-// ----------------------------------------------------------------------------
-// wxObjectRefData: ref counted data meant to be stored in wxObject
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxObjectRefData
-{
-    friend class WXDLLIMPEXP_BASE wxObject;
-
-public:
-    wxObjectRefData() : m_count(1) { }
-    virtual ~wxObjectRefData() { }
-
-    int GetRefCount() const { return m_count; }
-
-private:
-    int m_count;
-};
-
-

 inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
 {
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;
 inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
 {
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;


@@ -581,5 +569,4 @@ private :
     #include "wx/msw/msvcrt.h"
 #endif
 
     #include "wx/msw/msvcrt.h"
 #endif
 

-#endif  // _WX_OBJECTH__
-
+#endif // _WX_OBJECTH__