X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/521196a26a7089f37efaac22caaa1ea781d0d313..87d77923a6b62816336e53abd4217a119f14675d:/include/wx/object.h?ds=sidebyside

diff --git a/include/wx/object.h b/include/wx/object.h
index 8fa629a58b..92f759609d 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -5,7 +5,7 @@
 // Modified by: Ron Lee
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart and Markus Holzem
+// Copyright:   (c) 1997 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -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
@@ -155,7 +155,7 @@ WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
- wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name()          \
+ wxObject* wxConstructorFor##name()                             \
   { return new name; }                                          \
  wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename),   \
             0, (int) sizeof(name),                              \
@@ -164,7 +164,7 @@ WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \
- wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name()          \
+ wxObject* wxConstructorFor##name()                             \
   { return new name; }                                          \
  wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1),  \
             wxT(#basename2), (int) sizeof(name),                \
@@ -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) { }