X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a1b3ead3fd406e870042014eb7bd117586f4fff..ff58644a54af11b74b8e9b33a00de8496c531566:/src/gtk/tbargtk.cpp?ds=inline diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index e56eba64a1..46cb5b8c97 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -8,34 +8,40 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/toolbar.h" - #if wxUSE_TOOLBAR_NATIVE +#include "wx/toolbar.h" + #ifndef WX_PRECOMP - #include "wx/frame.h" + #include "wx/menu.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 -#ifdef GTK_DISABLE_DEPRECATED #undef GTK_DISABLE_DEPRECATED -#endif #include "wx/gtk/private.h" +/* XPM */ +static const char *arrow_down_xpm[] = { +/* columns rows colors chars-per-pixel */ +"7 7 2 1", +" c None", +". c Black", +/* pixels */ +" ", +" ", +" ", +".......", +" ..... ", +" ... ", +" . " +}; + + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -52,8 +58,7 @@ extern wxCursor g_globalCursor; static void GetGtkStyle(long style, GtkOrientation *orient, GtkToolbarStyle *gtkStyle) { - *orient = style & wxTB_VERTICAL ? GTK_ORIENTATION_VERTICAL - : GTK_ORIENTATION_HORIZONTAL; + *orient = ( style & wxTB_LEFT || style & wxTB_RIGHT ) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; if ( style & wxTB_TEXT ) @@ -92,12 +97,23 @@ public: Init(); } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { Init(); } + virtual ~wxToolBarTool() + { + if ( IsControl() && !m_item ) + { + // if we're a control which is not currently attached to the + // toolbar (as indicated by NULL m_item), we must undo the extra + // reference we added in DoDeleteTool() + g_object_unref(GetControl()->m_widget); + } + } + // is this a radio button? // // unlike GetKind(), can be called for any kind of tools, not just buttons @@ -119,26 +135,27 @@ public: wxFAIL_MSG( _T("unknown toolbar child type") ); // fall through + case wxITEM_DROPDOWN: case wxITEM_NORMAL: return GTK_TOOLBAR_CHILD_BUTTON; } } - void SetPixmap(const wxBitmap& bitmap) + void SetImage(const wxBitmap& bitmap) { if (bitmap.Ok()) { - GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() - : (GdkBitmap *)NULL; - if (bitmap.HasPixbuf()) - gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() ); - else - gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask ); + // 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_pixmap; + // the toolbar element for button tools or a GtkAlignment containing the + // control for control tools + GtkWidget *m_item; + + // a GtkImage containing the image for a button-type tool, may be NULL + GtkWidget *m_image; protected: void Init(); @@ -159,12 +176,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) //----------------------------------------------------------------------------- extern "C" { -static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), +static void gtk_toolbar_callback( GtkWidget *widget, wxToolBarTool *tool ) { - if (g_isIdle) - wxapp_install_idle_handler(); - wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); if (tbar->m_blockEvent) return; @@ -174,9 +188,17 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), if (tool->CanBeToggled()) { + if (tool->IsRadio() && + gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget)) && + tool->IsToggled()) + { + // pressed an already pressed radio button + return; + } + tool->Toggle(); - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); if ( tool->IsRadio() && !tool->IsToggled() ) { @@ -190,11 +212,111 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), // revert back tool->Toggle(); - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); } } } +//----------------------------------------------------------------------------- +// "right-click" +//----------------------------------------------------------------------------- +extern "C" { +static gboolean gtk_toolbar_tool_rclick_callback(GtkWidget *WXUNUSED(widget), + GdkEventButton *event, + wxToolBarToolBase *tool) +{ + if (event->button != 3) + return FALSE; + + wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); + + if (tbar->m_blockEvent) return TRUE; + + if (g_blockEventsOnDrag) return TRUE; + if (!tool->IsEnabled()) return TRUE; + + tbar->OnRightClick( tool->GetId(), (int)event->x, (int)event->y ); + + return TRUE; +} +} + +//----------------------------------------------------------------------------- +// "enter_notify_event" / "leave_notify_event" from dropdown +//----------------------------------------------------------------------------- + +extern "C" { +static gint gtk_toolbar_buddy_enter_callback( GtkWidget *WXUNUSED(widget), + GdkEventCrossing *WXUNUSED(gdk_event), + GtkWidget *tool ) +{ + guint8 state = GTK_WIDGET_STATE( tool ); + state |= GTK_STATE_PRELIGHT; + gtk_widget_set_state( tool, (GtkStateType) state ); + return FALSE; +} + +static gint gtk_toolbar_buddy_leave_callback( GtkWidget *WXUNUSED(widget), + GdkEventCrossing *WXUNUSED(gdk_event), + GtkWidget *tool ) +{ + guint8 state = GTK_WIDGET_STATE( tool ); + state &= ~GTK_STATE_PRELIGHT; + gtk_widget_set_state( tool, (GtkStateType) state ); + return FALSE; +} +} + +//----------------------------------------------------------------------------- +// "left-click" on dropdown +//----------------------------------------------------------------------------- + +extern "C" +{ +static void gtk_pop_tb_hide_callback( GtkWidget *WXUNUSED(menu), GtkToggleButton *button ) +{ + gtk_toggle_button_set_active( button, FALSE ); +} + +static gboolean gtk_toolbar_dropdown_lclick_callback(GtkWidget *widget, + GdkEventButton *event, + wxToolBarToolBase *tool) +{ + if (event->button != 1) + return FALSE; + + wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); + + if (tbar->m_blockEvent) return FALSE; + + if (g_blockEventsOnDrag) return FALSE; + if (!tool->IsEnabled()) return FALSE; + + wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tool->GetId() ); + if ( tbar->HandleWindowEvent(evt) ) + { + return TRUE; + } + + wxMenu * const menu = tool->GetDropdownMenu(); + if (!menu) + return TRUE; + + // simulate press + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widget), TRUE ); + + g_signal_connect (menu->m_menu, "hide", + G_CALLBACK (gtk_pop_tb_hide_callback), + widget); + + tbar->PopupMenu( menu, widget->allocation.x, + widget->allocation.y + widget->allocation.height ); + + + return TRUE; +} +} + //----------------------------------------------------------------------------- // "enter_notify_event" / "leave_notify_event" //----------------------------------------------------------------------------- @@ -204,8 +326,6 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *gdk_event, wxToolBarTool *tool ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) return TRUE; wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); @@ -220,14 +340,30 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), } } +//----------------------------------------------------------------------------- +// "size_request" from m_toolbar +//----------------------------------------------------------------------------- + +extern "C" { +static void +size_request(GtkWidget*, GtkRequisition* req, wxToolBar* win) +{ + const wxSize margins = win->GetMargins(); + req->width += margins.x; + req->height += 2 * margins.y; +} +} + //----------------------------------------------------------------------------- // InsertChild callback for wxToolBar //----------------------------------------------------------------------------- -static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), - wxWindow* WXUNUSED(child) ) +static void wxInsertChildInToolBar( wxWindow* WXUNUSED(parent), + wxWindow* child) { - // we don't do anything here + // Child widget will be inserted into GtkToolbar by DoInsertTool. Ref it + // here so reparenting into wxToolBar doesn't delete it. + g_object_ref(child->m_widget); } // ---------------------------------------------------------------------------- @@ -237,7 +373,7 @@ static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), void wxToolBarTool::Init() { m_item = - m_pixmap = (GtkWidget *)NULL; + m_image = NULL; } wxToolBarToolBase *wxToolBar::CreateTool(int id, @@ -253,9 +389,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id, clientData, shortHelpString, longHelpString); } -wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) +wxToolBarToolBase * +wxToolBar::CreateTool(wxControl *control, const wxString& label) { - return new wxToolBarTool(this, control); + return new wxToolBarTool(this, control, label); } //----------------------------------------------------------------------------- @@ -281,8 +418,7 @@ bool wxToolBar::Create( wxWindow *parent, long style, const wxString& name ) { - m_needParent = true; - m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar; + m_insertCallback = wxInsertChildInToolBar; if ( !PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) @@ -292,6 +428,8 @@ bool wxToolBar::Create( wxWindow *parent, return false; } + FixupStyle(); + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); GtkSetStyle(); @@ -317,7 +455,6 @@ bool wxToolBar::Create( wxWindow *parent, ConnectWidget( m_widget ); gtk_widget_show(GTK_WIDGET(m_toolbar)); } - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), !(style & wxTB_NO_TOOLTIPS) ); // FIXME: there is no such function for toolbars in 2.0 #if 0 @@ -329,9 +466,17 @@ bool wxToolBar::Create( wxWindow *parent, PostCreation(size); + g_signal_connect_after(m_toolbar, "size_request", + G_CALLBACK(size_request), this); + return true; } +GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + return GTK_WIDGET(m_toolbar)->window; +} + void wxToolBar::GtkSetStyle() { GtkOrientation orient; @@ -340,30 +485,20 @@ void wxToolBar::GtkSetStyle() 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::SetWindowStyleFlag( long style ) { wxToolBarBase::SetWindowStyleFlag(style); - if( style & wxTB_TOOLTIPS ) - { - if( m_toolbar ) - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); - } - else - { - if( m_toolbar ) - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), FALSE ); - } + if ( m_toolbar ) GtkSetStyle(); } bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; - - size_t posGtk = pos; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); if ( tool->IsButton() ) { @@ -374,39 +509,29 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) 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") ); + tool->m_image = gtk_image_new(); + tool->SetImage(bitmap); - GtkWidget *tool_pixmap = (GtkWidget *)NULL; - - - if (bitmap.HasPixbuf()) - { - tool_pixmap = gtk_image_new(); - tool->m_pixmap = tool_pixmap; - tool->SetPixmap(bitmap); - } - else - { - GdkPixmap *pixmap = bitmap.GetPixmap(); - - GdkBitmap *mask = (GdkBitmap *)NULL; - if ( bitmap.GetMask() ) - mask = bitmap.GetMask()->GetBitmap(); - - tool_pixmap = gtk_pixmap_new( pixmap, mask ); - gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); - } + gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5); + } + } - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); + int posGtk = 0; + if ( pos > 0 ) + { + for ( size_t i = 0; i < pos; i++ ) + { + posGtk++; - tool->m_pixmap = tool_pixmap; + // if we have a dropdown menu, we use 2 GTK tools internally + wxToolBarToolsList::compatibility_iterator node = m_tools.Item( i ); + wxToolBarTool * const tool2 = (wxToolBarTool*) node->GetData(); + if ( tool2->IsButton() && tool2->GetKind() == wxITEM_DROPDOWN ) + posGtk++; } } + switch ( tool->GetStyle() ) { case wxTOOL_STYLE_BUTTON: @@ -455,18 +580,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) ? NULL : (const char*) wxGTK_CONV( tool->GetShortHelp() ), "", // tooltip_private_text (?) - tool->m_pixmap, + tool->m_image, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool, posGtk ); - if ( !tool->m_item ) - { - wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") ); - - return false; - } + 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), @@ -474,31 +594,64 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) g_signal_connect (tool->m_item, "leave_notify_event", G_CALLBACK (gtk_toolbar_tool_callback), tool); + g_signal_connect(tool->m_item, "button-press-event", + G_CALLBACK (gtk_toolbar_tool_rclick_callback), + tool); + + if (tool->GetKind() == wxITEM_DROPDOWN) + { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data( arrow_down_xpm ); + GtkWidget *dropdown = gtk_toggle_button_new(); + GtkWidget *image = gtk_image_new_from_pixbuf( pixbuf ); + gtk_widget_show( image ); + gtk_container_add( GTK_CONTAINER(dropdown), image ); + + if (GetWindowStyle() & wxTB_FLAT) + gtk_button_set_relief( GTK_BUTTON(dropdown), GTK_RELIEF_NONE ); + GTK_WIDGET_UNSET_FLAGS (dropdown, GTK_CAN_FOCUS); + gtk_widget_show( dropdown ); + + g_signal_connect (dropdown, "enter_notify_event", + G_CALLBACK (gtk_toolbar_buddy_enter_callback), + tool->m_item); + g_signal_connect (dropdown, "leave_notify_event", + G_CALLBACK (gtk_toolbar_buddy_leave_callback), + tool->m_item); + g_signal_connect(dropdown, "button-press-event", + G_CALLBACK (gtk_toolbar_dropdown_lclick_callback), + tool); + + GtkRequisition req; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(tool->m_item) )->size_request ) + (tool->m_item, &req ); + gtk_widget_set_size_request( dropdown, -1, req.height ); + + gtk_toolbar_insert_widget(m_toolbar, dropdown, NULL, NULL, + posGtk + 1); + } } break; case wxTOOL_STYLE_SEPARATOR: gtk_toolbar_insert_space( m_toolbar, posGtk ); - - // skip the rest - return true; + break; case wxTOOL_STYLE_CONTROL: - gtk_toolbar_insert_widget( - m_toolbar, - tool->GetControl()->m_widget, - (const char *) NULL, - (const char *) NULL, - posGtk - ); + GtkWidget * const align = gtk_alignment_new(0.5, 0.5, 0, 0); + gtk_widget_show(align); + gtk_container_add(GTK_CONTAINER(align), + tool->GetControl()->m_widget); + gtk_toolbar_insert_widget(m_toolbar, align, NULL, NULL, posGtk); + + // release reference obtained by wxInsertChildInToolBar + g_object_unref(tool->GetControl()->m_widget); + + // remember the container we're in so that we could remove + // ourselves from it when we're detached from the toolbar + tool->m_item = align; break; } - 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; @@ -506,21 +659,34 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); switch ( tool->GetStyle() ) { case wxTOOL_STYLE_CONTROL: - tool->GetControl()->Destroy(); - break; + // don't destroy the control here as we can be called from + // RemoveTool() and then we need to keep the control alive; + // while if we're called from DeleteTool() the control will + // be destroyed when wxToolBarToolBase itself is deleted + { + GtkWidget * const w = tool->GetControl()->m_widget; + g_object_ref(w); + gtk_container_remove(GTK_CONTAINER(tool->m_item), w); + } + // fall through case wxTOOL_STYLE_BUTTON: gtk_widget_destroy( tool->m_item ); + tool->m_item = NULL; break; case wxTOOL_STYLE_SEPARATOR: gtk_toolbar_remove_space( m_toolbar, pos ); break; + + default: + wxFAIL_MSG( "unknown tool style" ); + return false; } InvalidateBestSize(); @@ -533,7 +699,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase) void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); if (tool->m_item) { @@ -543,12 +709,12 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); GtkWidget *item = tool->m_item; if ( item && GTK_IS_TOGGLE_BUTTON(item) ) { - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); m_blockEvent = true; @@ -599,7 +765,7 @@ void wxToolBar::SetToolSeparation( int separation ) void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) { - wxToolBarTool *tool = (wxToolBarTool *)FindById(id); + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); if ( tool ) { @@ -609,12 +775,39 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) } } +void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap ) +{ + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); + if ( tool ) + { + wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools.")); + + tool->SetNormalBitmap(bitmap); + tool->SetImage(tool->GetBitmap()); + } +} + +void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap ) +{ + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); + if ( tool ) + { + wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools.")); + + tool->SetDisabledBitmap(bitmap); + tool->SetImage(tool->GetBitmap()); + } +} + // ---------------------------------------------------------------------------- // wxToolBar idle handling // ---------------------------------------------------------------------------- void wxToolBar::OnInternalIdle() { + // Check if we have to show window now + if (GtkShowFromOnIdle()) return; + wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; @@ -655,7 +848,7 @@ void wxToolBar::OnInternalIdle() } } - if (wxUpdateUIEvent::CanUpdate(this)) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); }