X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..472137baebae6c011ad7d70285de454b9ce7796d:/src/common/xti.cpp diff --git a/src/common/xti.cpp b/src/common/xti.cpp index c367e7cf2c..04e166170d 100644 --- a/src/common/xti.cpp +++ b/src/common/xti.cpp @@ -10,28 +10,24 @@ // 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" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_EXTENDED_RTTI + #ifndef WX_PRECOMP -#include "wx/hash.h" -#include "wx/object.h" + #include "wx/object.h" + #include "wx/list.h" + #include "wx/hash.h" #endif -#if wxUSE_EXTENDED_RTTI - #include "wx/xti.h" #include "wx/xml/xml.h" #include "wx/tokenzr.h" -#include "wx/list.h" #include #include "wx/beforestd.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 @@ -318,13 +314,13 @@ 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); } @@ -767,4 +763,5 @@ void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxxVariant& wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ; value = dynobj->GetProperty( m_propertyName ) ; } -#endif + +#endif // wxUSE_EXTENDED_RTTI