Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make WXK*PRIOR and WXK*NEXT be aliases for WXK*PAGEUP and WXK*PAGEDOWN

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-03-24 04:14:29 +00:00
parent 50f151d726
commit 5bd24f7242
7 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/src/stc/ScintillaWX.cpp
View File

@@ -907,10 +907,10 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
case WXK_RIGHT: key = SCK_RIGHT; break;
case WXK_HOME: key = SCK_HOME; break;
case WXK_END: key = SCK_END; break;
case WXK_PAGEUP: // fall through
case WXK_PRIOR: key = SCK_PRIOR; break;
case WXK_PAGEDOWN: // fall through
case WXK_NEXT: key = SCK_NEXT; break;
case WXK_PAGEUP: key = SCK_PRIOR; break;
case WXK_PAGEDOWN: key = SCK_NEXT; break;
case WXK_NUMPAD_PAGEUP: key = SCK_PRIOR; break;
case WXK_NUMPAD_PAGEDOWN: key = SCK_NEXT; break;
case WXK_DELETE: key = SCK_DELETE; break;
case WXK_INSERT: key = SCK_INSERT; break;
case WXK_ESCAPE: key = SCK_ESCAPE; break;

8
include/wx/defs.h
View File

@@ -2084,8 +2084,6 @@ enum wxKeyCode
WXK_MENU,
WXK_PAUSE,
WXK_CAPITAL,
WXK_PRIOR, /* Page up */
WXK_NEXT, /* Page down */
WXK_END,
WXK_HOME,
WXK_LEFT,
@@ -2142,6 +2140,8 @@ enum wxKeyCode
WXK_SCROLL,
WXK_PAGEUP,
WXK_PAGEDOWN,
WXK_PRIOR = WXK_PAGEUP,
WXK_NEXT = WXK_PAGEDOWN,
WXK_NUMPAD_SPACE,
WXK_NUMPAD_TAB,
@@ -2155,10 +2155,10 @@ enum wxKeyCode
WXK_NUMPAD_UP,
WXK_NUMPAD_RIGHT,
WXK_NUMPAD_DOWN,
WXK_NUMPAD_PRIOR,
WXK_NUMPAD_PAGEUP,
WXK_NUMPAD_NEXT,
WXK_NUMPAD_PAGEDOWN,
WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP,
WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN,
WXK_NUMPAD_END,
WXK_NUMPAD_BEGIN,
WXK_NUMPAD_INSERT,

2
src/generic/scrlwing.cpp
View File

@@ -1084,13 +1084,11 @@ void wxScrollHelper::HandleOnChar(wxKeyEvent& event)
switch ( event.GetKeyCode() )
{
case WXK_PAGEUP:
case WXK_PRIOR:
dsty = sty - (5 * cliy / 6);
Scroll(-1, (dsty == -1) ? 0 : dsty);
break;
case WXK_PAGEDOWN:
case WXK_NEXT:
Scroll(-1, sty + (5 * cliy / 6));
break;

2
src/generic/vlbox.cpp
View File

@@ -538,13 +538,11 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
break;
case WXK_PAGEDOWN:
case WXK_NEXT:
PageDown();
current = GetFirstVisibleLine();
break;
case WXK_PAGEUP:
case WXK_PRIOR:
if ( m_current == (int)GetFirstVisibleLine() )
{
PageUp();

14
src/gtk/menu.cpp
View File

@@ -1196,12 +1196,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
hotkey << wxT("Down" );
break;
case WXK_PAGEUP:
case WXK_PRIOR:
hotkey << wxT("Prior" );
hotkey << wxT("PgUp" );
break;
case WXK_PAGEDOWN:
case WXK_NEXT:
hotkey << wxT("Next" );
hotkey << wxT("PgDn" );
break;
case WXK_LEFT:
hotkey << wxT("Left" );
@@ -1318,11 +1316,11 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
case WXK_NUMPAD_DOWN:
hotkey << wxT("KP_Down" );
break;
case WXK_NUMPAD_PRIOR: case WXK_NUMPAD_PAGEUP:
hotkey << wxT("KP_Prior" );
case WXK_NUMPAD_PAGEUP:
hotkey << wxT("KP_PgUp" );
break;
case WXK_NUMPAD_NEXT: case WXK_NUMPAD_PAGEDOWN:
hotkey << wxT("KP_Next" );
case WXK_NUMPAD_PAGEDOWN:
hotkey << wxT("KP_PgDn" );
break;
case WXK_NUMPAD_END:
hotkey << wxT("KP_End" );

8
src/stc/ScintillaWX.cpp
View File

@@ -907,10 +907,10 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
case WXK_RIGHT: key = SCK_RIGHT; break;
case WXK_HOME: key = SCK_HOME; break;
case WXK_END: key = SCK_END; break;
case WXK_PAGEUP: // fall through
case WXK_PRIOR: key = SCK_PRIOR; break;
case WXK_PAGEDOWN: // fall through
case WXK_NEXT: key = SCK_NEXT; break;
case WXK_PAGEUP: key = SCK_PRIOR; break;
case WXK_PAGEDOWN: key = SCK_NEXT; break;
case WXK_NUMPAD_PAGEUP: key = SCK_PRIOR; break;
case WXK_NUMPAD_PAGEDOWN: key = SCK_NEXT; break;
case WXK_DELETE: key = SCK_DELETE; break;
case WXK_INSERT: key = SCK_INSERT; break;
case WXK_ESCAPE: key = SCK_ESCAPE; break;

8
wxPython/demo/KeyEvents.py
View File

@@ -23,8 +23,8 @@ keyMap = {
wx.WXK_MENU : "WXK_MENU",
wx.WXK_PAUSE : "WXK_PAUSE",
wx.WXK_CAPITAL : "WXK_CAPITAL",
wx.WXK_PRIOR : "WXK_PRIOR",
wx.WXK_NEXT : "WXK_NEXT",
#wx.WXK_PRIOR : "WXK_PRIOR",
#wx.WXK_NEXT : "WXK_NEXT",
wx.WXK_END : "WXK_END",
wx.WXK_HOME : "WXK_HOME",
wx.WXK_LEFT : "WXK_LEFT",
@@ -93,9 +93,9 @@ keyMap = {
wx.WXK_NUMPAD_UP : "WXK_NUMPAD_UP",
wx.WXK_NUMPAD_RIGHT : "WXK_NUMPAD_RIGHT",
wx.WXK_NUMPAD_DOWN : "WXK_NUMPAD_DOWN",
wx.WXK_NUMPAD_PRIOR : "WXK_NUMPAD_PRIOR",
#wx.WXK_NUMPAD_PRIOR : "WXK_NUMPAD_PRIOR",
wx.WXK_NUMPAD_PAGEUP : "WXK_NUMPAD_PAGEUP",
wx.WXK_NUMPAD_NEXT : "WXK_NUMPAD_NEXT",
#wx.WXK_NUMPAD_NEXT : "WXK_NUMPAD_NEXT",
wx.WXK_NUMPAD_PAGEDOWN : "WXK_NUMPAD_PAGEDOWN",
wx.WXK_NUMPAD_END : "WXK_NUMPAD_END",
wx.WXK_NUMPAD_BEGIN : "WXK_NUMPAD_BEGIN",