From f9dcd25dbc1993b8f54ceb9b55ee2f37d13c2eba Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 15 May 2009 13:06:23 +0000 Subject: [PATCH] simplified code now that utf8_str() always returns a scoped buffer git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/gnome/gprint.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index 923cb6c28e..407d422c8c 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -1597,12 +1597,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx bool underlined = m_font.Ok() && m_font.GetUnderlined(); - // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer -#if wxUSE_UNICODE_UTF8 - const char *data = text.utf8_str(); -#else - const wxCharBuffer data = text.utf8_str(); -#endif + const wxScopedCharBuffer data(text.utf8_str()); size_t datalen = strlen(data); pango_layout_set_text( m_layout, data, datalen); @@ -1913,12 +1908,7 @@ void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *widt // Set layout's text - // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer -#if wxUSE_UNICODE_UTF8 - const char *dataUTF8 = string.utf8_str(); -#else - const wxCharBuffer dataUTF8 = string.utf8_str(); -#endif + const wxScopedCharBuffer dataUTF8(string.utf8_str()); gint oldSize = 0; if ( theFont ) -- 2.45.2