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

Compilation fix for wxUniv/X11 with wxUSE_STL==1.

Browse Source 
Don't rely on implicit conversion from wxString to wchar_t*.

Closes #13790.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-12-27 01:21:50 +00:00
parent 59060c07b4
commit 1b47b78407
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/x11/window.cpp
View File

@ -1107,7 +1107,7 @@ void wxWindowX11::DoGetTextExtent(const wxString& string,
PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
pango_layout_set_font_description(layout, desc);
const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
const wxCharBuffer data = wxConvUTF8.cWC2MB( string.wc_str() );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;