don't use built-in support for menu bitmaps if they are too big, they don't come...

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index a35bbe7235ae0fd33dcef9ddc6eb496044ffdb4c..50ec774b725122ae388a5c3cfc0116c7a6be8d2e 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -1,325 +1,754 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tbargtk.cpp
+// Name:        src/gtk/tbargtk.cpp

 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "tbargtk.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TOOLBAR_NATIVE

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

-#include <wx/intl.h>

 
 

-//-----------------------------------------------------------------------------
+#include "wx/gtk/private.h"
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+

 // data
 // data

-//-----------------------------------------------------------------------------
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;
+
+// ----------------------------------------------------------------------------
+// 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)
+    {
+        m_item = NULL;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)
+    {
+        m_item = NULL;
+    }
+
+    void SetImage();
+    void CreateDropDown();
+    void ShowDropdown(GtkToggleButton* button);

 
 

-extern bool   g_blockEventsOnDrag;
+    GtkToolItem* m_item;
+};
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+// ============================================================================
+// implementation
+// ============================================================================

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxToolBarTool
+// "clicked" from m_item

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
-
-wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex,
-      const wxBitmap& bitmap1, const  wxBitmap& bitmap2,
-      bool toggle, wxObject *clientData,
-      const wxString& shortHelpString, const wxString& longHelpString,
-      GtkWidget *item  )
+extern "C" {
+static void item_clicked(GtkToolButton*, wxToolBarTool* tool)

 {
 {

-  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;
-  m_item = item;
+    if (g_blockEventsOnDrag) return;
+
+    tool->GetToolBar()->OnLeftClick(tool->GetId(), false);
+}

 }
 
 }
 

-wxToolBarTool::~wxToolBarTool()
+//-----------------------------------------------------------------------------
+// "toggled" from m_item
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void item_toggled(GtkToggleToolButton* button, wxToolBarTool* tool)

 {
 {

+    if (g_blockEventsOnDrag) return;
+
+    const bool active = gtk_toggle_tool_button_get_active(button) != 0;
+    tool->Toggle(active);
+    if (!active && tool->GetKind() == wxITEM_RADIO)
+        return;
+
+    if (!tool->GetToolBar()->OnLeftClick(tool->GetId(), active))
+    {
+        // revert back
+        tool->Toggle();
+    }
+}

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

-// wxToolBar
+// "button_press_event" from m_item child

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
+extern "C" {
+static gboolean
+button_press_event(GtkWidget*, GdkEventButton* event, wxToolBarTool* tool)

 {
 {

-  if (g_blockEventsOnDrag) return;
-  if (!tool->m_enabled) return;
+    if (event->button != 3)
+        return FALSE;

 
 

-  if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
+    if (g_blockEventsOnDrag) return TRUE;

 
 

-  tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
+    tool->GetToolBar()->OnRightClick(
+        tool->GetId(), int(event->x), int(event->y));
+
+    return TRUE;
+}

 }
 
 }
 

-static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
-  GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
+//-----------------------------------------------------------------------------
+// "child_detached" from m_widget
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void child_detached(GtkWidget*, GtkToolbar* toolbar, void*)

 {
 {

-  if (g_blockEventsOnDrag) return TRUE;
-  
-  tool->m_owner->OnMouseEnter( tool->m_index );
-  
-  return TRUE;
+    // disable showing overflow arrow when toolbar is detached,
+    // otherwise toolbar collapses to just an arrow
+    gtk_toolbar_set_show_arrow(toolbar, false);
+}

 }
 
 }
 

+//-----------------------------------------------------------------------------
+// "child_attached" from m_widget

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
+extern "C" {
+static void child_attached(GtkWidget*, GtkToolbar* toolbar, void*)
+{
+    gtk_toolbar_set_show_arrow(toolbar, true);
+}
+}

 
 

-BEGIN_EVENT_TABLE(wxToolBar, wxControl)
-END_EVENT_TABLE()
+//-----------------------------------------------------------------------------
+// "enter_notify_event" / "leave_notify_event" from m_item
+//-----------------------------------------------------------------------------

 
 

