X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2edef6f2f587d957eabbc17364382293707340f..75799719334c85392638ce5c7d0e90a8b74b7e5a:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 54df87ed09..92f759609d 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -5,7 +5,7 @@ // Modified by: Ron Lee // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) 1997 Julian Smart and Markus Holzem +// Copyright: (c) 1997 Julian Smart // (c) 2001 Ron Lee // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,7 +13,7 @@ #ifndef _WX_OBJECTH__ #define _WX_OBJECTH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "object.h" #endif @@ -24,7 +24,7 @@ #include "wx/defs.h" #include "wx/memory.h" -class WXDLLEXPORT wxObject; +class WXDLLIMPEXP_BASE wxObject; #if wxUSE_DYNAMIC_CLASSES @@ -41,14 +41,9 @@ class WXDLLEXPORT wxObject; #undef GetClassInfo #endif -class WXDLLEXPORT wxClassInfo; -class WXDLLEXPORT wxHashTable; -class WXDLLEXPORT wxObjectRefData; - -#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) - #include "wx/ioswrap.h" -#endif - +class WXDLLIMPEXP_BASE wxClassInfo; +class WXDLLIMPEXP_BASE wxHashTable; +class WXDLLIMPEXP_BASE wxObjectRefData; // ---------------------------------------------------------------------------- // wxClassInfo @@ -56,7 +51,7 @@ class WXDLLEXPORT wxObjectRefData; typedef wxObject *(*wxObjectConstructorFn)(void); -class WXDLLEXPORT wxClassInfo +class WXDLLIMPEXP_BASE wxClassInfo { public: wxClassInfo( const wxChar *className, @@ -72,7 +67,9 @@ public: , m_baseInfo1(0) , m_baseInfo2(0) , m_next(sm_first) - { sm_first = this; } + { sm_first = this; } + + ~wxClassInfo(); wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } @@ -132,9 +129,11 @@ public: private: // InitializeClasses() helper static wxClassInfo *GetBaseByName(const wxChar *name); + + DECLARE_NO_COPY_CLASS(wxClassInfo) }; -WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name); +WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); // ---------------------------------------------------------------------------- // Dynamic class macros @@ -156,7 +155,7 @@ WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name); // Single inheritance with one base class #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \ - wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name() \ + wxObject* wxConstructorFor##name() \ { return new name; } \ wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename), \ 0, (int) sizeof(name), \ @@ -165,7 +164,7 @@ WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name); // Multiple inheritance with two base classes #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \ - wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name() \ + wxObject* wxConstructorFor##name() \ { return new name; } \ wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1), \ wxT(#basename2), (int) sizeof(name), \ @@ -299,14 +298,18 @@ name##PluginSentinel m_pluginsentinel; // to be replaced by dynamic_cast<> in the future #define wxDynamicCast(obj, className) \ - (className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className) + ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className)) // The 'this' pointer is always true, so use this version // to cast the this pointer and avoid compiler warnings. #define wxDynamicCastThis(className) \ (IsKindOf(&className::sm_class##className) ? (className *)(this) : (className *)0) +#ifdef HAVE_CONST_CAST +#define wxConstCast(obj, className) const_cast(obj) +#else #define wxConstCast(obj, className) ((className *)(obj)) +#endif #ifdef __WXDEBUG__ @@ -322,18 +325,6 @@ inline void wxCheckCast(void *ptr) #endif // __WXDEBUG__ - -// for some reason Borland seems to need this include. -#if wxUSE_STD_IOSTREAM \ - && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) \ - && defined(__BORLANDC__) - #if wxUSE_IOSTREAMH - #include - #else - #include - #endif -#endif // wxUSE_IOSTREAMH - // ---------------------------------------------------------------------------- // set up memory debugging macros // ---------------------------------------------------------------------------- @@ -366,7 +357,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 @@ -392,18 +383,40 @@ inline void wxCheckCast(void *ptr) #endif // WXDEBUG && wxUSE_MEMORY_TRACING +#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) +// needed by wxObject::Dump +#include "wx/iosfwrap.h" +#endif // ---------------------------------------------------------------------------- // wxObject: the root class of wxWindows object hierarchy // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxObject +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) + { + InitFrom(other); + } + + wxObject& operator=(const wxObject& other) + { + if ( this != &other ) + { + UnRef(); + InitFrom(other); + } + return *this; + } bool IsKindOf(wxClassInfo *info) const; @@ -411,7 +424,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 +436,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 +448,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 @@ -477,9 +490,9 @@ protected: // wxObjectRefData: ref counted data meant to be stored in wxObject // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxObjectRefData +class WXDLLIMPEXP_BASE wxObjectRefData { - friend class wxObject; + friend class WXDLLIMPEXP_BASE wxObject; public: wxObjectRefData() : m_count(1) { }