From 4b4faab50c1798052dc4db5d1d3d775339f6b072 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 19 Mar 2007 20:20:22 +0000 Subject: [PATCH] fixed handling of accelerators using PageUp/Down keys (bug 1683613) [backport from HEAD] git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 4 ++++ src/gtk/menu.cpp | 8 ++++---- src/gtk1/menu.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 9d273620ef..79a4199d64 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -106,6 +106,10 @@ wxMSW: - Fixed wxFileName::GetSize() for large files. - Fixed wxFont and wxPen accessor bugs introduced in 2.8.2. +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 7f4d87855d..232d301ff7 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" );