-wxToolBar::wxToolBar()
+extern "C" {
+static gboolean
+enter_notify_event(GtkWidget*, GdkEventCrossing* event, wxToolBarTool* tool)

 {
 {

+    if (g_blockEventsOnDrag) return TRUE;
+
+    int id = -1;
+    if (event->type == GDK_ENTER_NOTIFY)
+        id = tool->GetId();
+    tool->GetToolBar()->OnMouseEnter(id);
+
+    return FALSE;
+}

 }
 
 }
 

-wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+//-----------------------------------------------------------------------------
+// "size_request" from m_toolbar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+size_request(GtkWidget*, GtkRequisition* req, wxToolBar* win)

 {
 {

-  Create( parent, id, pos, size, style, name );
+    const wxSize margins = win->GetMargins();
+    req->width  += margins.x;
+    req->height += 2 * margins.y;
+}

 }
 
 }
 

-wxToolBar::~wxToolBar()
+//-----------------------------------------------------------------------------
+// "expose_event" from GtkImage inside m_item
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool)

 {
 {

+    const wxBitmap& bitmap = tool->GetDisabledBitmap();
+    if (tool->IsEnabled() || !bitmap.IsOk())
+        return false;
+
+    // draw disabled bitmap ourselves, GtkImage has no way to specify it
+    const GtkAllocation& alloc = widget->allocation;
+    gdk_draw_pixbuf(
+        widget->window, widget->style->black_gc, bitmap.GetPixbuf(),
+        0, 0,
+        alloc.x + (alloc.width - widget->requisition.width) / 2,
+        alloc.y + (alloc.height - widget->requisition.height) / 2,
+        -1, -1, GDK_RGB_DITHER_NORMAL, 0, 0);
+    return true;

 }
 }

+}
+
+//-----------------------------------------------------------------------------
+// "toggled" from dropdown menu button
+//-----------------------------------------------------------------------------

 
 

-bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+extern "C" {
+static void arrow_toggled(GtkToggleButton* button, wxToolBarTool* tool)

 {
 {

-  m_needParent = TRUE;
+    if (gtk_toggle_button_get_active(button))
+    {
+        tool->ShowDropdown(button);
+        gtk_toggle_button_set_active(button, false);
+    }
+}
+}

 
 

-  PreCreation( parent, id, pos, size, style, name );
+//-----------------------------------------------------------------------------
+// "button_press_event" from dropdown menu button
+//-----------------------------------------------------------------------------

 
 

-  m_tools.DeleteContents( TRUE );
+extern "C" {
+static gboolean
+arrow_button_press_event(GtkToggleButton* button, GdkEventButton* event, wxToolBarTool* tool)
+{
+    if (event->button == 1)
+    {
+        g_signal_handlers_block_by_func(button, (void*)arrow_toggled, tool);
+        gtk_toggle_button_set_active(button, true);
+        tool->ShowDropdown(button);
+        gtk_toggle_button_set_active(button, false);
+        g_signal_handlers_unblock_by_func(button, (void*)arrow_toggled, tool);
+        return true;
+    }
+    return false;
+}
+}

 
 

-  m_widget = gtk_handle_box_new();
+void wxToolBar::AddChildGTK(wxWindowGTK* child)
+{
+    GtkWidget* align = gtk_alignment_new(0.5, 0.5, 0, 0);
+    gtk_widget_show(align);
+    gtk_container_add(GTK_CONTAINER(align), child->m_widget);
+    GtkToolItem* item = gtk_tool_item_new();
+    gtk_container_add(GTK_CONTAINER(item), align);
+    // position will be corrected in DoInsertTool if necessary
+    gtk_toolbar_insert(GTK_TOOLBAR(GTK_BIN(m_widget)->child), item, -1);
+}

 
 

-  m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS ) );
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------

 
 

-  gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+void wxToolBarTool::SetImage()
+{
+    const wxBitmap& bitmap = GetNormalBitmap();
+    wxCHECK_RET(bitmap.IsOk(), "invalid bitmap for wxToolBar icon");

 
 

-  gtk_widget_show( GTK_WIDGET(m_toolbar) );
+    GtkWidget* image = gtk_tool_button_get_icon_widget(GTK_TOOL_BUTTON(m_item));
+    // always use pixbuf, because pixmap mask does not
+    // work with disabled images in some themes
+    gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
+}

 
 

