]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/tbargtk.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add wxDataViewIconText
[wxWidgets.git] / src / gtk / tbargtk.cpp
diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 9ee4df2deb4245b8ef17c4226853eafe0f32aab8..cb6c98f1c57dde76ae6d5545e73c30fb1dd25395 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -1,683 +1,868 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.cpp
+// Name:        src/gtk/tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
+// Modified:    13.12.99 by VZ to derive from wxToolBarBase
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "tbargtk.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TOOLBAR_NATIVE
 
 #include "wx/toolbar.h"
 
 
 #include "wx/toolbar.h"
 
-#if wxUSE_TOOLBAR
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
 
 
-#include "wx/frame.h"
+// FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough?
+// Beware that the new and old toolbar API may not be mixed in usage.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
 
 
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"
+#include "wx/menu.h"
 
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
 
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+/* XPM */
+static const char *arrow_down_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"7 7 2 1",
+"  c None",
+". c Black",
+/* pixels */
+"       ",
+"       ",
+"       ",
+".......",
+" ..... ",
+"  ...  ",
+"   .   "
+};
 
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
 
 
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 
-//-----------------------------------------------------------------------------
-// "clicked" (internal from gtk_toolbar)
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
 
 
-static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
+// translate wxWidgets toolbar style flags to GTK orientation and style
+static void GetGtkStyle(long style,
+                        GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
 {
 {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
+    *orient = ( style & wxTB_LEFT || style & wxTB_RIGHT ) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
 
 
-    if (tool->m_owner->m_blockNextEvent)
-    { 
-        tool->m_owner->m_blockNextEvent = FALSE;
-        return;
+
+    if ( style & wxTB_TEXT )
+    {
+        *gtkStyle = style & wxTB_NOICONS
+                        ? GTK_TOOLBAR_TEXT
+                        : (
+                          style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
+                          GTK_TOOLBAR_BOTH);
+    }
+    else // no text, hence we must have the icons or what would we show?
+    {
+        *gtkStyle = GTK_TOOLBAR_ICONS;
     }
     }
+}
 
 
-    if (g_blockEventsOnDrag) return;
-    if (!tool->m_enabled) return;
-
-    if (tool->m_isToggle)
-    { 
-        tool->m_toggleState = !tool->m_toggleState;
-       
-       if (tool->m_bitmap2.Ok())
-       {
-           wxBitmap bitmap = tool->m_bitmap1;
-           if (tool->m_toggleState) bitmap = tool->m_bitmap2;
-           
-            GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-           
-            GdkBitmap *mask = (GdkBitmap *) NULL;
-            if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
-  
-            gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-       }
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar,
+                  int id,
+                  const wxString& label,
+                  const wxBitmap& bitmap1,
+                  const wxBitmap& bitmap2,
+                  wxItemKind kind,
+                  wxObject *clientData,
+                  const wxString& shortHelpString,
+                  const wxString& longHelpString)
+        : wxToolBarToolBase(tbar, id, label, bitmap1, bitmap2, kind,
+                            clientData, shortHelpString, longHelpString)
+    {
+        Init();
     }
 
     }
 
-    tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
-}
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)
+    {
+        Init();
+    }
+
+    // is this a radio button?
+    //
+    // unlike GetKind(), can be called for any kind of tools, not just buttons
+    bool IsRadio() const { return IsButton() && GetKind() == wxITEM_RADIO; }
+
+    // this is only called for the normal buttons, i.e. not separators nor
+    // controls
+    GtkToolbarChildType GetGtkChildType() const
+    {
+        switch ( GetKind() )
+        {
+            case wxITEM_CHECK:
+                return GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
+
+            case wxITEM_RADIO:
+                return GTK_TOOLBAR_CHILD_RADIOBUTTON;
+
+            default:
+                wxFAIL_MSG( _T("unknown toolbar child type") );
+                // fall through
+
+            case wxITEM_DROPDOWN:
+            case wxITEM_NORMAL:
+                return GTK_TOOLBAR_CHILD_BUTTON;
+        }
+    }
+
+    void SetImage(const wxBitmap& bitmap)
+    {
+        if (bitmap.Ok())
+        {
+            // setting from pixmap doesn't seem to work right, but pixbuf works well
+            gtk_image_set_from_pixbuf((GtkImage*)m_image, bitmap.GetPixbuf());
+        }
+    }
+
+    GtkWidget            *m_item;
+    GtkWidget            *m_image;
+
+protected:
+    void Init();
+};
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+// ============================================================================
+// implementation
+// ============================================================================
 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-// "enter_notify_event"
