X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..81533a3af6ed598c32a35e1c1c2b60f4908f5541:/src/common/xti.cpp

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index c367e7cf2c..a924d13fda 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 <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;
 
-    return wxT("") ;
+    return wxEmptyString ;
 }
 
 int wxEnumData::GetEnumMemberValueByIndex( int idx ) const
@@ -118,13 +114,13 @@ const wxChar * wxEnumData::GetEnumMemberNameByIndex( int idx ) const
 template<> void wxStringReadValue(const wxString &s , bool &data )
 {
     int intdata ;
-    wxSscanf(s, _T("%d"), &intdata ) ;
+    wxSscanf(s, wxT("%d"), &intdata ) ;
     data = (bool)intdata ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const bool &data )
 {
-    s = wxString::Format(_T("%d"), data ) ;
+    s = wxString::Format(wxT("%d"), data ) ;
 }
 
 // char
@@ -132,13 +128,13 @@ template<> void wxStringWriteValue(wxString &s , const bool &data )
 template<> void wxStringReadValue(const wxString &s , char &data )
 {
     int intdata ;
-    wxSscanf(s, _T("%d"), &intdata ) ;
+    wxSscanf(s, wxT("%d"), &intdata ) ;
     data = char(intdata) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const char &data )
 {
-    s = wxString::Format(_T("%d"), data ) ;
+    s = wxString::Format(wxT("%d"), data ) ;
 }
 
 // unsigned char
@@ -146,85 +142,85 @@ template<> void wxStringWriteValue(wxString &s , const char &data )
 template<> void wxStringReadValue(const wxString &s , unsigned char &data )
 {
     int intdata ;
-    wxSscanf(s, _T("%d"), &intdata ) ;
+    wxSscanf(s, wxT("%d"), &intdata ) ;
     data = (unsigned char)(intdata) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
 {
-    s = wxString::Format(_T("%d"), data ) ;
+    s = wxString::Format(wxT("%d"), data ) ;
 }
 
 // int
 
 template<> void wxStringReadValue(const wxString &s , int &data )
 {
-    wxSscanf(s, _T("%d"), &data ) ;
+    wxSscanf(s, wxT("%d"), &data ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const int &data )
 {
-    s = wxString::Format(_T("%d"), data ) ;
+    s = wxString::Format(wxT("%d"), data ) ;
 }
 
 // unsigned int
 
 template<> void wxStringReadValue(const wxString &s , unsigned int &data )
 {
-    wxSscanf(s, _T("%d"), &data ) ;
+    wxSscanf(s, wxT("%d"), &data ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
 {
-    s = wxString::Format(_T("%d"), data ) ;
+    s = wxString::Format(wxT("%d"), data ) ;
 }
 
 // long
 
 template<> void wxStringReadValue(const wxString &s , long &data )
 {
-    wxSscanf(s, _T("%ld"), &data ) ;
+    wxSscanf(s, wxT("%ld"), &data ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const long &data )
 {
-    s = wxString::Format(_T("%ld"), data ) ;
+    s = wxString::Format(wxT("%ld"), data ) ;
 }
 
 // unsigned long
 
 template<> void wxStringReadValue(const wxString &s , unsigned long &data )
 {
-    wxSscanf(s, _T("%ld"), &data ) ;
+    wxSscanf(s, wxT("%ld"), &data ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
 {
-    s = wxString::Format(_T("%ld"), data ) ;
+    s = wxString::Format(wxT("%ld"), data ) ;
 }
 
 // float
 
 template<> void wxStringReadValue(const wxString &s , float &data )
 {
-    wxSscanf(s, _T("%f"), &data ) ;
+    wxSscanf(s, wxT("%f"), &data ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const float &data )
 {
-    s = wxString::Format(_T("%f"), data ) ;
+    s = wxString::Format(wxT("%f"), data ) ;
 }
 
 // double
 
 template<> void wxStringReadValue(const wxString &s , double &data )
 {
-    wxSscanf(s, _T("%lf"), &data ) ;
+    wxSscanf(s, wxT("%lf"), &data ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const double &data )
 {
-    s = wxString::Format(_T("%lf"), data ) ;
+    s = wxString::Format(wxT("%lf"), data ) ;
 }
 
 // wxString
@@ -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