[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 53e68f741a2a856fc24f237370ea16139f1d68bb..46cc7afe7fa448d717add1004fdc0413b0c9d50f 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -16,10 +16,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tbargtk.h"
 #endif
 
     #pragma implementation "tbargtk.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/toolbar.h"
 
 #if wxUSE_TOOLBAR_NATIVE
 #include "wx/toolbar.h"
 
 #if wxUSE_TOOLBAR_NATIVE


@@ -29,8 +32,6 @@
 #include <glib.h>
 #include "wx/gtk/private.h"
 
 #include <glib.h>
 #include "wx/gtk/private.h"
 

-extern GdkFont *GtkGetDefaultGuiFont();
-

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -47,7 +48,7 @@ extern wxCursor   g_globalCursor;
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-// translate wxWindows toolbar style flags to GTK orientation and style
+// translate wxWidgets toolbar style flags to GTK orientation and style

 static void GetGtkStyle(long style,
                         GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
 {
 static void GetGtkStyle(long style,
                         GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
 {


@@ -57,7 +58,13 @@ static void GetGtkStyle(long style,
 
     if ( style & wxTB_TEXT )
     {
 
     if ( style & wxTB_TEXT )
     {

-        *gtkStyle = style & wxTB_NOICONS ? GTK_TOOLBAR_TEXT : GTK_TOOLBAR_BOTH;
+        *gtkStyle = style & wxTB_NOICONS
+                        ? GTK_TOOLBAR_TEXT
+                        : (
+#ifdef __WXGTK20__
+                          style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
+#endif // __WXGTK20__
+                          GTK_TOOLBAR_BOTH);

     }
     else // no text, hence we must have the icons or what would we show?
     {
     }
     else // no text, hence we must have the icons or what would we show?
     {


@@ -119,6 +126,21 @@ public:
         }
     }
 
         }
     }
 

+    void SetPixmap(const wxBitmap& bitmap)
+    {
+        if (bitmap.Ok())
+        {
+            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
+                                               : (GdkBitmap *)NULL;
+#ifdef __WXGTK20__
+            if (bitmap.HasPixbuf())
+                gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() );
+            else
+#endif // !__WXGTK20__
+                gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
+        }
+    }
+

     GtkWidget            *m_item;
     GtkWidget            *m_pixmap;
 
     GtkWidget            *m_item;
     GtkWidget            *m_pixmap;
 


@@ -130,7 +152,7 @@ protected:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -140,33 +162,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 // "clicked" (internal from gtk_toolbar)
 //-----------------------------------------------------------------------------
 
 // "clicked" (internal from gtk_toolbar)
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
                                   wxToolBarTool *tool )
 {
 static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
                                   wxToolBarTool *tool )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
         wxapp_install_idle_handler();
 
     wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();

-    
+

     if (tbar->m_blockEvent) return;
 
     if (g_blockEventsOnDrag) return;
     if (!tool->IsEnabled()) return;
 
     if (tool->CanBeToggled())
     if (tbar->m_blockEvent) return;
 
     if (g_blockEventsOnDrag) return;
     if (!tool->IsEnabled()) return;
 
     if (tool->CanBeToggled())

-    { 
+    {

         tool->Toggle();
 
         tool->Toggle();
 

-        wxBitmap bitmap = tool->GetBitmap();
-        if ( bitmap.Ok() )
-        {
-            GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-
-            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
-                                               : (GdkBitmap *)NULL;
-
-            gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-        }
+        tool->SetPixmap(tool->GetBitmap());

 
         if ( tool->IsRadio() && !tool->IsToggled() )
         {
 
         if ( tool->IsRadio() && !tool->IsToggled() )
         {


@@ -175,31 +189,40 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
         }
     }
 
         }
     }
 

-    tbar->OnLeftClick( tool->GetId(), tool->IsToggled() );
+    if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() )
+    {
+        // revert back
+        tool->Toggle();
+
+        tool->SetPixmap(tool->GetBitmap());
+    }
+}

 }
 
 //-----------------------------------------------------------------------------
 // "enter_notify_event" / "leave_notify_event"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "enter_notify_event" / "leave_notify_event"
 //-----------------------------------------------------------------------------
 

