Forward port new wxRenderer methods in 2.8 to trunk.

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index c62103dc535ea70a41f0f107a7f8ee0a58e215cd..fcc213eff4a13daac8732b28a4dbff781a2204f3 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase


@@ -8,72 +8,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/toolbar.h"
-

 #if wxUSE_TOOLBAR_NATIVE
 
 #if wxUSE_TOOLBAR_NATIVE
 

-#include "wx/frame.h"
+#include "wx/toolbar.h"

 
 

-#include <glib.h>

 #include "wx/gtk/private.h"
 
 #include "wx/gtk/private.h"
 

-extern GdkFont *GtkGetDefaultGuiFont();
-

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

-// idle system
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 
 // 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)
-{
-    *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
 // ----------------------------------------------------------------------------


@@ -93,61 +44,20 @@ public:
         : wxToolBarToolBase(tbar, id, label, bitmap1, bitmap2, kind,
                             clientData, shortHelpString, longHelpString)
     {
         : wxToolBarToolBase(tbar, id, label, bitmap1, bitmap2, kind,
                             clientData, shortHelpString, longHelpString)
     {

-        Init();
+        m_item = NULL;

     }
 
     }
 

-    wxToolBarTool(wxToolBar *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)

     {
     {

-        Init();
+        m_item = NULL;

     }
 
     }
 

-    // 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;
+    void SetImage();
+    void CreateDropDown();
+    void ShowDropdown(GtkToggleButton* button);

 
 

-            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
-#endif // !__WXGTK20__
-                gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
-        }
-    }
-
-    GtkWidget            *m_item;
-    GtkWidget            *m_pixmap;
-
-protected:
-    void Init();
+    GtkToolItem* m_item;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -161,89 +71,253 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 // ============================================================================
 
 //-----------------------------------------------------------------------------
 // ============================================================================
 
 //-----------------------------------------------------------------------------

-// "clicked" (internal from gtk_toolbar)
+// "clicked" from m_item

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
-                                  wxToolBarTool *tool )
+static void item_clicked(GtkToolButton*, wxToolBarTool* tool)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    if (g_blockEventsOnDrag) return;

 
 

-    wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
+    tool->GetToolBar()->OnLeftClick(tool->GetId(), false);
+}
+}

 
 

-    if (tbar->m_blockEvent) return;
+//-----------------------------------------------------------------------------
+// "toggled" from m_item
+//-----------------------------------------------------------------------------

 
 

+extern "C" {
+static void item_toggled(GtkToggleToolButton* button, wxToolBarTool* tool)
+{

     if (g_blockEventsOnDrag) 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;
-        }
-    }
+    const bool active = gtk_toggle_tool_button_get_active(button) != 0;
+    tool->Toggle(active);
+    if (!active && tool->GetKind() == wxITEM_RADIO)
+        return;

 
 

-    if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() )
+    if (!tool->GetToolBar()->OnLeftClick(tool->GetId(), active))

     {
         // revert back
         tool->Toggle();
     {
         // revert back
         tool->Toggle();

-
-        tool->SetPixmap(tool->GetBitmap());

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

-// "enter_notify_event" / "leave_notify_event"
+// "button_press_event" from m_item child

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
-                                       GdkEventCrossing *gdk_event,
-                                       wxToolBarTool *tool )
+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;
 
 
     if (g_blockEventsOnDrag) return TRUE;
 

-    wxToolBar *tb = (wxToolBar *)tool->GetToolBar();
+    tool->GetToolBar()->OnRightClick(
+        tool->GetId(), int(event->x), int(event->y));

 
 

-    // emit the event
-    if( gdk_event->type == GDK_ENTER_NOTIFY )
-        tb->OnMouseEnter( tool->GetId() );
-    else
-        tb->OnMouseEnter( -1 );
+    return TRUE;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" from m_widget
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void child_detached(GtkWidget*, GtkToolbar* toolbar, void*)
+{
+    // 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
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void child_attached(GtkWidget*, GtkToolbar* toolbar, void*)
+{
+    gtk_toolbar_set_show_arrow(toolbar, true);
+}
+}
+
+//-----------------------------------------------------------------------------
+// "enter_notify_event" / "leave_notify_event" from m_item
+//-----------------------------------------------------------------------------
+
+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;
 }
 }
 
 //-----------------------------------------------------------------------------
 
     return FALSE;
 }
 }
 
 //-----------------------------------------------------------------------------

-// InsertChild callback for wxToolBar
+// "size_request" from m_toolbar

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

-static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent),
-                                    wxWindow* WXUNUSED(child) )
+extern "C" {
+static void
+size_request(GtkWidget*, GtkRequisition* req, wxToolBar* win)

 {
 {

-    // we don't do anything here
+    const wxSize margins = win->GetMargins();
+    req->width  += margins.x;
+    req->height += 2 * margins.y;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "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
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void arrow_toggled(GtkToggleButton* button, wxToolBarTool* tool)
+{
+    if (gtk_toggle_button_get_active(button))
+    {
+        tool->ShowDropdown(button);
+        gtk_toggle_button_set_active(button, false);
+    }
+}
+}
+
+//-----------------------------------------------------------------------------
+// "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)
+    {
+        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;
+}
+}
+
+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);

 }
 
 // ----------------------------------------------------------------------------
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxToolBarTool
 // ----------------------------------------------------------------------------
 

