Avoid crash when releasing the mouse in wxRibbonToolBar.

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

diff --git a/src/common/xti.cpp b/src/common/xti.cpp
index 4020bb2c8e598d3a9b42caa29905d8f043d25711..a924d13fda94d42371151af83cb6e78f463c9984 100644 (file)
--- 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"
@@ -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
@@ -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