// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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 <gtk/gtkversion.h>
-#ifdef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
-#endif
#include "wx/gtk/private.h"
-#include "wx/menu.h"
-
/* XPM */
static const char *arrow_down_xpm[] = {
: 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?
}
}
- 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();
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;
}
}
}
+//-----------------------------------------------------------------------------
+// "size_request" from m_toolbar
+//-----------------------------------------------------------------------------
+
extern "C" {
-static
-void gtktoolwidget_size_callback( GtkWidget *widget,
- GtkAllocation *alloc,
- wxWindow *win )
+static void
+size_request(GtkWidget*, GtkRequisition* req, wxToolBar* win)
{
- // this shouldn't happen...
- if (win->GetParent()->m_wxwindow) return;
-
- wxSize size = win->GetEffectiveMinSize();
- if (size.y != alloc->height)
- {
- GtkAllocation alloc2;
- alloc2.x = alloc->x;
- alloc2.y = (alloc->height - size.y + 3) / 2;
- alloc2.width = alloc->width;
- alloc2.height = size.y;
- gtk_widget_size_allocate( widget, &alloc2 );
- }
+ 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()
}
// ----------------------------------------------------------------------------
void wxToolBarTool::Init()
{
m_item =
+ m_itemDropdown =
m_image = NULL;
}
PostCreation(size);
+ g_signal_connect_after(m_toolbar, "size_request",
+ G_CALLBACK(size_request), this);
+
return true;
}
-GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const
+GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
return GTK_WIDGET(m_toolbar)->window;
}
// if we have a dropdown menu, we use 2 GTK tools internally
wxToolBarToolsList::compatibility_iterator node = m_tools.Item( i );
- wxToolBarTool *tool = (wxToolBarTool*) node->GetData();
- if ( tool->IsButton() && (tool->GetKind() == wxITEM_DROPDOWN) )
+ wxToolBarTool * const tool2 = (wxToolBarTool*) node->GetData();
+ if ( tool2->IsButton() && tool2->GetKind() == wxITEM_DROPDOWN )
posGtk++;
}
}
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 );
(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:
- gtk_toolbar_insert_widget(
- m_toolbar,
- tool->GetControl()->m_widget,
- (const char *) NULL,
- (const char *) NULL,
- posGtk
- );
- // release reference obtained by wxInsertChildInToolBar
- g_object_unref(tool->GetControl()->m_widget);
-
- // connect after in order to correct size_allocate events
- g_signal_connect_after (tool->GetControl()->m_widget, "size_allocate",
- G_CALLBACK (gtktoolwidget_size_callback), tool->GetControl());
-
+ 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);
+
+ // 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;
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();
}
}
- if (wxUpdateUIEvent::CanUpdate(this))
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
projects / wxWidgets.git / blobdiff