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

simplified code now that utf8_str() always returns a scoped buffer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-05-15 13:06:23 +00:00
parent 50283a5142
commit f9dcd25dbc
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/gnome/gprint.cpp
View File

@@ -1597,12 +1597,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx
bool underlined = m_font.Ok() && m_font.GetUnderlined(); bool underlined = m_font.Ok() && m_font.GetUnderlined();
// FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer const wxScopedCharBuffer data(text.utf8_str());
#if wxUSE_UNICODE_UTF8
const char *data = text.utf8_str();
#else
const wxCharBuffer data = text.utf8_str();
#endif
size_t datalen = strlen(data); size_t datalen = strlen(data);
pango_layout_set_text( m_layout, data, datalen); pango_layout_set_text( m_layout, data, datalen);
@@ -1913,12 +1908,7 @@ void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *widt
// Set layout's text // Set layout's text
// FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer const wxScopedCharBuffer dataUTF8(string.utf8_str());
#if wxUSE_UNICODE_UTF8
const char *dataUTF8 = string.utf8_str();
#else
const wxCharBuffer dataUTF8 = string.utf8_str();
#endif
gint oldSize = 0; gint oldSize = 0;
if ( theFont ) if ( theFont )