+// "clicked" (internal from gtk_toolbar)
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
-  GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
+extern "C" {
+static void gtk_toolbar_callback( GtkWidget *widget,
+                                  wxToolBarTool *tool )
 {
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
 
 
-    if (g_blockEventsOnDrag) return TRUE;
-    
-    
-    wxToolBar *tb = tool->m_owner;
-    
-#if (GTK_MINOR_VERSION == 0)
-    /* we grey-out the tip text of disabled tool in GTK 1.0 */
-    if (tool->m_enabled)
+    if (tbar->m_blockEvent) return;
+
+    if (g_blockEventsOnDrag) return;
+    if (!tool->IsEnabled()) return;
+
+    if (tool->CanBeToggled())
     {
     {
-        if (tb->m_fg->red != 0)
+        if (tool->IsRadio() &&
+            gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget)) &&
+            tool->IsToggled())
         {
         {
-            tb->m_fg->red = 0;
-            tb->m_fg->green = 0;
-            tb->m_fg->blue = 0;
-            gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
-            
-            gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
+            // pressed an already pressed radio button
+            return;
         }
         }
-    }
-    else
-    {
-        if (tb->m_fg->red == 0)
+
+        tool->Toggle();
+
+        tool->SetImage(tool->GetBitmap());
+
+        if ( tool->IsRadio() && !tool->IsToggled() )
         {
         {
-            tb->m_fg->red = 33000;
-            tb->m_fg->green = 33000;
-            tb->m_fg->blue = 33000;
-            gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg );
-            gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg );
+            // radio button went up, don't report this as a wxWin event
+            return;
         }
     }
         }
     }
-#endif
-    
-    /* emit the event */
-  
-    tb->OnMouseEnter( tool->m_index );
-  
+
+    if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() )
+    {
+        // revert back
+        tool->Toggle();
+
+        tool->SetImage(tool->GetBitmap());
+    }
+}
+}
+
+//-----------------------------------------------------------------------------
+// "right-click"
+//-----------------------------------------------------------------------------
+extern "C" {
+static gboolean gtk_toolbar_tool_rclick_callback(GtkWidget *WXUNUSED(widget),
+                                                 GdkEventButton *event,
+                                                 wxToolBarToolBase *tool)
+{
+    if (event->button != 3)
+        return FALSE;
+
+    wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
+
+    if (tbar->m_blockEvent) return TRUE;
+
+    if (g_blockEventsOnDrag) return TRUE;
+    if (!tool->IsEnabled()) return TRUE;
+
+    tbar->OnRightClick( tool->GetId(), (int)event->x, (int)event->y );
+
+    return TRUE;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "enter_notify_event" / "leave_notify_event" from dropdown
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint gtk_toolbar_buddy_enter_callback( GtkWidget *WXUNUSED(widget),
+                                       GdkEventCrossing *WXUNUSED(gdk_event),
+                                       GtkWidget *tool )
+{
+    guint8 state = GTK_WIDGET_STATE( tool );
+    state |= GTK_STATE_PRELIGHT;
+    gtk_widget_set_state( tool, (GtkStateType) state );
     return FALSE;
 }
 
     return FALSE;
 }
 
+static gint gtk_toolbar_buddy_leave_callback( GtkWidget *WXUNUSED(widget),
+                                       GdkEventCrossing *WXUNUSED(gdk_event),
+                                       GtkWidget *tool )
+{
+    guint8 state = GTK_WIDGET_STATE( tool );
+    state &= ~GTK_STATE_PRELIGHT;
+    gtk_widget_set_state( tool, (GtkStateType) state );
+    return FALSE;
+}
+}
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// InsertChild callback for wxToolBar
+// "left-click" on dropdown
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+extern "C"
+{
+static void gtk_pop_tb_hide_callback( GtkWidget *WXUNUSED(menu), GtkToggleButton *button  )
 {
 {
-    /* we don't do anything here but pray */
+    gtk_toggle_button_set_active( button, FALSE );
+}
+
+static gboolean gtk_toolbar_dropdown_lclick_callback(GtkWidget *widget,
+                                                 GdkEventButton *event,
+                                                 wxToolBarToolBase *tool)
+{
+    if (event->button != 1)
+        return FALSE;
+
+    wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
+
+    if (tbar->m_blockEvent) return FALSE;
+
+    if (g_blockEventsOnDrag) return FALSE;
+    if (!tool->IsEnabled()) return FALSE;
+
+    wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tool->GetId() );
+    if ( tbar->GetEventHandler()->ProcessEvent(evt) )
+    {
+        return TRUE;
+    }
+
+    wxMenu * const menu = tool->GetDropdownMenu();
+    if (!menu)
+        return TRUE;
+
+    // simulate press
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget), TRUE );
+
+    g_signal_connect (menu->m_menu, "hide",
+                                    G_CALLBACK (gtk_pop_tb_hide_callback),
+                                    widget);
+
+    tbar->PopupMenu( menu, widget->allocation.x,
+                           widget->allocation.y + widget->allocation.height );
+
+
+    return TRUE;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "enter_notify_event" / "leave_notify_event"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
+                                       GdkEventCrossing *gdk_event,
+                                       wxToolBarTool *tool )
+{
+    if (g_blockEventsOnDrag) return TRUE;
+
+    wxToolBar *tb = (wxToolBar *)tool->GetToolBar();
+
+    // emit the event
+    if( gdk_event->type == GDK_ENTER_NOTIFY )
+        tb->OnMouseEnter( tool->GetId() );
+    else
+        tb->OnMouseEnter( -1 );
+
+    return FALSE;
+}
 }
 
 }
 
