Linking with the TIFF library

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index aa7574fecaec1668cfba3abdf8003e3834d2086e..c6961b6381e588b1c1e3a72cbcdd281d18005883 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -316,6 +316,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 
+    // we have inserted a space before all the tools
+    if (m_xMargin > 1) pos++;
+    
     if ( tool->IsButton() )
     {
         wxBitmap bitmap = tool->GetBitmap1();
@@ -399,7 +402,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     GtkRequisition req;
     (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
     m_width = req.width + m_xMargin;
-    m_height = req.height + 2*m_yMargin + 4;
+    m_height = req.height + 2*m_yMargin;
 
     return TRUE;
 }