Minor fixes, should be ok now.

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 0f80c3f2a98c0c7b89b7a1f6ac5234c70bb84df4..dbfbd859156774e9eaf5d452759a85dfd6601c2d 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -162,6 +162,11 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
         m_widget = gtk_handle_box_new();
        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
        gtk_widget_show( GTK_WIDGET(m_toolbar) );
         m_widget = gtk_handle_box_new();
        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
        gtk_widget_show( GTK_WIDGET(m_toolbar) );

+       
+#if (GTK_MINOR_VERSION > 0)
+       if (style & wxTB_FLAT)
+            gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
+#endif

     }
     else
     {     
     }
     else
     {     


@@ -169,6 +174,11 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
     }
                                            
     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 );
+#endif

 
     m_fg = new GdkColor;
     m_fg->red = 0;
 
     m_fg = new GdkColor;
     m_fg->red = 0;