From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Mar 2007 20:18:20 +0000 (+0000)
Subject: fixed handling of accelerators using PageUp/Down keys (bug 1683613)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f005ea42f01380fe6f64d5e1d4acdd4c2d366f47

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 2ad1a71a45..8a7f67d72e 100644
--- 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 78539a50de..a0ef660c1b 100644
--- 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 fa3f149dd0..32295957b9 100644
--- 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" );