call gtk_toolbar_set_tooltips() from GtkSetStyle(); removed erroneous wxTB_TOOLTIPS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index e56eba64a14790c3d4995e60d8dc48ad3075e37d..c36d3ef85f0cefb44d04f45f5b0c70d95b79439d 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -317,7 +317,6 @@ bool wxToolBar::Create( wxWindow *parent,
         ConnectWidget( m_widget );
         gtk_widget_show(GTK_WIDGET(m_toolbar));
     }
         ConnectWidget( m_widget );
         gtk_widget_show(GTK_WIDGET(m_toolbar));
     }

-    gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), !(style & wxTB_NO_TOOLTIPS) );

 
     // FIXME: there is no such function for toolbars in 2.0
 #if 0
 
     // FIXME: there is no such function for toolbars in 2.0
 #if 0


@@ -340,21 +339,13 @@ void wxToolBar::GtkSetStyle()
 
     gtk_toolbar_set_orientation(m_toolbar, orient);
     gtk_toolbar_set_style(m_toolbar, style);
 
     gtk_toolbar_set_orientation(m_toolbar, orient);
     gtk_toolbar_set_style(m_toolbar, style);

+    gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), !(style & wxTB_NO_TOOLTIPS) );

 }
 
 void wxToolBar::SetWindowStyleFlag( long style )
 {
     wxToolBarBase::SetWindowStyleFlag(style);
 }
 
 void wxToolBar::SetWindowStyleFlag( long style )
 {
     wxToolBarBase::SetWindowStyleFlag(style);

-    if( style & wxTB_TOOLTIPS )
-    {
-        if( m_toolbar )
-             gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
-    }
-    else
-    {
-        if( m_toolbar )
-             gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), FALSE );
-    }
+

     if ( m_toolbar )
         GtkSetStyle();
 }
     if ( m_toolbar )
         GtkSetStyle();
 }