X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd69e87d2586726e57446d7208ceb8854bc74166..7b25d8e7bd0eca9f0f6efe62b3721d14c394dac9:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index c23fc6e6fb..46fecbc14a 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -2,612 +2,630 @@ // Name: tbargtk.cpp // Purpose: GTK toolbar // Author: Robert Roebling +// Modified: 13.12.99 by VZ to derive from wxToolBarBase // RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "tbargtk.h" +// ============================================================================ +// 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" + #include "wx/toolbar.h" -#if wxUSE_TOOLBAR +#if wxUSE_TOOLBAR_NATIVE #include "wx/frame.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +extern GdkFont *GtkGetDefaultGuiFont(); + +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- +// idle system extern void wxapp_install_idle_handler(); extern bool g_isIdle; -//----------------------------------------------------------------------------- // 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 +// ---------------------------------------------------------------------------- + +class wxToolBarTool : public wxToolBarToolBase +{ +public: + wxToolBarTool(wxToolBar *tbar, + int id, + const wxString& label, + const wxBitmap& bitmap1, + const wxBitmap& bitmap2, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelpString, + const wxString& longHelpString) + : wxToolBarToolBase(tbar, id, label, bitmap1, bitmap2, kind, + clientData, shortHelpString, longHelpString) + { + Init(); + } + + wxToolBarTool(wxToolBar *tbar, wxControl *control) + : wxToolBarToolBase(tbar, control) + { + Init(); + } + + // 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; + + 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 + 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__ + } + } + + GtkWidget *m_item; + GtkWidget *m_pixmap; + +protected: + void Init(); +}; + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) + +// ============================================================================ +// implementation +// ============================================================================ + //----------------------------------------------------------------------------- // "clicked" (internal from gtk_toolbar) //----------------------------------------------------------------------------- -static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) +static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), + wxToolBarTool *tool ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); - if (tool->m_owner->m_blockNextEvent) - { - tool->m_owner->m_blockNextEvent = FALSE; - return; - } + wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); + + if (tbar->m_blockEvent) return; if (g_blockEventsOnDrag) return; - if (!tool->m_enabled) return; - - if (tool->m_isToggle) - { - tool->m_toggleState = !tool->m_toggleState; - - if (tool->m_bitmap2.Ok()) - { - wxBitmap bitmap = tool->m_bitmap1; - if (tool->m_toggleState) bitmap = tool->m_bitmap2; - - GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap ); - - GdkBitmap *mask = (GdkBitmap *) NULL; - if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap(); - - gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); - } + if (!tool->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; + } } - tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); + if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() ) + { + // revert back + tool->Toggle(); + + tool->SetPixmap(tool->GetBitmap()); + } } //----------------------------------------------------------------------------- -// "enter_notify_event" +// "enter_notify_event" / "leave_notify_event" //----------------------------------------------------------------------------- -static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), - GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool ) +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 = tool->m_owner; - -#if (GTK_MINOR_VERSION == 0) - /* we grey-out the tip text of disabled tool in GTK 1.0 */ - if (tool->m_enabled) - { - if (tb->m_fg->red != 0) - { - tb->m_fg->red = 0; - tb->m_fg->green = 0; - tb->m_fg->blue = 0; - gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg ); - - gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); - } - } + + wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); + + // emit the event + if( gdk_event->type == GDK_ENTER_NOTIFY ) + tb->OnMouseEnter( tool->GetId() ); else - { - if (tb->m_fg->red == 0) - { - tb->m_fg->red = 33000; - tb->m_fg->green = 33000; - tb->m_fg->blue = 33000; - gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(tb->m_toolbar) ), tb->m_fg ); - gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); - } - } -#endif - - /* emit the event */ - - tb->OnMouseEnter( tool->m_index ); - + tb->OnMouseEnter( -1 ); + return FALSE; } //----------------------------------------------------------------------------- -// wxToolBar +// InsertChild callback for wxToolBar //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl) +static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), + wxWindow* WXUNUSED(child) ) +{ + // we don't do anything here +} + +// ---------------------------------------------------------------------------- +// wxToolBarTool +// ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxToolBar, wxControl) - EVT_IDLE(wxToolBar::OnIdle) -END_EVENT_TABLE() +void wxToolBarTool::Init() +{ + m_item = + m_pixmap = (GtkWidget *)NULL; +} -wxToolBar::wxToolBar() +wxToolBarToolBase *wxToolBar::CreateTool(int id, + const wxString& text, + const wxBitmap& bitmap1, + const wxBitmap& bitmap2, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelpString, + const wxString& longHelpString) { + return new wxToolBarTool(this, id, text, bitmap1, bitmap2, kind, + clientData, shortHelpString, longHelpString); } -wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) { - Create( parent, id, pos, size, style, name ); + return new wxToolBarTool(this, control); +} + +//----------------------------------------------------------------------------- +// wxToolBar construction +//----------------------------------------------------------------------------- + +void wxToolBar::Init() +{ + m_toolbar = (GtkToolbar *)NULL; + m_blockEvent = FALSE; + m_defaultWidth = 32; + m_defaultHeight = 32; } wxToolBar::~wxToolBar() { - delete m_fg; - delete m_bg; } -bool wxToolBar::Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +bool wxToolBar::Create( wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { m_needParent = TRUE; - m_blockNextEvent = FALSE; + m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar; - if (!PreCreation( parent, pos, size ) || - !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + if ( !PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxToolBar creation failed") ); - return FALSE; + + return FALSE; } - m_tools.DeleteContents( TRUE ); +#ifdef __WXGTK20__ + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); + GtkSetStyle(); - m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, - GTK_TOOLBAR_ICONS ) ); + // 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_separation = 5; - gtk_toolbar_set_space_size( m_toolbar, m_separation ); - m_hasToolAlready = FALSE; + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) ); +#endif + + SetToolSeparation(7); 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) ); - -#if (GTK_MINOR_VERSION > 0) + if (style & wxTB_FLAT) gtk_handle_box_set_shadow_type( GTK_HANDLE_BOX(m_widget), GTK_SHADOW_NONE ); -#endif } else - { - m_widget = GTK_WIDGET(m_toolbar); + { + m_widget = gtk_event_box_new(); + gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) ); + ConnectWidget( m_widget ); + gtk_widget_show(GTK_WIDGET(m_toolbar)); } - + gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); - -#if (GTK_MINOR_VERSION > 0) + + // 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 - m_fg = new GdkColor; - m_fg->red = 0; - m_fg->green = 0; - m_fg->blue = 0; - gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_fg ); - - m_bg = new GdkColor; - m_bg->red = 65535; - m_bg->green = 65535; - m_bg->blue = 50000; - gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg ); - -#if (GTK_MINOR_VERSION > 0) - gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips ); - - GtkStyle *g_style = - gtk_style_copy( - gtk_widget_get_style( - GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) ); - - g_style->bg[GTK_STATE_NORMAL] = *m_bg; - gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); -#else - gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg ); -#endif - - m_xMargin = 0; - m_yMargin = 0; - m_parent->DoAddChild( this ); - - PostCreation(); - Show( TRUE ); + PostCreation(size); return TRUE; } -bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown ) +void wxToolBar::GtkSetStyle() { - wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex ); - event.SetEventObject(this); - event.SetInt( toolIndex ); - event.SetExtraLong((long) toggleDown); - - GetEventHandler()->ProcessEvent(event); + GtkOrientation orient; + GtkToolbarStyle style; + GetGtkStyle(GetWindowStyle(), &orient, &style); - return TRUE; + gtk_toolbar_set_orientation(m_toolbar, orient); + gtk_toolbar_set_style(m_toolbar, style); } -void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) ) +void wxToolBar::SetWindowStyleFlag( long style ) { - wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex ); - event.SetEventObject( this ); - event.SetInt( toolIndex ); + wxToolBarBase::SetWindowStyleFlag(style); - GetEventHandler()->ProcessEvent(event); + if ( m_toolbar ) + GtkSetStyle(); } -void wxToolBar::OnMouseEnter( int toolIndex ) +bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { - wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() ); - event.SetEventObject(this); - event.SetInt( toolIndex ); - - GetEventHandler()->ProcessEvent(event); -} + wxToolBarTool *tool = (wxToolBarTool *)toolBase; -wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, - const wxBitmap& pushedBitmap, bool toggle, - wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData, - const wxString& helpString1, const wxString& helpString2 ) -{ - m_hasToolAlready = TRUE; - - wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL, - wxT("invalid bitmap for wxToolBar icon") ); - - wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, - wxT("wxToolBar doesn't support GdkBitmap") ); - - wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, - 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 ); +#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 - - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); - - wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, - toggle, clientData, - helpString1, helpString2, - tool_pixmap ); - - GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON - : GTK_TOOLBAR_CHILD_BUTTON; - - GtkWidget *item = gtk_toolbar_append_element - ( - GTK_TOOLBAR(m_toolbar), - ctype, - (GtkWidget *)NULL, - (const char *)NULL, - helpString1.mbc_str(), - "", - tool_pixmap, - (GtkSignalFunc)gtk_toolbar_callback, - (gpointer)tool - ); - - tool->m_item = item; - GtkRequisition req; - (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); - m_width = req.width; - m_height = req.height; + if ( tool->IsButton() ) + { + if ( !HasFlag(wxTB_NOICONS) ) + { + wxBitmap bitmap = tool->GetNormalBitmap(); - gtk_signal_connect( GTK_OBJECT(tool->m_item), - "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), - (gpointer)tool ); + wxCHECK_MSG( bitmap.Ok(), FALSE, + wxT("invalid bitmap for wxToolBar icon") ); - m_tools.Append( tool ); + wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE, + wxT("wxToolBar doesn't support GdkBitmap") ); - return tool; -} + wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE, + wxT("wxToolBar::Add needs a wxBitmap") ); -void wxToolBar::AddSeparator() -{ - gtk_toolbar_append_space( m_toolbar ); -} + GtkWidget *tool_pixmap = (GtkWidget *)NULL; -void wxToolBar::ClearTools() -{ - wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") ); -} -bool wxToolBar::Realize() -{ - m_x = 0; - m_y = 0; - m_width = 100; - m_height = 0; - - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_bitmap1.Ok()) - { - int tool_height = tool->m_bitmap1.GetHeight(); - if (tool_height > m_height) m_height = tool_height; - } - - node = node->Next(); - } - - m_height += 5 + 2*m_yMargin; - - return TRUE; -} +#ifdef __WXGTK20__ + tool_pixmap = gtk_image_new(); + tool->m_pixmap = tool_pixmap; + tool->SetPixmap(bitmap); +#else + GdkPixmap *pixmap = bitmap.GetPixmap(); -void wxToolBar::EnableTool(int toolIndex, bool enable) -{ - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - tool->m_enabled = enable; + GdkBitmap *mask = (GdkBitmap *)NULL; + if ( bitmap.GetMask() ) + mask = bitmap.GetMask()->GetBitmap(); -#if (GTK_MINOR_VERSION > 0) - /* we don't disable the tools for GTK 1.0 as the bitmaps don't get - greyed anyway and this also disables tooltips */ - if (tool->m_item) - gtk_widget_set_sensitive( tool->m_item, enable ); + tool_pixmap = gtk_pixmap_new( pixmap, mask ); + gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); #endif - - return; + + gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + + tool->m_pixmap = tool_pixmap; } - node = node->Next(); } - - wxFAIL_MSG( wxT("wrong toolbar index") ); -} -void wxToolBar::ToggleTool( int toolIndex, bool toggle ) -{ - wxNode *node = m_tools.First(); - while (node) + switch ( tool->GetStyle() ) { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item))) - { - tool->m_toggleState = toggle; - - if (tool->m_bitmap2.Ok()) - { - wxBitmap bitmap = tool->m_bitmap1; - if (tool->m_toggleState) bitmap = tool->m_bitmap2; - - GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap ); - - GdkBitmap *mask = (GdkBitmap *) NULL; - if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap(); - - gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); - } - - m_blockNextEvent = TRUE; // we cannot use gtk_signal_disconnect here - - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle ); - } - - return; - } - node = node->Next(); + 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 + { + 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 ) + { + // 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_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 ); + } + break; + + case wxTOOL_STYLE_SEPARATOR: + gtk_toolbar_insert_space( m_toolbar, posGtk ); + + // skip the rest + return TRUE; + + case wxTOOL_STYLE_CONTROL: + gtk_toolbar_insert_widget( + m_toolbar, + tool->GetControl()->m_widget, + (const char *) NULL, + (const char *) NULL, + posGtk + ); + break; } - - wxFAIL_MSG( wxT("wrong toolbar index") ); + + 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; } -wxObject *wxToolBar::GetToolClientData( int index ) const +bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) { - wxNode *node = m_tools.First(); - while (node) + wxToolBarTool *tool = (wxToolBarTool *)toolBase; + + switch ( tool->GetStyle() ) { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == index) return tool->m_clientData;; - node = node->Next(); + case wxTOOL_STYLE_CONTROL: + tool->GetControl()->Destroy(); + break; + + case wxTOOL_STYLE_BUTTON: + gtk_widget_destroy( tool->m_item ); + break; + + //case wxTOOL_STYLE_SEPARATOR: -- nothing to do } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return (wxObject*)NULL; + + InvalidateBestSize(); + return TRUE; } -bool wxToolBar::GetToolState(int toolIndex) const +// ---------------------------------------------------------------------------- +// wxToolBar tools state +// ---------------------------------------------------------------------------- + +void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { - wxNode *node = m_tools.First(); - while (node) + wxToolBarTool *tool = (wxToolBarTool *)toolBase; + + if (tool->m_item) { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) return tool->m_toggleState; - node = node->Next(); + gtk_widget_set_sensitive( tool->m_item, enable ); } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return FALSE; } -bool wxToolBar::GetToolEnabled(int toolIndex) const +void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { - wxNode *node = m_tools.First(); - while (node) + wxToolBarTool *tool = (wxToolBarTool *)toolBase; + + GtkWidget *item = tool->m_item; + if ( item && GTK_IS_TOGGLE_BUTTON(item) ) { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) return tool->m_enabled; - node = node->Next(); + tool->SetPixmap(tool->GetBitmap()); + + m_blockEvent = TRUE; + + gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); + + m_blockEvent = FALSE; } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return FALSE; } -void wxToolBar::SetMargins( int x, int y ) +void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool), + bool WXUNUSED(toggle)) { - wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") ); - - if (x > 2) gtk_toolbar_append_space( m_toolbar ); // oh well - - m_xMargin = x; - m_yMargin = y; + // VZ: absolutely no idea about how to do it + wxFAIL_MSG( _T("not implemented") ); } -void wxToolBar::SetToolPacking( int WXUNUSED(packing) ) -{ - wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") ); -} +// ---------------------------------------------------------------------------- +// wxToolBar geometry +// ---------------------------------------------------------------------------- -void wxToolBar::SetToolSeparation( int separation ) +wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x), + wxCoord WXUNUSED(y)) const { - gtk_toolbar_set_space_size( m_toolbar, separation ); - m_separation = separation; -} + // VZ: GTK+ doesn't seem to have such thing + wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") ); -int wxToolBar::GetToolPacking() -{ - return 0; + return (wxToolBarToolBase *)NULL; } -int wxToolBar::GetToolSeparation() +void wxToolBar::SetMargins( int x, int y ) { - return m_separation; -} + wxCHECK_RET( GetToolsCount() == 0, + wxT("wxToolBar::SetMargins must be called before adding tools.") ); -wxString wxToolBar::GetToolLongHelp(int toolIndex) -{ - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - return tool->m_longHelpString; - } - node = node->Next(); - } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return wxT(""); -} +#ifndef __WXGTK20__ + if (x > 1) + gtk_toolbar_append_space( m_toolbar ); // oh well +#endif -wxString wxToolBar::GetToolShortHelp(int toolIndex) -{ - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - return tool->m_shortHelpString; - } - node = node->Next(); - } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return wxT(""); + m_xMargin = x; + m_yMargin = y; } -void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) +void wxToolBar::SetToolSeparation( int separation ) { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - tool->m_longHelpString = helpString; - return; - } - node = node->Next(); - } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return; -} + // FIXME: this function disappeared +#ifndef __WXGTK20__ + gtk_toolbar_set_space_size( m_toolbar, separation ); +#endif -void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString) -{ - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - tool->m_shortHelpString = helpString; - return; - } - node = node->Next(); - } - - wxFAIL_MSG( wxT("wrong toolbar index") ); - - return; + m_toolSeparation = separation; } -void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) ) +void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) { - wxEvtHandler* evtHandler = GetEventHandler(); + wxToolBarTool *tool = (wxToolBarTool *)FindById(id); - wxNode* node = m_tools.First(); - while (node) + if ( tool ) { - wxToolBarTool* tool = (wxToolBarTool*) node->Data(); - - wxUpdateUIEvent event( tool->m_index ); - event.SetEventObject(this); - - if (evtHandler->ProcessEvent( event )) - { - if (event.GetSetEnabled()) - EnableTool(tool->m_index, event.GetEnabled()); - if (event.GetSetChecked()) - ToggleTool(tool->m_index, event.GetChecked()); -/* - if (event.GetSetText()) - // Set tooltip? -*/ - } - - node = node->Next(); + (void)tool->SetShortHelp(helpString); + gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item, + wxGTK_CONV( helpString ), ""); } } +// ---------------------------------------------------------------------------- +// wxToolBar idle handling +// ---------------------------------------------------------------------------- + void wxToolBar::OnInternalIdle() { wxCursor cursor = m_cursor; @@ -616,35 +634,60 @@ void wxToolBar::OnInternalIdle() if (cursor.Ok()) { /* I now set the cursor the anew in every OnInternalIdle call - as setting the cursor in a parent window also effects the - windows above so that checking for the current cursor is - not possible. */ - - if (HasFlag(wxTB_DOCKABLE)) - { - /* if the toolbar is dockable, then m_widget stands for the - GtkHandleBox widget, which uses its own window so that we - can set the cursor for it. if the toolbar is not dockable, - m_widget comes from m_toolbar which uses its parent's - window ("windowless windows") and thus we cannot set the - cursor. */ - gdk_window_set_cursor( m_widget->window, cursor.GetCursor() ); - } - - wxNode *node = m_tools.First(); - while (node) + as setting the cursor in a parent window also effects the + windows above so that checking for the current cursor is + not possible. */ + + if (HasFlag(wxTB_DOCKABLE) && (m_widget->window)) + { + /* if the toolbar is dockable, then m_widget stands for the + GtkHandleBox widget, which uses its own window so that we + can set the cursor for it. if the toolbar is not dockable, + m_widget comes from m_toolbar which uses its parent's + window ("windowless windows") and thus we cannot set the + cursor. */ + gdk_window_set_cursor( m_widget->window, cursor.GetCursor() ); + } + + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + while ( node ) { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (!tool->m_item->window) - break; - else - gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() ); - - node = node->Next(); + wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); + node = node->GetNext(); + + GtkWidget *item = tool->m_item; + if ( item ) + { + GdkWindow *window = item->window; + + if ( window ) + { + gdk_window_set_cursor( window, cursor.GetCursor() ); + } + } } } - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } + +// ---------------------------------------------------------------------------- + +// static +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