From e66faf3d437185a4fc099c120401b9f279a20785 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 15 Feb 2005 18:31:10 +0000 Subject: [PATCH] Applied pango font patch for X11. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/dcclient.cpp | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp index 37b47a4dbf..deec508b32 100644 --- a/src/x11/dcclient.cpp +++ b/src/x11/dcclient.cpp @@ -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 } -- 2.45.2