added wxDP_SPIN/DROPDOWN styles (only Win32 native version implements the former)

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 458f5e78e6ad0b6d8857d63f4710fee59a710349..11ffa2b356489989c6ffc7e81016b380543e16dc 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -1,315 +1,567 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        object.h
+// Name:        wx/object.h

 // Purpose:     wxObject class, plus run-time type information macros
 // Author:      Julian Smart
 // Purpose:     wxObject class, plus run-time type information macros
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Ron Lee

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) 1997 Julian Smart
+//              (c) 2001 Ron Lee <ron@debian.org>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "object.h"
 #endif
 
 #pragma interface "object.h"
 #endif
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #include "wx/defs.h"
 #include "wx/memory.h"
 
 #include "wx/defs.h"
 #include "wx/memory.h"
 

-class WXDLLEXPORT wxObject;
+class WXDLLIMPEXP_BASE wxObject;
+
+#ifndef wxUSE_EXTENDED_RTTI
+#define wxUSE_EXTENDED_RTTI 0
+#endif

 
 

-#if wxUSE_DYNAMIC_CLASSES
+#if wxUSE_EXTENDED_RTTI
+#include "wx/xti.h"
+#else

 
 

-// #ifdef __GNUWIN32__
+// ----------------------------------------------------------------------------
+// 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
 #ifdef GetClassName
 #undef GetClassName
 #endif
 #ifdef GetClassInfo
 #undef GetClassInfo
 #endif

-// #endif
-
-class WXDLLEXPORT wxClassInfo;
-class WXDLLEXPORT wxInputStream;
-class WXDLLEXPORT wxOutputStream;
-class WXDLLEXPORT wxObjectInputStream;
-class WXDLLEXPORT wxObjectOutputStream;
-class WXDLLEXPORT wxHashTable;
-class WXDLLEXPORT wxObject_Serialize;
-
-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-  #include "wx/ioswrap.h"
-#endif

 
 

-/*
- * Dynamic object system declarations
- */
+class WXDLLIMPEXP_BASE wxClassInfo;
+class WXDLLIMPEXP_BASE wxHashTable;
+class WXDLLIMPEXP_BASE wxObjectRefData;

 
 

