From: Robert Roebling Date: Sun, 11 Nov 2007 19:14:09 +0000 (+0000) Subject: Compilation for GTK+ X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/10c508ef3cfbbb0bf36151f4aafad8edca511a8a?ds=inline Compilation for GTK+ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 79493bbb99..2f29da4b3c 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1328,7 +1328,7 @@ void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) return; #ifdef __WXGTK__ - const wxCharBuffer data = wxConvUTF8.cWC2MB( str ); + const wxCharBuffer data = str.utf8_str(); if ( !data ) return; size_t datalen = strlen(data); @@ -1374,7 +1374,7 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub PangoLayout *layout = pango_cairo_create_layout (m_context); pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont()); - const wxCharBuffer data = wxConvUTF8.cWC2MB( str ); + const wxCharBuffer data = str.utf8_str(); if ( !data ) { return;