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

respect the specified font encoding in DoGetTextExtent() instead of always using m_font

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-14 17:34:35 +00:00
parent 1a6c768b17
commit bf5752a4a0
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/dcclient.cpp
View File

@@ -1696,16 +1696,24 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
*externalLeading = 0; *externalLeading = 0;
if (string.empty()) if (string.empty())
{
return; return;
// ensure that theFont is always non-NULL
if ( !theFont || !theFont->Ok() )
theFont = wx_const_cast(wxFont *, &m_font);
// and use it if it's valid
if ( theFont->Ok() )
{
pango_layout_set_font_description
(
m_layout,
theFont->GetNativeFontInfo()->description
);
} }
// Set new font description
if (theFont)
pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
// Set layout's text // Set layout's text
const wxCharBuffer dataUTF8 = wxGTK_CONV(string); const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, *theFont);
if ( !dataUTF8 ) if ( !dataUTF8 )
{ {
// hardly ideal, but what else can we do if conversion failed? // hardly ideal, but what else can we do if conversion failed?