wxTheApp can't be assigned to any longer

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index b215797a0e78b54d4b4194c925162703da66b15a..bbc627fe60bc9aa7f8d81a6159459a822ed3f10d 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -28,14 +28,12 @@ class WXDLLIMPEXP_BASE wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
-#ifndef wxUSE_XTI 
-#define wxUSE_XTI 0
+#ifndef wxUSE_EXTENDED_RTTI
+#define wxUSE_EXTENDED_RTTI 0
 #endif
 
-#if wxUSE_XTI
-
+#if wxUSE_EXTENDED_RTTI
 #include "wx/xti.h"
-
 #else
 
 // ----------------------------------------------------------------------------
@@ -209,7 +207,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
-#endif // !wxUSE_XTI
+#endif // !wxUSE_EXTENDED_RTTI
 
 
 // -----------------------------------
@@ -418,16 +416,16 @@ class WXDLLIMPEXP_BASE 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 )