]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/tbargtk.cpp
build fix
[wxWidgets.git] / src / gtk / tbargtk.cpp
index a297e9653cb858e23551049354a40e29f5bf71c1..fcc213eff4a13daac8732b28a4dbff781a2204f3 100644 (file)
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.cpp
+// Name:        src/gtk/tbargtk.cpp
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
-#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"
 
-#if wxUSE_TOOLBAR
+#include "wx/gtk/private.h"
 
-#include "wx/frame.h"
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
 
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+// data
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 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 void wxapp_install_idle_handler();
-extern bool g_isIdle;
+    GtkToolItem* m_item;
+};
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+// ============================================================================
+// implementation
+// ============================================================================
 
 //-----------------------------------------------------------------------------
-// data
+// "clicked" from m_item
 //-----------------------------------------------------------------------------
 
-extern bool       g_blockEventsOnDrag;
-extern wxCursor   g_globalCursor;
+extern "C" {
+static void item_clicked(GtkToolButton*, wxToolBarTool* tool)
+{
+    if (g_blockEventsOnDrag) return;
+
+    tool->GetToolBar()->OnLeftClick(tool->GetId(), false);
+}
+}
 
 //-----------------------------------------------------------------------------
-// "clicked" (internal from gtk_toolbar)
+// "toggled" from m_item
 //-----------------------------------------------------------------------------
 
-static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
+extern "C" {
+static void item_toggled(GtkToggleToolButton* button, wxToolBarTool* tool)
 {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
+    if (g_blockEventsOnDrag) return;
 
-    if (tool->m_owner->m_blockNextEvent)
-    { 
-        tool->m_owner->m_blockNextEvent = FALSE;
+    const bool active = gtk_toggle_tool_button_get_active(button) != 0;
+    tool->Toggle(active);
+    if (!active && tool->GetKind() == wxITEM_RADIO)
         return;
-    }
 
-    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 );
-       }
+    if (!tool->GetToolBar()->OnLeftClick(tool->GetId(), active))
+    {
+        // revert back
+        tool->Toggle();
     }
-
-    tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
+}
 }
 
 //-----------------------------------------------------------------------------
-// "enter_notify_event"
+// "button_press_event" from m_item child
 //-----------------------------------------------------------------------------
 
-static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), 
-  GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
+extern "C" {
+static gboolean
+button_press_event(GtkWidget*, GdkEventButton* event, wxToolBarTool* tool)
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (event->button != 3)
+        return FALSE;
 
     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 (tb->m_fg->red != 0)
-        {
-            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 );
-        }
-    }
-    else
-    {
-        if (tb->m_fg->red == 0)
-        {
-            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 );
-        }
-    }
-#endif
-    
-    /* emit the event */
-  
-    tb->OnMouseEnter( tool->m_index );
-  
-    return FALSE;
+
+    tool->GetToolBar()->OnRightClick(
+        tool->GetId(), int(event->x), int(event->y));
+
+    return TRUE;
+}
 }
 
 //-----------------------------------------------------------------------------
-// InsertChild callback for wxToolBar
+// "child_detached" from m_widget
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+extern "C" {
+static void child_detached(GtkWidget*, GtkToolbar* toolbar, void*)
 {
-    /* we don't do anything here but pray */
+    // disable showing overflow arrow when toolbar is detached,
+    // otherwise toolbar collapses to just an arrow
+    gtk_toolbar_set_show_arrow(toolbar, false);
+}
 }
 
 //-----------------------------------------------------------------------------
-// wxToolBar
+// "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)
-  EVT_IDLE(wxToolBar::OnIdle)
-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;
 }
+}
+
+//-----------------------------------------------------------------------------
+// "size_request" from m_toolbar
+//-----------------------------------------------------------------------------
 
-wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+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)
 {
-    delete m_fg;
-    delete m_bg;
+    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;
+}
 }
 
-bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
-  const wxPoint& pos, const wxSize& size,
-  long style, const wxString& name )
+//-----------------------------------------------------------------------------
+// "toggled" from dropdown menu button
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void arrow_toggled(GtkToggleButton* button, wxToolBarTool* tool)
 {
-    m_needParent = TRUE;
-    m_blockNextEvent = FALSE;
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
+    if (gtk_toggle_button_get_active(button))
+    {
+        tool->ShowDropdown(button);
+        gtk_toggle_button_set_active(button, false);
+    }
+}
+}
 
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+//-----------------------------------------------------------------------------
+// "button_press_event" from dropdown menu button
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+arrow_button_press_event(GtkToggleButton* button, GdkEventButton* event, wxToolBarTool* tool)
+{
+    if (event->button == 1)
     {
-        wxFAIL_MSG( wxT("wxToolBar creation failed") );
-       return FALSE;
+        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_tools.DeleteContents( TRUE );
+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
+// ----------------------------------------------------------------------------
 
-    m_separation = 7;
-    gtk_toolbar_set_space_size( m_toolbar, m_separation );
-    m_hasToolAlready = FALSE;
+void wxToolBarTool::SetImage()
+{
+    const wxBitmap& bitmap = GetNormalBitmap();
+    wxCHECK_RET(bitmap.IsOk(), "invalid bitmap for wxToolBar icon");
 
-    if (style & wxTB_DOCKABLE)
+    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());
+}
+
+// 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))
     {
-        m_widget = gtk_handle_box_new();
-        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
-        gtk_widget_show( GTK_WIDGET(m_toolbar) );
-        
-#if (GTK_MINOR_VERSION > 0)
-        if (style & wxTB_FLAT)
-            gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );
-#endif
+        box = gtk_vbox_new(false, 0);
+        arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
     }
     else
-    {     
-        m_widget = GTK_WIDGET(m_toolbar);
+    {
+        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);
+}
+
+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);
+        }
     }
-                                            
-    gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
-    
-#if (GTK_MINOR_VERSION > 0)
-    if (style & wxTB_FLAT)
-        gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
-#endif
-
-    m_fg = new GdkColor;
-    m_fg->red = 0;
-    m_fg->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 );
-  
-    PostCreation();
-
-    Show( TRUE );
-
-    return TRUE;
 }
 
-bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxString& text,
+                                         const wxBitmap& bitmap1,
+                                         const wxBitmap& bitmap2,
+                                         wxItemKind kind,
+                                         wxObject *clientData,
+                                         const wxString& shortHelpString,
+                                         const wxString& longHelpString)
 {
-    wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex );
-    event.SetEventObject(this);
-    event.SetInt( toolIndex );
-    event.SetExtraLong((long) toggleDown);
-
-    GetEventHandler()->ProcessEvent(event);
-
-    return TRUE;
+    return new wxToolBarTool(this, id, text, bitmap1, bitmap2, kind,
+                             clientData, shortHelpString, longHelpString);
 }
 
-void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
 {
-    wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex );
-    event.SetEventObject( this );
-    event.SetInt( toolIndex );
-
-    GetEventHandler()->ProcessEvent(event);
+    return new wxToolBarTool(this, control, label);
 }
 
-void wxToolBar::OnMouseEnter( int toolIndex )
+//-----------------------------------------------------------------------------
+// wxToolBar construction
+//-----------------------------------------------------------------------------
+
+void wxToolBar::Init()
 {
-    wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
-    event.SetEventObject(this);
-    event.SetInt( toolIndex );
-  
-    GetEventHandler()->ProcessEvent(event);
+    m_toolbar = (GtkToolbar *)NULL;
+    m_tooltips = NULL;
 }
 
-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 )
+wxToolBar::~wxToolBar()
 {
-    m_hasToolAlready = TRUE;
-    
-    wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
-                 wxT("invalid bitmap for wxToolBar icon") );
+    if (m_tooltips)
+    {
+        gtk_object_destroy(GTK_OBJECT(m_tooltips));
+        g_object_unref(m_tooltips);
+    }
+}
 
-    wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
-                 wxT("wxToolBar doesn't support GdkBitmap") );
+bool wxToolBar::Create( wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxString& name )
+{
+    if ( !PreCreation( parent, pos, size ) ||
+         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
-    wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
-                 wxT("wxToolBar::Add needs a wxBitmap") );
-  
-    GtkWidget *tool_pixmap = (GtkWidget *)NULL;
-  
-    GdkPixmap *pixmap = bitmap.GetPixmap();
+        return false;
+    }
 
-    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 );
+    FixupStyle();
 
-    wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
-                                             toggle, clientData,
-                                             helpString1, helpString2,
-                                             tool_pixmap );
+    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();
 
