X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6391d30221084cbd7146f8076141b697891b9d4..158b668823e14d9b42c9e7fe0281d35924192c68:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 6f5c68ce87..be4a7bbc3f 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -13,7 +13,7 @@ #ifndef _WX_OBJECTH__ #define _WX_OBJECTH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "object.h" #endif @@ -72,16 +72,9 @@ public: , m_baseInfo1(0) , m_baseInfo2(0) , m_next(sm_first) - { -#ifdef __WXDEBUG__ - if (sm_classTable != NULL) { - wxString msg(_T("too late binding of class info (lazy binding) for ")); - msg += className; - wxFAIL_MSG(msg); - } -#endif - sm_first = this; - } + { sm_first = this; } + + ~wxClassInfo(); wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } @@ -310,7 +303,7 @@ 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. @@ -508,7 +501,7 @@ protected: class WXDLLEXPORT wxObjectRefData { - friend class wxObject; + friend class WXDLLEXPORT wxObject; public: wxObjectRefData() : m_count(1) { }