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

define wxUTF8Buf as the type returned by wxString::utf8_str()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-20 22:52:36 +00:00
parent 48510f6156
commit 30386aeb86
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/print.cpp
View File

@@ -1715,12 +1715,7 @@ void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
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 wxUTF8Buf data = text.utf8_str();
size_t datalen = strlen(data);
pango_layout_set_text( m_layout, data, datalen);
@@ -2135,12 +2130,7 @@ void wxGtkPrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoo
}
// 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 wxUTF8Buf dataUTF8 = string.utf8_str();
PangoFontDescription *desc = m_fontdesc;
if (theFont) desc = theFont->GetNativeFontInfo()->description;