From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 27 Dec 2011 01:21:50 +0000 (+0000)
Subject: Compilation fix for wxUniv/X11 with wxUSE_STL==1.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1b47b784075508221e39c6bacbe7c2ffff64966d?ds=inline

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

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
---

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 1f004c99b4..fcd2ee3dea 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -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;