// 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[] = {
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
wxFAIL_MSG( _T("unknown toolbar child type") );
// fall through
+ case wxITEM_DROPDOWN:
case wxITEM_NORMAL:
return GTK_TOOLBAR_CHILD_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;
+
+ // a GtkImage containing the image for a button-type tool, may be NULL
+ GtkWidget *m_image;
protected:
void Init();
// pressed an already pressed radio button
return;
}
-
+
tool->Toggle();
tool->SetImage(tool->GetBitmap());
}
//-----------------------------------------------------------------------------
-// "left-click" on dropdown
+// "left-click" on dropdown
//-----------------------------------------------------------------------------
extern "C"
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;
}
-
+
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,
+
+ tbar->PopupMenu( menu, widget->allocation.x,
widget->allocation.y + widget->allocation.height );
-
-
+
+
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* WXUNUSED(child) )
+ 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);
}
// ----------------------------------------------------------------------------
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;
}
}
int posGtk = 0;
- if (pos > 0)
- {
- size_t i;
- for (i = 0; i < pos; i++)
+ if ( pos > 0 )
+ {
+ for ( size_t i = 0; i < pos; i++ )
{
posGtk++;
-
-
- // if we have a dropdown menu, we use 2 GTK tools
- // internally
+
+ // 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++;
}
}
-
-
+
+
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_BUTTON:
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_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, "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,
- (const char *) NULL,
- (const char *) NULL,
- posGtk+1
- );
+ 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
- );
-
- // 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);
+
+ // 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;
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();
}
}
- if (wxUpdateUIEvent::CanUpdate(this))
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
projects / wxWidgets.git / blobdiff