Applied patch [ 767505 ] BCB6 link error

[wxWidgets.git] / src / gtk / tbargtk.cpp

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index bd6f38fd3b76541f44036dd5996bfd942988bab4..a5a5b2b946aab6229572150b37fc429b534aefed 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -343,10 +343,6 @@ 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 );
 
     m_parent->DoAddChild( this );
@@ -677,7 +673,8 @@ void wxToolBar::OnInternalIdle()
         }
     }
 
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 #endif // wxUSE_TOOLBAR_NATIVE