X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d1b9112dcddb9660c92b2734de003623498cf98..5c6bd4a9570c63619275710f0b91a93231532b98:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index dc7a6a729e..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 @@ -74,6 +74,8 @@ public: , m_next(sm_first) { sm_first = this; } + ~wxClassInfo(); + wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; } const wxChar *GetClassName() const { return m_className; } @@ -301,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. @@ -499,7 +501,7 @@ protected: class WXDLLEXPORT wxObjectRefData { - friend class wxObject; + friend class WXDLLEXPORT wxObject; public: wxObjectRefData() : m_count(1) { }