X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..84c3e788d6200d68384852e4c4785c09922ec499:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 17e4682d6d..0123f40fb6 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -65,7 +65,8 @@ public: ~wxClassInfo(); - wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } + wxObject *CreateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; } + bool IsDynamic() const { return (NULL != m_objectConstructor); } const wxChar *GetClassName() const { return m_className; } const wxChar *GetBaseClassName1() const @@ -98,7 +99,6 @@ public: // Cleans up hash table used for fast searching. wxDEPRECATED( static void CleanUpClasses() ); #endif - static void CleanUp(); public: const wxChar *m_className; @@ -471,18 +471,6 @@ public: // destroy a reference void UnRef(); - - // Reserved for future use - virtual void ReservedObjectFunc1() {} - virtual void ReservedObjectFunc2() {} - virtual void ReservedObjectFunc3() {} - virtual void ReservedObjectFunc4() {} - virtual void ReservedObjectFunc5() {} - virtual void ReservedObjectFunc6() {} - virtual void ReservedObjectFunc7() {} - virtual void ReservedObjectFunc8() {} - virtual void ReservedObjectFunc9() {} - protected: // 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