-static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), 
+extern "C" {
+static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),

                                        GdkEventCrossing *gdk_event,
                                        wxToolBarTool *tool )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (g_blockEventsOnDrag) return TRUE;
                                        GdkEventCrossing *gdk_event,
                                        wxToolBarTool *tool )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (g_blockEventsOnDrag) return TRUE;

-    
+

     wxToolBar *tb = (wxToolBar *)tool->GetToolBar();
     wxToolBar *tb = (wxToolBar *)tool->GetToolBar();

-    
+

     // emit the event
     if( gdk_event->type == GDK_ENTER_NOTIFY )
         tb->OnMouseEnter( tool->GetId() );
     else
         tb->OnMouseEnter( -1 );
     // emit the event
     if( gdk_event->type == GDK_ENTER_NOTIFY )
         tb->OnMouseEnter( tool->GetId() );
     else
         tb->OnMouseEnter( -1 );

-  
+

     return FALSE;
 }
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxToolBar
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxToolBar


@@ -245,16 +268,14 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 
 void wxToolBar::Init()
 {
 
 void wxToolBar::Init()
 {

-    m_fg =
-    m_bg = (GdkColor *)NULL;

     m_toolbar = (GtkToolbar *)NULL;
     m_toolbar = (GtkToolbar *)NULL;

-    m_blockEvent = FALSE;
+    m_blockEvent = false;
+    m_defaultWidth = 32;
+    m_defaultHeight = 32;

 }
 
 wxToolBar::~wxToolBar()
 {
 }
 
 wxToolBar::~wxToolBar()
 {

-    delete m_fg;
-    delete m_bg;

 }
 
 bool wxToolBar::Create( wxWindow *parent,
 }
 
 bool wxToolBar::Create( wxWindow *parent,


@@ -264,7 +285,7 @@ bool wxToolBar::Create( wxWindow *parent,
                         long style,
                         const wxString& name )
 {
                         long style,
                         const wxString& name )
 {

-    m_needParent = TRUE;
+    m_needParent = true;

     m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if ( !PreCreation( parent, pos, size ) ||
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if ( !PreCreation( parent, pos, size ) ||


@@ -272,12 +293,16 @@ bool wxToolBar::Create( wxWindow *parent,
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 

-        return FALSE;
+        return false;

     }
 
 #ifdef __WXGTK20__
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     GtkSetStyle();
     }
 
 #ifdef __WXGTK20__
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     GtkSetStyle();

+
+    // Doesn't work this way.
+    // GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
+    // gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);

 #else
     GtkOrientation orient;
     GtkToolbarStyle gtkStyle;
 #else
     GtkOrientation orient;
     GtkToolbarStyle gtkStyle;


@@ -298,8 +323,11 @@ bool wxToolBar::Create( wxWindow *parent,
             gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
     }
     else
             gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
     }
     else

-    {     
-        m_widget = GTK_WIDGET(m_toolbar);
+    {
+        m_widget = gtk_event_box_new();
+        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+        ConnectWidget( m_widget );
+        gtk_widget_show(GTK_WIDGET(m_toolbar));

     }
 
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
     }
 
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );


@@ -310,43 +338,11 @@ bool wxToolBar::Create( wxWindow *parent,
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
 #endif
 
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
 #endif
 

-
-    m_fg = new GdkColor;
-    m_fg->red = 0; 
-    m_fg->green = 0; 
-    m_fg->blue = 0;
-    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->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_style_copy(
-                gtk_widget_get_style( 
-                    GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
-
-    g_style->bg[GTK_STATE_NORMAL] = *m_bg;
-
-    SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
-
-    gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
-

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

-    PostCreation();
-
-    Show( TRUE );
+    PostCreation(size);

 
 

-    return TRUE;
+    return true;

 }
 
 void wxToolBar::GtkSetStyle()
 }
 
 void wxToolBar::GtkSetStyle()


@@ -371,36 +367,56 @@ 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++;
-    
+#ifndef __WXGTK20__
+    // if we have inserted a space before all the tools we must change the GTK
+    // index by 1
+    size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
+#else
+    size_t posGtk = pos;
+#endif
+

     if ( tool->IsButton() )
     {
     if ( tool->IsButton() )
     {

-        wxBitmap bitmap = tool->GetNormalBitmap();
-
-        wxCHECK_MSG( bitmap.Ok(), FALSE,
-                     wxT("invalid bitmap for wxToolBar icon") );
-
-        wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE,
-                     wxT("wxToolBar doesn't support GdkBitmap") );
-
-        wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE,
-                     wxT("wxToolBar::Add needs a wxBitmap") );
-      
-        GtkWidget *tool_pixmap = (GtkWidget *)NULL;
-      
-        GdkPixmap *pixmap = bitmap.GetPixmap();
-
-        GdkBitmap *mask = (GdkBitmap *)NULL;
-        if ( bitmap.GetMask() )
-          mask = bitmap.GetMask()->GetBitmap();
-        
-        tool_pixmap = gtk_pixmap_new( pixmap, mask );
-        gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
-        
-        gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
-
-        tool->m_pixmap = tool_pixmap;
+        if ( !HasFlag(wxTB_NOICONS) )
+        {
+            wxBitmap bitmap = tool->GetNormalBitmap();
+
+            wxCHECK_MSG( bitmap.Ok(), false,
+                         wxT("invalid bitmap for wxToolBar icon") );
+
+            wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,
+                         wxT("wxToolBar doesn't support GdkBitmap") );
+
+            wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,
+                         wxT("wxToolBar::Add needs a wxBitmap") );
+
+            GtkWidget *tool_pixmap = (GtkWidget *)NULL;
+
+
+#ifdef __WXGTK20__
+            if (bitmap.HasPixbuf())
+            {
+                tool_pixmap = gtk_image_new();
+                tool->m_pixmap = tool_pixmap;
+                tool->SetPixmap(bitmap);
+            }
+            else
+#endif
+            {
+                GdkPixmap *pixmap = bitmap.GetPixmap();
+
+                GdkBitmap *mask = (GdkBitmap *)NULL;
+                if ( bitmap.GetMask() )
+                    mask = bitmap.GetMask()->GetBitmap();
+
+                tool_pixmap = gtk_pixmap_new( pixmap, mask );
+                gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
+            }
+
+            gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
+
+            tool->m_pixmap = tool_pixmap;
+        }

     }
 
     switch ( tool->GetStyle() )
     }
 
     switch ( tool->GetStyle() )