-typedef wxObject * (*wxObjectConstructorFn) (void);
+// ----------------------------------------------------------------------------
+// wxClassInfo
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxClassInfo
+typedef wxObject *(*wxObjectConstructorFn)(void);
+
+class WXDLLIMPEXP_BASE wxClassInfo

 {
 {

- public:
-   wxClassInfo(wxChar *cName, wxChar *baseName1, wxChar *baseName2, int sz, wxObjectConstructorFn fn);
+public:
+    wxClassInfo( const wxChar *className,
+                 const wxClassInfo *baseInfo1,
+                 const wxClassInfo *baseInfo2,
+                 int size,
+                 wxObjectConstructorFn ctor )
+        : m_className(className)
+        , m_objectSize(size)
+        , m_objectConstructor(ctor)
+        , m_baseInfo1(baseInfo1)
+        , m_baseInfo2(baseInfo2)
+        , m_next(sm_first)
+        {
+            sm_first = this;
+            Register();
+        }
+
+    ~wxClassInfo();
+
+    wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+
+    const wxChar       *GetClassName() const { return m_className; }
+    const wxChar       *GetBaseClassName1() const
+        { return m_baseInfo1 ? m_baseInfo1->GetClassName() : NULL; }
+    const wxChar       *GetBaseClassName2() const
+        { return m_baseInfo2 ? m_baseInfo2->GetClassName() : NULL; }
+    const wxClassInfo  *GetBaseClass1() const { return m_baseInfo1; }
+    const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
+    int                 GetSize() const { return m_objectSize; }
+
+    wxObjectConstructorFn      GetConstructor() const { return m_objectConstructor; }
+    static const wxClassInfo  *GetFirst() { return sm_first; }
+    const wxClassInfo         *GetNext() const { return m_next; }
+    static wxClassInfo        *FindClass(const wxChar *className);
+
+        // Climb upwards through inheritance hierarchy.
+        // Dual inheritance is catered for.
+
+    bool IsKindOf(const wxClassInfo *info) const
+    {
+        return info != 0 &&
+               ( info == this ||
+                 ( m_baseInfo1 && m_baseInfo1->IsKindOf(info) ) ||
+                 ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
+    }

 
 

-   wxObject *CreateObject(void);
+#if WXWIN_COMPATIBILITY_2_4
+    // Initializes parent pointers and hash table for fast searching.
+    wxDEPRECATED( static void InitializeClasses() );
+    // Cleans up hash table used for fast searching.
+    wxDEPRECATED( static void CleanUpClasses() );
+#endif
+    static void     CleanUp();

 
 

-   inline wxChar *GetClassName(void) const { return m_className; }
-   inline wxChar *GetBaseClassName1(void) const { return m_baseClassName1; }
-   inline wxChar *GetBaseClassName2(void) const { return m_baseClassName2; }
-   inline wxClassInfo* GetBaseClass1() const { return m_baseInfo1; }
-   inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
-   inline int GetSize(void) const { return m_objectSize; }
-   inline wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; }
-   static inline wxClassInfo* GetFirst() { return sm_first; }
-   inline wxClassInfo* GetNext() const { return m_next; }
-   bool IsKindOf(wxClassInfo *info) const;
+public:
+    const wxChar            *m_className;
+    int                      m_objectSize;
+    wxObjectConstructorFn    m_objectConstructor;

 
 

-   static wxClassInfo *FindClass(wxChar *c);
+        // Pointers to base wxClassInfos: set in InitializeClasses

 
 

-   // Initializes parent pointers and hash table for fast searching.
-   static void InitializeClasses(void);
+    const wxClassInfo       *m_baseInfo1;
+    const wxClassInfo       *m_baseInfo2;

 
 

-   // Cleans up hash table used for fast searching.
-   static void CleanUpClasses(void);
+        // class info object live in a linked list:
+        // pointers to its head and the next element in it

 
 

-public:
-   wxChar*                  m_className;
-   wxChar*                  m_baseClassName1;
-   wxChar*                  m_baseClassName2;
-   int                      m_objectSize;
-   wxObjectConstructorFn    m_objectConstructor;
+    static wxClassInfo      *sm_first;
+    wxClassInfo             *m_next;
+
+    // FIXME: this should be private (currently used directly by way too
+    //        many clients)
+    static wxHashTable      *sm_classTable;

 
 

-   // Pointers to base wxClassInfos: set in InitializeClasses
-   // called from wx_main.cc
-   wxClassInfo*             m_baseInfo1;
-   wxClassInfo*             m_baseInfo2;
+private:
+    // InitializeClasses() helper
+    static wxClassInfo *GetBaseByName(const wxChar *name);

 
 

-   static wxClassInfo*      sm_first;
-   wxClassInfo*             m_next;
+    DECLARE_NO_COPY_CLASS(wxClassInfo)

 
 

-   static wxHashTable*      sm_classTable;
+protected:
+    // registers the class
+    void Register();
+    void Unregister();

 };
 
 };
 

-WXDLLEXPORT wxObject* wxCreateDynamicObject(const wxChar *name);
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);

 
 

-#if wxUSE_SERIAL
-WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
+#if WXWIN_COMPATIBILITY_2_4
+inline void wxClassInfo::InitializeClasses() {}
+inline void wxClassInfo::CleanUpClasses() {}

 #endif
 
 #endif
 

