Fixed handling of keypress WXK_NUMPAD_NEXT

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 1e7ab07eb0139ece3c1d06e0e821ca52324ece0b..7821833663a09a7d9e4c0f590bedd489b95beada 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -248,7 +248,7 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
         case GDK_KP_Down:      key_code = WXK_NUMPAD_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_NUMPAD_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_NUMPAD_PAGEUP;   break;
         case GDK_KP_Down:      key_code = WXK_NUMPAD_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_NUMPAD_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_NUMPAD_PAGEUP;   break;

-        case GDK_KP_Next:      key_code = WXK_NUMPAD_PRIOR; break;
+        case GDK_KP_Next:      key_code = WXK_NUMPAD_NEXT;  break;

 //      case GDK_KP_Page_Down: key_code = WXK_NUMPAD_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_NUMPAD_END;   break;
         case GDK_KP_Begin:     key_code = WXK_NUMPAD_BEGIN; break;
 //      case GDK_KP_Page_Down: key_code = WXK_NUMPAD_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_NUMPAD_END;   break;
         case GDK_KP_Begin:     key_code = WXK_NUMPAD_BEGIN; break;


@@ -347,7 +347,7 @@ static long map_to_wx_keysym( KeySym keysym )
         case GDK_KP_Down:      key_code = WXK_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_PAGEUP; break;
         case GDK_KP_Down:      key_code = WXK_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_PAGEUP; break;

-        case GDK_KP_Next:      key_code = WXK_PRIOR;  break;
+        case GDK_KP_Next:      key_code = WXK_NEXT;  break;

 //      case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_END;    break;
         case GDK_KP_Begin:     key_code = WXK_HOME;   break;
 //      case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_END;    break;
         case GDK_KP_Begin:     key_code = WXK_HOME;   break;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 1e7ab07eb0139ece3c1d06e0e821ca52324ece0b..7821833663a09a7d9e4c0f590bedd489b95beada 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -248,7 +248,7 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
         case GDK_KP_Down:      key_code = WXK_NUMPAD_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_NUMPAD_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_NUMPAD_PAGEUP;   break;
         case GDK_KP_Down:      key_code = WXK_NUMPAD_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_NUMPAD_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_NUMPAD_PAGEUP;   break;

-        case GDK_KP_Next:      key_code = WXK_NUMPAD_PRIOR; break;
+        case GDK_KP_Next:      key_code = WXK_NUMPAD_NEXT;  break;

 //      case GDK_KP_Page_Down: key_code = WXK_NUMPAD_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_NUMPAD_END;   break;
         case GDK_KP_Begin:     key_code = WXK_NUMPAD_BEGIN; break;
 //      case GDK_KP_Page_Down: key_code = WXK_NUMPAD_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_NUMPAD_END;   break;
         case GDK_KP_Begin:     key_code = WXK_NUMPAD_BEGIN; break;


@@ -347,7 +347,7 @@ static long map_to_wx_keysym( KeySym keysym )
         case GDK_KP_Down:      key_code = WXK_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_PAGEUP; break;
         case GDK_KP_Down:      key_code = WXK_DOWN;  break;
         case GDK_KP_Prior:     key_code = WXK_PRIOR; break;
 //      case GDK_KP_Page_Up:   key_code = WXK_PAGEUP; break;

-        case GDK_KP_Next:      key_code = WXK_PRIOR;  break;
+        case GDK_KP_Next:      key_code = WXK_NEXT;  break;

 //      case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_END;    break;
         case GDK_KP_Begin:     key_code = WXK_HOME;   break;
 //      case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break;
         case GDK_KP_End:       key_code = WXK_END;    break;
         case GDK_KP_Begin:     key_code = WXK_HOME;   break;