correct a bug in the MSW code using wxMask

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 491eea3cd268d64d4630e451e79ccb1357d90e0e..d8323989a0d3ee32d919e3281d50731691ce01e1 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -2,9 +2,7 @@
 // Name:        tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -113,16 +111,19 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 
   m_tools.DeleteContents( TRUE );
 
-  m_widget = gtk_handle_box_new();
-
   m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL,
                                             GTK_TOOLBAR_ICONS ) );
-  gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
-  gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+  m_widget = GTK_WIDGET(m_toolbar);                                        
+                                           
+  gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
-  gtk_widget_show( GTK_WIDGET(m_toolbar) );
+  gtk_toolbar_append_space( m_toolbar );
+  
+  m_parent->AddChild( this );
 
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
 
   Show( TRUE );
@@ -209,12 +210,6 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
                       (gpointer)tool
                      );
 
-  // VZ: we don't want GDK_NO_EXPOSE events because for some reason our
-  // toolbar buttons get them (it doesn't happen in a standalone GTK+ program
-  // for unknown reasons) and it prevents tooltips from appearing.
-  gtk_widget_set_events( GTK_WIDGET(item),
-                         gtk_widget_get_events( GTK_WIDGET(item) ) &
-                         ~GDK_EXPOSURE_MASK);
   tool->m_item = item;
 
   gtk_signal_connect( GTK_OBJECT(tool->m_item),
@@ -257,7 +252,7 @@ void wxToolBar::Realize()
     node = node->Next();
   }
   
-  m_height += 10;
+  m_height += 12;
 }
 
 void wxToolBar::EnableTool(int toolIndex, bool enable)
@@ -343,7 +338,7 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
 
 void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
 {
-  wxFAIL_MSG( "wxToolBar::SetMargins not implemented" );
+//  wxFAIL_MSG( "wxToolBar::SetMargins not implemented" );
 }
 
 void wxToolBar::SetToolPacking( int WXUNUSED(packing) )