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/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -343,7 +343,9 @@ bool wxToolBar::Create( wxWindow *parent,

    g_style->bg[GTK_STATE_NORMAL] = *m_bg;

+#ifndef __WXGTK20__
    SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
+#endif

    gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );