X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a5a83677555023d476401bab5809a1107222c74..ba88951339bb5ae38d11394b25041b7e019b6883:/src/gtk1/tbargtk.cpp

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 00a20b4236..46fecbc14a 100644
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -2,267 +2,692 @@
 // Name:        tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:
+// Modified:    13.12.99 by VZ to derive from wxToolBarBase
+// RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "tbargtk.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "tbargtk.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/toolbar.h"
-#include <wx/intl.h>
 
-//-----------------------------------------------------------------------------
-// wxToolBarTool
-//-----------------------------------------------------------------------------
+#if wxUSE_TOOLBAR_NATIVE
+
+#include "wx/frame.h"
+
+#include <glib.h>
+#include "wx/gtk/private.h"
+
+extern GdkFont *GtkGetDefaultGuiFont();
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
+// idle system
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
-wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex,
-      const wxBitmap& bitmap1, const  wxBitmap& bitmap2,
-      bool toggle, wxObject *clientData,
-      const wxString& shortHelpString, const wxString& longHelpString )
+// data
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// translate wxWidgets toolbar style flags to GTK orientation and style
+static void GetGtkStyle(long style,
+                        GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
 {
-  m_owner = owner;
-  m_index = theIndex;
-  m_bitmap1 = bitmap1;
-  m_bitmap2 = bitmap2;
-  m_isToggle = toggle;
-  m_enabled = TRUE;
-  m_toggleState = FALSE;
-  m_shortHelpString = shortHelpString;
-  m_longHelpString = longHelpString;
-  m_isMenuCommand = TRUE;
-  m_clientData = clientData;
-  m_deleteSecondBitmap = FALSE;
-};
+    *orient = style & wxTB_VERTICAL ? GTK_ORIENTATION_VERTICAL
+                                    : GTK_ORIENTATION_HORIZONTAL;
+
+
+    if ( style & wxTB_TEXT )
+    {
+        *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?
+    {
+        *gtkStyle = GTK_TOOLBAR_ICONS;
+    }
+}
 
-wxToolBarTool::~wxToolBarTool()
+// ----------------------------------------------------------------------------
+// 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();
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control)
+        : wxToolBarToolBase(tbar, control)
+    {
+        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_NORMAL:
+                return GTK_TOOLBAR_CHILD_BUTTON;
+        }
+    }
+
+    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
+                gtk_image_set_from_pixmap(GTK_IMAGE(m_pixmap),
+                                          bitmap.GetPixmap(), mask);
+#else
+            gtk_pixmap_set(GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask);
+#endif // !__WXGTK20__
+        }
+    }
+
+    GtkWidget            *m_item;
+    GtkWidget            *m_pixmap;
+
+protected:
+    void Init();
 };
 
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
 //-----------------------------------------------------------------------------
-// wxToolBar
+// "clicked" (internal from gtk_toolbar)
 //-----------------------------------------------------------------------------
 
-static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
+static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
+                                  wxToolBarTool *tool )
 {
-  if (!tool->m_enabled) return;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-  if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
+    wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
 
-  tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
-};
+    if (tbar->m_blockEvent) return;
+
+    if (g_blockEventsOnDrag) return;
+    if (!tool->IsEnabled()) return;
+
+    if (tool->CanBeToggled())
+    {
+        tool->Toggle();
+
+        tool->SetPixmap(tool->GetBitmap());
 
+        if ( tool->IsRadio() && !tool->IsToggled() )
+        {
+            // radio button went up, don't report this as a wxWin event
+            return;
+        }
+    }
+
+    if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() )
+    {
+        // revert back
+        tool->Toggle();
+
+        tool->SetPixmap(tool->GetBitmap());
+    }
+}
+
+//-----------------------------------------------------------------------------
+// "enter_notify_event" / "leave_notify_event"
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
+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;
 
-BEGIN_EVENT_TABLE(wxToolBar, wxControl)
-END_EVENT_TABLE()
+    wxToolBar *tb = (wxToolBar *)tool->GetToolBar();
 
-wxToolBar::wxToolBar()
+    // emit the event
+    if( gdk_event->type == GDK_ENTER_NOTIFY )
+        tb->OnMouseEnter( tool->GetId() );
+    else
+        tb->OnMouseEnter( -1 );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// InsertChild callback for wxToolBar
+//-----------------------------------------------------------------------------
+
+static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent),
+                                    wxWindow* WXUNUSED(child) )
 {
-};
+    // we don't do anything here
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
 
-wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+void wxToolBarTool::Init()
 {
-  Create( parent, id, pos, size, style, name );
-};
+    m_item =
+    m_pixmap = (GtkWidget *)NULL;
+}
+
+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()
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 {
-};
+    return new wxToolBarTool(this, control);
+}
 
-bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+//-----------------------------------------------------------------------------
+// wxToolBar construction
+//-----------------------------------------------------------------------------
+
+void wxToolBar::Init()
 {
-  m_needParent = TRUE;
+    m_toolbar = (GtkToolbar *)NULL;
+    m_blockEvent = FALSE;
+    m_defaultWidth = 32;
+    m_defaultHeight = 32;
+}
 
-  PreCreation( parent, id, pos, size, style, name );
+wxToolBar::~wxToolBar()
+{
+}
+
+bool wxToolBar::Create( wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxString& name )
+{
+    m_needParent = TRUE;
+    m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
-  m_tools.DeleteContents( TRUE );
+    if ( !PreCreation( parent, pos, size ) ||
+         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
-  m_widget = gtk_handle_box_new();
+        return FALSE;
+    }
 
-  m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS ) );
+#ifdef __WXGTK20__
+    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
+    GtkSetStyle();
 
-  gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+    // 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;
+    GetGtkStyle(style, &orient, &gtkStyle);
 
-  gtk_widget_show( GTK_WIDGET(m_toolbar) );
+    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) );
+#endif
 
-  PostCreation();
+    SetToolSeparation(7);
 
-  Show( TRUE );
+    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) );
 
-  return TRUE;
-};
+        if (style & wxTB_FLAT)
+            gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
+    }
+    else
+    {
+        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));
+    }
 
-bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
-{
-  wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex );
-  event.SetEventObject(this);
-  event.SetInt( toolIndex );
-  event.SetExtraLong((long) toggleDown);
+    gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
-  GetEventHandler()->ProcessEvent(event);
+    // FIXME: there is no such function for toolbars in 2.0
+#ifndef __WXGTK20__
+    if (style & wxTB_FLAT)
+        gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
+#endif
 
-  return TRUE;
-};
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
 
-void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
+    return TRUE;
+}
+
+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);
+}
 
-void wxToolBar::OnMouseEnter( int toolIndex )
+void wxToolBar::SetWindowStyleFlag( long style )
 {
-  wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, toolIndex );
-  event.SetEventObject(this);
-  event.SetInt( toolIndex );
+    wxToolBarBase::SetWindowStyleFlag(style);
 
-  GetEventHandler()->ProcessEvent(event);
-};
+    if ( m_toolbar )
+        GtkSetStyle();
+}
 
-wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
-  const wxBitmap& pushedBitmap, bool toggle,
-  float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
-  const wxString& helpString1, const wxString& helpString2 )
+bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
-  if (!bitmap.Ok()) return NULL;
+    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+
+#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
 
-  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle,
-  clientData, helpString1, helpString2 );
+    if ( tool->IsButton() )
+    {
+        if ( !HasFlag(wxTB_NOICONS) )
+        {
+            wxBitmap bitmap = tool->GetNormalBitmap();
 
-  GdkPixmap *pixmap = bitmap.GetPixmap();
+            wxCHECK_MSG( bitmap.Ok(), FALSE,
+                         wxT("invalid bitmap for wxToolBar icon") );
 
-  GdkBitmap *mask = NULL;
-  if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+            wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE,
+                         wxT("wxToolBar doesn't support GdkBitmap") );
 
-  GtkWidget *tool_pixmap = gtk_pixmap_new( pixmap, mask );
-  gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
+            wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE,
+                         wxT("wxToolBar::Add needs a wxBitmap") );
 
-  GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON;
-  if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
+            GtkWidget *tool_pixmap = (GtkWidget *)NULL;
 
-  gtk_toolbar_append_element( m_toolbar,
-    ctype, NULL, NULL, helpString1, "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
 
-  m_tools.Append( tool );
+#ifdef __WXGTK20__
+            tool_pixmap = gtk_image_new();
+            tool->m_pixmap = tool_pixmap;
+            tool->SetPixmap(bitmap);
+#else
+            GdkPixmap *pixmap = bitmap.GetPixmap();
 
-  return tool;
-};
+            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 );
+#endif
 
-void wxToolBar::AddSeparator(void)
-{
-  gtk_toolbar_append_space( m_toolbar );
-};
+            gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
+
+            tool->m_pixmap = tool_pixmap;
+        }
+    }
+
+    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 *tool = (wxToolBarTool *)node->GetData();
+                        if ( !tool->IsRadio() )
+                            break;
+
+                        widget = tool->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_pixmap,
+                                  (GtkSignalFunc)gtk_toolbar_callback,
+                                  (gpointer)tool,
+                                  posGtk
+                               );
+
+                if ( !tool->m_item )
+                {
+                    wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
+
+                    return FALSE;
+                }
+
+                gtk_signal_connect( GTK_OBJECT(tool->m_item),
+                                    "enter_notify_event",
+                                    GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
+                                    (gpointer)tool );
+                gtk_signal_connect( GTK_OBJECT(tool->m_item),
+                                    "leave_notify_event",
+                                    GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
+                                    (gpointer)tool );
+            }
+            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
+                                      );
+            break;
+    }
+
+    GtkRequisition req;
+    (* 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::ClearTools(void)
+    return TRUE;
+}
+
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 {
-  wxFAIL_MSG(_("wxToolBar::ClearTools not implemented"));
-};
+    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+
+    switch ( tool->GetStyle() )
+    {
+        case wxTOOL_STYLE_CONTROL:
+            tool->GetControl()->Destroy();
+            break;
+
+        case wxTOOL_STYLE_BUTTON:
+            gtk_widget_destroy( tool->m_item );
+            break;
+
+        //case wxTOOL_STYLE_SEPARATOR: -- nothing to do
+    }
+
+    InvalidateBestSize();
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar tools state
+// ----------------------------------------------------------------------------
 
-void wxToolBar::Realize(void)
+void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {
-  m_x = 0;
-  m_y = 0;
-  m_width = 100;
-  m_height = 0;
-  
-  wxNode *node = m_tools.First();
-  while (node)
-  {
-    wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-    if (tool->m_bitmap1.Ok())
+    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+
+    if (tool->m_item)
     {
-      int tool_height = tool->m_bitmap1.GetHeight();
-      if (tool_height > m_height) m_height = tool_height;
-    };
-    
-    node = node->Next();
-  };
-  
-  m_height += 10;
-};
+        gtk_widget_set_sensitive( tool->m_item, enable );
+    }
+}
 
-void wxToolBar::EnableTool(int toolIndex, bool enable)
+void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {
-  wxNode *node = m_tools.First();
-  while (node)
-  {
-    wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-    if (tool->m_index == toolIndex)
-    { 
-      tool->m_enabled = enable;
-      return;
+    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+
+    GtkWidget *item = tool->m_item;
+    if ( item && GTK_IS_TOGGLE_BUTTON(item) )
+    {
+        tool->SetPixmap(tool->GetBitmap());
+
+        m_blockEvent = TRUE;
+
+        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
+
+        m_blockEvent = FALSE;
     }
-    node = node->Next();
-  };
-};
+}
 
-void wxToolBar::ToggleTool(int WXUNUSED(toolIndex), bool WXUNUSED(toggle) ) 
+void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
+                            bool WXUNUSED(toggle))
 {
-  wxFAIL_MSG(_("wxToolBar::ToggleTool not implemented"));
-};
+    // VZ: absolutely no idea about how to do it
+    wxFAIL_MSG( _T("not implemented") );
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar geometry
+// ----------------------------------------------------------------------------
 
-wxObject *wxToolBar::GetToolClientData(int index) const
+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 == index) return tool->m_clientData;;
-    node = node->Next();
-  };
-  return (wxObject*)NULL;
-};
+    // VZ: GTK+ doesn't seem to have such thing
+    wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
 
-bool wxToolBar::GetToolState(int toolIndex) const
+    return (wxToolBarToolBase *)NULL;
+}
+
+void wxToolBar::SetMargins( int x, int y )
 {
-  wxNode *node = m_tools.First();
-  while (node)
-  {
-    wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-    if (tool->m_index == toolIndex) return tool->m_toggleState;
-    node = node->Next();
-  };
-  return FALSE;
-};
+    wxCHECK_RET( GetToolsCount() == 0,
+                 wxT("wxToolBar::SetMargins must be called before adding tools.") );
 
-bool wxToolBar::GetToolEnabled(int toolIndex) const
+#ifndef __WXGTK20__
+    if (x > 1)
+        gtk_toolbar_append_space( m_toolbar );  // oh well
+#endif
+
+    m_xMargin = x;
+    m_yMargin = y;
+}
+
+void wxToolBar::SetToolSeparation( int separation )
 {
-  wxNode *node = m_tools.First();
-  while (node)
-  {
-    wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-    if (tool->m_index == toolIndex) return tool->m_enabled;
-    node = node->Next();
-  };
-  return FALSE;
-};
+    // FIXME: this function disappeared
+#ifndef __WXGTK20__
+    gtk_toolbar_set_space_size( m_toolbar, separation );
+#endif
+
+    m_toolSeparation = separation;
+}
 
-void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
+void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 {
-};
+    wxToolBarTool *tool = (wxToolBarTool *)FindById(id);
 
-void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
+    if ( tool )
+    {
+        (void)tool->SetShortHelp(helpString);
+        gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item,
+                             wxGTK_CONV( helpString ), "");
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar idle handling
+// ----------------------------------------------------------------------------
+
+void wxToolBar::OnInternalIdle()
 {
-};
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
-void wxToolBar::SetToolSeparation( int separation )
+    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) && (m_widget->window))
+        {
+            /* 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() );
+                }
+            }
+        }
+    }
+
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-  gtk_toolbar_set_space_size( m_toolbar, separation );
-};
+#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