-    GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
-                                       : GTK_TOOLBAR_CHILD_BUTTON;
+    if (style & wxTB_DOCKABLE)
+    {
+        m_widget = gtk_handle_box_new();
 
-    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
-                     );
+        g_signal_connect(m_widget, "child_detached",
+            G_CALLBACK(child_detached), NULL);
+        g_signal_connect(m_widget, "child_attached",
+            G_CALLBACK(child_attached), NULL);
 
-    tool->m_item = item;
+        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));
 
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-    m_width = req.width + m_xMargin;
-    m_height = req.height + 2*m_yMargin + 4;
+    m_parent->DoAddChild( this );
 
-    gtk_signal_connect( GTK_OBJECT(tool->m_item),
-                        "enter_notify_event", 
-                        GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
-                        (gpointer)tool );
+    PostCreation(size);
 
-    m_tools.Append( tool );
+    g_signal_connect_after(m_toolbar, "size_request",
+        G_CALLBACK(size_request), this);
 
-    return tool;
+    return true;
 }
 
-bool wxToolBar::AddControl(wxControl *control)
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    wxCHECK_MSG( control, FALSE, wxT("toolbar: can't insert NULL control") );
-
-    wxCHECK_MSG( control->GetParent() == this, FALSE,
-                 wxT("control must have toolbar as parent") );
-
-    m_hasToolAlready = TRUE;
-    
-    wxToolBarTool *tool = new wxToolBarTool(control);
-    
-    tool -> m_item = NULL;
-    gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL );
-    
-    GtkRequisition req;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-    m_width = req.width + m_xMargin;
-    m_height = req.height + 2*m_yMargin + 4;
-
-    m_tools.Append( tool );
-    
-    return TRUE;
+    return GTK_WIDGET(m_toolbar)->window;
 }
 
-void wxToolBar::AddSeparator()
+void wxToolBar::GtkSetStyle()
 {
-    gtk_toolbar_append_space( m_toolbar );
-}
+    GtkOrientation orient = GTK_ORIENTATION_HORIZONTAL;
+    if (HasFlag(wxTB_LEFT | wxTB_RIGHT))
+        orient = GTK_ORIENTATION_VERTICAL;
 
-bool wxToolBar::DeleteTool(int toolIndex)
-{
-    wxNode *node = m_tools.First();
-    while (node)
+    GtkToolbarStyle style = GTK_TOOLBAR_ICONS;
+    if (HasFlag(wxTB_NOICONS))
+        style = GTK_TOOLBAR_TEXT;
+    else if (HasFlag(wxTB_TEXT))
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        {
-            if (tool->m_control)
-                tool->m_control->Destroy();
-            else
-                gtk_widget_destroy( tool->m_item );
-            m_tools.DeleteNode( node );
-           
-            return TRUE;
-        }
-        node = node->Next();
+        style = GTK_TOOLBAR_BOTH;
+        if (HasFlag(wxTB_HORZ_LAYOUT))
+            style = GTK_TOOLBAR_BOTH_HORIZ;
     }
 
-    return FALSE;
+    gtk_toolbar_set_orientation(m_toolbar, orient);
+    gtk_toolbar_set_style(m_toolbar, style);
 }
 
-void wxToolBar::ClearTools()
+void wxToolBar::SetWindowStyleFlag( long style )
 {
-    wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") );
-}
+    wxToolBarBase::SetWindowStyleFlag(style);
 
-bool wxToolBar::Realize()
-{
-    return TRUE;
+    if ( m_toolbar )
+        GtkSetStyle();
 }
 
-void wxToolBar::EnableTool(int toolIndex, bool enable)
+bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+
+    GSList* radioGroup;
+    switch ( tool->GetStyle() )
     {
-        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();
+        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;
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
+    gtk_widget_show(GTK_WIDGET(tool->m_item));
+
+    InvalidateBestSize();
+
+    return true;
 }
 
-void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 
+bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase)
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+
+    if (tool->GetStyle() == wxTOOL_STYLE_CONTROL)
     {
-        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 );
-           }
-
-            return;
-        }
-        node = node->Next();
+        // 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);
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
+    gtk_object_destroy(GTK_OBJECT(tool->m_item));
+    tool->m_item = NULL;
+
+    InvalidateBestSize();
+    return true;
 }
 
-wxObject *wxToolBar::GetToolClientData( int index ) const
+GSList* wxToolBar::GetRadioGroup(size_t pos)
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    GSList* radioGroup = NULL;
+    GtkToolItem* item = NULL;
+    if (pos > 0)
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == index) return tool->m_clientData;;
-        node = node->Next();
+        item = gtk_toolbar_get_nth_item(m_toolbar, int(pos) - 1);
+        if (!GTK_IS_RADIO_TOOL_BUTTON(item))
+            item = NULL;
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-  
-    return (wxObject*)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;
 }
 