-  PostCreation();
+// helper to create a dropdown menu item
+void wxToolBarTool::CreateDropDown()
+{
+    gtk_tool_item_set_homogeneous(m_item, false);
+    GtkWidget* box;
+    GtkWidget* arrow;
+    if (GetToolBar()->HasFlag(wxTB_LEFT | wxTB_RIGHT))
+    {
+        box = gtk_vbox_new(false, 0);
+        arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+    }
+    else
+    {
+        box = gtk_hbox_new(false, 0);
+        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+    }
+    GtkWidget* tool_button = GTK_BIN(m_item)->child;
+    gtk_widget_reparent(tool_button, box);
+    GtkWidget* arrow_button = gtk_toggle_button_new();
+    gtk_button_set_relief(GTK_BUTTON(arrow_button),
+        gtk_tool_item_get_relief_style(GTK_TOOL_ITEM(m_item)));
+    gtk_container_add(GTK_CONTAINER(arrow_button), arrow);
+    gtk_container_add(GTK_CONTAINER(box), arrow_button);
+    gtk_widget_show_all(box);
+    gtk_container_add(GTK_CONTAINER(m_item), box);
+
+    g_signal_connect(arrow_button, "toggled", G_CALLBACK(arrow_toggled), this);
+    g_signal_connect(arrow_button, "button_press_event",
+        G_CALLBACK(arrow_button_press_event), this);
+}

 
 

-  Show( TRUE );
+void wxToolBarTool::ShowDropdown(GtkToggleButton* button)
+{
+    wxToolBarBase* toolbar = GetToolBar();
+    wxCommandEvent event(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, GetId());
+    if (!toolbar->HandleWindowEvent(event))
+    {
+        wxMenu* menu = GetDropdownMenu();
+        if (menu)
+        {
+            const GtkAllocation& alloc = GTK_WIDGET(button)->allocation;
+            int x = alloc.x;
+            int y = alloc.y;
+            if (toolbar->HasFlag(wxTB_LEFT | wxTB_RIGHT))
+                x += alloc.width;
+            else
+                y += alloc.height;
+            toolbar->PopupMenu(menu, x, y);
+        }
+    }
+}

 
 

-  return TRUE;
+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);

 }
 
 }
 

-bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)

 {
 {

-  wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex );
-  event.SetEventObject(this);
-  event.SetInt( toolIndex );
-  event.SetExtraLong((long) toggleDown);
+    return new wxToolBarTool(this, control, label);
+}

 
 

-  GetEventHandler()->ProcessEvent(event);
+//-----------------------------------------------------------------------------
+// wxToolBar construction
+//-----------------------------------------------------------------------------
+
+void wxToolBar::Init()
+{
+    m_toolbar = NULL;
+    m_tooltips = NULL;
+}

 
 

-  return TRUE;
+wxToolBar::~wxToolBar()
+{
+    if (m_tooltips)
+    {
+        gtk_object_destroy(GTK_OBJECT(m_tooltips));
+        g_object_unref(m_tooltips);
+    }

 }
 
 }
 

-void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
+bool wxToolBar::Create( wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxString& name )

 {
 {

-  wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex );
-  event.SetEventObject( this );
-  event.SetInt( toolIndex );
+    if ( !PreCreation( parent, pos, size ) ||
+         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxToolBar creation failed") );
+
+        return false;
+    }
+
+    FixupStyle();
+
+    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
+    m_tooltips = gtk_tooltips_new();
+    g_object_ref(m_tooltips);
+    gtk_object_sink(GTK_OBJECT(m_tooltips));
+    GtkSetStyle();
+
+    if (style & wxTB_DOCKABLE)
+    {
+        m_widget = gtk_handle_box_new();
+
+        g_signal_connect(m_widget, "child_detached",
+            G_CALLBACK(child_detached), NULL);
+        g_signal_connect(m_widget, "child_attached",
+            G_CALLBACK(child_attached), NULL);
+
+        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();
+        ConnectWidget( m_widget );
+    }
+    g_object_ref(m_widget);
+    gtk_container_add(GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar));
+    gtk_widget_show(GTK_WIDGET(m_toolbar));
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);

 
 

-  GetEventHandler()->ProcessEvent(event);
+    g_signal_connect_after(m_toolbar, "size_request",
+        G_CALLBACK(size_request), this);
+
+    return true;

 }
 
 }
 

-void wxToolBar::OnMouseEnter( int toolIndex )
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-  wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
-  event.SetEventObject(this);
-  event.SetInt( toolIndex );
-  
-  GetEventHandler()->ProcessEvent(event);
+    return GTK_WIDGET(m_toolbar)->window;

 }
 
 }
 

-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 )
+void wxToolBar::GtkSetStyle()

 {
 {

-  if (!bitmap.Ok()) return NULL;
+    GtkOrientation orient = GTK_ORIENTATION_HORIZONTAL;
+    if (HasFlag(wxTB_LEFT | wxTB_RIGHT))
+        orient = GTK_ORIENTATION_VERTICAL;
+
+    GtkToolbarStyle style = GTK_TOOLBAR_ICONS;
+    if (HasFlag(wxTB_NOICONS))
+        style = GTK_TOOLBAR_TEXT;
+    else if (HasFlag(wxTB_TEXT))
+    {
+        style = GTK_TOOLBAR_BOTH;
+        if (HasFlag(wxTB_HORZ_LAYOUT))
+            style = GTK_TOOLBAR_BOTH_HORIZ;
+    }

 
 

-  wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle,
-    clientData, helpString1, helpString2 );
+    gtk_toolbar_set_orientation(m_toolbar, orient);
+    gtk_toolbar_set_style(m_toolbar, style);
+}

 
 

-  GtkWidget *tool_pixmap = NULL;
-  
-  wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, "wxToolBar doesn't support GdkBitmap" )
-  
-  wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, "wxToolBar::Add needs a wxBitmap" )
-  
-  if (TRUE)
-  {
-    GdkPixmap *pixmap = bitmap.GetPixmap();
+void wxToolBar::SetWindowStyleFlag( long style )
+{
+    wxToolBarBase::SetWindowStyleFlag(style);
+
+    if ( m_toolbar )
+        GtkSetStyle();
+}

 
 

-    GdkBitmap *mask = NULL;
-    if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
-    
-    tool_pixmap = gtk_pixmap_new( pixmap, mask );
-  }
-  
-  gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
+bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
 

