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

Corrected GTK2 creation of default font.

Browse Source 
Removed ugly SET_STYLE_FONT code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-01-31 10:31:05 +00:00
parent a148cfb644
commit 288059b2b9
10 changed files with 20 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk1/window.cpp
View File

@@ -4145,12 +4145,16 @@ void wxWindowGTK::SetWidgetStyle()
GtkStyle *style = GetWidgetStyle();
#ifndef __WXGTK20__
if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{
SET_STYLE_FONT(style, m_font.GetInternalFont( 1.0 ));
}
#ifdef __WXGTK20__
pango_font_description_free( style->font_desc );
pango_font_description_copy( m_font.GetNativeFontInfo()->description );
#else
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) )
#endif
}
if (m_foregroundColour.Ok())
{