@@ -414,8 +430,10 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 
                 if ( tool->IsRadio() )
                 {
 
                 if ( tool->IsRadio() )
                 {

-                    wxToolBarToolsList::Node *node = pos ? m_tools.Item(pos - 1)
-                                                         : NULL;
+                    wxToolBarToolsList::compatibility_iterator node
+                        = wxToolBarToolsList::compatibility_iterator();
+                    if ( pos ) node = m_tools.Item(pos - 1);
+

                     while ( node )
                     {
                         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
                     while ( node )
                     {
                         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();


@@ -432,7 +450,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync

-                        tool->Toggle(TRUE);
+                        tool->Toggle(true);

                     }
                 }
 
                     }
                 }
 


@@ -451,32 +469,32 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                                   tool->m_pixmap,
                                   (GtkSignalFunc)gtk_toolbar_callback,
                                   (gpointer)tool,
                                   tool->m_pixmap,
                                   (GtkSignalFunc)gtk_toolbar_callback,
                                   (gpointer)tool,

-                                  pos
+                                  posGtk

                                );
 
                 if ( !tool->m_item )
                 {
                     wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
 
                                );
 
                 if ( !tool->m_item )
                 {
                     wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
 

-                    return FALSE;
+                    return false;

                 }
 
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),
                 }
 
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),

-                                    "enter_notify_event", 
+                                    "enter_notify_event",

                                     GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
                                     (gpointer)tool );
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),
                                     GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
                                     (gpointer)tool );
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),

-                                    "leave_notify_event", 
+                                    "leave_notify_event",

                                     GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
                                     (gpointer)tool );
             }
             break;
 
         case wxTOOL_STYLE_SEPARATOR:
                                     GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
                                     (gpointer)tool );
             }
             break;
 
         case wxTOOL_STYLE_SEPARATOR:

