X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..4304b42f1a1a586e96c645cb47d1cd3c98e3dec6:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 0f90b72a74..970873c7e2 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -32,7 +32,8 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; //----------------------------------------------------------------------------- // "clicked" (internal from gtk_toolbar) @@ -40,7 +41,14 @@ extern bool g_blockEventsOnDrag; static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { - if (g_isIdle) wxapp_install_idle_handler(); + 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; @@ -114,6 +122,15 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), return FALSE; } +//----------------------------------------------------------------------------- +// InsertChild callback for wxToolBar +//----------------------------------------------------------------------------- + +static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) +{ + /* we don't do anything here but pray */ +} + //----------------------------------------------------------------------------- // wxToolBar //----------------------------------------------------------------------------- @@ -146,11 +163,13 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, 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 )) { - wxFAIL_MSG( _T("wxToolBar creation failed") ); + wxFAIL_MSG( wxT("wxToolBar creation failed") ); return FALSE; } @@ -159,6 +178,7 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS ) ); +// gtk_toolbar_set_space_style( m_toolbar, GTK_TOOLBAR_SPACE_LINE ); m_separation = 5; gtk_toolbar_set_space_size( m_toolbar, m_separation ); m_hasToolAlready = FALSE; @@ -256,19 +276,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, - _T("invalid bitmap for wxToolBar icon") ); + wxT("invalid bitmap for wxToolBar icon") ); wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL, - _T("wxToolBar doesn't support GdkBitmap") ); + wxT("wxToolBar doesn't support GdkBitmap") ); wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL, - _T("wxToolBar::Add needs a wxBitmap") ); + wxT("wxToolBar::Add needs a wxBitmap") ); GtkWidget *tool_pixmap = (GtkWidget *)NULL; @@ -295,7 +315,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, GtkWidget *item = gtk_toolbar_append_element ( - GTK_TOOLBAR(m_toolbar), + m_toolbar, ctype, (GtkWidget *)NULL, (const char *)NULL, @@ -308,6 +328,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), @@ -318,14 +343,59 @@ 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 ); } +bool wxToolBar::DeleteTool(int toolIndex) +{ + wxNode *node = m_tools.First(); + while (node) + { + wxToolBarTool *tool = (wxToolBarTool*)node->Data(); + if (tool->m_index == toolIndex) + { + if (tool->m_control) + tool->m_control->Destroy(); + else + gtk_widget_destroy( tool->m_item ); + m_tools.DeleteNode( node ); + + return TRUE; + } + node = node->Next(); + } + + return FALSE; +} + void wxToolBar::ClearTools() { - wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") ); + wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") ); } bool wxToolBar::Realize() @@ -375,7 +445,7 @@ void wxToolBar::EnableTool(int toolIndex, bool enable) node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); } void wxToolBar::ToggleTool( int toolIndex, bool toggle ) @@ -403,13 +473,9 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle ) gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); } - gtk_signal_disconnect_by_func( GTK_OBJECT(tool->m_item), - GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool ); + m_blockNextEvent = TRUE; // we cannot use gtk_signal_disconnect here gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle ); - - gtk_signal_connect( GTK_OBJECT(tool->m_item), "clicked", - GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool ); } return; @@ -417,7 +483,7 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle ) node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); } wxObject *wxToolBar::GetToolClientData( int index ) const @@ -430,7 +496,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return (wxObject*)NULL; } @@ -445,7 +511,7 @@ bool wxToolBar::GetToolState(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return FALSE; } @@ -460,14 +526,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return FALSE; } void wxToolBar::SetMargins( int x, int y ) { - wxCHECK_RET( !m_hasToolAlready, _T("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 @@ -477,7 +543,7 @@ void wxToolBar::SetMargins( int x, int y ) void wxToolBar::SetToolPacking( int WXUNUSED(packing) ) { - wxFAIL_MSG( _T("wxToolBar::SetToolPacking not implemented") ); + wxFAIL_MSG( wxT("wxToolBar::SetToolPacking not implemented") ); } void wxToolBar::SetToolSeparation( int separation ) @@ -509,9 +575,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex) node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); - return _T(""); + return wxT(""); } wxString wxToolBar::GetToolShortHelp(int toolIndex) @@ -527,9 +593,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex) node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); - return _T(""); + return wxT(""); } void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) @@ -546,7 +612,7 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString) node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return; } @@ -565,7 +631,7 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString) node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return; } @@ -598,4 +664,43 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) ) } } +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