-#define DECLARE_DYNAMIC_CLASS(name) \
- public:\
-  static wxClassInfo sm_class##name;\
-  wxClassInfo *GetClassInfo() const \
-   { return &name::sm_class##name; }
+// ----------------------------------------------------------------------------
+// Dynamic class macros
+// ----------------------------------------------------------------------------
+
+#define DECLARE_DYNAMIC_CLASS(name)           \
+ public:                                      \
+  static wxClassInfo ms_classInfo;            \
+  static wxObject* wxCreateObject();          \
+  virtual wxClassInfo *GetClassInfo() const   \
+   { return &name::ms_classInfo; }
+
+#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
+    DECLARE_NO_ASSIGN_CLASS(name)               \
+    DECLARE_DYNAMIC_CLASS(name)
+
+#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)   \
+    DECLARE_NO_COPY_CLASS(name)               \
+    DECLARE_DYNAMIC_CLASS(name)

 
 #define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 #define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 
 
 #define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 #define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 

-//////
-////// for concrete classes
-//////
+// -----------------------------------
+// for concrete classes
+// -----------------------------------

 
 

-// Single inheritance with one base class
-#define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
-wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
-   { return new name; }\
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename), (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+    // Single inheritance with one base class

 
 

-// Multiple inheritance with two base classes
-#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
-wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
-   { return new name; }\
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename1), (wxChar *) wxT(#basename2), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+#define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
+ wxObject* name::wxCreateObject()                               \
+  { return new name; }                                          \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename::ms_classInfo, NULL,                      \
+            (int) sizeof(name),                                 \
+            (wxObjectConstructorFn) name::wxCreateObject);

 
 

-//////
-////// for abstract classes
-//////
+    // Multiple inheritance with two base classes

 
 

-// Single inheritance with one base class
-#define IMPLEMENT_ABSTRACT_CLASS(name, basename) \
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename), \
-         (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);
+#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \
+ wxObject* name::wxCreateObject()                               \
+  { return new name; }                                          \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename1::ms_classInfo,                           \
+            &basename2::ms_classInfo,                           \
+            (int) sizeof(name),                                 \
+            (wxObjectConstructorFn) name::wxCreateObject);

 
 

-// Multiple inheritance with two base classes
-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
- wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename1), \
-         (wxChar *) wxT(#basename2), (int) sizeof(name), (wxObjectConstructorFn) NULL);
+// -----------------------------------
+// for abstract classes
+// -----------------------------------

 
 

-#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
-#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
+    // Single inheritance with one base class

 
 

-#define CLASSINFO(name) (&name::sm_class##name)
+#define IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename::ms_classInfo, NULL,                      \
+            (int) sizeof(name), (wxObjectConstructorFn) 0);

 
 

-#else // !wxUSE_DYNAMIC_CLASSES
+    // Multiple inheritance with two base classes
+
+#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename1::ms_classInfo,                           \
+            &basename2::ms_classInfo,                           \
+            (int) sizeof(name),                                 \
+            (wxObjectConstructorFn) 0);

 
 

-// No dynamic class system: so stub out the macros
-#define DECLARE_DYNAMIC_CLASS(name)
-#define DECLARE_ABSTRACT_CLASS(name)
-#define DECLARE_CLASS(name)
-#define IMPLEMENT_DYNAMIC_CLASS(name, basename)
-#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)

 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 

-#endif // wxUSE_DYNAMIC_CLASSES/!wxUSE_DYNAMIC_CLASSES
+#endif // !wxUSE_EXTENDED_RTTI
+
+
+// -----------------------------------
+// for pluggable classes
+// -----------------------------------
+
+    // NOTE: this should probably be the very first statement
+    //       in the class declaration so wxPluginSentinel is
+    //       the first member initialised and the last destroyed.
+
+// _DECLARE_DL_SENTINEL(name) wxPluginSentinel m_pluginsentinel;
+
+#if wxUSE_NESTED_CLASSES
+
+#define _DECLARE_DL_SENTINEL(name, exportdecl)  \
+class exportdecl name##PluginSentinel {         \
+private:                                        \
+    static const wxString sm_className;         \
+public:                                         \
+    name##PluginSentinel();                     \
+    ~name##PluginSentinel();                    \
+};                                              \
+name##PluginSentinel  m_pluginsentinel;
+
+#define _IMPLEMENT_DL_SENTINEL(name)                                \
+ const wxString name::name##PluginSentinel::sm_className(#name);    \
+ name::name##PluginSentinel::name##PluginSentinel() {               \
+    wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name);   \
+    if( e != 0 ) { e->RefObj(); }                                      \
+ }                                                                  \
+ name::name##PluginSentinel::~name##PluginSentinel() {            \
+    wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name);   \
+    if( e != 0 ) { e->UnrefObj(); }                                 \
+ }
+#else
+
+#define _DECLARE_DL_SENTINEL(name)
+#define _IMPLEMENT_DL_SENTINEL(name)

 
 