-void wxToolBarTool::Init()
+void wxToolBarTool::SetImage()

 {
 {

-    m_item =
-    m_pixmap = (GtkWidget *)NULL;
+    const wxBitmap& bitmap = GetNormalBitmap();
+    wxCHECK_RET(bitmap.IsOk(), "invalid bitmap for wxToolBar icon");
+
+    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))
+    {
+        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);
+}
+
+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);
+        }
+    }

 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,


@@ -259,9 +333,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
                              clientData, shortHelpString, longHelpString);
 }
 
                              clientData, shortHelpString, longHelpString);
 }
 

-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)

 {
 {

-    return new wxToolBarTool(this, control);
+    return new wxToolBarTool(this, control, label);

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


@@ -271,13 +346,16 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 void wxToolBar::Init()
 {
     m_toolbar = (GtkToolbar *)NULL;
 void wxToolBar::Init()
 {
     m_toolbar = (GtkToolbar *)NULL;

-    m_blockEvent = FALSE;
-    m_defaultWidth = 32;
-    m_defaultHeight = 32;
+    m_tooltips = NULL;

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

+    if (m_tooltips)
+    {
+        gtk_object_destroy(GTK_OBJECT(m_tooltips));
+        g_object_unref(m_tooltips);
+    }

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


@@ -287,39 +365,30 @@ bool wxToolBar::Create( wxWindow *parent,
                         long style,
                         const wxString& name )
 {
                         long style,
                         const wxString& name )
 {

-    m_needParent = TRUE;
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
-

     if ( !PreCreation( parent, pos, size ) ||
          !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
     if ( !PreCreation( parent, pos, size ) ||
          !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-#ifdef __WXGTK20__
+    FixupStyle();
+

     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     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();
 
     GtkSetStyle();
 

-    // Doesn't work this way.
-    // GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
-    // gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
-#else
-    GtkOrientation orient;
-    GtkToolbarStyle gtkStyle;
-    GetGtkStyle(style, &orient, &gtkStyle);
-
-    m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) );
-#endif
-
-    SetToolSeparation(7);
-

     if (style & wxTB_DOCKABLE)
     {
         m_widget = gtk_handle_box_new();
     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) );
+
+        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 );
 
         if (style & wxTB_FLAT)
             gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE );


@@ -327,31 +396,42 @@ bool wxToolBar::Create( wxWindow *parent,
     else
     {
         m_widget = gtk_event_box_new();
     else
     {
         m_widget = gtk_event_box_new();

-        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );

         ConnectWidget( m_widget );
         ConnectWidget( m_widget );

-        gtk_widget_show(GTK_WIDGET(m_toolbar));

     }
     }

-
-    gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
-
-    // 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
+    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);
 
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 

-    return TRUE;
+    g_signal_connect_after(m_toolbar, "size_request",
+        G_CALLBACK(size_request), this);
+
+    return true;
+}
+
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return GTK_WIDGET(m_toolbar)->window;

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

-    GtkOrientation orient;
-    GtkToolbarStyle style;
-    GetGtkStyle(GetWindowStyle(), &orient, &style);
+    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;
+    }

 
     gtk_toolbar_set_orientation(m_toolbar, orient);
     gtk_toolbar_set_style(m_toolbar, style);
 
     gtk_toolbar_set_orientation(m_toolbar, orient);
     gtk_toolbar_set_style(m_toolbar, style);


@@ -367,181 +447,148 @@ void wxToolBar::SetWindowStyleFlag( long style )
 
 bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
 
 bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {

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

 
 

+    GSList* radioGroup;

     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_BUTTON:
     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
+            switch (tool->GetKind())

             {
             {

-                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 )
+                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
                     {
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync

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

                     }
                     }

-                }
-
-                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 );
+                    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:
             break;
 
         case wxTOOL_STYLE_SEPARATOR:

-            gtk_toolbar_insert_space( m_toolbar, posGtk );
-
-            // skip the rest
-            return TRUE;
+            tool->m_item = gtk_separator_tool_item_new();
+            gtk_toolbar_insert(m_toolbar, tool->m_item, int(pos));
+            break;

 
         case wxTOOL_STYLE_CONTROL:
 
         case wxTOOL_STYLE_CONTROL:

-            gtk_toolbar_insert_widget(
-                                       m_toolbar,
-                                       tool->GetControl()->m_widget,
-                                       (const char *) NULL,
-                                       (const char *) NULL,
-                                       posGtk
-                                      );
+            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;
     }
             break;
     }

+    gtk_widget_show(GTK_WIDGET(tool->m_item));

 
 