-bool wxToolBar::GetToolState(int toolIndex) const
+// ----------------------------------------------------------------------------
+// wxToolBar tools state
+// ----------------------------------------------------------------------------
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {
-    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;
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+
+    if (tool->m_item)
+        gtk_widget_set_sensitive(GTK_WIDGET(tool->m_item), enable);
 }
 
-bool wxToolBar::GetToolEnabled(int toolIndex) const
+void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
+
+    if (tool->m_item)
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex) return tool->m_enabled;
-        node = node->Next();
+        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);
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-  
-    return FALSE;
 }
 
-void wxToolBar::SetMargins( int x, int y )
+void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
+                            bool WXUNUSED(toggle))
 {
-    wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") );
-    
-    if (x > 1) gtk_toolbar_append_space( m_toolbar );  // oh well
-    
-    m_xMargin = x;
-    m_yMargin = y;
+    // VZ: absolutely no idea about how to do it
+    wxFAIL_MSG( _T("not implemented") );
 }
 
-void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
-{
-    wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") );
-}
+// ----------------------------------------------------------------------------
+// wxToolBar geometry
+// ----------------------------------------------------------------------------
 
-void wxToolBar::SetToolSeparation( int separation )
+wxSize wxToolBar::DoGetBestSize() const
 {
-    gtk_toolbar_set_space_size( m_toolbar, separation );
-    m_separation = separation;
+    // 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;
 }
 
-int wxToolBar::GetToolPacking()
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
+                                                  wxCoord WXUNUSED(y)) const
 {
-    return 0;
-}
+    // VZ: GTK+ doesn't seem to have such thing
+    wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
 
-int wxToolBar::GetToolSeparation()
-{
-    return m_separation;
+    return (wxToolBarToolBase *)NULL;
 }
 
-wxString wxToolBar::GetToolLongHelp(int toolIndex)
+void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 {
-    wxNode *node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            return tool->m_longHelpString;
-        }
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return wxT("");
-}
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
 
-wxString wxToolBar::GetToolShortHelp(int toolIndex)
-{
-    wxNode *node = m_tools.First();
-    while (node)
+    if ( tool )
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            return tool->m_shortHelpString;
+        (void)tool->SetShortHelp(helpString);
+        if (tool->m_item)
+        {
+            gtk_tool_item_set_tooltip(tool->m_item,
+                m_tooltips, wxGTK_CONV(helpString), "");
         }
-        node = node->Next();
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return wxT("");
 }
 
-void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {
-    wxNode *node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
+    if ( tool )
     {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            tool->m_longHelpString = helpString;
-            return;
-        }
-        node = node->Next();
-    }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return;
-}
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
 
-void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
-{
-    wxNode *node = m_tools.First();
-    while (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool*)node->Data();
-        if (tool->m_index == toolIndex)
-        { 
-            tool->m_shortHelpString = helpString;
-            return;
-        }
-        node = node->Next();
+        tool->SetNormalBitmap(bitmap);
+        tool->SetImage();
     }
-  
-    wxFAIL_MSG( wxT("wrong toolbar index") );
-    
-    return;
 }
 
-void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {
-    wxEvtHandler* evtHandler = GetEventHandler();
-
-    wxNode* node = m_tools.First();
-    while (node)
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
+    if ( tool )
     {
-        wxToolBarTool* tool = (wxToolBarTool*) node->Data();
-
-        wxUpdateUIEvent event( tool->m_index );
-        event.SetEventObject(this);
-
-        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?
-*/
-        }
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
 
-        node = node->Next();
+        tool->SetDisabledBitmap(bitmap);
     }
 }
 
+// ----------------------------------------------------------------------------
+// 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. */
+           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() );
-       }
-       
-        wxNode *node = m_tools.First();
-       while (node)
         {
-           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();
+
+            if (tool->m_item)
+            {
+                GdkWindow* window = GTK_WIDGET(tool->m_item)->window;
+
+                if ( window )
+                {
+                    gdk_window_set_cursor( window, cursor.GetCursor() );
+                }
+            }
         }
     }
 
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
 }
 
-#endif
+#endif // wxUSE_TOOLBAR_NATIVE