X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1d738f18c7dbcc58604b6f3ba73ceebef656dc2..b08cd3bf53901e3180e0ee60376807563c828495:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index bdb127321b..11ffa2b356 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -13,7 +13,7 @@ #ifndef _WX_OBJECTH__ #define _WX_OBJECTH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "object.h" #endif @@ -26,8 +26,6 @@ class WXDLLIMPEXP_BASE wxObject; -#if wxUSE_DYNAMIC_CLASSES - #ifndef wxUSE_EXTENDED_RTTI #define wxUSE_EXTENDED_RTTI 0 #endif @@ -73,7 +71,7 @@ public: , m_baseInfo1(baseInfo1) , m_baseInfo2(baseInfo2) , m_next(sm_first) - { + { sm_first = this; Register(); } @@ -83,8 +81,10 @@ public: wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } const wxChar *GetClassName() const { return m_className; } - const wxChar *GetBaseClassName1() const { return m_baseInfo1->GetClassName(); } - const wxChar *GetBaseClassName2() const { return m_baseInfo2->GetClassName(); } + 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; } @@ -105,12 +105,14 @@ public: ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) ); } +#if WXWIN_COMPATIBILITY_2_4 // Initializes parent pointers and hash table for fast searching. - static void InitializeClasses(); - + wxDEPRECATED( static void InitializeClasses() ); // Cleans up hash table used for fast searching. - static void CleanUpClasses(); - + wxDEPRECATED( static void CleanUpClasses() ); +#endif + static void CleanUp(); + public: const wxChar *m_className; int m_objectSize; @@ -136,8 +138,8 @@ private: static wxClassInfo *GetBaseByName(const wxChar *name); DECLARE_NO_COPY_CLASS(wxClassInfo) - -protected: + +protected: // registers the class void Register(); void Unregister(); @@ -145,15 +147,21 @@ protected: WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); +#if WXWIN_COMPATIBILITY_2_4 +inline void wxClassInfo::InitializeClasses() {} +inline void wxClassInfo::CleanUpClasses() {} +#endif + // ---------------------------------------------------------------------------- // Dynamic class macros // ---------------------------------------------------------------------------- #define DECLARE_DYNAMIC_CLASS(name) \ public: \ - static wxClassInfo sm_class##name; \ + static wxClassInfo ms_classInfo; \ + static wxObject* wxCreateObject(); \ virtual wxClassInfo *GetClassInfo() const \ - { return &name::sm_class##name; } + { return &name::ms_classInfo; } #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ DECLARE_NO_ASSIGN_CLASS(name) \ @@ -173,23 +181,23 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); // Single inheritance with one base class #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \ - wxObject* wxConstructorFor##name() \ + wxObject* name::wxCreateObject() \ { return new name; } \ - wxClassInfo name::sm_class##name(wxT(#name), \ - &basename::sm_class##basename, NULL, \ + wxClassInfo name::ms_classInfo(wxT(#name), \ + &basename::ms_classInfo, NULL, \ (int) sizeof(name), \ - (wxObjectConstructorFn) wxConstructorFor##name); + (wxObjectConstructorFn) name::wxCreateObject); // Multiple inheritance with two base classes #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \ - wxObject* wxConstructorFor##name() \ + wxObject* name::wxCreateObject() \ { return new name; } \ - wxClassInfo name::sm_class##name(wxT(#name), \ - &basename1::sm_class##basename1, \ - &basename2::sm_class##basename2, \ - wxT(#basename2), (int) sizeof(name), \ - (wxObjectConstructorFn) wxConstructorFor##name); + wxClassInfo name::ms_classInfo(wxT(#name), \ + &basename1::ms_classInfo, \ + &basename2::ms_classInfo, \ + (int) sizeof(name), \ + (wxObjectConstructorFn) name::wxCreateObject); // ----------------------------------- // for abstract classes @@ -198,16 +206,16 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); // Single inheritance with one base class #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \ - wxClassInfo name::sm_class##name(wxT(#name), \ - &basename::sm_class##basename, NULL, \ + wxClassInfo name::ms_classInfo(wxT(#name), \ + &basename::ms_classInfo, NULL, \ (int) sizeof(name), (wxObjectConstructorFn) 0); // Multiple inheritance with two base classes #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \ - wxClassInfo name::sm_class##name(wxT(#name), \ - &basename1::sm_class##basename1, \ - &basename2::sm_class##basename2, \ + wxClassInfo name::ms_classInfo(wxT(#name), \ + &basename1::ms_classInfo, \ + &basename2::ms_classInfo, \ (int) sizeof(name), \ (wxObjectConstructorFn) 0); @@ -284,66 +292,33 @@ name##PluginSentinel m_pluginsentinel; #define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) \ IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) -#define CLASSINFO(name) (&name::sm_class##name) - -#else // !wxUSE_DYNAMIC_CLASSES +#define CLASSINFO(name) (&name::ms_classInfo) - // 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 DECLARE_PLUGGABLE_CLASS(name) -#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name) -#define IMPLEMENT_PLUGGABLE_CLASS(name, basename) -#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2) -#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename) -#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) - -#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) -#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo) -#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename) -#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2) -#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename) -#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) - -#endif // wxUSE_DYNAMIC_CLASSES - -#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className) +#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo) // 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) \ - ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className)) + ((className *) wxCheckDynamicCast( \ + wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \ + wx_const_cast(className *, wx_static_cast(const className *, obj)))), \ + &className::ms_classInfo)) // 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 - + (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0) #ifdef __WXDEBUG__ -inline void wxCheckCast(void *ptr) +inline void* wxCheckCast(void *ptr) { wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") ); + return ptr; } #define wxStaticCast(obj, className) \ - (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj))) + ((className *)wxCheckCast(wxDynamicCast(obj, className))) #else // !__WXDEBUG__ #define wxStaticCast(obj, className) ((className *)(obj)) @@ -408,13 +383,8 @@ 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 +// wxObject: the root class of wxWidgets object hierarchy // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxObject @@ -476,11 +446,6 @@ public: void operator delete[] (void* buf, const wxChar*, int ); #endif - -#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) - virtual void Dump(wxSTD ostream& str); -#endif - // ref counted data handling methods // get/set @@ -535,6 +500,46 @@ 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 + 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 + // ---------------------------------------------------------------------------- // more debugging macros // ---------------------------------------------------------------------------- @@ -553,6 +558,9 @@ inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo) #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__