-    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();
 
     InvalidateBestSize();
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

-    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
 

-    switch ( tool->GetStyle() )
+    if (tool->GetStyle() == wxTOOL_STYLE_CONTROL)

     {
     {

-        case wxTOOL_STYLE_CONTROL:
-            tool->GetControl()->Destroy();
-            break;
-
-        case wxTOOL_STYLE_BUTTON:
-            gtk_widget_destroy( tool->m_item );
-            break;
-
-#ifdef __WXGTK20__
-        case wxTOOL_STYLE_SEPARATOR:
-            gtk_toolbar_remove_space( m_toolbar, pos );
-            break;
-#endif
+        // 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();
 
     InvalidateBestSize();

-    return TRUE;
+    return true;
+}
+
+GSList* wxToolBar::GetRadioGroup(size_t pos)
+{
+    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;

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


@@ -550,28 +597,24 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {

-    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
     if (tool->m_item)
 
     if (tool->m_item)

-    {
-        gtk_widget_set_sensitive( tool->m_item, enable );
-    }
+        gtk_widget_set_sensitive(GTK_WIDGET(tool->m_item), enable);

 }
 
 void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {
 }
 
 void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {

-    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
 

-    GtkWidget *item = tool->m_item;
-    if ( item && GTK_IS_TOGGLE_BUTTON(item) )
+    if (tool->m_item)

     {
     {

-        tool->SetPixmap(tool->GetBitmap());
-
-        m_blockEvent = TRUE;
+        g_signal_handlers_block_by_func(tool->m_item, (void*)item_toggled, tool);

 
 

-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
+        gtk_toggle_tool_button_set_active(
+            GTK_TOGGLE_TOOL_BUTTON(tool->m_item), toggle);

 
 

-        m_blockEvent = FALSE;
+        g_signal_handlers_unblock_by_func(tool->m_item, (void*)item_toggled, tool);

     }
 }
 
     }
 }
 


@@ -586,6 +629,19 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
 // wxToolBar geometry
 // ----------------------------------------------------------------------------
 
 // wxToolBar geometry
 // ----------------------------------------------------------------------------
 

+wxSize wxToolBar::DoGetBestSize() const
+{
+    // 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;
+}
+

 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
                                                   wxCoord WXUNUSED(y)) const
 {
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
                                                   wxCoord WXUNUSED(y)) const
 {


@@ -595,39 +651,41 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
     return (wxToolBarToolBase *)NULL;
 }
 
     return (wxToolBarToolBase *)NULL;
 }
 

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

 {
 {

-    wxCHECK_RET( GetToolsCount() == 0,
-                 wxT("wxToolBar::SetMargins must be called before adding tools.") );
-
-#ifndef __WXGTK20__
-    if (x > 1)
-        gtk_toolbar_append_space( m_toolbar );  // oh well
-#endif
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

 
 

-    m_xMargin = x;
-    m_yMargin = y;
+    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::SetToolSeparation( int separation )
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )

 {
 {

-    // FIXME: this function disappeared
-#ifndef __WXGTK20__
-    gtk_toolbar_set_space_size( m_toolbar, separation );
-#endif
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));

 
 

-    m_toolSeparation = separation;
+        tool->SetNormalBitmap(bitmap);
+        tool->SetImage();
+    }

 }
 
 }
 

-void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )

 {
 {

-    wxToolBarTool *tool = (wxToolBarTool *)FindById(id);
-
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

     if ( tool )
     {
     if ( tool )
     {

-        (void)tool->SetShortHelp(helpString);
-        gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item,
-                             wxGTK_CONV( helpString ), "");
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);

     }
 }
 
     }
 }
 


@@ -637,6 +695,9 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 
 void wxToolBar::OnInternalIdle()
 {
 
 void wxToolBar::OnInternalIdle()
 {

+    // Check if we have to show window now
+    if (GtkShowFromOnIdle()) return;
+

     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 


@@ -664,10 +725,9 @@ void wxToolBar::OnInternalIdle()
             wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
             node = node->GetNext();
 
             wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
             node = node->GetNext();
 

-            GtkWidget *item = tool->m_item;
-            if ( item )
+            if (tool->m_item)

             {
             {

-                GdkWindow *window = item->window;
+                GdkWindow* window = GTK_WIDGET(tool->m_item)->window;

 
                 if ( window )
                 {
 
                 if ( window )
                 {


@@ -677,7 +737,7 @@ void wxToolBar::OnInternalIdle()
         }
     }
 
         }
     }
 

-    if (wxUpdateUIEvent::CanUpdate(this))
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())

         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 


@@ -688,15 +748,7 @@ void wxToolBar::OnInternalIdle()
 wxVisualAttributes
 wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-#ifdef __WXGTK20__

     return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
     return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);

-#else
-    wxVisualAttributes attr;
-    GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
-    attr = GetDefaultAttributesFromGTKWidget(widget);
-    gtk_widget_destroy(widget);
-    return attr;
-#endif

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