Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxT() instead of _T() in XTI code.

Browse Source 
_T() is deprecated and doesn't work with Solaris compiler, use wxT() instead.

Also change one occurrence of _T() inside a comment in wx/debug.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-01-09 18:48:39 +00:00
parent 9349c84fdb
commit ebd98179c5
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/xti.cpp
View File

@@ -117,13 +117,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 != 0);
}
template<> void wxStringWriteValue(wxString &s, const bool &data )
{
s = wxString::Format(_T("%d"), data );
s = wxString::Format(wxT("%d"), data );
}
// char
@@ -131,13 +131,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
@@ -145,106 +145,106 @@ 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 );
}
#ifdef wxLongLong_t
template<> void wxStringReadValue(const wxString &s, wxLongLong_t &data )
{
wxSscanf(s, _T("%lld"), &data );
wxSscanf(s, wxT("%lld"), &data );
}
template<> void wxStringWriteValue(wxString &s, const wxLongLong_t &data )
{
s = wxString::Format(_T("%lld"), data );
s = wxString::Format(wxT("%lld"), data );
}
template<> void wxStringReadValue(const wxString &s, wxULongLong_t &data )
{
wxSscanf(s, _T("%lld"), &data );
wxSscanf(s, wxT("%lld"), &data );
}
template<> void wxStringWriteValue(wxString &s, const wxULongLong_t &data )
{
s = wxString::Format(_T("%lld"), data );
s = wxString::Format(wxT("%lld"), data );
}
#endif
// 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