pressing PageDown and then PageUp should return to the same item

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 9a61e7d5899e6826429c3a58d3dd703a765b6885..cf0fbc201de5c3b715101e231e42b3c21aebb9d5 100644 (file)
--- 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
@@ -410,7 +411,7 @@ void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
             }
 
             if (item->GetSubMenu())
-                DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
+                DoMenuUpdates(item->GetSubMenu(), focusWin);
         }
         node = node->GetNext();
     }