+extern "C" {
+static
+void gtktoolwidget_size_callback( GtkWidget *widget,
+                                  GtkAllocation *alloc,
+                                  wxWindow *win )
+{
+    // this shouldn't happen...
+    if (win->GetParent()->m_wxwindow) return;
+
+    wxSize size = win->GetEffectiveMinSize();
+    if (size.y != alloc->height)
+    {
+        GtkAllocation alloc2;
+        alloc2.x = alloc->x;
+        alloc2.y = (alloc->height - size.y + 3) / 2;
+        alloc2.width = alloc->width;
+        alloc2.height = size.y;
+        gtk_widget_size_allocate( widget, &alloc2 );
+    }
+}
+}
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// wxToolBar
+// InsertChild callback for wxToolBar
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
+static void wxInsertChildInToolBar( wxWindow* WXUNUSED(parent),
+                                    wxWindow* child)
+{
+    // Child widget will be inserted into GtkToolbar by DoInsertTool. Ref it
+    // here so reparenting into wxToolBar doesn't delete it.
+    g_object_ref(child->m_widget);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
 
 
-BEGIN_EVENT_TABLE(wxToolBar, wxControl)
-  EVT_IDLE(wxToolBar::OnIdle)
-END_EVENT_TABLE()
+void wxToolBarTool::Init()
+{
+    m_item =
+    m_image = NULL;
+}
 
 
-wxToolBar::wxToolBar()
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxString& text,
+                                         const wxBitmap& bitmap1,
+                                         const wxBitmap& bitmap2,
+                                         wxItemKind kind,
+                                         wxObject *clientData,
+                                         const wxString& shortHelpString,
+                                         const wxString& longHelpString)
 {
 {
+    return new wxToolBarTool(this, id, text, bitmap1, bitmap2, kind,
+                             clientData, shortHelpString, longHelpString);
 }
 
 }
 
-wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
 {
 {
-    Create( parent, id, pos, size, style, name );
+    return new wxToolBarTool(this, control, label);
+}
+
+//-----------------------------------------------------------------------------
+// wxToolBar construction
+//-----------------------------------------------------------------------------
+
+void wxToolBar::Init()
+{
+    m_toolbar = (GtkToolbar *)NULL;
+    m_blockEvent = false;
+    m_defaultWidth = 32;
+    m_defaultHeight = 32;
 }
 
 wxToolBar::~wxToolBar()
 {
 }
 
 wxToolBar::~wxToolBar()
 {
-    delete m_fg;
-    delete m_bg;
 }
 
 }
 
-bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+bool wxToolBar::Create( wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxString& name )
 {
 {
-    m_needParent = TRUE;
-    m_blockNextEvent = FALSE;
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
+    m_insertCallback = wxInsertChildInToolBar;
 
 
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    if ( !PreCreation( parent, pos, size ) ||
+         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
-       return FALSE;
+
+        return false;
     }
 
     }
 
-    m_tools.DeleteContents( TRUE );
+    FixupStyle();
+
+    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
+    GtkSetStyle();
 
 
-    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL,
-                                              GTK_TOOLBAR_ICONS ) );
+    // 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);
 
 
-    m_separation = 5;
-    gtk_toolbar_set_space_size( m_toolbar, m_separation );
-    m_hasToolAlready = FALSE;
+    SetToolSeparation(7);
 
     if (style & wxTB_DOCKABLE)
     {
         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 (style & wxTB_DOCKABLE)
     {
         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 );
         if (style & wxTB_FLAT)
             gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
-#endif
     }
     else
     }
     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 );
-    
-#if (GTK_MINOR_VERSION > 0)
+
+    // FIXME: there is no such function for toolbars in 2.0
+#if 0
     if (style & wxTB_FLAT)
         gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
 #endif
 
     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->green = 0;
-    m_fg->blue = 0;
-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_fg );
-  
-    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)
-    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;
-    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_xMargin = 0;
-    m_yMargin = 0;
-    
     m_parent->DoAddChild( this );
     m_parent->DoAddChild( this );
-  
-    PostCreation();
 
 
-    Show( TRUE );
+    PostCreation(size);
 
 
-    return TRUE;
+    return true;
 }
 
 }
 
-bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
 {
-    wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex );
-    event.SetEventObject(this);
-    event.SetInt( toolIndex );
-    event.SetExtraLong((long) toggleDown);
-
-    GetEventHandler()->ProcessEvent(event);
-
-    return TRUE;
+    return GTK_WIDGET(m_toolbar)->window;
 }
 
 }
 
-void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
+void wxToolBar::GtkSetStyle()
 {
 {
-    wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex );
-    event.SetEventObject( this );
-    event.SetInt( toolIndex );
+    GtkOrientation orient;
+    GtkToolbarStyle style;
+    GetGtkStyle(GetWindowStyle(), &orient, &style);
 
 
-    GetEventHandler()->ProcessEvent(event);
+    gtk_toolbar_set_orientation(m_toolbar, orient);
+    gtk_toolbar_set_style(m_toolbar, style);
+    gtk_toolbar_set_tooltips(m_toolbar, !(style & wxTB_NO_TOOLTIPS));
 }
 
 }
 
-void wxToolBar::OnMouseEnter( int toolIndex )
+void wxToolBar::SetWindowStyleFlag( long style )
 {
 {
-    wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
-    event.SetEventObject(this);
-    event.SetInt( toolIndex );
-  
-    GetEventHandler()->ProcessEvent(event);
+    wxToolBarBase::SetWindowStyleFlag(style);
+
+    if ( m_toolbar )
+        GtkSetStyle();
 }
 
 }
 
-wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
-  const wxBitmap& pushedBitmap, bool toggle,
-  wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData,
-  const wxString& helpString1, const wxString& helpString2 )
+bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
 {
-    m_hasToolAlready = TRUE;
-    
-    wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
-                 wxT("invalid bitmap for wxToolBar icon") );
-
-    wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
-                 wxT("wxToolBar doesn't support GdkBitmap") );
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
 
 
-    wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
-                 wxT("wxToolBar::Add needs a wxBitmap") );
-  
-    GtkWidget *tool_pixmap = (GtkWidget *)NULL;
-  
-    GdkPixmap *pixmap = bitmap.GetPixmap();
+    if ( tool->IsButton() )
+    {
+        if ( !HasFlag(wxTB_NOICONS) )
+        {
+            wxBitmap bitmap = tool->GetNormalBitmap();
 
 
-    GdkBitmap *mask = (GdkBitmap *)NULL;
-    if ( bitmap.GetMask() )
-      mask = bitmap.GetMask()->GetBitmap();
-    
-    tool_pixmap = gtk_pixmap_new( pixmap, mask );
-#if (GTK_MINOR_VERSION > 0)
-    gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
-#endif
-    
-    gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
-
-    wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
-                                             toggle, clientData,
-                                             helpString1, helpString2,
-                                             tool_pixmap );
-
-    GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
-                                       : GTK_TOOLBAR_CHILD_BUTTON;
-
-    GtkWidget *item = gtk_toolbar_append_element
-                     (
-                      m_toolbar,
-                      ctype,
-                      (GtkWidget *)NULL,
-                      (const char *)NULL,
-                      helpString1.mbc_str(),
-                      "",
-                      tool_pixmap,
-                      (GtkSignalFunc)gtk_toolbar_callback,
-                      (gpointer)tool
-                     );
-
-    tool->m_item = item;
+            wxCHECK_MSG( bitmap.Ok(), false,
+                         wxT("invalid bitmap for wxToolBar icon") );
 
 
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-    m_width = req.width;
-    m_height = req.height;
+            tool->m_image = gtk_image_new();
+            tool->SetImage(bitmap);
 
 
-    gtk_signal_connect( GTK_OBJECT(tool->m_item),
-                        "enter_notify_event", 
-                        GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
-                        (gpointer)tool );
+            gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5);
+        }
+    }
 
 
-    m_tools.Append( tool );
+    int posGtk = 0;
+    if ( pos > 0 )
+    {
+        for ( size_t i = 0; i < pos; i++ )
+        {
+            posGtk++;
 
 
-    return tool;
-}
+            // if we have a dropdown menu, we use 2 GTK tools internally
+            wxToolBarToolsList::compatibility_iterator node = m_tools.Item( i );
+            wxToolBarTool *tool = (wxToolBarTool*) node->GetData();
+            if ( tool->IsButton() && (tool->GetKind() == wxITEM_DROPDOWN) )
+                posGtk++;
+        }
+    }
 
 
-bool wxToolBar::AddControl(wxControl *control)
-{
-    wxCHECK_MSG( control, FALSE, wxT("toolbar: can't insert NULL control") );
 
 
-    wxCHECK_MSG( control->GetParent() == this, FALSE,
-                 wxT("control must have toolbar as parent") );
+    switch ( tool->GetStyle() )
+    {
+        case wxTOOL_STYLE_BUTTON:
+            // for a radio button we need the widget which starts the radio
+            // group it belongs to, i.e. the first radio button immediately
+            // preceding this one
+            {
+                GtkWidget *widget = NULL;
+
+                if ( tool->IsRadio() )
+                {
+                    wxToolBarToolsList::compatibility_iterator node
+                        = wxToolBarToolsList::compatibility_iterator();
+                    if ( pos )
+                        node = m_tools.Item(pos - 1);
+
+                    while ( node )
+                    {
+                        wxToolBarTool *toolNext = (wxToolBarTool *)node->GetData();
+                        if ( !toolNext->IsRadio() )
+                            break;
+
+                        widget = toolNext->m_item;
+
+                        node = node->GetPrevious();
+                    }
+
+                    if ( !widget )
+                    {
+                        // 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->m_item = gtk_toolbar_insert_element
+                               (
+                                  m_toolbar,
+                                  tool->GetGtkChildType(),
+                                  widget,
+                                  tool->GetLabel().empty()
+                                    ? NULL
+                                    : (const char*) wxGTK_CONV( tool->GetLabel() ),
+                                  tool->GetShortHelp().empty()
+                                    ? NULL
+                                    : (const char*) wxGTK_CONV( tool->GetShortHelp() ),
+                                  "", // tooltip_private_text (?)
+                                  tool->m_image,
+                                  (GtkSignalFunc)gtk_toolbar_callback,
+                                  (gpointer)tool,
+                                  posGtk
+                               );
+
+                wxCHECK_MSG(tool->m_item != NULL, false, _T("gtk_toolbar_insert_element() failed"));
+
+                g_signal_connect (tool->m_item, "enter_notify_event",
+                                  G_CALLBACK (gtk_toolbar_tool_callback),
+                                  tool);
+                g_signal_connect (tool->m_item, "leave_notify_event",
+                                  G_CALLBACK (gtk_toolbar_tool_callback),
+                                  tool);
+                g_signal_connect(tool->m_item, "button-press-event",
+                                  G_CALLBACK (gtk_toolbar_tool_rclick_callback),
+                                  tool);
+
+                if (tool->GetKind() == wxITEM_DROPDOWN)
+                {
+                    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data( arrow_down_xpm );
+                    GtkWidget *dropdown = gtk_toggle_button_new();
+                    GtkWidget *image = gtk_image_new_from_pixbuf( pixbuf );
+                    gtk_widget_show( image );
+                    gtk_container_add( GTK_CONTAINER(dropdown), image );
+
+                    if (GetWindowStyle() & wxTB_FLAT)
+                        gtk_button_set_relief( GTK_BUTTON(dropdown), GTK_RELIEF_NONE );
+                    GTK_WIDGET_UNSET_FLAGS (dropdown, GTK_CAN_FOCUS);
+                    gtk_widget_show( dropdown );
+
+                    g_signal_connect (dropdown, "enter_notify_event",
+                                  G_CALLBACK (gtk_toolbar_buddy_enter_callback),
+                                  tool->m_item);
+                    g_signal_connect (dropdown, "leave_notify_event",
+                                  G_CALLBACK (gtk_toolbar_buddy_leave_callback),
+                                  tool->m_item);
+                    g_signal_connect(dropdown, "button-press-event",
+                                  G_CALLBACK (gtk_toolbar_dropdown_lclick_callback),
+                                  tool);
+
+                    GtkRequisition req;
+                    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(tool->m_item) )->size_request )
+                        (tool->m_item, &req );
+                    gtk_widget_set_size_request( dropdown, -1, req.height );
+
+                    gtk_toolbar_insert_widget(
+                                       m_toolbar,
+                                       dropdown,
+                                       (const char *) NULL,
+                                       (const char *) NULL,
+                                       posGtk+1
+                                      );
+                }
+            }
+            break;
+
+        case wxTOOL_STYLE_SEPARATOR:
+            gtk_toolbar_insert_space( m_toolbar, posGtk );
+
+            // skip the rest
+            return true;
+
+        case wxTOOL_STYLE_CONTROL:
+            gtk_toolbar_insert_widget(
+                                       m_toolbar,
+                                       tool->GetControl()->m_widget,
+                                       (const char *) NULL,
+                                       (const char *) NULL,
+                                       posGtk
+                                      );
+            // release reference obtained by wxInsertChildInToolBar
+            g_object_unref(tool->GetControl()->m_widget);
+
+            // connect after in order to correct size_allocate events
+            g_signal_connect_after (tool->GetControl()->m_widget, "size_allocate",
+                          G_CALLBACK (gtktoolwidget_size_callback), tool->GetControl());
+
+            break;
+    }
 
 
-    m_hasToolAlready = TRUE;
-    
-    wxToolBarTool *tool = new wxToolBarTool(control);
-    
-    gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
-    
     GtkRequisition req;
     GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-    m_width = req.width;
-    m_height = req.height;
-
-    m_tools.Append( tool );
-    
-    return TRUE;
-}
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+    m_width = req.width + m_xMargin;
+    m_height = req.height + 2*m_yMargin;
+    InvalidateBestSize();
 
 
-void wxToolBar::AddSeparator()
-{
-    gtk_toolbar_append_space( m_toolbar );
+    return true;
 }
 
 }
 
