X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03f38c58fdd36b1e951dfed81b245a7337bbc3b4..e564aa153eb1dc5ebd9f8c9f5f055c2a49c15b05:/src/gtk1/tbargtk.cpp diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 29c954eca5..ffd6c88c60 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -2,360 +2,559 @@ // Name: tbargtk.cpp // Purpose: GTK toolbar // Author: Robert Roebling -// Modified by: -// Created: 01/02/97 -// RCS-ID: +// Modified: 13.12.99 by VZ to derive from wxToolBarBase +// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "tbargtk.h" + #pragma implementation "tbargtk.h" #endif #include "wx/toolbar.h" -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- +#if wxUSE_TOOLBAR_NATIVE -extern bool g_blockEventsOnDrag; +#include "wx/frame.h" -//----------------------------------------------------------------------------- -// wxToolBarTool -//----------------------------------------------------------------------------- +#include +#include "wx/gtk/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject) +extern GdkFont *GtkGetDefaultGuiFont(); -wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex, - const wxBitmap& bitmap1, const wxBitmap& bitmap2, - bool toggle, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString, - GtkWidget *item ) -{ - m_owner = owner; - m_index = theIndex; - m_bitmap1 = bitmap1; - m_bitmap2 = bitmap2; - m_isToggle = toggle; - m_enabled = TRUE; - m_toggleState = FALSE; - m_shortHelpString = shortHelpString; - m_longHelpString = longHelpString; - m_isMenuCommand = TRUE; - m_clientData = clientData; - m_deleteSecondBitmap = FALSE; - m_item = item; -} +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +// idle system +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + +// data +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; + +// ---------------------------------------------------------------------------- +// wxToolBarTool +// ---------------------------------------------------------------------------- -wxToolBarTool::~wxToolBarTool() +class wxToolBarTool : public wxToolBarToolBase { -} +public: + wxToolBarTool(wxToolBar *tbar, + int id, + const wxBitmap& bitmap1, + const wxBitmap& bitmap2, + bool toggle, + wxObject *clientData, + const wxString& shortHelpString, + const wxString& longHelpString) + : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle, + clientData, shortHelpString, longHelpString) + { + Init(); + } + + wxToolBarTool(wxToolBar *tbar, wxControl *control) + : wxToolBarToolBase(tbar, control) + { + Init(); + } + + GtkWidget *m_item; + GtkWidget *m_pixmap; + +protected: + void Init(); +}; + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) + +// ============================================================================ +// 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_blockEventsOnDrag) return; - if (!tool->m_enabled) return; + if (g_isIdle) + wxapp_install_idle_handler(); + + wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); + + if (tbar->m_blockEvent) return; + + if (g_blockEventsOnDrag) return; + if (!tool->IsEnabled()) return; + + if (tool->CanBeToggled()) + { + tool->Toggle(); + + wxBitmap bitmap = tool->GetBitmap(); + if ( bitmap.Ok() ) + { + GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap ); - if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; + GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() + : (GdkBitmap *)NULL; - tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); + gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); + } + } + + tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ); } //----------------------------------------------------------------------------- -// "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_blockEventsOnDrag) return TRUE; - - tool->m_owner->OnMouseEnter( tool->m_index ); + if (g_isIdle) wxapp_install_idle_handler(); + + if (g_blockEventsOnDrag) return TRUE; + + wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); + + // emit the event + if( gdk_event->type == GDK_ENTER_NOTIFY ) + tb->OnMouseEnter( tool->GetId() ); + else + tb->OnMouseEnter( -1 ); - return FALSE; + 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 +// ---------------------------------------------------------------------------- + +void wxToolBarTool::Init() +{ + m_item = + m_pixmap = (GtkWidget *)NULL; +} + +wxToolBarToolBase *wxToolBar::CreateTool(int id, + const wxBitmap& bitmap1, + const wxBitmap& bitmap2, + bool toggle, + wxObject *clientData, + const wxString& shortHelpString, + const wxString& longHelpString) +{ + return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle, + clientData, shortHelpString, longHelpString); +} -wxToolBar::wxToolBar() +wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) { + return new wxToolBarTool(this, control); } -wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +//----------------------------------------------------------------------------- +// wxToolBar construction +//----------------------------------------------------------------------------- + +void wxToolBar::Init() { - Create( parent, id, pos, size, style, name ); + m_fg = + m_bg = (GdkColor *)NULL; + m_toolbar = (GtkToolbar *)NULL; + m_blockEvent = FALSE; } 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_needParent = TRUE; + m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar; - PreCreation( parent, id, pos, size, style, name ); + if ( !PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxToolBar creation failed") ); - m_tools.DeleteContents( TRUE ); + return FALSE; + } - m_widget = gtk_handle_box_new(); + GtkOrientation orient = style & wxTB_VERTICAL ? GTK_ORIENTATION_VERTICAL + : GTK_ORIENTATION_HORIZONTAL; - m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS ) ); - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); +#ifdef __WXGTK20__ + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); + gtk_toolbar_set_orientation(m_toolbar, orient); + gtk_toolbar_set_style(m_toolbar, GTK_TOOLBAR_ICONS); +#else + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( orient, GTK_TOOLBAR_ICONS ) ); +#endif - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) ); + SetToolSeparation(7); - gtk_widget_show( GTK_WIDGET(m_toolbar) ); + 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) ); - PostCreation(); + 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); + } - Show( TRUE ); + gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); - return 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 -bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown ) -{ - wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex ); - event.SetEventObject(this); - event.SetInt( toolIndex ); - event.SetExtraLong((long) toggleDown); - GetEventHandler()->ProcessEvent(event); + 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 ); - return TRUE; -} + GtkStyle *g_style = + gtk_style_copy( + gtk_widget_get_style( + GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) ); -void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) ) -{ - wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex ); - event.SetEventObject( this ); - event.SetInt( toolIndex ); + g_style->bg[GTK_STATE_NORMAL] = *m_bg; - GetEventHandler()->ProcessEvent(event); -} + SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont()); -void wxToolBar::OnMouseEnter( int toolIndex ) -{ - wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() ); - event.SetEventObject(this); - event.SetInt( toolIndex ); - - GetEventHandler()->ProcessEvent(event); -} + gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); -wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, - const wxBitmap& pushedBitmap, bool toggle, - float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData, - const wxString& helpString1, const wxString& helpString2 ) -{ - wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL, - "invalid bitmap for wxToolBar icon" ); + m_parent->DoAddChild( this ); - wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, - toggle, clientData, - helpString1, helpString2 ); + PostCreation(); - wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, - "wxToolBar doesn't support GdkBitmap" ); + Show( TRUE ); - wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, - "wxToolBar::Add needs a wxBitmap" ); - - GtkWidget *tool_pixmap = (GtkWidget *) NULL; - - if (TRUE) // FIXME huh? - { - GdkPixmap *pixmap = bitmap.GetPixmap(); + return TRUE; +} + +bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) +{ + wxToolBarTool *tool = (wxToolBarTool *)toolBase; - GdkBitmap *mask = (GdkBitmap *) NULL; - if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap(); + // we have inserted a space before all the tools + if (m_xMargin > 1) pos++; - tool_pixmap = gtk_pixmap_new( pixmap, mask ); - } - - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); - -#if 0 - GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON - : GTK_TOOLBAR_CHILD_BUTTON; - - tool->m_item = gtk_toolbar_append_element - ( - GTK_TOOLBAR(m_toolbar), - ctype, - (GtkWidget *)NULL, - (const char *)NULL, - helpString1, - "", - tool_pixmap, - (GtkSignalFunc)gtk_toolbar_callback, - (gpointer)tool - ); - - gtk_signal_connect( GTK_OBJECT(tool->m_item), - "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), - (gpointer)tool ); -#else - tool->m_item = gtk_toolbar_append_item - ( - GTK_TOOLBAR(m_toolbar), - (const char *)NULL, - helpString1, - "", - tool_pixmap, - (GtkSignalFunc)gtk_toolbar_callback, - (gpointer)tool - ); + if ( tool->IsButton() ) + { + 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 ); - m_tools.Append( tool ); + tool->m_pixmap = tool_pixmap; + } - return tool; -} + 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 ) + { + 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, pos ); + + // 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, + pos + ); + break; + } -void wxToolBar::AddSeparator() -{ - gtk_toolbar_append_space( m_toolbar ); -} + 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; -void wxToolBar::ClearTools() -{ - wxFAIL_MSG( "wxToolBar::ClearTools not implemented" ); + return TRUE; } -void wxToolBar::Realize() +bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) { - 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()) + wxToolBarTool *tool = (wxToolBarTool *)toolBase; + + switch ( tool->GetStyle() ) { - int tool_height = tool->m_bitmap1.GetHeight(); - if (tool_height > m_height) m_height = tool_height; + 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 } - - node = node->Next(); - } - - m_height += 10; + + return TRUE; } -void wxToolBar::EnableTool(int toolIndex, bool enable) +// ---------------------------------------------------------------------------- +// wxToolBar tools state +// ---------------------------------------------------------------------------- + +void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - tool->m_enabled = enable; - return; - } - node = node->Next(); - } - - wxFAIL_MSG( "wrong toolbar index" ); +#if (GTK_MINOR_VERSION > 0) + wxToolBarTool *tool = (wxToolBarTool *)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 } -void wxToolBar::ToggleTool( int toolIndex, bool toggle ) +void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) - { - tool->m_toggleState = toggle; - if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item))) - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle ); - return; + wxToolBarTool *tool = (wxToolBarTool *)toolBase; + + GtkWidget *item = tool->m_item; + if ( item && GTK_IS_TOGGLE_BUTTON(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 ); + } + + m_blockEvent = TRUE; + + gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); + + m_blockEvent = FALSE; } - node = node->Next(); - } - - wxFAIL_MSG( "wrong toolbar index" ); } -wxObject *wxToolBar::GetToolClientData( int index ) const +void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool), + bool WXUNUSED(toggle)) { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == index) return tool->m_clientData;; - node = node->Next(); - } - - wxFAIL_MSG( "wrong toolbar index" ); - - return (wxObject*)NULL; + // VZ: absolutely no idea about how to do it + wxFAIL_MSG( _T("not implemented") ); } -bool wxToolBar::GetToolState(int toolIndex) const +// ---------------------------------------------------------------------------- +// wxToolBar geometry +// ---------------------------------------------------------------------------- + +wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x), + wxCoord WXUNUSED(y)) const { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) return tool->m_toggleState; - node = node->Next(); - } - - wxFAIL_MSG( "wrong toolbar index" ); - - return FALSE; + // VZ: GTK+ doesn't seem to have such thing + wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") ); + + return (wxToolBarToolBase *)NULL; } -bool wxToolBar::GetToolEnabled(int toolIndex) const +void wxToolBar::SetMargins( int x, int y ) { - wxNode *node = m_tools.First(); - while (node) - { - wxToolBarTool *tool = (wxToolBarTool*)node->Data(); - if (tool->m_index == toolIndex) return tool->m_enabled; - node = node->Next(); - } - - wxFAIL_MSG( "wrong toolbar index" ); - - return FALSE; + 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; } -void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) ) +void wxToolBar::SetToolSeparation( int separation ) { - wxFAIL_MSG( "wxToolBar::SetMargins not implemented" ); + // FIXME: this function disappeared +#ifndef __WXGTK20__ + gtk_toolbar_set_space_size( m_toolbar, separation ); +#endif + + m_toolSeparation = separation; } -void wxToolBar::SetToolPacking( int WXUNUSED(packing) ) +void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) { - wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" ); + wxToolBarTool *tool = (wxToolBarTool *)FindById(id); + + if ( tool ) + { + (void)tool->SetShortHelp(helpString); + gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item, + helpString.mbc_str(), ""); + } } -void wxToolBar::SetToolSeparation( int separation ) +// ---------------------------------------------------------------------------- +// wxToolBar idle handling +// ---------------------------------------------------------------------------- + +void wxToolBar::OnInternalIdle() { - gtk_toolbar_set_space_size( m_toolbar, separation ); + wxCursor cursor = m_cursor; + if (g_globalCursor.Ok()) cursor = g_globalCursor; + + if (cursor.Ok()) + { + /* I now set the cursor the anew in every OnInternalIdle call + as setting the cursor in a parent window also effects the + windows above so that checking for the current cursor is + not possible. */ + + 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::Node *node = m_tools.GetFirst(); + while ( node ) + { + 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(); } +#endif // wxUSE_TOOLBAR_NATIVE