merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,6 +33,8 @@
|
||||
#include "gdk/gdk.h"
|
||||
#include "gtk/gtk.h"
|
||||
|
||||
extern GdkFont *GtkGetDefaultGuiFont();
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// globals
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -303,8 +305,9 @@ bool wxToolBar::Create( wxWindow *parent,
|
||||
GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
|
||||
|
||||
g_style->bg[GTK_STATE_NORMAL] = *m_bg;
|
||||
gdk_font_unref( g_style->font );
|
||||
g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() );
|
||||
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
|
||||
|
||||
|
||||
m_parent->DoAddChild( this );
|
||||
|
||||
|
Reference in New Issue
Block a user