/////////////////////////////////////////////////////////////////////////////
-// Name: tbargtk.cpp
+// Name: src/gtk/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"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TOOLBAR_NATIVE
#include "wx/toolbar.h"
-#include "wx/frame.h"
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+ #include "wx/frame.h"
+#endif
+
+// 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.
+#include <gtk/gtkversion.h>
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
+
+#include "wx/gtk/private.h"
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
// 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
+ : (
+ style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
+ 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 SetImage(const wxBitmap& bitmap)
+ {
+ if (bitmap.Ok())
+ {
+ // 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_image;
+
+protected:
+ void Init();
+};
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
-extern bool g_blockEventsOnDrag;
+// ============================================================================
+// implementation
+// ============================================================================
//-----------------------------------------------------------------------------
// "clicked" (internal from gtk_toolbar)
//-----------------------------------------------------------------------------
-static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
+extern "C" {
+static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
+ wxToolBarTool *tool )
{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ wxToolBar *tbar = (wxToolBar *)tool->GetToolBar();
+
+ if (tbar->m_blockEvent) return;
+
if (g_blockEventsOnDrag) return;
- if (!tool->m_enabled) return;
+ if (!tool->IsEnabled()) return;
+
+ if (tool->CanBeToggled())
+ {
+ tool->Toggle();
+
+ tool->SetImage(tool->GetBitmap());
- if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
+ if ( tool->IsRadio() && !tool->IsToggled() )
+ {
+ // radio button went up, don't report this as a wxWin event
+ return;
+ }
+ }
+
+ if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() )
+ {
+ // revert back
+ tool->Toggle();
- tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
+ tool->SetImage(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 )
+extern "C" {
+static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
+ GdkEventCrossing *gdk_event,
+ wxToolBarTool *tool )
{
+ // don't need to install idle handler, its done from "event" signal
+
if (g_blockEventsOnDrag) return TRUE;
-
- /* we grey-out the tip text of disabled tool */
-
- wxToolBar *tb = tool->m_owner;
-
- 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 );
- }
- }
-
- /* 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
+// ----------------------------------------------------------------------------
+
+void wxToolBarTool::Init()
+{
+ m_item =
+ m_image = 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_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_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL,
- GTK_TOOLBAR_ICONS ) );
+ m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
+ GtkSetStyle();
- m_separation = 5;
- gtk_toolbar_set_space_size( m_toolbar, m_separation );
- m_hasToolAlready = FALSE;
+ // 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);
+
+ 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) );
+ gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
+ gtk_widget_show( GTK_WIDGET(m_toolbar) );
+
+ 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);
- }
-
- gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
-
- 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 );
-
- gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg );
-
- m_xMargin = 0;
- m_yMargin = 0;
-
- m_parent->AddChild( this );
-
- (m_parent->m_insertCallback)( m_parent, this );
-
- PostCreation();
-
- Show( TRUE );
-
- return TRUE;
-}
-
-bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
-{
- wxCommandEvent event( wxEVT_COMMAND_TOOL_CLICKED, toolIndex );
- event.SetEventObject(this);
- event.SetInt( toolIndex );
- event.SetExtraLong((long) toggleDown);
-
- // First try sending the command to a window that has the focus, within a frame that
- // also contains this toolbar.
- wxFrame* frame = (wxFrame*) NULL;
- wxWindow* win = this;
- wxWindow* focusWin = (wxWindow*) NULL;
-
- while (win)
{
- if (win->IsKindOf(CLASSINFO(wxFrame)))
- {
- frame = (wxFrame*) win;
- break;
- }
- else
- win = win->GetParent();
+ 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));
}
- if (frame)
- focusWin = wxFindFocusDescendant(frame);
-
- if (focusWin && focusWin->GetEventHandler()->ProcessEvent(event))
- return TRUE;
- GetEventHandler()->ProcessEvent(event);
+ // FIXME: there is no such function for toolbars in 2.0
+#if 0
+ if (style & wxTB_FLAT)
+ gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
+#endif
- return TRUE;
-}
+ m_parent->DoAddChild( this );
-void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
-{
- wxCommandEvent event( wxEVT_COMMAND_TOOL_RCLICKED, toolIndex );
- event.SetEventObject( this );
- event.SetInt( toolIndex );
+ PostCreation(size);
- GetEventHandler()->ProcessEvent(event);
+ return true;
}
-void wxToolBar::OnMouseEnter( int toolIndex )
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const
{
- wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
- event.SetEventObject(this);
- event.SetInt( toolIndex );
-
- GetEventHandler()->ProcessEvent(event);
+ return GTK_WIDGET(m_toolbar)->window;
}
-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 )
+void wxToolBar::GtkSetStyle()
{
- m_hasToolAlready = TRUE;
-
- wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
- "invalid bitmap for wxToolBar icon" );
-
- wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
- "wxToolBar doesn't support GdkBitmap" );
-
- wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
- "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 );
-
- 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,
- "",
- tool_pixmap,
- (GtkSignalFunc)gtk_toolbar_callback,
- (gpointer)tool
- );
-
- tool->m_item = item;
-
- gtk_signal_connect( GTK_OBJECT(tool->m_item),
- "enter_notify_event",
- GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback),
- (gpointer)tool );
-
- m_tools.Append( tool );
-
- return tool;
-}
+ GtkOrientation orient;
+ GtkToolbarStyle style;
+ GetGtkStyle(GetWindowStyle(), &orient, &style);
-void wxToolBar::AddSeparator()
-{
- gtk_toolbar_append_space( m_toolbar );
+ 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::ClearTools()
+void wxToolBar::SetWindowStyleFlag( long style )
{
- wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
+ wxToolBarBase::SetWindowStyleFlag(style);
+
+ if ( m_toolbar )
+ GtkSetStyle();
}
-bool wxToolBar::Realize()
+bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
{
- m_x = 0;
- m_y = 0;
- m_width = 100;
- m_height = 0;
-
- wxNode *node = m_tools.First();
- while (node)
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+
+ if ( tool->IsButton() )
{
- wxToolBarTool *tool = (wxToolBarTool*)node->Data();
- if (tool->m_bitmap1.Ok())
+ if ( !HasFlag(wxTB_NOICONS) )
{
- int tool_height = tool->m_bitmap1.GetHeight();
- if (tool_height > m_height) m_height = tool_height;
+ wxBitmap bitmap = tool->GetNormalBitmap();
+
+ wxCHECK_MSG( bitmap.Ok(), false,
+ wxT("invalid bitmap for wxToolBar icon") );
+
+ tool->m_image = gtk_image_new();
+ tool->SetImage(bitmap);
+
+ gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5);
}
-
- node = node->Next();
}
-
- m_height += 5 + 2*m_yMargin;
-
- return TRUE;
-}
-void wxToolBar::EnableTool(int toolIndex, bool enable)
-{
- wxNode *node = m_tools.First();
- while (node)
+ const int posGtk = int(pos);
+
+ switch ( tool->GetStyle() )
{
- wxToolBarTool *tool = (wxToolBarTool*)node->Data();
- if (tool->m_index == toolIndex)
- {
- tool->m_enabled = enable;
-
-/* we don't disable the tools for now 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 );
-*/
-
- 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 *toolNext = (wxToolBarTool *)node->GetData();
+ if ( !toolNext->IsRadio() )
+ break;
+
+ widget = toolNext->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_image,
+ (GtkSignalFunc)gtk_toolbar_callback,
+ (gpointer)tool,
+ posGtk
+ );
+
+ wxCHECK_MSG(tool->m_item != NULL, false, _T("gtk_toolbar_insert_element() failed"));
+
+ 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);
+ }
+ 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( "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;
}
-void wxToolBar::ToggleTool( int toolIndex, bool toggle )
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
{
- wxNode *node = m_tools.First();
- while (node)
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+
+ switch ( tool->GetStyle() )
{
- 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;
- }
- 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:
+ gtk_toolbar_remove_space( m_toolbar, pos );
+ break;
}
-
- wxFAIL_MSG( "wrong toolbar index" );
+
+ InvalidateBestSize();
+ return true;
}
-wxObject *wxToolBar::GetToolClientData( int index ) const
+// ----------------------------------------------------------------------------
+// wxToolBar tools state
+// ----------------------------------------------------------------------------
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
{
- wxNode *node = m_tools.First();
- while (node)
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+
+ if (tool->m_item)
{
- wxToolBarTool *tool = (wxToolBarTool*)node->Data();
- if (tool->m_index == index) return tool->m_clientData;;
- node = node->Next();
+ gtk_widget_set_sensitive( tool->m_item, enable );
}
-
- wxFAIL_MSG( "wrong toolbar index" );
-
- return (wxObject*)NULL;
}
-bool wxToolBar::GetToolState(int toolIndex) const
+void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
{
- wxNode *node = m_tools.First();
- while (node)
+ wxToolBarTool* tool = wx_static_cast(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_toggleState;
- node = node->Next();
+ tool->SetImage(tool->GetBitmap());
+
+ m_blockEvent = true;
+
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(item), toggle );
+
+ m_blockEvent = false;
}
-
- wxFAIL_MSG( "wrong toolbar index" );
-
- return FALSE;
}
-bool wxToolBar::GetToolEnabled(int toolIndex) 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 == toolIndex) return tool->m_enabled;
- node = node->Next();
- }
-
- wxFAIL_MSG( "wrong toolbar index" );
-
- return FALSE;
+ // VZ: absolutely no idea about how to do it
+ wxFAIL_MSG( _T("not implemented") );
}
-void wxToolBar::SetMargins( int x, int y )
+// ----------------------------------------------------------------------------
+// wxToolBar geometry
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
+ wxCoord WXUNUSED(y)) const
{
- wxCHECK_RET( !m_hasToolAlready, "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: GTK+ doesn't seem to have such thing
+ wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
+
+ return (wxToolBarToolBase *)NULL;
}
-void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
+void wxToolBar::SetMargins( int x, int y )
{
- wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" );
+ wxCHECK_RET( GetToolsCount() == 0,
+ wxT("wxToolBar::SetMargins must be called before adding tools.") );
+
+ m_xMargin = x;
+ m_yMargin = y;
}
void wxToolBar::SetToolSeparation( int separation )
{
+ // FIXME: this function disappeared
+#if 0
gtk_toolbar_set_space_size( m_toolbar, separation );
- m_separation = separation;
-}
+#endif
-int wxToolBar::GetToolPacking()
-{
- return 0;
+ m_toolSeparation = separation;
}
-int wxToolBar::GetToolSeparation()
+void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
{
- return m_separation;
-}
+ wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
-wxString wxToolBar::GetToolLongHelp(int toolIndex)
-{
- wxNode *node = m_tools.First();
- while (node)
+ if ( tool )
{
- wxToolBarTool *tool = (wxToolBarTool*)node->Data();
- if (tool->m_index == toolIndex)
- {
- return tool->m_longHelpString;
- }
- node = node->Next();
+ (void)tool->SetShortHelp(helpString);
+ gtk_tooltips_set_tip(m_toolbar->tooltips, tool->m_item,
+ wxGTK_CONV( helpString ), "");
}
-
- wxFAIL_MSG( "wrong toolbar index" );
-
- return "";
}
-wxString wxToolBar::GetToolShortHelp(int toolIndex)
+// ----------------------------------------------------------------------------
+// wxToolBar idle handling
+// ----------------------------------------------------------------------------
+
+void wxToolBar::OnInternalIdle()
{
- 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( "wrong toolbar index" );
+ // Check if we have to show window now
+ if (GtkShowFromOnIdle()) return;
- return "";
-}
+ wxCursor cursor = m_cursor;
+ if (g_globalCursor.Ok()) cursor = g_globalCursor;
-void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
-{
- wxNode *node = m_tools.First();
- while (node)
+ if (cursor.Ok())
{
- wxToolBarTool *tool = (wxToolBarTool*)node->Data();
- if (tool->m_index == toolIndex)
- {
- tool->m_longHelpString = helpString;
- return;
+ /* 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() );
}
- node = node->Next();
- }
-
- wxFAIL_MSG( "wrong toolbar index" );
-
- return;
-}
-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;
+ wxToolBarToolsList::compatibility_iterator 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() );
+ }
+ }
}
- node = node->Next();
}
-
- wxFAIL_MSG( "wrong toolbar index" );
-
- return;
+
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
+}
+
+#endif // wxUSE_TOOLBAR_NATIVE
projects / wxWidgets.git / blobdiff