-#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+#endif  // wxUSE_NESTED_CLASSES
+
+#define DECLARE_PLUGGABLE_CLASS(name) \
+ DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT)
+#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name)  \
+ DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT)
+
+#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) \
+ DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, usergoo)
+#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)  \
+ DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, usergoo)
+
+#define IMPLEMENT_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_DYNAMIC_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_ABSTRACT_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name)
+
+#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_PLUGGABLE_CLASS(name, basename)
+#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
+#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
+#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
+
+#define CLASSINFO(name) (&name::ms_classInfo)
+
+#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)

 
 // Just seems a bit nicer-looking (pretend it's not a macro)
 
 // Just seems a bit nicer-looking (pretend it's not a macro)

-#define wxIsKindOf(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIsKindOf(obj, className) obj->IsKindOf(&className::ms_classInfo)

 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \

-        ((obj) && ((obj)->IsKindOf(&className::sm_class##className)) \
-        ? (className *)(obj) \
-        : (className *)0)
+    ((className *) wxCheckDynamicCast( \
+        wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
+          wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
+        &className::ms_classInfo))

 
 

-#define wxConstCast(obj, className) ((className *)(obj))
+// The 'this' pointer is always true, so use this version
+// to cast the this pointer and avoid compiler warnings.
+#define wxDynamicCastThis(className) \
+ (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    inline void wxCheckCast(void *ptr)
-    {
-        wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
-    }
+inline void* wxCheckCast(void *ptr)
+{
+    wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
+    return ptr;
+}
+#define wxStaticCast(obj, className) \
+ ((className *)wxCheckCast(wxDynamicCast(obj, className)))

 
 

-    #define wxStaticCast(obj, className) \
-        (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+#else  // !__WXDEBUG__
+#define wxStaticCast(obj, className) ((className *)(obj))

 
 

-#else // !Debug
-    #define wxStaticCast(obj, className) ((className *)(obj))
-#endif // Debug/!Debug
+#endif  // __WXDEBUG__

 
 

-// Unfortunately Borland seems to need this include.
-#ifdef __BORLANDC__
-    #if wxUSE_IOSTREAMH
-        #include <iostream.h>
-    #else
-        #include <iostream>
-    #endif
+// ----------------------------------------------------------------------------
+// set up memory debugging macros
+// ----------------------------------------------------------------------------
+
+/*
+    Which new/delete operator variants do we want?
+
+    _WX_WANT_NEW_SIZET_WXCHAR_INT             = void *operator new (size_t size, wxChar *fileName = 0, int lineNum = 0)
+    _WX_WANT_DELETE_VOID                      = void operator delete (void * buf)
+    _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET      = void operator delete (void *buf, const char *_fname, size_t _line)
+    _WX_WANT_DELETE_VOID_WXCHAR_INT           = void operator delete(void *buf, wxChar*, int)
+    _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT       = void *operator new[] (size_t size, wxChar *fileName , int lineNum = 0)
+    _WX_WANT_ARRAY_DELETE_VOID                = void operator delete[] (void *buf)
+    _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT     = void operator delete[] (void* buf, wxChar*, int )
+*/
+
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+
+// All compilers get this one
+#define _WX_WANT_NEW_SIZET_WXCHAR_INT
+
+// Everyone except Visage gets the next one
+#ifndef __VISAGECPP__
+    #define _WX_WANT_DELETE_VOID
+#endif
+
+// Only visage gets this one under the correct circumstances
+#if defined(__VISAGECPP__) && __DEBUG_ALLOC__
+    #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
+#endif
+
+// Only VC++ 6.0 and CodeWarrior compilers get overloaded delete that matches new
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
+    #define _WX_WANT_DELETE_VOID_WXCHAR_INT

 #endif
 
 #endif
 

-class WXDLLEXPORT wxObjectRefData;
+// Now see who (if anyone) gets the array memory operators
+#if wxUSE_ARRAY_MEMORY_OPERATORS

 
 

-class WXDLLEXPORT wxObject
+    // Everyone except Visual C++ (cause problems for VC++ - crashes)
+    #if !defined(__VISUALC__)
+        #define _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
+    #endif
+
+    // Everyone except Visual C++ (cause problems for VC++ - crashes)
+    #if !defined(__VISUALC__)
+        #define _WX_WANT_ARRAY_DELETE_VOID
+    #endif
+
+    // Only CodeWarrior 6 or higher
+    #if defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+        #define _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
+    #endif
+
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+
+#endif // WXDEBUG && wxUSE_MEMORY_TRACING
+
+// ----------------------------------------------------------------------------
+// wxObject: the root class of wxWidgets object hierarchy
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxObject

 {
 {

- public:
+    DECLARE_ABSTRACT_CLASS(wxObject)

 
 

-  // This is equivalent to using the macro DECLARE_ABSTRACT_CLASS
-  static wxClassInfo sm_classwxObject;
+private:
+    void InitFrom(const wxObject& other);

 
 

-  wxObject(void);
-  virtual ~wxObject(void);
+public:
+    wxObject() { m_refData = NULL; }
+    virtual ~wxObject() { UnRef(); }

 
 

-  virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }
-  wxObject *Clone(void) const;
-  virtual void CopyObject(wxObject& object_dest) const;
+    wxObject(const wxObject& other)
+        {
+            InitFrom(other);
+        }

 
 

-  bool IsKindOf(wxClassInfo *info) const;
+    wxObject& operator=(const wxObject& other)
+    {
+        if ( this != &other )
+        {
+            UnRef();
+            InitFrom(other);
+        }
+        return *this;
+    }

 
 

-#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
-  void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);
+    bool IsKindOf(wxClassInfo *info) const;

 
 

-#if defined(__VISAGECPP__)
-  #if __DEBUG_ALLOC__
-     void operator delete (void * buf,const char * _fname, size_t _line);
-  #endif  //__DEBUG_ALLOC__
-#else
-  void operator delete (void * buf);
+
+    // Turn on the correct set of new and delete operators
+
+#ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
+    void *operator new ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 );

 #endif
 #endif

-   // defined(__VISAGECPP__)

 
 

-// VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-  void operator delete(void *buf, wxChar*, int);
+#ifdef _WX_WANT_DELETE_VOID
+    void operator delete ( void * buf );

 #endif
 
 #endif
 

-    // Causes problems for VC++
-#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
-  void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0);
-  void operator delete[] (void * buf);
+#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
+    void operator delete ( void *buf, const char *_fname, size_t _line );

 #endif
 
 #endif
 

-#ifdef __MWERKS__
-  void * operator new[] (size_t size, wxChar * fileName , int lineNum = 0);
-  void * operator new[] (size_t size) { return operator new[] ( size , NULL , 0 ) ; }
-  void operator delete[] (void * buf);
+#ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
+    void operator delete ( void *buf, const wxChar*, int );

 #endif
 
 #endif
 

-#endif // Debug & memory tracing
+#ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
+    void *operator new[] ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 );
+#endif

 
 

-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-  virtual void Dump(ostream& str);
+#ifdef _WX_WANT_ARRAY_DELETE_VOID
+    void operator delete[] ( void *buf );

 #endif
 
 #endif
 

-#if wxUSE_SERIAL
-  virtual void StoreObject( wxObjectOutputStream &stream );
-  virtual void LoadObject( wxObjectInputStream &stream );
+#ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
+    void operator delete[] (void* buf, const wxChar*, int );

 #endif
 
 #endif
 

-  // make a 'clone' of the object
-  void Ref(const wxObject& clone);
+    // ref counted data handling methods

 
 

-  // destroy a reference
-  void UnRef(void);
+    // get/set
+    wxObjectRefData *GetRefData() const { return m_refData; }
+    void SetRefData(wxObjectRefData *data) { m_refData = data; }

 
 

-  inline wxObjectRefData *GetRefData(void) const { return m_refData; }
-  inline void SetRefData(wxObjectRefData *data) { m_refData = data; }
+    // make a 'clone' of the object
+    void Ref(const wxObject& clone);

 
 

-//EK
-#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
-public:
-  static int                        N;
-  static int                        Nid;  // total number of objects and serial counter
-         int                        id; // serial number for current object
-#endif // __WXDEBUG__
+    // destroy a reference
+    void UnRef();

 
 protected:
 
 protected:

-  wxObjectRefData*      m_refData;
-#if wxUSE_SERIAL
-  wxObject_Serialize*   m_serialObj;
-#endif
-};
+    // ensure that our data is not shared with anybody else: if we have no
+    // data, it is created using CreateRefData() below, if we have shared data
+    // it is copied using CloneRefData(), otherwise nothing is done
+    void AllocExclusive();

 
 

