X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4161a2a08e622ba55f66610e26892f5fda37e6f..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index d81c1fb2a6..58d9d0713d 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -8,14 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -109,6 +101,12 @@ public: : wxToolBarToolBase(tbar, control, label) { Init(); + // Hold a reference to keep control alive until DoInsertTool() is + // called, or if RemoveTool() is called (see DoDeleteTool) + g_object_ref(control->m_widget); + // release reference when gtk_widget_destroy() is called on control + g_signal_connect( + control->m_widget, "destroy", G_CALLBACK(g_object_unref), NULL); } // is this a radio button? @@ -147,8 +145,14 @@ public: } } - GtkWidget *m_item; - GtkWidget *m_image; + // the toolbar element for button tools or a GtkAlignment containing the + // control for control tools + GtkWidget *m_item; + // dropdown element for button tools + GtkWidget *m_itemDropdown; + + // a GtkImage containing the image for a button-type tool, may be NULL + GtkWidget *m_image; protected: void Init(); @@ -286,7 +290,7 @@ static gboolean gtk_toolbar_dropdown_lclick_callback(GtkWidget *widget, if (!tool->IsEnabled()) return FALSE; wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tool->GetId() ); - if ( tbar->GetEventHandler()->ProcessEvent(evt) ) + if ( tbar->HandleWindowEvent(evt) ) { return TRUE; } @@ -333,16 +337,28 @@ 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( wxWindow* WXUNUSED(parent), - wxWindow* child) + wxWindow* /* child */) { - // 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); + // Child widget will be inserted into GtkToolbar by DoInsertTool() } // ---------------------------------------------------------------------------- @@ -352,6 +368,7 @@ static void wxInsertChildInToolBar( wxWindow* WXUNUSED(parent), void wxToolBarTool::Init() { m_item = + m_itemDropdown = m_image = NULL; } @@ -445,6 +462,9 @@ bool wxToolBar::Create( wxWindow *parent, PostCreation(size); + g_signal_connect_after(m_toolbar, "size_request", + G_CALLBACK(size_request), this); + return true; } @@ -581,6 +601,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) GtkWidget *image = gtk_image_new_from_pixbuf( pixbuf ); gtk_widget_show( image ); gtk_container_add( GTK_CONTAINER(dropdown), image ); + g_object_unref(pixbuf); if (GetWindowStyle() & wxTB_FLAT) gtk_button_set_relief( GTK_BUTTON(dropdown), GTK_RELIEF_NONE ); @@ -602,44 +623,30 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) (tool->m_item, &req ); gtk_widget_set_size_request( dropdown, -1, req.height ); - gtk_toolbar_insert_widget( - m_toolbar, - dropdown, - (const char *) NULL, - (const char *) NULL, - posGtk+1 - ); + gtk_toolbar_insert_widget(m_toolbar, dropdown, NULL, NULL, + posGtk + 1); + tool->m_itemDropdown = dropdown; } } break; case wxTOOL_STYLE_SEPARATOR: gtk_toolbar_insert_space( m_toolbar, posGtk ); - - // skip the rest - return true; + break; case wxTOOL_STYLE_CONTROL: - GtkWidget* align = gtk_alignment_new(0.5, 0.5, 0, 0); + GtkWidget * const align = gtk_alignment_new(0.5, 0.5, 0, 0); gtk_widget_show(align); - gtk_container_add((GtkContainer*)align, tool->GetControl()->m_widget); - gtk_toolbar_insert_widget( - m_toolbar, - align, - (const char *) NULL, - (const char *) NULL, - posGtk - ); - // release reference obtained by wxInsertChildInToolBar - g_object_unref(tool->GetControl()->m_widget); + gtk_container_add(GTK_CONTAINER(align), + tool->GetControl()->m_widget); + gtk_toolbar_insert_widget(m_toolbar, align, NULL, NULL, posGtk); + + // 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; @@ -652,16 +659,31 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *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 + gtk_container_remove( + GTK_CONTAINER(tool->m_item), tool->GetControl()->m_widget); + // fall through case wxTOOL_STYLE_BUTTON: gtk_widget_destroy( tool->m_item ); + tool->m_item = NULL; + if (tool->m_itemDropdown) + { + gtk_widget_destroy(tool->m_itemDropdown); + tool->m_itemDropdown = NULL; + } break; case wxTOOL_STYLE_SEPARATOR: gtk_toolbar_remove_space( m_toolbar, pos ); break; + + default: + wxFAIL_MSG( "unknown tool style" ); + return false; } InvalidateBestSize(); @@ -823,7 +845,7 @@ void wxToolBar::OnInternalIdle() } } - if (wxUpdateUIEvent::CanUpdate(this)) + if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); }