From: Robin Dunn Date: Thu, 3 Apr 2003 18:39:20 +0000 (+0000) Subject: Fixed menu event propogation to be consistent across platforms, and X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a01fe3d6d24dcecdd1c7e27fd9499a96cf8cec5e Fixed menu event propogation to be consistent across platforms, and with the docs. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 9a61e7d589..87911b477f 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -199,7 +199,8 @@ bool wxFrameBase::ProcessCommand(int id) } } - return GetEventHandler()->ProcessEvent(commandEvent); + GetEventHandler()->ProcessEvent(commandEvent); + return TRUE; #else // !wxUSE_MENUS return FALSE; #endif // wxUSE_MENUS/!wxUSE_MENUS diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 941df0c833..dc12c62e98 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -172,7 +172,8 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_OPEN, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -375,7 +376,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) buf << wxT('/') << str.c_str(); // local buffer in multibyte form - char cbuf[400]; + char cbuf[400]; strcpy(cbuf, wxGTK_CONV(buf) ); GtkItemFactoryEntry entry; @@ -386,7 +387,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) entry.item_type = (char *)""; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ? - // in order to get the pointer to the item we need the item text _without_ underscores + // in order to get the pointer to the item we need the item text _without_ underscores wxString tmp = wxT("
/"); const wxChar *pc; for ( pc = str; *pc != wxT('\0'); pc++ ) @@ -493,10 +494,10 @@ static wxMenu *CopyMenu (wxMenu *menu) else menucopy->Append (itemid, text, CopyMenu(submenu), menu->GetHelpString(itemid)); - + node = node->GetNext(); } - + return menucopy; } @@ -700,30 +701,38 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) if (!menu->IsEnabled(id)) return; - wxMenuItem* item = menu->FindChildItem( id ); - wxCHECK_RET( item, wxT("error in menu item callback") ); - - if (item->IsCheckable()) + if ( menu->IsAttached() ) // is this menu on a menubar? { - bool isReallyChecked = item->IsChecked(), - isInternallyChecked = item->wxMenuItemBase::IsChecked(); - - // ensure that the internal state is always consistent with what is - // shown on the screen - item->wxMenuItemBase::Check(isReallyChecked); + wxFrame* frame = menu->GetMenuBar()->GetFrame(); + frame->ProcessCommand(id); + } + else + { + wxMenuItem* item = menu->FindChildItem( id ); + wxCHECK_RET( item, wxT("error in menu item callback") ); - // we must not report the events for the radio button going up nor the - // events resulting from the calls to wxMenuItem::Check() - if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) || - (isInternallyChecked == isReallyChecked) ) + if (item->IsCheckable()) { - return; + bool isReallyChecked = item->IsChecked(), + isInternallyChecked = item->wxMenuItemBase::IsChecked(); + + // ensure that the internal state is always consistent with what is + // shown on the screen + item->wxMenuItemBase::Check(isReallyChecked); + + // we must not report the events for the radio button going up nor the + // events resulting from the calls to wxMenuItem::Check() + if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) || + (isInternallyChecked == isReallyChecked) ) + { + return; + } + + // the user pressed on the menu item: report the event below } - // the user pressed on the menu item: report the event below + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } - - menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } //----------------------------------------------------------------------------- @@ -744,7 +753,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -769,7 +779,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -861,10 +872,10 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) // "&" is doubled to indicate "&" instead of accelerator continue; } - + label += *pc; } - + // wxPrintf( L"text %s label %s\n", text.c_str(), label.c_str() ); return label; @@ -879,7 +890,7 @@ void wxMenuItem::SetText( const wxString& str ) wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t')); if (oldLabel == label1) return; - + DoSetText(str); if (m_menuItem) @@ -898,7 +909,7 @@ void wxMenuItem::SetText( const wxString& str ) if (m_text[n] != wxT('\\')) tmp += m_text[n]; } - + gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) ); #else // set new text @@ -958,9 +969,9 @@ void wxMenuItem::DoSetText( const wxString& str ) } ++pc; } - + // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() ); - + m_hotKey = wxT(""); if(*pc == wxT('\t')) @@ -1190,7 +1201,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); - + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); @@ -1276,7 +1287,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) wxString path( mitem->GetFactoryPath() ); menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) ); - + if (!menuItem) wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() ); } @@ -1284,7 +1295,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) if ( !mitem->IsSeparator() ) { wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); - + gtk_signal_connect( GTK_OBJECT(menuItem), "select", GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), (gpointer)this ); diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 941df0c833..dc12c62e98 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -172,7 +172,8 @@ static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_OPEN, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -375,7 +376,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) buf << wxT('/') << str.c_str(); // local buffer in multibyte form - char cbuf[400]; + char cbuf[400]; strcpy(cbuf, wxGTK_CONV(buf) ); GtkItemFactoryEntry entry; @@ -386,7 +387,7 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title) entry.item_type = (char *)""; gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); // what is 2 ? - // in order to get the pointer to the item we need the item text _without_ underscores + // in order to get the pointer to the item we need the item text _without_ underscores wxString tmp = wxT("
/"); const wxChar *pc; for ( pc = str; *pc != wxT('\0'); pc++ ) @@ -493,10 +494,10 @@ static wxMenu *CopyMenu (wxMenu *menu) else menucopy->Append (itemid, text, CopyMenu(submenu), menu->GetHelpString(itemid)); - + node = node->GetNext(); } - + return menucopy; } @@ -700,30 +701,38 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) if (!menu->IsEnabled(id)) return; - wxMenuItem* item = menu->FindChildItem( id ); - wxCHECK_RET( item, wxT("error in menu item callback") ); - - if (item->IsCheckable()) + if ( menu->IsAttached() ) // is this menu on a menubar? { - bool isReallyChecked = item->IsChecked(), - isInternallyChecked = item->wxMenuItemBase::IsChecked(); - - // ensure that the internal state is always consistent with what is - // shown on the screen - item->wxMenuItemBase::Check(isReallyChecked); + wxFrame* frame = menu->GetMenuBar()->GetFrame(); + frame->ProcessCommand(id); + } + else + { + wxMenuItem* item = menu->FindChildItem( id ); + wxCHECK_RET( item, wxT("error in menu item callback") ); - // we must not report the events for the radio button going up nor the - // events resulting from the calls to wxMenuItem::Check() - if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) || - (isInternallyChecked == isReallyChecked) ) + if (item->IsCheckable()) { - return; + bool isReallyChecked = item->IsChecked(), + isInternallyChecked = item->wxMenuItemBase::IsChecked(); + + // ensure that the internal state is always consistent with what is + // shown on the screen + item->wxMenuItemBase::Check(isReallyChecked); + + // we must not report the events for the radio button going up nor the + // events resulting from the calls to wxMenuItem::Check() + if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) || + (isInternallyChecked == isReallyChecked) ) + { + return; + } + + // the user pressed on the menu item: report the event below } - // the user pressed on the menu item: report the event below + menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } - - menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1); } //----------------------------------------------------------------------------- @@ -744,7 +753,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -769,7 +779,8 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) + wxEvtHandler* handler = menu->GetEventHandler(); + if (handler && handler->ProcessEvent(event)) return; wxWindow *win = menu->GetInvokingWindow(); @@ -861,10 +872,10 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) // "&" is doubled to indicate "&" instead of accelerator continue; } - + label += *pc; } - + // wxPrintf( L"text %s label %s\n", text.c_str(), label.c_str() ); return label; @@ -879,7 +890,7 @@ void wxMenuItem::SetText( const wxString& str ) wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t')); if (oldLabel == label1) return; - + DoSetText(str); if (m_menuItem) @@ -898,7 +909,7 @@ void wxMenuItem::SetText( const wxString& str ) if (m_text[n] != wxT('\\')) tmp += m_text[n]; } - + gtk_label_set_text_with_mnemonic( GTK_LABEL(label), wxGTK_CONV(tmp) ); #else // set new text @@ -958,9 +969,9 @@ void wxMenuItem::DoSetText( const wxString& str ) } ++pc; } - + // wxPrintf( L"str %s m_text %s\n", str.c_str(), m_text.c_str() ); - + m_hotKey = wxT(""); if(*pc == wxT('\t')) @@ -1190,7 +1201,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer)this ); - + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); @@ -1276,7 +1287,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) wxString path( mitem->GetFactoryPath() ); menuItem = gtk_item_factory_get_widget( m_factory, wxGTK_CONV( path ) ); - + if (!menuItem) wxLogError( wxT("Wrong menu path: %s\n"), path.c_str() ); } @@ -1284,7 +1295,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem) if ( !mitem->IsSeparator() ) { wxASSERT_MSG( menuItem, wxT("invalid menuitem") ); - + gtk_signal_connect( GTK_OBJECT(menuItem), "select", GTK_SIGNAL_FUNC(gtk_menu_hilight_callback), (gpointer)this ); diff --git a/src/mac/app.cpp b/src/mac/app.cpp index bf3a261a93..aab9d27580 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -2348,21 +2348,13 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) void wxApp::MacHandleMenuCommand( wxUint32 id ) { - wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; - wxMenu* menu = NULL ; - wxMenuItem* item = NULL ; - if ( mbar ) - { - item = mbar->FindItem( id , &menu ) ; - } - wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") ); - - if (item->IsCheckable()) - { - item->Check( !item->IsChecked() ) ; - } - - menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + wxFrame* frame = mbar->GetFrame(); + wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") ); + if ( frame ) + { + frame->ProcessCommand(id); + } } #if !TARGET_CARBON diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index bf3a261a93..aab9d27580 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -2348,21 +2348,13 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr ) void wxApp::MacHandleMenuCommand( wxUint32 id ) { - wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; - wxMenu* menu = NULL ; - wxMenuItem* item = NULL ; - if ( mbar ) - { - item = mbar->FindItem( id , &menu ) ; - } - wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") ); - - if (item->IsCheckable()) - { - item->Check( !item->IsChecked() ) ; - } - - menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; + wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ; + wxFrame* frame = mbar->GetFrame(); + wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") ); + if ( frame ) + { + frame->ProcessCommand(id); + } } #if !TARGET_CARBON