X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab86c659ac3093dc5513ff0c5001d2fa2979b30c..a625c5b6c0d1c0f137bfbbdd98608c194017da75:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 46fecbc14a..a4aa985348 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,40 +8,44 @@ // 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" +#if wxUSE_TOOLBAR_NATIVE + #include "wx/toolbar.h" -#if wxUSE_TOOLBAR_NATIVE +#ifndef WX_PRECOMP + #include "wx/menu.h" +#endif -#include "wx/frame.h" +// FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough? +// Beware that the new and old toolbar API may not be mixed in usage. +#undef GTK_DISABLE_DEPRECATED -#include #include "wx/gtk/private.h" -extern GdkFont *GtkGetDefaultGuiFont(); +/* XPM */ +static const char *arrow_down_xpm[] = { +/* columns rows colors chars-per-pixel */ +"7 7 2 1", +" c None", +". c Black", +/* pixels */ +" ", +" ", +" ", +".......", +" ..... ", +" ... ", +" . " +}; + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- -// idle system -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - // data extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; @@ -54,8 +58,7 @@ extern wxCursor g_globalCursor; static void GetGtkStyle(long style, GtkOrientation *orient, GtkToolbarStyle *gtkStyle) { - *orient = style & wxTB_VERTICAL ? GTK_ORIENTATION_VERTICAL - : GTK_ORIENTATION_HORIZONTAL; + *orient = ( style & wxTB_LEFT || style & wxTB_RIGHT ) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; if ( style & wxTB_TEXT ) @@ -63,9 +66,7 @@ static void GetGtkStyle(long style, *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? @@ -96,8 +97,8 @@ public: Init(); } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { Init(); } @@ -123,32 +124,23 @@ public: wxFAIL_MSG( _T("unknown toolbar child type") ); // fall through + case wxITEM_DROPDOWN: case wxITEM_NORMAL: return GTK_TOOLBAR_CHILD_BUTTON; } } - void SetPixmap(const wxBitmap& bitmap) + void SetImage(const wxBitmap& bitmap) { if (bitmap.Ok()) { - GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() - : (GdkBitmap *)NULL; -#ifdef __WXGTK20__ - if (bitmap.HasPixbuf()) - gtk_image_set_from_pixbuf(GTK_IMAGE(m_pixmap), - bitmap.GetPixbuf()); - else - gtk_image_set_from_pixmap(GTK_IMAGE(m_pixmap), - bitmap.GetPixmap(), mask); -#else - gtk_pixmap_set(GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask); -#endif // !__WXGTK20__ + // setting from pixmap doesn't seem to work right, but pixbuf works well + gtk_image_set_from_pixbuf((GtkImage*)m_image, bitmap.GetPixbuf()); } } GtkWidget *m_item; - GtkWidget *m_pixmap; + GtkWidget *m_image; protected: void Init(); @@ -168,12 +160,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // "clicked" (internal from gtk_toolbar) //----------------------------------------------------------------------------- -static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), +extern "C" { +static void gtk_toolbar_callback( GtkWidget *widget, wxToolBarTool *tool ) { - if (g_isIdle) - wxapp_install_idle_handler(); - wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); if (tbar->m_blockEvent) return; @@ -183,9 +173,17 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), if (tool->CanBeToggled()) { + if (tool->IsRadio() && + gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget)) && + tool->IsToggled()) + { + // pressed an already pressed radio button + return; + } + tool->Toggle(); - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); if ( tool->IsRadio() && !tool->IsToggled() ) { @@ -199,20 +197,120 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), // revert back tool->Toggle(); - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); + } +} +} + +//----------------------------------------------------------------------------- +// "right-click" +//----------------------------------------------------------------------------- +extern "C" { +static gboolean gtk_toolbar_tool_rclick_callback(GtkWidget *WXUNUSED(widget), + GdkEventButton *event, + wxToolBarToolBase *tool) +{ + if (event->button != 3) + return FALSE; + + wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); + + if (tbar->m_blockEvent) return TRUE; + + if (g_blockEventsOnDrag) return TRUE; + if (!tool->IsEnabled()) return TRUE; + + tbar->OnRightClick( tool->GetId(), (int)event->x, (int)event->y ); + + return TRUE; +} +} + +//----------------------------------------------------------------------------- +// "enter_notify_event" / "leave_notify_event" from dropdown +//----------------------------------------------------------------------------- + +extern "C" { +static gint gtk_toolbar_buddy_enter_callback( GtkWidget *WXUNUSED(widget), + GdkEventCrossing *WXUNUSED(gdk_event), + GtkWidget *tool ) +{ + guint8 state = GTK_WIDGET_STATE( tool ); + state |= GTK_STATE_PRELIGHT; + gtk_widget_set_state( tool, (GtkStateType) state ); + return FALSE; +} + +static gint gtk_toolbar_buddy_leave_callback( GtkWidget *WXUNUSED(widget), + GdkEventCrossing *WXUNUSED(gdk_event), + GtkWidget *tool ) +{ + guint8 state = GTK_WIDGET_STATE( tool ); + state &= ~GTK_STATE_PRELIGHT; + gtk_widget_set_state( tool, (GtkStateType) state ); + return FALSE; +} +} + +//----------------------------------------------------------------------------- +// "left-click" on dropdown +//----------------------------------------------------------------------------- + +extern "C" +{ +static void gtk_pop_tb_hide_callback( GtkWidget *WXUNUSED(menu), GtkToggleButton *button ) +{ + gtk_toggle_button_set_active( button, FALSE ); +} + +static gboolean gtk_toolbar_dropdown_lclick_callback(GtkWidget *widget, + GdkEventButton *event, + wxToolBarToolBase *tool) +{ + if (event->button != 1) + return FALSE; + + wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); + + if (tbar->m_blockEvent) return FALSE; + + if (g_blockEventsOnDrag) return FALSE; + if (!tool->IsEnabled()) return FALSE; + + wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tool->GetId() ); + if ( tbar->HandleWindowEvent(evt) ) + { + return TRUE; } + + wxMenu * const menu = tool->GetDropdownMenu(); + if (!menu) + return TRUE; + + // simulate press + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget), TRUE ); + + g_signal_connect (menu->m_menu, "hide", + G_CALLBACK (gtk_pop_tb_hide_callback), + widget); + + tbar->PopupMenu( menu, widget->allocation.x, + widget->allocation.y + widget->allocation.height ); + + + return TRUE; +} } //----------------------------------------------------------------------------- // "enter_notify_event" / "leave_notify_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *gdk_event, wxToolBarTool *tool ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) return TRUE; wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); @@ -225,15 +323,32 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), 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; +} +} //----------------------------------------------------------------------------- // InsertChild callback for wxToolBar //----------------------------------------------------------------------------- -static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), - wxWindow* WXUNUSED(child) ) +static void wxInsertChildInToolBar( wxWindow* WXUNUSED(parent), + wxWindow* child) { - // we don't do anything here + // Child widget will be inserted into GtkToolbar by DoInsertTool. Ref it + // here so reparenting into wxToolBar doesn't delete it. + g_object_ref(child->m_widget); } // ---------------------------------------------------------------------------- @@ -243,7 +358,7 @@ static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), void wxToolBarTool::Init() { m_item = - m_pixmap = (GtkWidget *)NULL; + m_image = NULL; } wxToolBarToolBase *wxToolBar::CreateTool(int id, @@ -259,9 +374,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id, 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,7 +387,7 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) void wxToolBar::Init() { m_toolbar = (GtkToolbar *)NULL; - m_blockEvent = FALSE; + m_blockEvent = false; m_defaultWidth = 32; m_defaultHeight = 32; } @@ -287,31 +403,24 @@ bool wxToolBar::Create( wxWindow *parent, long style, const wxString& name ) { - m_needParent = TRUE; - m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar; + m_insertCallback = wxInsertChildInToolBar; 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() ); 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, >kStyle); - - m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) ); -#endif SetToolSeparation(7); @@ -332,10 +441,8 @@ bool wxToolBar::Create( wxWindow *parent, 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 0 if (style & wxTB_FLAT) gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE ); #endif @@ -344,7 +451,15 @@ bool wxToolBar::Create( wxWindow *parent, 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() @@ -355,6 +470,7 @@ void wxToolBar::GtkSetStyle() gtk_toolbar_set_orientation(m_toolbar, orient); gtk_toolbar_set_style(m_toolbar, style); + gtk_toolbar_set_tooltips(m_toolbar, !(style & wxTB_NO_TOOLTIPS)); } void wxToolBar::SetWindowStyleFlag( long style ) @@ -367,15 +483,7 @@ void wxToolBar::SetWindowStyleFlag( long style ) 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 + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); if ( tool->IsButton() ) { @@ -383,39 +491,32 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { wxBitmap bitmap = tool->GetNormalBitmap(); - wxCHECK_MSG( bitmap.Ok(), FALSE, + 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; - + tool->m_image = gtk_image_new(); + tool->SetImage(bitmap); -#ifdef __WXGTK20__ - tool_pixmap = gtk_image_new(); - tool->m_pixmap = tool_pixmap; - tool->SetPixmap(bitmap); -#else - 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 ); -#endif + gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5); + } + } - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + int posGtk = 0; + if ( pos > 0 ) + { + for ( size_t i = 0; i < pos; i++ ) + { + posGtk++; - tool->m_pixmap = tool_pixmap; + // if we have a dropdown menu, we use 2 GTK tools internally + wxToolBarToolsList::compatibility_iterator node = m_tools.Item( i ); + wxToolBarTool * const tool2 = (wxToolBarTool*) node->GetData(); + if ( tool2->IsButton() && tool2->GetKind() == wxITEM_DROPDOWN ) + posGtk++; } } + switch ( tool->GetStyle() ) { case wxTOOL_STYLE_BUTTON: @@ -429,15 +530,16 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { wxToolBarToolsList::compatibility_iterator node = wxToolBarToolsList::compatibility_iterator(); - if ( pos ) node = m_tools.Item(pos - 1); + if ( pos ) + node = m_tools.Item(pos - 1); while ( node ) { - wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); - if ( !tool->IsRadio() ) + wxToolBarTool *toolNext = (wxToolBarTool *)node->GetData(); + if ( !toolNext->IsRadio() ) break; - widget = tool->m_item; + widget = toolNext->m_item; node = node->GetPrevious(); } @@ -447,7 +549,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) // 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); } } @@ -463,27 +565,60 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) ? NULL : (const char*) wxGTK_CONV( tool->GetShortHelp() ), "", // tooltip_private_text (?) - tool->m_pixmap, + tool->m_image, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool, posGtk ); - if ( !tool->m_item ) - { - wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") ); + wxCHECK_MSG(tool->m_item != NULL, false, _T("gtk_toolbar_insert_element() failed")); - return FALSE; - } + g_signal_connect (tool->m_item, "enter_notify_event", + G_CALLBACK (gtk_toolbar_tool_callback), + tool); + g_signal_connect (tool->m_item, "leave_notify_event", + G_CALLBACK (gtk_toolbar_tool_callback), + tool); + g_signal_connect(tool->m_item, "button-press-event", + G_CALLBACK (gtk_toolbar_tool_rclick_callback), + tool); - 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 ); + if (tool->GetKind() == wxITEM_DROPDOWN) + { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data( arrow_down_xpm ); + GtkWidget *dropdown = gtk_toggle_button_new(); + GtkWidget *image = gtk_image_new_from_pixbuf( pixbuf ); + gtk_widget_show( image ); + gtk_container_add( GTK_CONTAINER(dropdown), image ); + + if (GetWindowStyle() & wxTB_FLAT) + gtk_button_set_relief( GTK_BUTTON(dropdown), GTK_RELIEF_NONE ); + GTK_WIDGET_UNSET_FLAGS (dropdown, GTK_CAN_FOCUS); + gtk_widget_show( dropdown ); + + g_signal_connect (dropdown, "enter_notify_event", + G_CALLBACK (gtk_toolbar_buddy_enter_callback), + tool->m_item); + g_signal_connect (dropdown, "leave_notify_event", + G_CALLBACK (gtk_toolbar_buddy_leave_callback), + tool->m_item); + g_signal_connect(dropdown, "button-press-event", + G_CALLBACK (gtk_toolbar_dropdown_lclick_callback), + tool); + + GtkRequisition req; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(tool->m_item) )->size_request ) + (tool->m_item, &req ); + gtk_widget_set_size_request( dropdown, -1, req.height ); + + gtk_toolbar_insert_widget( + m_toolbar, + dropdown, + (const char *) NULL, + (const char *) NULL, + posGtk+1 + ); + } } break; @@ -491,9 +626,21 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) gtk_toolbar_insert_space( m_toolbar, posGtk ); // skip the rest - return TRUE; + return true; case wxTOOL_STYLE_CONTROL: +#if 1 + GtkWidget* align = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(align); + gtk_container_add((GtkContainer*)align, tool->GetControl()->m_widget); + gtk_toolbar_insert_widget( + m_toolbar, + align, + (const char *) NULL, + (const char *) NULL, + posGtk + ); +#else gtk_toolbar_insert_widget( m_toolbar, tool->GetControl()->m_widget, @@ -501,22 +648,20 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) (const char *) NULL, posGtk ); +#endif + // release reference obtained by wxInsertChildInToolBar + g_object_unref(tool->GetControl()->m_widget); break; } - GtkRequisition req; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); - m_width = req.width + m_xMargin; - m_height = req.height + 2*m_yMargin; InvalidateBestSize(); - 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 = wx_static_cast(wxToolBarTool*, toolBase); switch ( tool->GetStyle() ) { @@ -528,11 +673,13 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) gtk_widget_destroy( tool->m_item ); break; - //case wxTOOL_STYLE_SEPARATOR: -- nothing to do + case wxTOOL_STYLE_SEPARATOR: + gtk_toolbar_remove_space( m_toolbar, pos ); + break; } InvalidateBestSize(); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -541,7 +688,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); if (tool->m_item) { @@ -551,18 +698,18 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); GtkWidget *item = tool->m_item; if ( item && GTK_IS_TOGGLE_BUTTON(item) ) { - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); - m_blockEvent = TRUE; + m_blockEvent = true; - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(item), toggle ); - m_blockEvent = FALSE; + m_blockEvent = false; } } @@ -591,11 +738,6 @@ void wxToolBar::SetMargins( int x, int y ) 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 - m_xMargin = x; m_yMargin = y; } @@ -603,7 +745,7 @@ void wxToolBar::SetMargins( int x, int y ) void wxToolBar::SetToolSeparation( int separation ) { // FIXME: this function disappeared -#ifndef __WXGTK20__ +#if 0 gtk_toolbar_set_space_size( m_toolbar, separation ); #endif @@ -612,7 +754,7 @@ void wxToolBar::SetToolSeparation( int separation ) void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) { - wxToolBarTool *tool = (wxToolBarTool *)FindById(id); + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); if ( tool ) { @@ -622,12 +764,39 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) } } +void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap ) +{ + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); + if ( tool ) + { + wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools.")); + + tool->SetNormalBitmap(bitmap); + tool->SetImage(tool->GetBitmap()); + } +} + +void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap ) +{ + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); + if ( tool ) + { + wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools.")); + + tool->SetDisabledBitmap(bitmap); + tool->SetImage(tool->GetBitmap()); + } +} + // ---------------------------------------------------------------------------- // 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; @@ -679,15 +848,7 @@ void wxToolBar::OnInternalIdle() wxVisualAttributes wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { -#ifdef __WXGTK20__ return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new); -#else - wxVisualAttributes attr; - GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); - attr = GetDefaultAttributesFromGTKWidget(widget); - gtk_widget_destroy(widget); - return attr; -#endif } #endif // wxUSE_TOOLBAR_NATIVE