Compile fixes for ANSI mode.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-17 17:03:01 +00:00
parent eba330067e
commit fb3ed106d1
4 changed files with 40 additions and 8 deletions

View File

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