X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c4e2405ca04acd251411f122484dc1ed2ef7e2f..921dd444fe87c122ec1559cccc10d248f92cfb6d:/src/gtk/tbargtk.cpp?ds=inline diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index b6180cd225..87b8aa903f 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -35,6 +35,26 @@ #endif #include "wx/gtk/private.h" +#include "wx/wxcrt.h" +#include "wx/menu.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 +72,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,8 +111,8 @@ public: Init(); } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { Init(); } @@ -158,9 +177,6 @@ extern "C" { static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { - if (g_isIdle) - wxapp_install_idle_handler(); - wxToolBar *tbar = (wxToolBar *)tool->GetToolBar(); if (tbar->m_blockEvent) return; @@ -191,6 +207,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->GetEventHandler()->ProcessEvent(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" //----------------------------------------------------------------------------- @@ -200,8 +316,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(); @@ -216,11 +330,32 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), } } +extern "C" { +static +void gtktoolwidget_size_callback( GtkWidget *widget, + GtkAllocation *alloc, + wxWindow *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 ); + } +} +} //----------------------------------------------------------------------------- // InsertChild callback for wxToolBar //----------------------------------------------------------------------------- -static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), +static void wxInsertChildInToolBar( wxWindow* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) { // we don't do anything here @@ -249,9 +384,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); } //----------------------------------------------------------------------------- @@ -277,8 +413,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 )) @@ -288,6 +423,8 @@ bool wxToolBar::Create( wxWindow *parent, return false; } + FixupStyle(); + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); GtkSetStyle(); @@ -371,8 +508,25 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) } } - const int posGtk = int(pos); - + int posGtk = 0; + if (pos > 0) + { + size_t i; + for (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 *tool = (wxToolBarTool*) node->GetData(); + if (tool->IsButton() && (tool->GetKind() == wxITEM_DROPDOWN)) + posGtk++; + } + } + + switch ( tool->GetStyle() ) { case wxTOOL_STYLE_BUTTON: @@ -435,6 +589,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; @@ -452,6 +646,11 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) (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()); + break; } @@ -570,6 +769,30 @@ 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 // ---------------------------------------------------------------------------- @@ -578,7 +801,7 @@ 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;