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

Applied patch [ 638561 ] Allow SetFont(wxNullFont) in wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-09 09:14:39 +00:00
parent ce788ad93a
commit 77416abdc5
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/dcclient.cpp
View File

@@ -1732,14 +1732,17 @@ void wxWindowDC::SetFont( const wxFont &font )
m_font = font; m_font = font;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_fontdesc = m_font.GetNativeFontInfo()->description; if (m_font.Ok())
if (m_owner)
{ {
if (m_font.GetNoAntiAliasing()) m_fontdesc = m_font.GetNativeFontInfo()->description;
m_context = m_owner->GtkGetPangoX11Context();
else if (m_owner)
m_context = m_owner->GtkGetPangoDefaultContext(); {
if (m_font.GetNoAntiAliasing())
m_context = m_owner->GtkGetPangoX11Context();
else
m_context = m_owner->GtkGetPangoDefaultContext();
}
} }
#endif #endif
} }

17
src/gtk1/dcclient.cpp
View File

@@ -1732,14 +1732,17 @@ void wxWindowDC::SetFont( const wxFont &font )
m_font = font; m_font = font;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_fontdesc = m_font.GetNativeFontInfo()->description; if (m_font.Ok())
if (m_owner)
{ {
if (m_font.GetNoAntiAliasing()) m_fontdesc = m_font.GetNativeFontInfo()->description;
m_context = m_owner->GtkGetPangoX11Context();
else if (m_owner)
m_context = m_owner->GtkGetPangoDefaultContext(); {
if (m_font.GetNoAntiAliasing())
m_context = m_owner->GtkGetPangoX11Context();
else
m_context = m_owner->GtkGetPangoDefaultContext();
}
} }
#endif #endif
} }