-  GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON;
-  if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
+    GSList* radioGroup;
+    switch ( tool->GetStyle() )
+    {
+        case wxTOOL_STYLE_BUTTON:
+            switch (tool->GetKind())
+            {
+                case wxITEM_CHECK:
+                    tool->m_item = gtk_toggle_tool_button_new();
+                    g_signal_connect(tool->m_item, "toggled",
+                        G_CALLBACK(item_toggled), tool);
+                    break;
+                case wxITEM_RADIO:
+                    radioGroup = GetRadioGroup(pos);
+                    if (radioGroup)
+                    {
+                        // 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_radio_tool_button_new(radioGroup);
+                    g_signal_connect(tool->m_item, "toggled",
+                        G_CALLBACK(item_toggled), tool);
+                    break;
+                default:
+                    wxFAIL_MSG("unknown toolbar child type");
+                    // fall through
+                case wxITEM_DROPDOWN:
+                case wxITEM_NORMAL:
+                    tool->m_item = gtk_tool_button_new(NULL, "");
+                    g_signal_connect(tool->m_item, "clicked",
+                        G_CALLBACK(item_clicked), tool);
+                    break;
+            }
+            if (!HasFlag(wxTB_NOICONS))
+            {
+                GtkWidget* image = gtk_image_new();
+                gtk_tool_button_set_icon_widget(
+                    GTK_TOOL_BUTTON(tool->m_item), image);
+                tool->SetImage();
+                gtk_widget_show(image);
+                g_signal_connect(image, "expose_event",
+                    G_CALLBACK(image_expose_event), tool);
+            }
+            if (!tool->GetLabel().empty())
+            {
+                gtk_tool_button_set_label(
+                    GTK_TOOL_BUTTON(tool->m_item), wxGTK_CONV(tool->GetLabel()));
+                // needed for labels in horizontal toolbar with wxTB_HORZ_LAYOUT
+                gtk_tool_item_set_is_important(tool->m_item, true);
+            }
+            if (!HasFlag(wxTB_NO_TOOLTIPS) && !tool->GetShortHelp().empty())
+            {
+                gtk_tool_item_set_tooltip(tool->m_item,
+                    m_tooltips, wxGTK_CONV(tool->GetShortHelp()), "");
+            }
+            g_signal_connect(GTK_BIN(tool->m_item)->child, "button_press_event",
+                G_CALLBACK(button_press_event), tool);
+            g_signal_connect(tool->m_item, "enter_notify_event",
+                G_CALLBACK(enter_notify_event), tool);
+            g_signal_connect(tool->m_item, "leave_notify_event",
+                G_CALLBACK(enter_notify_event), tool);
+
+            if (tool->GetKind() == wxITEM_DROPDOWN)
+                tool->CreateDropDown();
+            gtk_toolbar_insert(m_toolbar, tool->m_item, int(pos));
+            break;
+
+        case wxTOOL_STYLE_SEPARATOR:
+            tool->m_item = gtk_separator_tool_item_new();
+            gtk_toolbar_insert(m_toolbar, tool->m_item, int(pos));
+            break;
+
+        case wxTOOL_STYLE_CONTROL:
+            wxWindow* control = tool->GetControl();
+            if (control->m_widget->parent == NULL)
+                AddChildGTK(control);
+            tool->m_item = GTK_TOOL_ITEM(control->m_widget->parent->parent);
+            if (gtk_toolbar_get_item_index(m_toolbar, tool->m_item) != int(pos))
+            {
+                g_object_ref(tool->m_item);
+                gtk_container_remove(
+                    GTK_CONTAINER(m_toolbar), GTK_WIDGET(tool->m_item));
+                gtk_toolbar_insert(m_toolbar, tool->m_item, int(pos));
+                g_object_unref(tool->m_item);
+            }
+            // Inserted items "slide" into place using an animated effect that
+            // causes multiple size events on the item. Must set size request
+            // to keep item size from getting permanently set too small by the
+            // first of these size events.
+            const wxSize size = control->GetSize();
+            gtk_widget_set_size_request(control->m_widget, size.x, size.y);
+            break;
+    }
+    gtk_widget_show(GTK_WIDGET(tool->m_item));

 
 

-  tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap, 
-                                             (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
+    InvalidateBestSize();

 
 

-  gtk_signal_connect( GTK_OBJECT(tool->m_item), "enter_notify_event", 
-      GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), (gpointer)tool );
+    return true;
+}

 
 

-  m_tools.Append( tool );
+bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase)
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
 

-  return tool;
+    if (tool->GetStyle() == wxTOOL_STYLE_CONTROL)
+    {
+        // don't destroy the control here as we can be called from
+        // RemoveTool() and then we need to keep the control alive;
+        // while if we're called from DeleteTool() the control will
+        // be destroyed when wxToolBarToolBase itself is deleted
+        GtkWidget* widget = tool->GetControl()->m_widget;
+        gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
+    }
+    gtk_object_destroy(GTK_OBJECT(tool->m_item));
+    tool->m_item = NULL;
+
+    InvalidateBestSize();
+    return true;

 }
 
 }
 

-void wxToolBar::AddSeparator(void)
+GSList* wxToolBar::GetRadioGroup(size_t pos)

 {
 {

-  gtk_toolbar_append_space( m_toolbar );
+    GSList* radioGroup = NULL;
+    GtkToolItem* item = NULL;
+    if (pos > 0)
+    {
+        item = gtk_toolbar_get_nth_item(m_toolbar, int(pos) - 1);
+        if (!GTK_IS_RADIO_TOOL_BUTTON(item))
+            item = NULL;
+    }
+    if (item == NULL && pos < m_tools.size())
+    {
+        item = gtk_toolbar_get_nth_item(m_toolbar, int(pos));
+        if (!GTK_IS_RADIO_TOOL_BUTTON(item))
+            item = NULL;
+    }
+    if (item)
+        radioGroup = gtk_radio_tool_button_get_group((GtkRadioToolButton*)item);
+    return radioGroup;

 }
 
 }
 

