X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..d8274c928e8a68e6514d07d4dd268aaf8167db17:/include/wx/object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index 78331a8a9a..1a2a2c8038 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_BASE wxObject;
+class WXDLLIMPEXP_BASE wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
@@ -41,9 +41,9 @@ class WXDLLEXPORT_BASE wxObject;
 #undef GetClassInfo
 #endif
 
-class WXDLLEXPORT_BASE wxClassInfo;
-class WXDLLEXPORT_BASE wxHashTable;
-class WXDLLEXPORT_BASE wxObjectRefData;
+class WXDLLIMPEXP_BASE wxClassInfo;
+class WXDLLIMPEXP_BASE wxHashTable;
+class WXDLLIMPEXP_BASE wxObjectRefData;
 
 // ----------------------------------------------------------------------------
 // wxClassInfo
@@ -51,7 +51,7 @@ class WXDLLEXPORT_BASE wxObjectRefData;
 
 typedef wxObject *(*wxObjectConstructorFn)(void);
 
-class WXDLLEXPORT_BASE wxClassInfo
+class WXDLLIMPEXP_BASE wxClassInfo
 {
 public:
     wxClassInfo( const wxChar *className,
@@ -133,7 +133,7 @@ private:
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
-WXDLLEXPORT_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
 // ----------------------------------------------------------------------------
 // Dynamic class macros
@@ -145,6 +145,14 @@ WXDLLEXPORT_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
   virtual wxClassInfo *GetClassInfo() const   \
    { return &name::sm_class##name; }
 
+#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
+    DECLARE_NO_ASSIGN_CLASS(name)               \
+    DECLARE_DYNAMIC_CLASS(name)
+
+#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)   \
+    DECLARE_NO_COPY_CLASS(name)               \
+    DECLARE_DYNAMIC_CLASS(name)
+
 #define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 #define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 
@@ -392,7 +400,7 @@ inline void wxCheckCast(void *ptr)
 // wxObject: the root class of wxWindows object hierarchy
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxObject
+class WXDLLIMPEXP_BASE wxObject
 {
     DECLARE_ABSTRACT_CLASS(wxObject)
 
@@ -490,9 +498,9 @@ protected:
 // wxObjectRefData: ref counted data meant to be stored in wxObject
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxObjectRefData
+class WXDLLIMPEXP_BASE wxObjectRefData
 {
-    friend class WXDLLEXPORT_BASE wxObject;
+    friend class WXDLLIMPEXP_BASE wxObject;
 
 public:
     wxObjectRefData() : m_count(1) { }