Applied patch [ 638561 ] Allow SetFont(wxNullFont) in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1732,14 +1732,17 @@ void wxWindowDC::SetFont( const wxFont &font )
|
||||
|
||||
m_font = font;
|
||||
#ifdef __WXGTK20__
|
||||
m_fontdesc = m_font.GetNativeFontInfo()->description;
|
||||
|
||||
if (m_owner)
|
||||
if (m_font.Ok())
|
||||
{
|
||||
if (m_font.GetNoAntiAliasing())
|
||||
m_context = m_owner->GtkGetPangoX11Context();
|
||||
else
|
||||
m_context = m_owner->GtkGetPangoDefaultContext();
|
||||
m_fontdesc = m_font.GetNativeFontInfo()->description;
|
||||
|
||||
if (m_owner)
|
||||
{
|
||||
if (m_font.GetNoAntiAliasing())
|
||||
m_context = m_owner->GtkGetPangoX11Context();
|
||||
else
|
||||
m_context = m_owner->GtkGetPangoDefaultContext();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user