Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjusting to changes in xti.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-10-17 19:53:19 +00:00
parent bb7eff4c0d
commit 05fa251a2f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/object.cpp
View File

@@ -49,14 +49,14 @@
#endif #endif
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data ) wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data )
{ return data.Get<wxObject*>() ; } { return data.Get<wxObject*>() ; }
wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data ) wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data )
{ return &data.Get<wxObject>() ; } { return &data.Get<wxObject>() ; }
wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
{ return wxxVariant( dynamic_cast<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), \ (int) sizeof(wxObject), \
(wxObjectConstructorFn) 0 , (wxObjectConstructorFn) 0 ,
(wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 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 wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;} template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;}
template<> void wxStringWriteValue(wxString & , wxObject const & ){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_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ;
wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::sm_classwxObject , NULL , NULL , typeid(wxObject).name() ) ; wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ;
#else #else
wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0, wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
(int) sizeof(wxObject), (int) sizeof(wxObject),

14
src/common/xti.cpp
View File

@@ -271,12 +271,12 @@ template<> void wxCollectionToVariantArray( wxArrayString const &theArray, wxxVa
wxArrayCollectionToVariantArray( theArray , value ) ; wxArrayCollectionToVariantArray( theArray , value ) ;
} }
wxTypeInfoMap *wxTypeInfo::sm_typeTable = NULL ; wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL ;
wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName) wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName)
{ {
wxTypeInfoMap::iterator iter = sm_typeTable->find(typeName) ; wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName) ;
wxASSERT_MSG( iter != sm_typeTable->end() , wxT("lookup for a non-existent type-info") ) ; wxASSERT_MSG( iter != ms_typeTable->end() , wxT("lookup for a non-existent type-info") ) ;
return (wxTypeInfo *)iter->second; return (wxTypeInfo *)iter->second;
} }
@@ -300,17 +300,17 @@ wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )
void wxTypeInfo::Register() void wxTypeInfo::Register()
{ {
if ( sm_typeTable == NULL ) if ( ms_typeTable == NULL )
sm_typeTable = new wxTypeInfoMap() ; ms_typeTable = new wxTypeInfoMap() ;
if( !m_name.IsEmpty() ) if( !m_name.IsEmpty() )
(*sm_typeTable)[m_name] = this ; (*ms_typeTable)[m_name] = this ;
} }
void wxTypeInfo::Unregister() void wxTypeInfo::Unregister()
{ {
if( !m_name.IsEmpty() ) if( !m_name.IsEmpty() )
sm_typeTable->erase(m_name); ms_typeTable->erase(m_name);
} }
// removing header dependancy on string tokenizer // removing header dependancy on string tokenizer