From c34e3c7930684745d6aaf4696fc18faa32463d0e Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 26 Aug 2003 00:39:07 +0000 Subject: [PATCH] unicode fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/gdicmn.cpp | 8 ++++---- src/msw/colour.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index fbc7b50b37..69ddd20986 100644 --- 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 , wxFromStringConverter) 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 , wxFromStringConverter) diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index eebf6ed159..629336cc4a 100644 --- 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 , &wxFromStringConverter) -- 2.47.2