warnings (and some errors) fixes for wxUniv DLL build

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index d21eb7615587e00cefe24a7af3d34f57d3efe244..2c5530169c48ca3a33527c7a07710f5e82d71482 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -51,7 +51,7 @@
     #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*>() ; } 
@@ -60,7 +60,7 @@ const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ;
  wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"),   
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,   
-                       (wxPropertyInfo*) NULL,0 , 0 ,     
+                       (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,     
                        0 , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);    
  template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
@@ -188,7 +188,7 @@ wxClassInfo::~wxClassInfo()
             info = info->m_next;
         }
     }
-#if wxUSE_XTI
+#if wxUSE_EXTENDED_RTTI
        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)