wxUSE_EXTENDED_RTTI as name

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 11f848e5241ed905b044bdb64f255df9dcceb82a..6e42ede2c66fc4e9b05c9006ec80260cd2e885a3 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -422,7 +422,7 @@ void wxPluginLibrary::UpdateClassInfo()
         }
     }
 
         }
     }
 

-#if wxUSE_XTI == 0
+#if wxUSE_EXTENDED_RTTI == 0

     for(info = m_after; info != m_before; info = info->m_next)
     {
         if( info->m_baseClassName1 )
     for(info = m_after; info != m_before; info = info->m_next)
     {
         if( info->m_baseClassName1 )

diff --git a/src/common/object.cpp b/src/common/object.cpp
index d21eb7615587e00cefe24a7af3d34f57d3efe244..4c8647abd19377e36b14df9dae6c58e1d6b41e66 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -51,7 +51,7 @@
     #pragma optimize("", off)
 #endif
 
     #pragma optimize("", off)
 #endif
 

-#if wxUSE_XTI
+#if wxUSE_EXTENDED_RTTI

 const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; 
  wxObject* wxVariantToObjectConverterwxObject ( const wxxVariant &data ) 
 { return data.Get<wxObject*>() ; } 
 const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; 
  wxObject* wxVariantToObjectConverterwxObject ( const wxxVariant &data ) 
 { return data.Get<wxObject*>() ; } 


@@ -188,7 +188,7 @@ wxClassInfo::~wxClassInfo()
             info = info->m_next;
         }
     }
             info = info->m_next;
         }
     }

-#if wxUSE_XTI
+#if wxUSE_EXTENDED_RTTI

        Unregister( m_className ) ;
 #endif
 }
        Unregister( m_className ) ;
 #endif
 }


@@ -264,7 +264,7 @@ void wxClassInfo::InitializeClasses()
         }
     }
 
         }
     }
 

-#if wxUSE_XTI == 0
+#if wxUSE_EXTENDED_RTTI == 0

         // Set base pointers for each wxClassInfo
 
     for(info = sm_first; info; info = info->m_next)
         // Set base pointers for each wxClassInfo
 
     for(info = sm_first; info; info = info->m_next)

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 13595aa27caa84fcf4707b4080d68226df69a9b1..74db154c9203b5fa6b52b2cb915f6e332c7980e9 100644 (file)
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -31,7 +31,7 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if wxUSE_XTI
+#if wxUSE_EXTENDED_RTTI

 
 // ----------------------------------------------------------------------------
 // Enum Support
 
 // ----------------------------------------------------------------------------
 // Enum Support