X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/648762b1b4349bff303d2d33904260bc701e9e72..f9133b32002a600cb48dd05fbcce1ab3ed684dba:/include/wx/object.h diff --git a/include/wx/object.h b/include/wx/object.h index 8627c53661..92f759609d 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -24,7 +24,7 @@ #include "wx/defs.h" #include "wx/memory.h" -class WXDLLEXPORT wxObject; +class WXDLLIMPEXP_BASE wxObject; #if wxUSE_DYNAMIC_CLASSES @@ -41,9 +41,9 @@ class WXDLLEXPORT wxObject; #undef GetClassInfo #endif -class WXDLLEXPORT wxClassInfo; -class WXDLLEXPORT wxHashTable; -class WXDLLEXPORT wxObjectRefData; +class WXDLLIMPEXP_BASE wxClassInfo; +class WXDLLIMPEXP_BASE wxHashTable; +class WXDLLIMPEXP_BASE wxObjectRefData; // ---------------------------------------------------------------------------- // wxClassInfo @@ -51,7 +51,7 @@ class WXDLLEXPORT wxObjectRefData; typedef wxObject *(*wxObjectConstructorFn)(void); -class WXDLLEXPORT wxClassInfo +class WXDLLIMPEXP_BASE wxClassInfo { public: wxClassInfo( const wxChar *className, @@ -133,7 +133,7 @@ private: DECLARE_NO_COPY_CLASS(wxClassInfo) }; -WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name); +WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name); // ---------------------------------------------------------------------------- // Dynamic class macros @@ -392,7 +392,7 @@ inline void wxCheckCast(void *ptr) // wxObject: the root class of wxWindows object hierarchy // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxObject +class WXDLLIMPEXP_BASE wxObject { DECLARE_ABSTRACT_CLASS(wxObject) @@ -490,9 +490,9 @@ protected: // wxObjectRefData: ref counted data meant to be stored in wxObject // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxObjectRefData +class WXDLLIMPEXP_BASE wxObjectRefData { - friend class WXDLLEXPORT wxObject; + friend class WXDLLIMPEXP_BASE wxObject; public: wxObjectRefData() : m_count(1) { }