X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b15ed747536e28abd36b95f4faeb0813188196af..7291c37aa8f406b9487963a1b7fd6ee45b2e0b34:/src/gtk/window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 6691ffd0ce..ad3161a7d5 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3175,8 +3175,14 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
     PangoLayout *layout = pango_layout_new(context);
     pango_layout_set_font_description(layout, desc);
     {
+#if wxUSE_UNICODE
         const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
         pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+#else
+        const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
+        const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
+        pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+#endif
     }
     PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;