Fixed menu event propogation to be consistent across platforms, and

with the docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/framecmn.cpp

@@ -204,7 +204,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

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();
@@ -700,30 +701,38 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     if (!menu->IsEnabled(id))
         return;
 
-    wxMenuItem* item = menu->FindChildItem( id );
+    if ( menu->IsAttached() ) // is this menu on a menubar?
-    wxCHECK_RET( item, wxT("error in menu item callback") );
-
-    if (item->IsCheckable())
     {
-        bool isReallyChecked = item->IsChecked(),
+        wxFrame* frame = menu->GetMenuBar()->GetFrame();
-             isInternallyChecked = item->wxMenuItemBase::IsChecked();
+        frame->ProcessCommand(id);
+    }
+    else
+    {
+        wxMenuItem* item = menu->FindChildItem( id );
+        wxCHECK_RET( item, wxT("error in menu item callback") );
 
-        // ensure that the internal state is always consistent with what is
+        if (item->IsCheckable())
-        // 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;
+            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();

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();
@@ -700,30 +701,38 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     if (!menu->IsEnabled(id))
         return;
 
-    wxMenuItem* item = menu->FindChildItem( id );
+    if ( menu->IsAttached() ) // is this menu on a menubar?
-    wxCHECK_RET( item, wxT("error in menu item callback") );
-
-    if (item->IsCheckable())
     {
-        bool isReallyChecked = item->IsChecked(),
+        wxFrame* frame = menu->GetMenuBar()->GetFrame();
-             isInternallyChecked = item->wxMenuItemBase::IsChecked();
+        frame->ProcessCommand(id);
+    }
+    else
+    {
+        wxMenuItem* item = menu->FindChildItem( id );
+        wxCHECK_RET( item, wxT("error in menu item callback") );
 
-        // ensure that the internal state is always consistent with what is
+        if (item->IsCheckable())
-        // 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;
+            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();