Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprecate old ids, remove rest of build problems with case statemets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: univ/textctrl.cpp
|
||||
// Name: src/univ/textctrl.cpp
|
||||
// Purpose: wxTextCtrl
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
@@ -4685,7 +4685,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
|
||||
int keycode = event.GetKeyCode();
|
||||
#if wxUSE_UNICODE
|
||||
wxChar unicode = event.GetUnicodeKey();
|
||||
#endif
|
||||
#endif
|
||||
if ( keycode == WXK_RETURN )
|
||||
{
|
||||
if ( IsSingleLine() || (GetWindowStyle() & wxTE_PROCESS_ENTER) )
|
||||
@@ -4714,7 +4714,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
|
||||
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
#ifdef __WXDEBUG__
|
||||
// Ctrl-R refreshes the control in debug mode
|
||||
@@ -4814,14 +4814,12 @@ bool wxStdTextCtrlInputHandler::HandleKey(wxInputConsumer *consumer,
|
||||
break;
|
||||
|
||||
case WXK_PAGEDOWN:
|
||||
case WXK_NEXT:
|
||||
// we don't map Ctrl-PgUp/Dn to anything special - what should it
|
||||
// to? for now, it's the same as without control
|
||||
action << wxACTION_TEXT_PAGE_DOWN;
|
||||
break;
|
||||
|
||||
case WXK_PAGEUP:
|
||||
case WXK_PRIOR:
|
||||
action << wxACTION_TEXT_PAGE_UP;
|
||||
break;
|
||||
|
||||
|
Reference in New Issue
Block a user