AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fix for ANSI STL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-07-12 12:16:23 +00:00
parent 325ab46800
commit de004174ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/utilsgtk.cpp
View File

@ -192,11 +192,11 @@ wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
wxWCharBuffer wbuf; wxWCharBuffer wbuf;
if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
{ {
wbuf = wxConvUI->cMB2WC(s); wbuf = wxConvUI->cMB2WC(s.c_str());
} }
else // another encoding, use generic conversion class else // another encoding, use generic conversion class
{ {
wbuf = wxCSConv(enc).cMB2WC(s); wbuf = wxCSConv(enc).cMB2WC(s.c_str());
} }
if ( !wbuf && !s.empty() ) if ( !wbuf && !s.empty() )
@ -207,7 +207,7 @@ wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
// we choose ISO8859-1 here arbitrarily, it's just the most common // we choose ISO8859-1 here arbitrarily, it's just the most common
// encoding probably and, also importantly here, conversion from it // encoding probably and, also importantly here, conversion from it
// never fails as it's done internally by wxCSConv // never fails as it's done internally by wxCSConv
wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s); wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s.c_str());
} }
return wxConvUTF8.cWC2MB(wbuf); return wxConvUTF8.cWC2MB(wbuf);
@ -217,7 +217,7 @@ wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc)
{ {
// this conversion should never fail as GTK+ always uses UTF-8 internally // this conversion should never fail as GTK+ always uses UTF-8 internally
// so there are no complications here // so there are no complications here
const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s)); const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s.c_str()));
if ( enc == wxFONTENCODING_SYSTEM ) if ( enc == wxFONTENCODING_SYSTEM )
return wxConvUI->cWC2MB(wbuf); return wxConvUI->cWC2MB(wbuf);