fixed handling of accelerators using PageUp/Down keys (bug 1683613)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 2ad1a71a4568fad0a162587008eb762eff6a9f44..8a7f67d72e72acbebffc67848fc3911c57d20c5a 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -119,6 +119,10 @@ wxMSW:
 
 - Fixed wxFileName::GetSize() for large files
 
+wxGTK:
+
+- Fixed handling of accelerators using PageUp/Down keys
+
 
 2.8.2
 -----

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 78539a50de79a6e59a803f3b4afd2b7dae1e0007..a0ef660c1ba9a112e5ed3aeb5c7298b92e675f48 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -1362,10 +1362,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );
                 break;
             case WXK_PAGEDOWN:
-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );
@@ -1483,10 +1483,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );
                 break;
             case WXK_NUMPAD_PAGEDOWN:
-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index fa3f149dd054385613bb75c1d021055647c90e97..32295957b91943d7244744de2d4f96fe0e4f738f 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -1244,10 +1244,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );
                 break;
             case WXK_PAGEDOWN:
-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );
@@ -1365,10 +1365,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );
                 break;
             case WXK_NUMPAD_PAGEDOWN:
-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );