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

Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprecate old ids, remove rest of build problems with case statemets.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-27 12:25:17 +00:00
parent aa3310b88d
commit faa94f3ec8
22 changed files with 132 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/richtext/richtextctrl.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: richtext/richeditctrl.cpp
// Name: src/richtext/richeditctrl.cpp
// Purpose: A rich edit control
// Author: Julian Smart
// Modified by:
@@ -429,8 +429,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
event.GetKeyCode() == WXK_HOME ||
event.GetKeyCode() == WXK_PAGEUP ||
event.GetKeyCode() == WXK_PAGEDOWN ||
event.GetKeyCode() == WXK_PRIOR ||
event.GetKeyCode() == WXK_NEXT ||
event.GetKeyCode() == WXK_END)
{
KeyboardNavigate(event.GetKeyCode(), flags);
@@ -618,11 +616,11 @@ bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags)
else
success = MoveDown(1, flags);
}
else if (keyCode == WXK_PAGEUP || keyCode == WXK_PRIOR)
else if (keyCode == WXK_PAGEUP)
{
success = PageUp(1, flags);
}
else if (keyCode == WXK_PAGEDOWN || keyCode == WXK_NEXT)
else if (keyCode == WXK_PAGEDOWN)
{
success = PageDown(1, flags);
}
@@ -716,7 +714,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
wxSize clientSize = GetClientSize();
// Going down
if (keyCode == WXK_DOWN || keyCode == WXK_RIGHT || keyCode == WXK_END || keyCode == WXK_NEXT || keyCode == WXK_PAGEDOWN)
if (keyCode == WXK_DOWN || keyCode == WXK_RIGHT || keyCode == WXK_END || keyCode == WXK_PAGEDOWN)
{
if ((rect.y + rect.height) > (clientSize.y + startY))
{
@@ -746,7 +744,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
}
}
// Going up
else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PRIOR || keyCode == WXK_PAGEUP)
else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PAGEUP )
{
if (rect.y < startY)
{
@@ -2533,4 +2531,3 @@ long wxRichTextCtrl::GetFirstVisiblePosition() const
#endif
// wxUSE_RICHTEXT