-            gtk_toolbar_insert_space( m_toolbar, pos );
+            gtk_toolbar_insert_space( m_toolbar, posGtk );

 
             // skip the rest
 
             // skip the rest

-            return TRUE;
+            return true;

 
         case wxTOOL_STYLE_CONTROL:
             gtk_toolbar_insert_widget(
 
         case wxTOOL_STYLE_CONTROL:
             gtk_toolbar_insert_widget(


@@ -484,7 +502,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                                        tool->GetControl()->m_widget,
                                        (const char *) NULL,
                                        (const char *) NULL,
                                        tool->GetControl()->m_widget,
                                        (const char *) NULL,
                                        (const char *) NULL,

-                                       pos
+                                       posGtk

                                       );
             break;
     }
                                       );
             break;
     }


@@ -494,11 +512,12 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
         (m_widget, &req );
     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;
         (m_widget, &req );
     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;

+    InvalidateBestSize();

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

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


@@ -512,10 +531,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
             gtk_widget_destroy( tool->m_item );
             break;
 
             gtk_widget_destroy( tool->m_item );
             break;
 

-        //case wxTOOL_STYLE_SEPARATOR: -- nothing to do
+#ifdef __WXGTK20__
+        case wxTOOL_STYLE_SEPARATOR:
+            gtk_toolbar_remove_space( m_toolbar, pos );
+            break;
+#endif

     }
 
     }
 

-    return TRUE;
+    InvalidateBestSize();
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -532,29 +556,20 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
     }
 }
 
     }
 }
 

-void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) 
+void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )

 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 
     GtkWidget *item = tool->m_item;
     if ( item && GTK_IS_TOGGLE_BUTTON(item) )
     {
 {
     wxToolBarTool *tool = (wxToolBarTool *)toolBase;
 
     GtkWidget *item = tool->m_item;
     if ( item && GTK_IS_TOGGLE_BUTTON(item) )
     {

-        wxBitmap bitmap = tool->GetBitmap();
-        if ( bitmap.Ok() )
-        {
-            GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-
-            GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
-                                               : (GdkBitmap *)NULL;
+        tool->SetPixmap(tool->GetBitmap());

 
 

-            gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-        }
-
-        m_blockEvent = TRUE;
+        m_blockEvent = true;

 
         gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
 
         gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );

-        
-        m_blockEvent = FALSE;
+
+        m_blockEvent = false;

     }
 }
 
     }
 }
 


@@ -582,9 +597,12 @@ void wxToolBar::SetMargins( int x, int y )
 {
     wxCHECK_RET( GetToolsCount() == 0,
                  wxT("wxToolBar::SetMargins must be called before adding tools.") );
 {
     wxCHECK_RET( GetToolsCount() == 0,
                  wxT("wxToolBar::SetMargins must be called before adding tools.") );

-    
-    if (x > 1) gtk_toolbar_append_space( m_toolbar );  // oh well
-    
+
+#ifndef __WXGTK20__
+    if (x > 1)
+        gtk_toolbar_append_space( m_toolbar );  // oh well
+#endif
+

     m_xMargin = x;
     m_yMargin = y;
 }
     m_xMargin = x;
     m_yMargin = y;
 }


@@ -638,7 +656,7 @@ void wxToolBar::OnInternalIdle()
             gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
         }
 
             gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
         }
 

-        wxToolBarToolsList::Node *node = m_tools.GetFirst();
+        wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();

         while ( node )
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
         while ( node )
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->GetData();


@@ -657,7 +675,26 @@ void wxToolBar::OnInternalIdle()
         }
     }
 
         }
     }
 

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+#ifdef __WXGTK20__
+    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
+#else
+    wxVisualAttributes attr;
+    GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+    attr = GetDefaultAttributesFromGTKWidget(widget);
+    gtk_widget_destroy(widget);
+    return attr;
+#endif

 }
 
 #endif // wxUSE_TOOLBAR_NATIVE
 }
 
 #endif // wxUSE_TOOLBAR_NATIVE