Warning fix.

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 2437f07e4b13dd65d2737200e568a10d5c22786c..eebcea9bf9c8d08cc00531ee3ba5ca75012fdc87 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -174,9 +174,9 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                     else if ( current == wxT("ENTER") || current == wxT("RETURN") )
                         keyCode = WXK_RETURN;
                     else if ( current == wxT("PGUP") )
-                        keyCode = WXK_PRIOR;
+                        keyCode = WXK_PAGEUP;
                     else if ( current == wxT("PGDN") )
-                        keyCode = WXK_NEXT;
+                        keyCode = WXK_PAGEDOWN;
                     else if ( current == wxT("LEFT") )
                         keyCode = WXK_LEFT;
                     else if ( current == wxT("RIGHT") )
@@ -250,11 +250,11 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                     else if ( current == wxT("KP_DOWN") )
                         keyCode = WXK_NUMPAD_DOWN;
                     else if ( current == wxT("KP_PRIOR") )
-                        keyCode = WXK_NUMPAD_PRIOR;
+                        keyCode = WXK_NUMPAD_PAGEUP;
                     else if ( current == wxT("KP_PAGEUP") )
                         keyCode = WXK_NUMPAD_PAGEUP;
                     else if ( current == wxT("KP_NEXT;") )
-                        keyCode = WXK_NUMPAD_NEXT;
+                        keyCode = WXK_NUMPAD_PAGEDOWN;
                     else if ( current == wxT("KP_PAGEDOWN") )
                         keyCode = WXK_NUMPAD_PAGEDOWN;
                     else if ( current == wxT("KP_END") )
@@ -1058,4 +1058,21 @@ wxString wxMenuBarBase::GetHelpString(int id) const
     return item->GetHelp();
 }
 
+void wxMenuBarBase::UpdateMenus( void )
+{
+    wxEvtHandler* source;
+    wxMenu* menu;
+    int nCount = GetMenuCount();
+    for (int n = 0; n < nCount; n++)
+    {
+        menu = GetMenu( n );
+        if (menu != NULL)
+        {
+            source = menu->GetEventHandler();
+            if (source != NULL)
+                menu->UpdateUI( source );
+        }
+    }
+}
+
 #endif // wxUSE_MENUS