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; }
( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
}
-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
// Initializes parent pointers and hash table for fast searching.
- wxDEPRECATED( static void InitializeClasses() );
+ wxDEPRECATED( static void InitializeClasses() );
// Cleans up hash table used for fast searching.
- wxDEPRECATED( static void CleanUpClasses() );
+ wxDEPRECATED( static void CleanUpClasses() );
#endif
static void CleanUp();
WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
inline void wxClassInfo::InitializeClasses() {}
inline void wxClassInfo::CleanUpClasses() {}
#endif
#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) \
// 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, \
+ wxClassInfo name::ms_classInfo(wxT(#name), \
+ &basename1::ms_classInfo, \
+ &basename2::ms_classInfo, \
wxT(#basename2), (int) sizeof(name), \
- (wxObjectConstructorFn) wxConstructorFor##name);
+ (wxObjectConstructorFn) name::wxCreateObject);
// -----------------------------------
// for abstract classes
// 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);
#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2) \
IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define CLASSINFO(name) (&name::sm_class##name)
+#define CLASSINFO(name) (&name::ms_classInfo)
#else // !wxUSE_DYNAMIC_CLASSES
#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((wxObject*)(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<className *>(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))
#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
// ----------------------------------------------------------------------------
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
#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 ;
+ void SetProperty (const wxChar *propertyName, const wxxVariant &value);
+ wxxVariant GetProperty (const wxChar *propertyName) const ;
// get the runtime identity of this object
wxClassInfo *GetClassInfo() 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;
projects / wxWidgets.git / blobdiff