X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c1d8296a78d1f630952fc5395e4072c8a654b8ef:/src/common/xti.cpp diff --git a/src/common/xti.cpp b/src/common/xti.cpp index 4eb4a9fb31..93906a9e4f 100644 --- a/src/common/xti.cpp +++ b/src/common/xti.cpp @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xti.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -88,7 +84,7 @@ const wxChar *wxEnumData::GetEnumMemberName(int value) const if (value == m_members[i].m_value) return m_members[i].m_name; - return wxT("") ; + return wxEmptyString ; } int wxEnumData::GetEnumMemberValueByIndex( int idx ) const @@ -314,17 +310,17 @@ wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString ) { m_eventClass = eventClass ; m_eventType = eventType ; m_lastEventType = lastEventType; } void wxTypeInfo::Register() -{ +{ if ( ms_typeTable == NULL ) ms_typeTable = new wxTypeInfoMap() ; - if( !m_name.IsEmpty() ) + if( !m_name.empty() ) (*ms_typeTable)[m_name] = this ; } void wxTypeInfo::Unregister() { - if( !m_name.IsEmpty() ) + if( !m_name.empty() ) ms_typeTable->erase(m_name); } @@ -474,7 +470,7 @@ wxObjectStreamingCallback wxClassInfo::GetStreamingCallback() const return retval ; } -bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const +bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const { wxObjectStreamingCallback sb = GetStreamingCallback() ; if ( sb ) @@ -523,13 +519,13 @@ void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *proper accessor->AddToPropertyCollection( object , value ) ; } -// void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const +// void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const // The map parameter (the name map that is) seems something special // to MSVC and so we use a other name. -void wxClassInfo::GetProperties( wxPropertyInfoMap &infomap ) const +void wxClassInfo::GetProperties( wxPropertyInfoMap &infomap ) const { const wxPropertyInfo *pi = GetFirstProperty() ; - while( pi ) + while( pi ) { if ( infomap.find( pi->GetName() ) == infomap.end() ) infomap[pi->GetName()] = (wxPropertyInfo*) pi ; @@ -610,13 +606,13 @@ wxxVariant wxDynamicObject::GetProperty (const wxChar *propertyName) const return m_data->m_properties[propertyName] ; } -void wxDynamicObject::RemoveProperty( const wxChar *propertyName ) +void wxDynamicObject::RemoveProperty( const wxChar *propertyName ) { wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Removing Unknown Property in a Dynamic Object") ) ; m_data->m_properties.erase( propertyName ) ; } -void wxDynamicObject::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) +void wxDynamicObject::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) { wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(oldPropertyName),wxT("Renaming Unknown Property in a Dynamic Object") ) ; wxxVariant value = m_data->m_properties[oldPropertyName] ; @@ -701,7 +697,7 @@ void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFu } // removes an existing runtime-property -void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName ) +void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName ) { for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin() ; iter != m_data->m_dynamicObjects.end() ; ++iter ) (*iter)->RemoveProperty( propertyName ) ; @@ -709,13 +705,13 @@ void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName ) } // removes an existing runtime-handler -void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName ) +void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName ) { delete FindHandlerInfoInThisClass(handlerName) ; } // renames an existing runtime-property -void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) +void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) { wxPropertyInfo* pi = FindPropertyInfoInThisClass(oldPropertyName) ; wxASSERT_MSG( pi ,wxT("not existing property") ) ; @@ -726,7 +722,7 @@ void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName , const w } // renames an existing runtime-handler -void wxDynamicClassInfo::RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) +void wxDynamicClassInfo::RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) { wxASSERT_MSG(FindHandlerInfoInThisClass(oldHandlerName),wxT("not existing handler") ) ; FindHandlerInfoInThisClass(oldHandlerName)->m_name = newHandlerName ;