AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied pango font patch for X11.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2005-02-15 18:31:10 +00:00
parent ac10c957a5
commit e66faf3d43
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/x11/dcclient.cpp
View File

@ -1670,13 +1670,11 @@ wxCoord wxWindowDC::GetCharWidth() const
#if wxUSE_UNICODE
PangoLayout *layout = pango_layout_new( m_context );
if (!m_fontdesc)
{
char *crash = NULL;
*crash = 0;
}
pango_layout_set_font_description(layout, m_fontdesc);
if (m_fontdesc)
pango_layout_set_font_description(layout, m_fontdesc);
else
pango_layout_set_font_description(layout, this->GetFont().GetNativeFontInfo()->description);
pango_layout_set_text(layout, "H", 1 );
int w,h;
pango_layout_get_pixel_size(layout, &w, &h);
@ -1706,14 +1704,11 @@ wxCoord wxWindowDC::GetCharHeight() const
#if wxUSE_UNICODE
PangoLayout *layout = pango_layout_new( m_context );
if (!m_fontdesc)
{
char *crash = NULL;
*crash = 0;
}
pango_layout_set_font_description(layout, m_fontdesc);
if (m_fontdesc)
pango_layout_set_font_description(layout, m_fontdesc);
else
pango_layout_set_font_description(layout, this->GetFont().GetNativeFontInfo()->description);
pango_layout_set_text(layout, "H", 1 );
int w,h;
pango_layout_get_pixel_size(layout, &w, &h);
@ -1772,14 +1767,10 @@ void wxWindowDC::SetFont( const wxFont &font )
m_font = font;
return;
#if wxUSE_UNICODE
if (m_font.Ok())
{
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
}
m_fontdesc = font.GetNativeFontInfo()->description;
#endif
}