-void wxToolBar::ClearTools()
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
 {
 {
-    wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );
-}
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
 
 
-bool wxToolBar::Realize()
-{
-    m_x = 0;
-    m_y = 0;
-    m_width = 100;
-    m_height = 0;
-  
-    wxNode *node = m_tools.First();
-    while (node)
+    switch ( tool->GetStyle() )
     {
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_bitmap1.Ok())
-        {
-            int tool_height = tool->m_bitmap1.GetHeight();
-            if (tool_height > m_height) m_height = tool_height;
-        }
-    
-        node = node->Next();
+        case wxTOOL_STYLE_CONTROL:
+            tool->GetControl()->Destroy();
+            break;
+
+        case wxTOOL_STYLE_BUTTON:
+            gtk_widget_destroy( tool->m_item );
+            break;
+
+        case wxTOOL_STYLE_SEPARATOR:
+            gtk_toolbar_remove_space( m_toolbar, pos );
+            break;
     }
     }
-  
-    m_height += 5 + 2*m_yMargin;
-   
-    return TRUE;
+
+    InvalidateBestSize();
+    return true;
 }
 
 }
 
-void wxToolBar::EnableTool(int toolIndex, bool enable)
+// ----------------------------------------------------------------------------
+// wxToolBar tools state
+// ----------------------------------------------------------------------------
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+
+    if (tool->m_item)
     {
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        {
-            tool->m_enabled = enable;
-            
-#if (GTK_MINOR_VERSION > 0)
-            /* we don't disable the tools for GTK 1.0 as the bitmaps don't get
-               greyed anyway and this also disables tooltips */
-            if (tool->m_item)
-                gtk_widget_set_sensitive( tool->m_item, enable );
-#endif
-                
-            return;
-        }
-        node = node->Next();
+        gtk_widget_set_sensitive( tool->m_item, enable );
     }
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
 }
 
 }
 
