Fixed small bug in tab code WRT to having only

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

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index aa7574fecaec1668cfba3abdf8003e3834d2086e..de64297fd4b1eb265aa2ee011a093c99ed079041 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -272,24 +272,26 @@ bool wxToolBar::Create( wxWindow *parent,
 
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
 
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 

-#if (GTK_MINOR_VERSION > 0)

     if (style & wxTB_FLAT)
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
     if (style & wxTB_FLAT)
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );

-#endif
+

 
     m_fg = new GdkColor;
 
     m_fg = new GdkColor;

-    m_fg->red = 0;
-    m_fg->green = 0;
+    m_fg->red = 0; 
+    m_fg->green = 0; 

     m_fg->blue = 0;
     m_fg->blue = 0;

-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_fg );
-
+    wxColour fg(0,0,0);
+    fg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
+    m_fg->pixel = fg.GetPixel();
+    

     m_bg = new GdkColor;
     m_bg->red = 65535;
     m_bg->green = 65535;
     m_bg = new GdkColor;
     m_bg->red = 65535;
     m_bg->green = 65535;

-    m_bg->blue = 50000;
-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg );
-
-#if (GTK_MINOR_VERSION > 0)
+    m_bg->blue = 49980;
+    wxColour bg(255,255,196);
+    bg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
+    m_bg->pixel = bg.GetPixel();
+    

     gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
 
     GtkStyle *g_style = 
     gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
 
     GtkStyle *g_style = 


@@ -299,9 +301,7 @@ bool wxToolBar::Create( wxWindow *parent,
 
     g_style->bg[GTK_STATE_NORMAL] = *m_bg;
     gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
 
     g_style->bg[GTK_STATE_NORMAL] = *m_bg;
     gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );

-#else
-    gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg );
-#endif
+    

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -316,6 +316,9 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
     wxToolBarTool *tool = (wxToolBarTool *)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();
     if ( tool->IsButton() )
     {
         wxBitmap bitmap = tool->GetBitmap1();


@@ -399,12 +402,12 @@ 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;
     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;
 }
 
 
     return TRUE;
 }
 

-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)

 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;