X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b1c162e227574deaa255bd66f6c14d10be870f2..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index df1b967d1d..9ee4df2deb 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -13,48 +13,27 @@ #include "wx/toolbar.h" +#if wxUSE_TOOLBAR + +#include "wx/frame.h" + #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" //----------------------------------------------------------------------------- -// data +// idle system //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- -// wxToolBarTool +// data //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject) - -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; -} - -wxToolBarTool::~wxToolBarTool() -{ -} +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; //----------------------------------------------------------------------------- // "clicked" (internal from gtk_toolbar) @@ -62,10 +41,35 @@ wxToolBarTool::~wxToolBarTool() static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { + if (g_isIdle) + wxapp_install_idle_handler(); + + if (tool->m_owner->m_blockNextEvent) + { + tool->m_owner->m_blockNextEvent = FALSE; + return; + } + if (g_blockEventsOnDrag) return; if (!tool->m_enabled) return; - if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; + 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 ); + } + } tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); } @@ -77,19 +81,66 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *WXUNUSED(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 ); + } + } + 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 */ - tool->m_owner->OnMouseEnter( tool->m_index ); + tb->OnMouseEnter( tool->m_index ); return FALSE; } +//----------------------------------------------------------------------------- +// InsertChild callback for wxToolBar +//----------------------------------------------------------------------------- + +static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) +{ + /* we don't do anything here but pray */ +} + //----------------------------------------------------------------------------- // wxToolBar //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl) +BEGIN_EVENT_TABLE(wxToolBar, wxControl) + EVT_IDLE(wxToolBar::OnIdle) +END_EVENT_TABLE() + wxToolBar::wxToolBar() { } @@ -112,8 +163,15 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, long style, const wxString& name ) { m_needParent = TRUE; + m_blockNextEvent = FALSE; + 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") ); + return FALSE; + } m_tools.DeleteContents( TRUE ); @@ -123,10 +181,29 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_separation = 5; gtk_toolbar_set_space_size( m_toolbar, m_separation ); m_hasToolAlready = FALSE; - - m_widget = 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) ); + +#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); + } + gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); + +#if (GTK_MINOR_VERSION > 0) + 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; @@ -140,14 +217,24 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, 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->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -188,19 +275,19 @@ void wxToolBar::OnMouseEnter( int toolIndex ) wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap, bool toggle, - float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData, + wxCoord WXUNUSED(xPos), wxCoord WXUNUSED(yPos), wxObject *clientData, const wxString& helpString1, const wxString& helpString2 ) { m_hasToolAlready = TRUE; wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL, - "invalid bitmap for wxToolBar icon" ); + wxT("invalid bitmap for wxToolBar icon") ); wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, - "wxToolBar doesn't support GdkBitmap" ); + wxT("wxToolBar doesn't support GdkBitmap") ); wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, - "wxToolBar::Add needs a wxBitmap" ); + wxT("wxToolBar::Add needs a wxBitmap") ); GtkWidget *tool_pixmap = (GtkWidget *)NULL; @@ -211,24 +298,27 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, 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 ); wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle, clientData, helpString1, helpString2, - tool_pixmap ); + tool_pixmap ); GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON : GTK_TOOLBAR_CHILD_BUTTON; GtkWidget *item = gtk_toolbar_append_element ( - GTK_TOOLBAR(m_toolbar), + m_toolbar, ctype, (GtkWidget *)NULL, (const char *)NULL, - helpString1, + helpString1.mbc_str(), "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, @@ -237,6 +327,11 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, 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; + gtk_signal_connect( GTK_OBJECT(tool->m_item), "enter_notify_event", GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), @@ -247,6 +342,29 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, return tool; } +bool wxToolBar::AddControl(wxControl *control) +{ + wxCHECK_MSG( control, FALSE, wxT("toolbar: can't insert NULL control") ); + + wxCHECK_MSG( control->GetParent() == this, FALSE, + wxT("control must have toolbar as parent") ); + + m_hasToolAlready = TRUE; + + wxToolBarTool *tool = new wxToolBarTool(control); + + gtk_toolbar_append_widget( m_toolbar, control->m_widget, (const char *) NULL, (const char *) NULL ); + + GtkRequisition req; + (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req ); + m_width = req.width; + m_height = req.height; + + m_tools.Append( tool ); + + return TRUE; +} + void wxToolBar::AddSeparator() { gtk_toolbar_append_space( m_toolbar ); @@ -254,7 +372,7 @@ void wxToolBar::AddSeparator() void wxToolBar::ClearTools() { - wxFAIL_MSG( "wxToolBar::ClearTools not implemented" ); + wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") ); } bool wxToolBar::Realize() @@ -291,16 +409,20 @@ void wxToolBar::EnableTool(int toolIndex, bool enable) if (tool->m_index == toolIndex) { tool->m_enabled = enable; - - if (tool->m_item) - gtk_widget_set_sensitive( tool->m_item, enable ); - + +#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 ); +#endif + return; } node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); } void wxToolBar::ToggleTool( int toolIndex, bool toggle ) @@ -311,15 +433,34 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle ) 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))) + { + 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(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); } wxObject *wxToolBar::GetToolClientData( int index ) const @@ -332,7 +473,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return (wxObject*)NULL; } @@ -347,7 +488,7 @@ bool wxToolBar::GetToolState(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return FALSE; } @@ -362,14 +503,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return FALSE; } void wxToolBar::SetMargins( int x, int y ) { - wxCHECK_RET( !m_hasToolAlready, "wxToolBar::SetMargins must be called before adding tool." ); + wxCHECK_RET( !m_hasToolAlready, wxT("wxToolBar::SetMargins must be called before adding tool.") ); if (x > 2) gtk_toolbar_append_space( m_toolbar ); // oh well @@ -379,7 +520,7 @@ void wxToolBar::SetMargins( int x, int y ) void wxToolBar::SetToolPacking( int WXUNUSED(packing) ) { - wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" ); + wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") ); } void wxToolBar::SetToolSeparation( int separation ) @@ -411,9 +552,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex) node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); - return ""; + return wxT(""); } wxString wxToolBar::GetToolShortHelp(int toolIndex) @@ -429,9 +570,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex) node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); - return ""; + return wxT(""); } void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) @@ -443,12 +584,12 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) if (tool->m_index == toolIndex) { tool->m_longHelpString = helpString; - return; + return; } node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return; } @@ -462,14 +603,81 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString) if (tool->m_index == toolIndex) { tool->m_shortHelpString = helpString; - return; + return; } node = node->Next(); } - wxFAIL_MSG( "wrong toolbar index" ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return; } +void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) ) +{ + wxEvtHandler* evtHandler = GetEventHandler(); + + wxNode* node = m_tools.First(); + while (node) + { + 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 wxToolBar::OnInternalIdle() +{ + 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)) + { + /* 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) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + node = node->Next(); + + if (!tool->m_item || !tool->m_item->window) + continue; + else + gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() ); + } + } + + UpdateWindowUI(); +} + +#endif