-void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
+void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+
+    GtkWidget *item = tool->m_item;
+    if ( item && GTK_IS_TOGGLE_BUTTON(item) )
     {
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item)))
-           {
-                tool->m_toggleState = toggle;
-               
-               if (tool->m_bitmap2.Ok())
-               {
-                   wxBitmap bitmap = tool->m_bitmap1;
-                   if (tool->m_toggleState) bitmap = tool->m_bitmap2;
-           
-                    GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-           
-                    GdkBitmap *mask = (GdkBitmap *) NULL;
-                    if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
-  
-                    gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
-               }
-               
-                m_blockNextEvent = TRUE;  // we cannot use gtk_signal_disconnect here
-               
-                gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );
-           }
+        tool->SetImage(tool->GetBitmap());
 
 
-            return;
-        }
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-}
+        m_blockEvent = true;
 
 
-wxObject *wxToolBar::GetToolClientData( int index ) const
-{
-    wxNode *node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == index) return tool->m_clientData;;
-        node = node->Next();
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(item), toggle );
+
+        m_blockEvent = false;
     }
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-  
-    return (wxObject*)NULL;
 }
 
 }
 
-bool wxToolBar::GetToolState(int toolIndex) const
+void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
+                            bool WXUNUSED(toggle))
 {
 {
-    wxNode *node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex) return tool->m_toggleState;
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-  
-    return FALSE;
+    // VZ: absolutely no idea about how to do it
+    wxFAIL_MSG( _T("not implemented") );
 }
 
 }
 
-bool wxToolBar::GetToolEnabled(int toolIndex) const
+// ----------------------------------------------------------------------------
+// wxToolBar geometry
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
+                                                  wxCoord WXUNUSED(y)) const
 {
 {
-    wxNode *node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex) return tool->m_enabled;
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-  
-    return FALSE;
+    // VZ: GTK+ doesn't seem to have such thing
+    wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
+
+    return (wxToolBarToolBase *)NULL;
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {
 }
 
 void wxToolBar::SetMargins( int x, int y )
 {
-    wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") );
-    
-    if (x > 2) gtk_toolbar_append_space( m_toolbar );  // oh well
-    
+    wxCHECK_RET( GetToolsCount() == 0,
+                 wxT("wxToolBar::SetMargins must be called before adding tools.") );
+
     m_xMargin = x;
     m_yMargin = y;
 }
 
     m_xMargin = x;
     m_yMargin = y;
 }
 
-void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
-{
-    wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") );
-}
-
 void wxToolBar::SetToolSeparation( int separation )
 {
 void wxToolBar::SetToolSeparation( int separation )
 {
+    // FIXME: this function disappeared
+#if 0
     gtk_toolbar_set_space_size( m_toolbar, separation );
     gtk_toolbar_set_space_size( m_toolbar, separation );
-    m_separation = separation;
-}
+#endif
 
 
-int wxToolBar::GetToolPacking()
-{
-    return 0;
+    m_toolSeparation = separation;
 }
 
 }
 
