X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4322df68b099e5e983acc0a3dad4ad5841b57b5..3e6858cdcb9278b36446466c346d984e7e306553:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 8ba9d4ef1f..68b72f8fbc 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" @@ -24,18 +16,32 @@ #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 // ---------------------------------------------------------------------------- @@ -91,8 +97,8 @@ public: Init(); } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { Init(); } @@ -118,6 +124,7 @@ public: wxFAIL_MSG( _T("unknown toolbar child type") ); // fall through + case wxITEM_DROPDOWN: case wxITEM_NORMAL: return GTK_TOOLBAR_CHILD_BUTTON; } @@ -154,12 +161,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; @@ -169,6 +173,14 @@ 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->SetImage(tool->GetBitmap()); @@ -190,6 +202,106 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), } } +//----------------------------------------------------------------------------- +// "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" //----------------------------------------------------------------------------- @@ -199,8 +311,6 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *gdk_event, wxToolBarTool *tool ) { - // don't need to install idle handler, its done from "event" signal - if (g_blockEventsOnDrag) return TRUE; wxToolBar *tb = (wxToolBar *)tool->GetToolBar(); @@ -215,35 +325,30 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), } } +//----------------------------------------------------------------------------- +// "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( 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); } // ---------------------------------------------------------------------------- @@ -269,9 +374,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); } //----------------------------------------------------------------------------- @@ -297,8 +403,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 )) @@ -346,10 +451,13 @@ 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& windows) const +GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { return GTK_WIDGET(m_toolbar)->window; } @@ -393,7 +501,21 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) } } - const int posGtk = int(pos); + int posGtk = 0; + if ( pos > 0 ) + { + for ( size_t i = 0; i < pos; i++ ) + { + posGtk++; + + // 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() ) { @@ -457,6 +579,46 @@ 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, + (const char *) NULL, + (const char *) NULL, + posGtk+1 + ); + } } break; @@ -467,26 +629,21 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) return true; case wxTOOL_STYLE_CONTROL: + GtkWidget* 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, - tool->GetControl()->m_widget, + align, (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()); - + // release reference obtained by wxInsertChildInToolBar + g_object_unref(tool->GetControl()->m_widget); 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;