unicode fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index fbc7b50b3758920be3097dfee91b58f30b7d0db7..69ddd2098684ffe8a2bf32ec3000ca666c6aefc5 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -71,24 +71,24 @@
 
 template<> void wxStringReadValue(const wxString &s , wxPoint &data )
 {
-       wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
+       wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
 {
-       s = wxString::Format("%d,%d", data.x , data.y ) ;
+       s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
 }
 
 WX_CUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>)
 
 template<> void wxStringReadValue(const wxString &s , wxSize &data )
 {
-       wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
+       wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxSize &data )
 {
-       s = wxString::Format("%d,%d", data.x , data.y ) ;
+       s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
 }
 
 WX_CUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index eebf6ed159be75cd37262a376624c0909f44b097..629336cc4aea04ce2ddc6183d429a1e3686da7a0 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -49,7 +49,7 @@ template<> void wxStringReadValue(const wxString &s , wxColour &data )
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {
-       s = wxString::Format("#%02X%02X%02X", data.Red() , data.Green() , data.Blue() ) ;
+       s = wxString::Format(wxT("#%02X%02X%02X"), data.Red() , data.Green() , data.Blue() ) ;
 }
 
 IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>)