From de004174ff6ea3db88b2043ec38674fa61799912 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 12 Jul 2007 12:16:23 +0000 Subject: [PATCH] compilation fix for ANSI STL build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/utilsgtk.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 6b3e1751a2..e311c5fee2 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -192,11 +192,11 @@ wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc) wxWCharBuffer wbuf; if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT ) { - wbuf = wxConvUI->cMB2WC(s); + wbuf = wxConvUI->cMB2WC(s.c_str()); } else // another encoding, use generic conversion class { - wbuf = wxCSConv(enc).cMB2WC(s); + wbuf = wxCSConv(enc).cMB2WC(s.c_str()); } 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 // encoding probably and, also importantly here, conversion from it // 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); @@ -217,7 +217,7 @@ wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc) { // this conversion should never fail as GTK+ always uses UTF-8 internally // so there are no complications here - const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s)); + const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s.c_str())); if ( enc == wxFONTENCODING_SYSTEM ) return wxConvUI->cWC2MB(wbuf);