X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..0e6c619a1aff67b336fceb7c51f10c119ee504ec:/src/gtk1/menu.cpp diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index a0c5707d0a..7bf133ec47 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -150,7 +150,7 @@ bool wxMenuBar::Enabled( int id ) const } //----------------------------------------------------------------------------- -// wxMenu +// "activate" //----------------------------------------------------------------------------- static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) @@ -161,15 +161,45 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) if (!menu->IsEnabled(id)) return; - wxCommandEvent event( wxEVENT_TYPE_MENU_COMMAND, id ); + wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); + event.SetEventObject( menu ); + event.SetInt(id ); + + if (menu->m_callback) + { + (void) (*(menu->m_callback)) (*menu, event); + return; + } + + if (menu->GetEventHandler()->ProcessEvent(event)) return; + + wxWindow *win = menu->GetInvokingWindow(); + if (win) win->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- +// "select" +//----------------------------------------------------------------------------- + +static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) +{ + int id = menu->FindMenuIdByMenuItem(widget); + + wxASSERT( id != -1 ); // should find it! + + if (!menu->IsEnabled(id)) return; + + wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); event.SetInt(id ); +/* wxMSW doesn't call callback here either if (menu->m_callback) { (void) (*(menu->m_callback)) (*menu, event); return; } +*/ if (menu->GetEventHandler()->ProcessEvent(event)) return; @@ -177,6 +207,10 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) if (win) win->GetEventHandler()->ProcessEvent( event ); } +//----------------------------------------------------------------------------- +// wxMenu +//----------------------------------------------------------------------------- + IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject) wxMenuItem::wxMenuItem() @@ -202,7 +236,7 @@ void wxMenuItem::SetText(const wxString& str) void wxMenuItem::Check( bool check ) { - wxCHECK_RET( IsCheckable(), _("Can't check uncheckable item!") ) + wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" ) m_isChecked = check; gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check ); @@ -283,6 +317,10 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer*)this ); + gtk_signal_connect( GTK_OBJECT(menuItem), "select", + GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), + (gpointer*)this ); + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); m_items.Append( mitem ); @@ -410,7 +448,7 @@ wxMenuItem *wxMenu::FindItem(int id) const node = node->Next(); } - wxLogDebug(_("wxMenu::FindItem: item %d not found."), id); + wxLogDebug( "wxMenu::FindItem: item %d not found.", id); return (wxMenuItem *) NULL; }