From 05fa251a2f0eb98997094e733c0873ddd89050a9 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 17 Oct 2003 19:53:19 +0000
Subject: [PATCH] adjusting to changes in xti.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/object.cpp |  8 ++++----
 src/common/xti.cpp    | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/common/object.cpp b/src/common/object.cpp
index acf2b96975..93a6437fc3 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -49,14 +49,14 @@
 #endif
 
 #if wxUSE_EXTENDED_RTTI
-const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ;
+const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
  wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data )
 { return data.Get<wxObject*>() ; }
  wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data )
 { return &data.Get<wxObject>() ; }
  wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
  { return wxxVariant( dynamic_cast<wxObject*> (data)  ) ; }
- wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"),
+ wxClassInfo wxObject::ms_classInfo(ms_classParents , wxT("") , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
 			(wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
@@ -65,8 +65,8 @@ const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ;
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
  template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;}
- wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::sm_classwxObject , NULL , NULL , typeid(wxObject*).name() ) ; 
- wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::sm_classwxObject , NULL , NULL , typeid(wxObject).name() ) ; 
+ wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ; 
+ wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ; 
 #else
 wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),
diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 21aa7a1170..5320362612 100644
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -271,12 +271,12 @@ template<> void wxCollectionToVariantArray( wxArrayString const &theArray, wxxVa
     wxArrayCollectionToVariantArray( theArray , value ) ;
 }
 
-wxTypeInfoMap *wxTypeInfo::sm_typeTable = NULL ;
+wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL ;
 
 wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName)
 {
-    wxTypeInfoMap::iterator iter = sm_typeTable->find(typeName) ;
-    wxASSERT_MSG( iter != sm_typeTable->end() , wxT("lookup for a non-existent type-info") ) ;
+    wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName) ;
+    wxASSERT_MSG( iter != ms_typeTable->end() , wxT("lookup for a non-existent type-info") ) ;
     return (wxTypeInfo *)iter->second;
 }
 
@@ -300,17 +300,17 @@ wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )
 
 void wxTypeInfo::Register()
 {    
-    if ( sm_typeTable == NULL )
-        sm_typeTable = new wxTypeInfoMap() ;
+    if ( ms_typeTable == NULL )
+        ms_typeTable = new wxTypeInfoMap() ;
 
     if( !m_name.IsEmpty() )
-        (*sm_typeTable)[m_name] = this ;
+        (*ms_typeTable)[m_name] = this ;
 }
 
 void wxTypeInfo::Unregister()
 {
     if( !m_name.IsEmpty() )
-        sm_typeTable->erase(m_name);
+        ms_typeTable->erase(m_name);
 }
 
 // removing header dependancy on string tokenizer
-- 
2.45.2