-/*
- * wxObjectData
- */
+    // both methods must be implemented if Unshare() is used, not pure virtual
+    // only because of the backwards compatibility reasons
+
+    // create a new m_refData
+    virtual wxObjectRefData *CreateRefData() const;
+
+    // create a new m_refData initialized with the given one
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
 

-class WXDLLEXPORT wxObjectRefData {
+    wxObjectRefData *m_refData;
+};
+
+// ----------------------------------------------------------------------------
+// wxObjectRefData: ref counted data meant to be stored in wxObject
+// ----------------------------------------------------------------------------

 
 

-    friend class wxObject;
+class WXDLLIMPEXP_BASE wxObjectRefData
+{
+    friend class WXDLLIMPEXP_BASE wxObject;

 
 public:
 
 public:

-    wxObjectRefData(void);
-    virtual ~wxObjectRefData(void);
+    wxObjectRefData() : m_count(1) { }
+    virtual ~wxObjectRefData() { }
+
+    int GetRefCount() const { return m_count; }

 
 

-    inline int GetRefCount(void) const { return m_count; }

 private:
     int m_count;
 };
 
 private:
     int m_count;
 };
 

-#ifdef __WXDEBUG__
-#ifndef WXDEBUG_NEW
-#define WXDEBUG_NEW new(__TFILE__,__LINE__)
-#endif
+
+inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
+{
+    return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;
+}
+
+#if wxUSE_EXTENDED_RTTI
+class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
+{
+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+public:
+    // instantiates this object with an instance of its superclass
+    wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;
+    ~wxDynamicObject();
+
+    void SetProperty (const wxChar *propertyName, const wxxVariant &value);
+    wxxVariant GetProperty (const wxChar *propertyName) const ;
+
+    // get the runtime identity of this object
+    wxClassInfo *GetClassInfo() const
+    {
+#ifdef _MSC_VER
+        return (wxClassInfo*) m_classInfo;

 #else
 #else

-#define WXDEBUG_NEW new
+        return wx_const_cast(wxClassInfo *, m_classInfo);
+#endif
+    }
+
+    wxObject* GetSuperClassInstance() const
+    {
+        return m_superClassInstance ;
+    }
+private :
+    // removes an existing runtime-property
+    void RemoveProperty( const wxChar *propertyName ) ;
+
+    // renames an existing runtime-property
+    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
+
+    wxObject *m_superClassInstance ;
+    const wxDynamicClassInfo *m_classInfo;
+    struct wxDynamicObjectInternal;
+    wxDynamicObjectInternal *m_data;
+};

 #endif
 
 #endif
 

-// Redefine new to be the debugging version. This doesn't
-// work with all compilers, in which case you need to
-// use WXDEBUG_NEW explicitly if you wish to use the debugging version.
+// ----------------------------------------------------------------------------
+// more debugging macros
+// ----------------------------------------------------------------------------

 
 

-#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
-#define new new(__TFILE__,__LINE__)
+#ifdef __WXDEBUG__
+    #ifndef WXDEBUG_NEW
+        #define WXDEBUG_NEW new(__TFILE__,__LINE__)
+    #endif
+#else // !__WXDEBUG__
+    #define WXDEBUG_NEW new

 #endif
 
 #endif
 

+// Redefine new to be the debugging version. This doesn't work with all
+// compilers, in which case you need to use WXDEBUG_NEW explicitly if you wish
+// to use the debugging version.
+
+#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
+    #define new new(__TFILE__,__LINE__)
+#elif (defined(__WXDEBUG__) && defined(__VISUALC__) && !wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS)
+    // Including this file redefines new and allows leak reports to contain line numbers
+    #include "wx/msw/msvcrt.h"

 #endif
 #endif

-    // _WX_OBJECTH__

 
 

+#endif  // _WX_OBJECTH__