-void wxToolBar::ClearTools(void)
+// ----------------------------------------------------------------------------
+// wxToolBar tools state
+// ----------------------------------------------------------------------------
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)

 {
 {

-  wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+
+    if (tool->m_item)
+        gtk_widget_set_sensitive(GTK_WIDGET(tool->m_item), enable);

 }
 
 }
 

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

 {
 {

-  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 = static_cast<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;
-}
-
-void wxToolBar::EnableTool(int toolIndex, bool enable)
-{
-  wxNode *node = m_tools.First();
-  while (node)
-  {
-    wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-    if (tool->m_index == toolIndex)
-    { 
-      tool->m_enabled = enable;
-      return;
-    }
-    node = node->Next();
-  }
-  
-  wxFAIL_MSG( "wrong toolbar index" );
-}
-
-void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
-{
-  wxNode *node = m_tools.First();
-  while (node)
-  {
-    wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-    if (tool->m_index == toolIndex)
-    { 
-      tool->m_toggleState = toggle;
-      if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item)))
-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );
-      return;
+        g_signal_handlers_block_by_func(tool->m_item, (void*)item_toggled, tool);
+
+        gtk_toggle_tool_button_set_active(
+            GTK_TOGGLE_TOOL_BUTTON(tool->m_item), toggle);
+
+        g_signal_handlers_unblock_by_func(tool->m_item, (void*)item_toggled, tool);

     }
     }

-    node = node->Next();
-  }
-  
-  wxFAIL_MSG( "wrong toolbar index" );

 }
 
 }
 

-wxObject *wxToolBar::GetToolClientData( int index ) 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 == index) return tool->m_clientData;;
-    node = node->Next();
-  }
-  
-  wxFAIL_MSG( "wrong toolbar index" );
-  
-  return (wxObject*)NULL;
+    // VZ: absolutely no idea about how to do it
+    wxFAIL_MSG( _T("not implemented") );

 }
 
 }
 

-bool wxToolBar::GetToolState(int toolIndex) const
+// ----------------------------------------------------------------------------
+// wxToolBar geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxToolBar::DoGetBestSize() const

 {
 {

-  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( "wrong toolbar index" );
-  
-  return FALSE;
+    // Unfortunately, if overflow arrow is enabled GtkToolbar only reports size
+    // of arrow. To get the real size, the arrow is temporarily disabled here.
+    // This is gross, since it will cause a queue_resize, and could potentially
+    // lead to an infinite loop. But there seems to be no alternative, short of
+    // disabling the arrow entirely.
+    gtk_toolbar_set_show_arrow(m_toolbar, false);
+    const wxSize size = wxToolBarBase::DoGetBestSize();
+    gtk_toolbar_set_show_arrow(m_toolbar, true);
+    return size;

 }
 
 }
 

-bool wxToolBar::GetToolEnabled(int toolIndex) 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 == toolIndex) return tool->m_enabled;
-    node = node->Next();
-  }
-  
-  wxFAIL_MSG( "wrong toolbar index" );
-  
-  return FALSE;
+    // VZ: GTK+ doesn't seem to have such thing
+    wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
+
+    return NULL;

 }
 
 }
 

-void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
+void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )

 {
 {

+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
+
+    if ( tool )
+    {
+        (void)tool->SetShortHelp(helpString);
+        if (tool->m_item)
+        {
+            gtk_tool_item_set_tooltip(tool->m_item,
+                m_tooltips, wxGTK_CONV(helpString), "");
+        }
+    }

 }
 
 }
 

-void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )

 {
 {

+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+        tool->SetImage();
+    }
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+    }

 }
 
 }
 

-void wxToolBar::SetToolSeparation( int separation )
+// ----------------------------------------------------------------------------
+// wxToolBar idle handling
+// ----------------------------------------------------------------------------
+
+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
+           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();
+
+            if (tool->m_item)
+            {
+                GdkWindow* window = GTK_WIDGET(tool->m_item)->window;
+
+                if ( window )
+                {
+                    gdk_window_set_cursor( window, cursor.GetCursor() );
+                }
+            }
+        }
+    }
+
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-  gtk_toolbar_set_space_size( m_toolbar, separation );
+    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);

 }
 
 }
 

+#endif // wxUSE_TOOLBAR_NATIVE