Font work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:40:45 +00:00
parent 138618acb9
commit cfcc393212
12 changed files with 176 additions and 126 deletions
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4145,10 +4145,12 @@ 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 ));
    }
+#endif

    if (m_foregroundColour.Ok())
    {