X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47c93b637e9016ffcd3010b4d785d26f5b746b98..7e71773004dfa6e6686ea69d4554496eb9e6bc9c:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 8753cade8d..fcc213eff4 100644 --- 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 @@ -8,38 +8,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#ifdef __GNUG__ - #pragma implementation "tbargtk.h" -#endif - -#include "wx/toolbar.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_TOOLBAR_NATIVE -#include "wx/frame.h" - -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/toolbar.h" -extern GdkFont *GtkGetDefaultGuiFont(); +#include "wx/gtk/private.h" // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- -// idle system -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - // data extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; @@ -53,135 +34,309 @@ class wxToolBarTool : public wxToolBarToolBase public: wxToolBarTool(wxToolBar *tbar, int id, + const wxString& label, const wxBitmap& bitmap1, const wxBitmap& bitmap2, - bool toggle, + wxItemKind kind, wxObject *clientData, const wxString& shortHelpString, const wxString& longHelpString) - : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, + : 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; } - GtkWidget *m_item; - GtkWidget *m_pixmap; + void SetImage(); + void CreateDropDown(); + void ShowDropdown(GtkToggleButton* button); -protected: - void Init(); + GtkToolItem* m_item; }; // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // ============================================================================ // implementation // ============================================================================ //----------------------------------------------------------------------------- -// "clicked" (internal from gtk_toolbar) +// "clicked" from m_item //----------------------------------------------------------------------------- -static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), - wxToolBarTool *tool ) +extern "C" { +static void item_clicked(GtkToolButton*, wxToolBarTool* tool) { - if (g_isIdle) - wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return; - wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); - if ( tbar->m_blockNextEvent ) - { - tbar->m_blockNextEvent = FALSE; - return; - } + tool->GetToolBar()->OnLeftClick(tool->GetId(), false); +} +} +//----------------------------------------------------------------------------- +// "toggled" from m_item +//----------------------------------------------------------------------------- + +extern "C" { +static void item_toggled(GtkToggleToolButton* button, wxToolBarTool* tool) +{ if (g_blockEventsOnDrag) return; - if (!tool->IsEnabled()) return; - if (tool->CanBeToggled()) - { + 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(); + } +} +} - wxBitmap bitmap = tool->GetBitmap(); - if ( bitmap.Ok() ) - { - GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap ); +//----------------------------------------------------------------------------- +// "button_press_event" from m_item child +//----------------------------------------------------------------------------- - GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() - : (GdkBitmap *)NULL; +extern "C" { +static gboolean +button_press_event(GtkWidget*, GdkEventButton* event, wxToolBarTool* tool) +{ + if (event->button != 3) + return FALSE; - gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); - } - } + if (g_blockEventsOnDrag) return TRUE; + + tool->GetToolBar()->OnRightClick( + tool->GetId(), int(event->x), int(event->y)); + + return TRUE; +} +} - tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ); +//----------------------------------------------------------------------------- +// "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); +} } //----------------------------------------------------------------------------- -// "enter_notify_event" +// "child_attached" from m_widget //----------------------------------------------------------------------------- -static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), - GdkEventCrossing *WXUNUSED(gdk_event), - wxToolBarTool *tool ) +extern "C" { +static void child_attached(GtkWidget*, GtkToolbar* toolbar, void*) { - if (g_isIdle) wxapp_install_idle_handler(); + 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; - - wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); - - // emit the event - tb->OnMouseEnter( tool->GetId() ); - + + int id = -1; + if (event->type == GDK_ENTER_NOTIFY) + id = tool->GetId(); + tool->GetToolBar()->OnMouseEnter(id); + return FALSE; } +} + +//----------------------------------------------------------------------------- +// "size_request" from m_toolbar +//----------------------------------------------------------------------------- + +extern "C" { +static void +size_request(GtkWidget*, GtkRequisition* req, wxToolBar* win) +{ + 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; +} +} //----------------------------------------------------------------------------- -// InsertChild callback for wxToolBar +// "toggled" from dropdown menu button //----------------------------------------------------------------------------- -static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), - wxWindow* WXUNUSED(child) ) +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) { - // we don't do anything here + 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 // ---------------------------------------------------------------------------- -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, + const wxString& text, const wxBitmap& bitmap1, const wxBitmap& bitmap2, - bool toggle, + wxItemKind kind, wxObject *clientData, const wxString& shortHelpString, const wxString& longHelpString) { - return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle, + return new wxToolBarTool(this, id, text, bitmap1, bitmap2, kind, 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); } //----------------------------------------------------------------------------- @@ -190,16 +345,17 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) void wxToolBar::Init() { - m_fg = - m_bg = (GdkColor *)NULL; m_toolbar = (GtkToolbar *)NULL; - m_blockNextEvent = FALSE; + m_tooltips = NULL; } wxToolBar::~wxToolBar() { - delete m_fg; - delete m_bg; + if (m_tooltips) + { + gtk_object_destroy(GTK_OBJECT(m_tooltips)); + g_object_unref(m_tooltips); + } } bool wxToolBar::Create( wxWindow *parent, @@ -209,194 +365,230 @@ bool wxToolBar::Create( wxWindow *parent, 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") ); - return FALSE; + return false; } - GtkOrientation orient = style & wxTB_VERTICAL ? GTK_ORIENTATION_VERTICAL - : GTK_ORIENTATION_HORIZONTAL; - m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( orient, GTK_TOOLBAR_ICONS ) ); + FixupStyle(); - SetToolSeparation(7); + 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(); - 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 ); } else - { - m_widget = GTK_WIDGET(m_toolbar); + { + m_widget = gtk_event_box_new(); + ConnectWidget( m_widget ); } - - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); - - if (style & wxTB_FLAT) - gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE ); - - - m_fg = new GdkColor; - m_fg->red = 0; - m_fg->green = 0; - m_fg->blue = 0; - wxColour fg(0,0,0); - fg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) ); - m_fg->pixel = fg.GetPixel(); - - m_bg = new GdkColor; - m_bg->red = 65535; - m_bg->green = 65535; - m_bg->blue = 49980; - wxColour bg(255,255,196); - bg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) ); - m_bg->pixel = bg.GetPixel(); - - 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; - gdk_font_unref( g_style->font ); - g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() ); - gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); + 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(); + PostCreation(size); - Show( TRUE ); + g_signal_connect_after(m_toolbar, "size_request", + G_CALLBACK(size_request), this); - return TRUE; + return true; } -bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) +GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + return GTK_WIDGET(m_toolbar)->window; +} - // we have inserted a space before all the tools - if (m_xMargin > 1) pos++; - - if ( tool->IsButton() ) +void wxToolBar::GtkSetStyle() +{ + 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)) { - wxBitmap bitmap = tool->GetBitmap1(); - - 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; - - GdkPixmap *pixmap = bitmap.GetPixmap(); - - 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 ); - - tool->m_pixmap = tool_pixmap; + 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); +} + +void wxToolBar::SetWindowStyleFlag( long style ) +{ + wxToolBarBase::SetWindowStyleFlag(style); + + if ( m_toolbar ) + GtkSetStyle(); +} + +bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) +{ + wxToolBarTool* tool = static_cast(toolBase); + + GSList* radioGroup; switch ( tool->GetStyle() ) { case wxTOOL_STYLE_BUTTON: - tool->m_item = gtk_toolbar_insert_element - ( - m_toolbar, - tool->CanBeToggled() - ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON - : GTK_TOOLBAR_CHILD_BUTTON, - (GtkWidget *)NULL, - (const char *)NULL, - tool->GetShortHelp().mbc_str(), - "", // tooltip_private_text (?) - tool->m_pixmap, - (GtkSignalFunc)gtk_toolbar_callback, - (gpointer)tool, - pos - ); - - if ( !tool->m_item ) + switch (tool->GetKind()) { - wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") ); - - return FALSE; + 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; } - - gtk_signal_connect( GTK_OBJECT(tool->m_item), - "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), - (gpointer)tool ); + 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: - gtk_toolbar_append_space( m_toolbar ); - - // 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: - gtk_toolbar_insert_widget( - m_toolbar, - tool->GetControl()->m_widget, - (const char *) NULL, - (const char *) NULL, - pos - ); + 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)); - 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(); - return TRUE; + return true; } -bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) +bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = static_cast(toolBase); - switch ( tool->GetStyle() ) + if (tool->GetStyle() == wxTOOL_STYLE_CONTROL) { - case wxTOOL_STYLE_CONTROL: - tool->GetControl()->Destroy(); - break; + // 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; - case wxTOOL_STYLE_BUTTON: - gtk_widget_destroy( tool->m_item ); - break; + InvalidateBestSize(); + return true; +} - //case wxTOOL_STYLE_SEPARATOR: -- nothing to do +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; } - - return TRUE; + 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; } // ---------------------------------------------------------------------------- @@ -405,37 +597,24 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { -#if (GTK_MINOR_VERSION > 0) - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = static_cast(toolBase); - /* 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 + 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(toolBase); - GtkWidget *item = tool->m_item; - if ( item && GTK_IS_TOGGLE_BUTTON(item) ) + if (tool->m_item) { - wxBitmap bitmap = tool->GetBitmap(); - if ( bitmap.Ok() ) - { - GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap ); - - GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() - : (GdkBitmap *)NULL; - - gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); - } + g_signal_handlers_block_by_func(tool->m_item, (void*)item_toggled, tool); - m_blockNextEvent = TRUE; // we cannot use gtk_signal_disconnect here + gtk_toggle_tool_button_set_active( + GTK_TOGGLE_TOOL_BUTTON(tool->m_item), toggle); - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); + g_signal_handlers_unblock_by_func(tool->m_item, (void*)item_toggled, tool); } } @@ -450,6 +629,19 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool), // 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 { @@ -459,32 +651,41 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x), 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.") ); - - if (x > 1) gtk_toolbar_append_space( m_toolbar ); // oh well - - m_xMargin = x; - m_yMargin = y; + wxToolBarTool* tool = static_cast(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::SetToolSeparation( int separation ) +void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap ) { - gtk_toolbar_set_space_size( m_toolbar, separation ); - m_toolSeparation = separation; + wxToolBarTool* tool = static_cast(FindById(id)); + if ( tool ) + { + wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools.")); + + 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(FindById(id)); if ( tool ) { - (void)tool->SetShortHelp(helpString); - gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item, - helpString.mbc_str(), ""); + wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools.")); + + tool->SetDisabledBitmap(bitmap); } } @@ -494,6 +695,9 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) 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; @@ -515,16 +719,15 @@ void wxToolBar::OnInternalIdle() gdk_window_set_cursor( m_widget->window, cursor.GetCursor() ); } - wxToolBarToolsList::Node *node = m_tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node ) { 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 ) { @@ -534,7 +737,18 @@ void wxToolBar::OnInternalIdle() } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); +} + + +// ---------------------------------------------------------------------------- + +// static +wxVisualAttributes +wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new); } #endif // wxUSE_TOOLBAR_NATIVE