X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a11340a1c93bb8466ac097ba15a756275067b6a..bc5443ba0701dd68eac6f987319ece2b7faba33d:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 9651bf9b84..a1d021fa91 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -94,19 +94,12 @@ public: ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) ); } -#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 - public: const wxChar *m_className; int m_objectSize; wxObjectConstructorFn m_objectConstructor; - // Pointers to base wxClassInfos: set in InitializeClasses + // Pointers to base wxClassInfos const wxClassInfo *m_baseInfo1; const wxClassInfo *m_baseInfo2; @@ -121,25 +114,16 @@ public: // many clients) static wxHashTable *sm_classTable; -private: - // InitializeClasses() helper - static wxClassInfo *GetBaseByName(const wxChar *name); - - DECLARE_NO_COPY_CLASS(wxClassInfo) - protected: // registers the class void Register(); void Unregister(); + + DECLARE_NO_COPY_CLASS(wxClassInfo) }; WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); -#if WXWIN_COMPATIBILITY_2_4 -inline void wxClassInfo::InitializeClasses() {} -inline void wxClassInfo::CleanUpClasses() {} -#endif - // ---------------------------------------------------------------------------- // Dynamic class macros // ----------------------------------------------------------------------------