Take basic style into account when applying style sheet

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

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index c367e7cf2ca837a63f3739c3643b3ea130c1222b..04e166170d9afd69820157e0e885f74b974ae8ff 100644 (file)
--- a/src/common/xti.cpp
+++ b/src/common/xti.cpp
@@ -10,28 +10,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_EXTENDED_RTTI
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/hash.h"
-#include "wx/object.h"
+    #include "wx/object.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"

 #endif
 
 #endif
 

-#if wxUSE_EXTENDED_RTTI
-

 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
 #include "wx/xti.h"
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"

-#include "wx/list.h"

 #include <string.h>
 
 #include "wx/beforestd.h"
 #include <string.h>
 
 #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;
 
         if (value == m_members[i].m_value)
             return m_members[i].m_name;
 

-    return wxT("") ;
+    return wxEmptyString ;

 }
 
 int wxEnumData::GetEnumMemberValueByIndex( int idx ) const
 }
 
 int wxEnumData::GetEnumMemberValueByIndex( int idx ) const


@@ -318,13 +314,13 @@ void wxTypeInfo::Register()
     if ( ms_typeTable == NULL )
         ms_typeTable = new wxTypeInfoMap() ;
 
     if ( ms_typeTable == NULL )
         ms_typeTable = new wxTypeInfoMap() ;
 

-    if( !m_name.IsEmpty() )
+    if( !m_name.empty() )

         (*ms_typeTable)[m_name] = this ;
 }
 
 void wxTypeInfo::Unregister()
 {
         (*ms_typeTable)[m_name] = this ;
 }
 
 void wxTypeInfo::Unregister()
 {

-    if( !m_name.IsEmpty() )
+    if( !m_name.empty() )

         ms_typeTable->erase(m_name);
 }
 
         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 ) ;
 }
     wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
     value = dynobj->GetProperty( m_propertyName ) ;
 }

-#endif
+
+#endif // wxUSE_EXTENDED_RTTI