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

diff --git a/include/wx/object.h b/include/wx/object.h
index 78331a8a9a..bbc627fe60 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -24,10 +24,18 @@
 #include "wx/defs.h"
 #include "wx/memory.h"
 
-class WXDLLEXPORT_BASE wxObject;
+class WXDLLIMPEXP_BASE wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
+#ifndef wxUSE_EXTENDED_RTTI
+#define wxUSE_EXTENDED_RTTI 0
+#endif
+
+#if wxUSE_EXTENDED_RTTI
+#include "wx/xti.h"
+#else
+
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
@@ -41,9 +49,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 +59,7 @@ class WXDLLEXPORT_BASE wxObjectRefData;
 
 typedef wxObject *(*wxObjectConstructorFn)(void);
 
-class WXDLLEXPORT_BASE wxClassInfo
+class WXDLLIMPEXP_BASE wxClassInfo
 {
 public:
     wxClassInfo( const wxChar *className,
@@ -104,6 +112,7 @@ public:
 
     static void     CleanUpClasses();
 
+
 public:
     const wxChar            *m_className;
     const wxChar            *m_baseClassName1;
@@ -133,7 +142,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 +154,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)
 
@@ -190,6 +207,9 @@ WXDLLEXPORT_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
+#endif // !wxUSE_EXTENDED_RTTI
+
+
 // -----------------------------------
 // for pluggable classes
 // -----------------------------------
@@ -257,7 +277,6 @@ name##PluginSentinel  m_pluginsentinel;
 #define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
  IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
 
-
 #define CLASSINFO(name) (&name::sm_class##name)
 
 #else // !wxUSE_DYNAMIC_CLASSES
@@ -290,7 +309,6 @@ name##PluginSentinel  m_pluginsentinel;
 
 #endif // wxUSE_DYNAMIC_CLASSES
 
-
 #define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
 
 // Just seems a bit nicer-looking (pretend it's not a macro)
@@ -392,22 +410,22 @@ 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)
 
 private:
     void InitFrom(const wxObject& other);
-    
+
 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }
-    
+
     wxObject(const wxObject& other)
         {
             InitFrom(other);
         }
-    
+
     wxObject& operator=(const wxObject& other)
     {
         if ( this != &other )
@@ -490,9 +508,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) { }