X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fac4253c6f9c86d1aee264311b82404cd425ca10..ffaaaacbca5d66342d27251617e1bbc22748e7d9:/src/gtk1/tbargtk.cpp diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 0f80c3f2a9..499cae0d70 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -12,6 +12,9 @@ #endif #include "wx/toolbar.h" + +#if wxUSE_TOOLBAR + #include "wx/frame.h" #include "glib.h" @@ -29,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) @@ -42,7 +46,23 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to 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 ); } @@ -58,53 +78,35 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget), if (g_blockEventsOnDrag) return TRUE; - /* we grey-out the tip text of disabled tool */ 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 ); - -#if (GTK_MINOR_VERSION > 0) - GtkStyle *g_style = - gtk_style_copy( - gtk_widget_get_style( - GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) ); - - g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg; - gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style ); -#else + gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); -#endif - } + } } 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 ); -#if (GTK_MINOR_VERSION > 0) - GtkStyle *g_style = - gtk_style_copy( - gtk_widget_get_style( - GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window ) ); - - g_style->fg[GTK_STATE_NORMAL] = *tb->m_fg; - gtk_widget_set_style( GTK_TOOLBAR(tb->m_toolbar)->tooltips->tip_window, g_style ); -#else gtk_tooltips_set_colors( GTK_TOOLBAR(tb->m_toolbar)->tooltips, tb->m_bg, tb->m_fg ); -#endif - } + } } +#endif /* emit the event */ @@ -146,7 +148,12 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, { m_needParent = TRUE; - 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 ); @@ -160,15 +167,25 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, 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 (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; @@ -189,7 +206,7 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, 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 @@ -199,9 +216,7 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_xMargin = 0; m_yMargin = 0; - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -248,13 +263,13 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap, 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; @@ -265,13 +280,16 @@ 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; @@ -291,6 +309,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), @@ -308,7 +331,7 @@ void wxToolBar::AddSeparator() void wxToolBar::ClearTools() { - wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") ); + wxFAIL_MSG( wxT("wxToolBar::ClearTools not implemented") ); } bool wxToolBar::Realize() @@ -345,20 +368,20 @@ void wxToolBar::EnableTool(int toolIndex, bool enable) 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 ); -*/ - + +#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( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); } void wxToolBar::ToggleTool( int toolIndex, bool toggle ) @@ -369,15 +392,38 @@ 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 ); + } + + gtk_signal_disconnect_by_func( GTK_OBJECT(tool->m_item), + GTK_SIGNAL_FUNC(gtk_toolbar_callback), (gpointer*)tool ); + 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; } node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); } wxObject *wxToolBar::GetToolClientData( int index ) const @@ -390,7 +436,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; } @@ -405,7 +451,7 @@ bool wxToolBar::GetToolState(int toolIndex) const node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return FALSE; } @@ -420,14 +466,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 @@ -437,7 +483,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 ) @@ -469,9 +515,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) @@ -487,9 +533,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) @@ -501,12 +547,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( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return; } @@ -520,12 +566,12 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString) if (tool->m_index == toolIndex) { tool->m_shortHelpString = helpString; - return; + return; } node = node->Next(); } - wxFAIL_MSG( _T("wrong toolbar index") ); + wxFAIL_MSG( wxT("wrong toolbar index") ); return; } @@ -558,3 +604,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(); + if (!tool->m_item->window) + break; + else + gdk_window_set_cursor( tool->m_item->window, cursor.GetCursor() ); + + node = node->Next(); + } + } + + UpdateWindowUI(); +} + +#endif