-int wxToolBar::GetToolSeparation()
+void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 {
 {
-    return m_separation;
-}
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
 
 
-wxString wxToolBar::GetToolLongHelp(int toolIndex)
-{
-    wxNode *node = m_tools.First();
-    while (node)
+    if ( tool )
     {
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            return tool->m_longHelpString;
-        }
-        node = node->Next();
+        (void)tool->SetShortHelp(helpString);
+        gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item,
+                             wxGTK_CONV( helpString ), "");
     }
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return wxT("");
 }
 
 }
 
-wxString wxToolBar::GetToolShortHelp(int toolIndex)
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
     {
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            return tool->m_shortHelpString;
-        }
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return wxT("");
-}
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
 
 
-void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
-{
-    wxNode *node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            tool->m_longHelpString = helpString;
-            return;
-        }
-        node = node->Next();
+        tool->SetNormalBitmap(bitmap);
+        tool->SetImage(tool->GetBitmap());
     }
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return;
 }
 
 }
 
-void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
     {
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            tool->m_shortHelpString = helpString;
-            return;
-        }
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return;
-}
-
-void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
-{
-    wxEvtHandler* evtHandler = GetEventHandler();
-
-    wxNode* node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool* tool = (wxToolBarTool*) node->Data();
-
-        wxUpdateUIEvent event( tool->m_index );
-        event.SetEventObject(this);
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
 
 
-        if (evtHandler->ProcessEvent( event ))
-        {
-            if (event.GetSetEnabled())
-                EnableTool(tool->m_index, event.GetEnabled());
-            if (event.GetSetChecked())
-                ToggleTool(tool->m_index, event.GetChecked());
-/*
-            if (event.GetSetText())
-                // Set tooltip?
-*/
-        }
-
-        node = node->Next();
+        tool->SetDisabledBitmap(bitmap);
+        tool->SetImage(tool->GetBitmap());
     }
 }
 
     }
 }
 
+// ----------------------------------------------------------------------------
+// wxToolBar idle handling
+// ----------------------------------------------------------------------------
+
 void wxToolBar::OnInternalIdle()
 {
 void wxToolBar::OnInternalIdle()
 {
+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     if (cursor.Ok())
     {
         /* I now set the cursor the anew in every OnInternalIdle call
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     if (cursor.Ok())
     {
         /* I now set the cursor the anew in every OnInternalIdle call
-          as setting the cursor in a parent window also effects the
-          windows above so that checking for the current cursor is
-          not possible. */
-          
-        if (HasFlag(wxTB_DOCKABLE))
-       {
-           /* if the toolbar is dockable, then m_widget stands for the
-              GtkHandleBox widget, which uses its own window so that we
-              can set the cursor for it. if the toolbar is not dockable,
-              m_widget comes from m_toolbar which uses its parent's
-              window ("windowless windows") and thus we cannot set the
-              cursor. */
-           gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
-       }
-       
-        wxNode *node = m_tools.First();
-       while (node)
+           as setting the cursor in a parent window also effects the
+           windows above so that checking for the current cursor is
+           not possible. */
+
+        if (HasFlag(wxTB_DOCKABLE) && (m_widget->window))
         {
         {
-           wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-           node = node->Next();
-           
-           if (!tool->m_item || !tool->m_item->window)
-               continue;
-           else
-               gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() );
+            /* if the toolbar is dockable, then m_widget stands for the
+               GtkHandleBox widget, which uses its own window so that we
+               can set the cursor for it. if the toolbar is not dockable,
+               m_widget comes from m_toolbar which uses its parent's
+               window ("windowless windows") and thus we cannot set the
+               cursor. */
+            gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
+        }
+
+        wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+        while ( node )
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
+            node = node->GetNext();
+
+            GtkWidget *item = tool->m_item;
+            if ( item )
+            {
+                GdkWindow *window = item->window;
+
+                if ( window )
+                {
+                    gdk_window_set_cursor( window, cursor.GetCursor() );
+                }
+            }
         }
     }
 
         }
     }
 
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 }
 
-#endif
+
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
+}
+
+#endif // wxUSE_TOOLBAR_NATIVE
wxWidgets (Impactor)