+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name: keycode.tex
+%% Purpose: wxKeyCode values enumerated
+%% Author: wxWidgets Team
+%% Modified by:
+%% Created:
+%% RCS-ID: $Id$
+%% Copyright: (c) wxWidgets Team
+%% License: wxWindows license
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\section{Keycodes}\label{keycodes}
\wxheading{Include files}
WXK_MENU
WXK_PAUSE
WXK_CAPITAL
- WXK_PRIOR
- WXK_NEXT
+ WXK_PAGEUP
+ WXK_PAGEDOWN
WXK_END
WXK_HOME
WXK_LEFT
WXK_F23
WXK_F24
WXK_NUMLOCK
- WXK_SCROLL
+ WXK_SCROLL
WXK_PAGEUP,
WXK_PAGEDOWN,
WXK_NUMPAD_UP,
WXK_NUMPAD_RIGHT,
WXK_NUMPAD_DOWN,
- WXK_NUMPAD_PRIOR,
WXK_NUMPAD_PAGEUP,
- WXK_NUMPAD_NEXT,
WXK_NUMPAD_PAGEDOWN,
WXK_NUMPAD_END,
WXK_NUMPAD_BEGIN,
WXK_SPECIAL20
\end{verbatim}
}
-
/* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */
/* is buggy, and occurs for code that does actually get executed */
# if !defined __WXDEBUG__ && __VISUALC__ <= 1100
-# pragma warning(disable:4702) /* unreachable code */
+# pragma warning(disable:4702) /* unreachable code */
# endif
/* Deprecated functions such as sprintf, localtime */
WXK_SCROLL,
WXK_PAGEUP,
WXK_PAGEDOWN,
+#if WXWIN_COMPATIBILITY_2_6
WXK_PRIOR = WXK_PAGEUP,
WXK_NEXT = WXK_PAGEDOWN,
+#endif
WXK_NUMPAD_SPACE,
WXK_NUMPAD_TAB,
WXK_NUMPAD_DOWN,
WXK_NUMPAD_PAGEUP,
WXK_NUMPAD_PAGEDOWN,
+#if WXWIN_COMPATIBILITY_2_6
WXK_NUMPAD_PRIOR = WXK_NUMPAD_PAGEUP,
WXK_NUMPAD_NEXT = WXK_NUMPAD_PAGEDOWN,
+#endif
WXK_NUMPAD_END,
WXK_NUMPAD_BEGIN,
WXK_NUMPAD_INSERT,
else if ( current == wxT("ENTER") || current == wxT("RETURN") )
keyCode = WXK_RETURN;
else if ( current == wxT("PGUP") )
- keyCode = WXK_PRIOR;
+ keyCode = WXK_PAGEUP;
else if ( current == wxT("PGDN") )
- keyCode = WXK_NEXT;
+ keyCode = WXK_PAGEDOWN;
else if ( current == wxT("LEFT") )
keyCode = WXK_LEFT;
else if ( current == wxT("RIGHT") )
else if ( current == wxT("KP_DOWN") )
keyCode = WXK_NUMPAD_DOWN;
else if ( current == wxT("KP_PRIOR") )
- keyCode = WXK_NUMPAD_PRIOR;
+ keyCode = WXK_NUMPAD_PAGEUP;
else if ( current == wxT("KP_PAGEUP") )
keyCode = WXK_NUMPAD_PAGEUP;
else if ( current == wxT("KP_NEXT;") )
- keyCode = WXK_NUMPAD_NEXT;
+ keyCode = WXK_NUMPAD_PAGEDOWN;
else if ( current == wxT("KP_PAGEDOWN") )
keyCode = WXK_NUMPAD_PAGEDOWN;
else if ( current == wxT("KP_END") )
switch(event.GetKeyCode())
{
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
controlBar->OnNext(); break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
controlBar->OnPrevious(); break;
case WXK_HOME:
controlBar->OnFirst(); break;
{
// 1.5 times the width gives nice margins even if the weekday
// names are short
- m_widthCol = width+width/2;
+ m_widthCol = width+width/2;
}
}
wxDateTime::WeekDay wd;
wxDateTime::WeekDay *wd)
{
RecalcGeometry();
- // use the correct x-pos
+ // use the correct x-pos
wxCoord x0 = wxMax((GetSize().x - m_widthCol*7) /2, 0);
wxPoint pos_corr = pos;
pos_corr.x -= x0;
}
break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
target = m_date - wxDateSpan::Month();
ChangeMonth(&target);
SetDateAndNotify(target); // always
break;
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
target = m_date + wxDateSpan::Month();
ChangeMonth(&target);
SetDateAndNotify(target); // always
///////////////////////////////////////////////////////////////////////////
-// Name: generic/grid.cpp
+// Name: src/generic/grid.cpp
// Purpose: wxGrid and related classes
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
// Modified by: Robin Dunn, Vadim Zeitlin
// get the widths of all cells previous to this one
int colXPos = 0;
- for ( int i = 0; i < col; i++ )
+ for ( int i = 0; i < col; i++ )
{
colXPos += m_grid->GetColSize(i);
}
// get the widths of all cells previous to this one
int colXPos = 0;
- for ( int i = 0; i < col; i++ )
+ for ( int i = 0; i < col; i++ )
{
colXPos += m_grid->GetColSize(i);
}
}
break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
MovePageUp();
break;
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
MovePageDown();
break;
wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
- while ( startPos < (int)tVal.Length() )
+ while ( startPos < (int)tVal.length() )
{
pos = tVal.Mid(startPos).Find( eol );
if ( pos < 0 )
startPos += pos + 1;
}
- if ( startPos < (int)value.Length() )
+ if ( startPos < (int)value.length() )
{
lines.Add( value.Mid( startPos ) );
}
editor->Show( true, attr );
int colXPos = 0;
- for (int i = 0; i < m_currentCellCoords.GetCol(); i++)
+ for (int i = 0; i < m_currentCellCoords.GetCol(); i++)
{
colXPos += GetColSize(i);
}
}
// special handling for wide cells - show always left part of the cell!
- // Otherwise, e.g. when stepping from row to row, it would jump between
+ // Otherwise, e.g. when stepping from row to row, it would jump between
// left and right part of the cell on every step!
// if ( left < 0 )
if ( left < 0 || (right-left) >= cw )
}
#endif // wxUSE_GRID
-
/////////////////////////////////////////////////////////////////////////////
-// Name: generic/listctrl.cpp
+// Name: src/generic/listctrl.cpp
// Purpose: generic implementation of wxListCtrl
// Author: Robert Roebling
// Vadim Zeitlin (virtual list control support)
// continue until we have enough space or only one character left
wxCoord w_c, h_c;
- size_t len = text.Length();
+ size_t len = text.length();
wxString drawntext = text.Left(len);
while (len > 1)
{
}
// if still not enough space, remove ellipsis characters
- while (ellipsis.Length() > 0 && w + base_w > width)
+ while (ellipsis.length() > 0 && w + base_w > width)
{
- ellipsis = ellipsis.Left(ellipsis.Length() - 1);
+ ellipsis = ellipsis.Left(ellipsis.length() - 1);
dc->GetTextExtent(ellipsis, &base_w, &h);
}
OnArrowChar( 0, event );
break;
- case WXK_PRIOR:
+ case WXK_PAGEUP:
{
int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;
}
break;
- case WXK_NEXT:
+ case WXK_PAGEDOWN:
{
int steps = InReportView()
? m_linesPerPage - 1
{
m_headerWin->SetSize( 0, 0, cw, m_headerHeight );
if(ch > m_headerHeight)
- m_mainWin->SetSize( 0, m_headerHeight + 1,
+ m_mainWin->SetSize( 0, m_headerHeight + 1,
cw, ch - m_headerHeight - 1 );
else
- m_mainWin->SetSize( 0, m_headerHeight + 1,
+ m_mainWin->SetSize( 0, m_headerHeight + 1,
cw, 0);
}
else // no header window
}
#endif // wxUSE_LISTCTRL
-
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/window.cpp
+// Name: src/gtk/window.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
break;
case GDK_Prior: // == GDK_Page_Up
- key_code = WXK_PRIOR;
+ key_code = WXK_PAGEUP;
break;
case GDK_Next: // == GDK_Page_Down
- key_code = WXK_NEXT;
+ key_code = WXK_PAGEDOWN;
break;
case GDK_End:
break;
case GDK_KP_Prior: // == GDK_KP_Page_Up
- key_code = isChar ? WXK_PRIOR : WXK_NUMPAD_PRIOR;
+ key_code = isChar ? WXK_PAGEUP : WXK_NUMPAD_PAGEUP;
break;
case GDK_KP_Next: // == GDK_KP_Page_Down
- key_code = isChar ? WXK_NEXT : WXK_NUMPAD_NEXT;
+ key_code = isChar ? WXK_PAGEDOWN : WXK_NUMPAD_PAGEDOWN;
break;
case GDK_KP_End:
if (g_eraseGC)
gdk_gc_unref( g_eraseGC );
}
-
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/window.cpp
+// Name: src/gtk1/window.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
break;
case GDK_Prior: // == GDK_Page_Up
- key_code = WXK_PRIOR;
+ key_code = WXK_PAGEUP;
break;
case GDK_Next: // == GDK_Page_Down
- key_code = WXK_NEXT;
+ key_code = WXK_PAGEDOWN;
break;
case GDK_End:
break;
case GDK_KP_Prior: // == GDK_KP_Page_Up
- key_code = isChar ? WXK_PRIOR : WXK_NUMPAD_PRIOR;
+ key_code = isChar ? WXK_PAGEUP : WXK_NUMPAD_PAGEUP;
break;
case GDK_KP_Next: // == GDK_KP_Page_Down
- key_code = isChar ? WXK_NEXT : WXK_NUMPAD_NEXT;
+ key_code = isChar ? WXK_NEXT : WXK_NUMPAD_PAGEDOWN;
break;
case GDK_KP_End:
if (g_eraseGC)
gdk_gc_unref( g_eraseGC );
}
-
/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/mac/carbon/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Stefan Csomor
// Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
!( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
-// && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END
+// && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END
)
{
// eat it
// Check if we have reached the max # of chars (if it is set), but still
// allow navigation and deletion
- if ( !IsMultiLine() && m_maxLength && GetValue().Length() >= m_maxLength &&
+ if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&
key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxPROCESS_ENTER) )
)
m_privateContextMenu->AppendSeparator();
m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
}
-
+
if (m_privateContextMenu != NULL)
PopupMenu(m_privateContextMenu);
}
wxTextPos wxMacTextControl::GetLastPosition() const
{
- return GetStringValue().Length() ;
+ return GetStringValue().length() ;
}
void wxMacTextControl::Replace( long from , long to , const wxString &val )
wxString content = GetStringValue() ;
lines = 1;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (content[i] == '\r')
lines++;
// Find line first
int count = 0;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (count == lineNo)
{
// Add chars in line then
wxString tmp;
- for (size_t j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.length(); j++)
{
if (content[j] == '\n')
return tmp;
// Find line first
int count = 0;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (count == lineNo)
{
// Count chars in line then
count = 0;
- for (size_t j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.length(); j++)
{
count++;
if (content[j] == '\n')
val.Remove( start , end - start ) ;
val.insert( start , str ) ;
SetStringValue( val ) ;
- SetSelection( start + str.Length() , start + str.Length() ) ;
+ SetSelection( start + str.length() , start + str.length() ) ;
#endif
}
/////////////////////////////////////////////////////////////////////////////
-// Name: uma.cpp
+// Name: src/mac/carbon/uma.cpp
// Purpose: UMA support
// Author: Stefan Csomor
// Modified by:
glyph = kMenuClearGlyph ;
break ;
- case WXK_PRIOR : // PAGE UP
+ case WXK_PAGEUP :
macKey = kPageUpCharCode ;
glyph = kMenuPageUpGlyph ;
break ;
- case WXK_NEXT :
+ case WXK_PAGEDOWN :
macKey = kPageDownCharCode ;
glyph = kMenuPageDownGlyph ;
break ;
{
MacAppendMenu(menu, "\pA");
- // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
+ // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;
{
MacInsertMenuItem( menu , "\pA" , item) ;
- // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
+ // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
UMASetMenuItemText(menu, item+1 , title , encoding );
UMASetMenuItemShortcut( menu , item+1 , entry ) ;
InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
}
}
-#endif
+#endif
}
void UMAMoveControl( ControlRef inControl , short x , short y )
}
#endif // wxUSE_BASE
-
/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/mac/classic/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Stefan Csomor
// Modified by:
::SetControlData((ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
TESetSelect( from , to , ((TEHandle) m_macTE) ) ;
TEDelete( ((TEHandle) m_macTE) ) ;
- TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
+ TEInsert( value , value.length() , ((TEHandle) m_macTE) ) ;
}
else
{
wxString content = GetValue() ;
int count = 1;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (content[i] == '\r') count++;
}
// Find line first
int count = 0;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (count == lineNo)
{
// Count chars in line then
count = 0;
- for (size_t j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.length(); j++)
{
count++;
if (content[j] == '\n') return count;
// Find line first
int count = 0;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (count == lineNo)
{
// Add chars in line then
wxString tmp;
- for (size_t j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.length(); j++)
{
if (content[j] == '\n')
return tmp;
if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
!( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
-/* && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END */
+/* && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END */
)
{
// eat it
/////////////////////////////////////////////////////////////////////////////
-// Name: uma.cpp
+// Name: src/mac/classic/uma.cpp
// Purpose: UMA support
// Author: Stefan Csomor
// Modified by:
macKey = kClearCharCode ;
glyph = kMenuClearGlyph ;
break ;
- case WXK_PRIOR : // PAGE UP
+ case WXK_PAGEUP :
macKey = kPageUpCharCode ;
glyph = kMenuPageUpGlyph ;
break ;
- case WXK_NEXT :
+ case WXK_PAGEDOWN :
macKey = kPageDownCharCode ;
glyph = kMenuPageDownGlyph ;
break ;
AddCookie(Array[i], WXK_SPACE);
break;
case kHIDUsage_KeyboardPageUp:
- AddCookie(Array[i], WXK_PRIOR);
+ AddCookie(Array[i], WXK_PAGEUP);
break;
case kHIDUsage_KeyboardEnd:
AddCookie(Array[i], WXK_END);
break;
case kHIDUsage_KeyboardPageDown:
- AddCookie(Array[i], WXK_NEXT);
+ AddCookie(Array[i], WXK_PAGEDOWN);
break;
case kHIDUsage_KeyboardRightArrow:
AddCookie(Array[i], WXK_RIGHT);
KEY (KB_padHome, WXK_NUMPAD_HOME)
KEY (KB_padEnd, WXK_NUMPAD_END)
KEY (KB_padPageUp, WXK_NUMPAD_PAGEUP)
- //KEY (KB_padPageUp, WXK_NUMPAD_PRIOR)
KEY (KB_padPageDown, WXK_NUMPAD_PAGEDOWN)
- //KEY (KB_padPageDown, WXK_NUMPAD_NEXT)
KEY (KB_1, '1')
KEY (KB_2, '2')
KEY (KB_3, '3')
// If any of the style changes changed any of the frame styles:
// MSDN: SetWindowLong:
- // Certain window data is cached, so changes you make using
- // SetWindowLong will not take effect until you call the
- // SetWindowPos function. Specifically, if you change any of
- // the frame styles, you must call SetWindowPos with the
+ // Certain window data is cached, so changes you make using
+ // SetWindowLong will not take effect until you call the
+ // SetWindowPos function. Specifically, if you change any of
+ // the frame styles, you must call SetWindowPos with the
// SWP_FRAMECHANGED flag for the cache to be updated properly.
callSWP = ((styleOld ^ style ) & (WS_BORDER |
if (IsContextMenuEnabled() && message == WM_LBUTTONDOWN)
{
SHRGINFO shrgi = {0};
-
+
shrgi.cbSize = sizeof(SHRGINFO);
shrgi.hwndClient = (HWND) GetHWND();
shrgi.ptDown.x = x;
shrgi.ptDown.y = y;
-
+
shrgi.dwFlags = SHRG_RETURNCMD;
// shrgi.dwFlags = SHRG_NOTIFYPARENT;
-
+
if (GN_CONTEXTMENU == ::SHRecognizeGesture(&shrgi))
{
wxPoint pt(x, y);
pt = ClientToScreen(pt);
-
+
wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);
-
+
evtCtx.SetEventObject(this);
if (GetEventHandler()->ProcessEvent(evtCtx))
{
// handle extended keys
case VK_PRIOR:
- id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_PRIOR, WXK_PRIOR);
+ id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_PAGEUP, WXK_PAGEUP);
break;
case VK_NEXT:
- id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_NEXT, WXK_NEXT);
+ id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_PAGEDOWN, WXK_PAGEDOWN);
break;
case VK_END:
id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_END, WXK_END);
case WXK_ALT: keySym = VK_MENU; break;
case WXK_PAUSE: keySym = VK_PAUSE; break;
case WXK_CAPITAL: keySym = VK_CAPITAL; break;
- case WXK_PRIOR: keySym = VK_PRIOR; break;
- case WXK_NEXT : keySym = VK_NEXT; break;
+ case WXK_PAGEUP: keySym = VK_PRIOR; break;
+ case WXK_PAGEDOWN: keySym = VK_NEXT; break;
case WXK_END: keySym = VK_END; break;
case WXK_HOME : keySym = VK_HOME; break;
case WXK_LEFT : keySym = VK_LEFT; break;
case VK_CTRL: nId = WXK_CONTROL; break;
case VK_PAUSE: nId = WXK_PAUSE; break;
case VK_SPACE: nId = WXK_SPACE; break;
- case VK_PAGEUP: nId = WXK_PRIOR; break;
- case VK_PAGEDOWN: nId = WXK_NEXT; break;
+ case VK_PAGEUP: nId = WXK_PAGEUP; break;
+ case VK_PAGEDOWN: nId = WXK_PAGEDOWN; break;
case VK_ESC: nId = WXK_ESCAPE; break;
case VK_END: nId = WXK_END; break;
case VK_HOME : nId = WXK_HOME; break;
case WXK_SHIFT: nKeySym = VK_SHIFT; break;
case WXK_CONTROL: nKeySym = VK_CTRL; break;
case WXK_PAUSE: nKeySym = VK_PAUSE; break;
- case WXK_PRIOR: nKeySym = VK_PAGEUP; break;
- case WXK_NEXT : nKeySym = VK_PAGEDOWN; break;
+ case WXK_PAGEUP: nKeySym = VK_PAGEUP; break;
+ case WXK_PAGEDOWN: nKeySym = VK_PAGEDOWN; break;
case WXK_END: nKeySym = VK_END; break;
case WXK_HOME : nKeySym = VK_HOME; break;
case WXK_LEFT : nKeySym = VK_LEFT; break;
/////////////////////////////////////////////////////////////////////////////
-// Name: richtext/richeditctrl.cpp
+// Name: src/richtext/richeditctrl.cpp
// Purpose: A rich edit control
// Author: Julian Smart
// Modified by:
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);
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);
}
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))
{
}
}
// 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)
{
#endif
// wxUSE_RICHTEXT
-
///////////////////////////////////////////////////////////////////////////////
-// Name: univ/slider.cpp
+// Name: src/univ/slider.cpp
// Purpose: implementation of the universal version of wxSlider
// Author: Vadim Zeitlin
// Modified by:
action = wxACTION_SLIDER_LINE_DOWN;
break;
- case WXK_PRIOR:
case WXK_PAGEUP:
action = wxACTION_SLIDER_PAGE_UP;
break;
- case WXK_NEXT:
case WXK_PAGEDOWN:
action = wxACTION_SLIDER_PAGE_DOWN;
break;
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/textctrl.cpp
+// Name: src/univ/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Vadim Zeitlin
// Modified by:
int keycode = event.GetKeyCode();
#if wxUSE_UNICODE
wxChar unicode = event.GetUnicodeKey();
-#endif
+#endif
if ( keycode == WXK_RETURN )
{
if ( IsSingleLine() || (GetWindowStyle() & wxTE_PROCESS_ENTER) )
return;
}
-#endif
+#endif
}
#ifdef __WXDEBUG__
// Ctrl-R refreshes the control in debug mode
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;
case XK_Down:
id = WXK_DOWN; break;
case XK_Next:
- id = WXK_NEXT; break;
+ id = WXK_PAGEDOWN; break;
case XK_Prior:
- id = WXK_PRIOR; break;
+ id = WXK_PAGEUP; break;
case XK_Menu:
id = WXK_MENU; break;
case XK_Select:
case WXK_PAUSE: keySym = XK_Pause; break;
case WXK_ESCAPE: keySym = XK_Escape; break;
case WXK_SPACE: keySym = ' '; break;
- case WXK_PRIOR: keySym = XK_Prior; break;
- case WXK_NEXT : keySym = XK_Next; break;
+ case WXK_PAGEUP: keySym = XK_Prior; break;
+ case WXK_PAGEDOWN: keySym = XK_Next; break;
case WXK_END: keySym = XK_End; break;
case WXK_HOME : keySym = XK_Home; break;
case WXK_LEFT : keySym = XK_Left; break;
/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/x11/textctrl.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
for (int i = m_y1; i < m_y2+2; i++)
{
if (i >= (int)m_owner->m_lines.GetCount())
- m_lines.Add( wxT("") );
+ m_lines.Add( wxEmptyString );
else
m_lines.Add( m_owner->m_lines[i].m_text );
}
if (value.empty())
{
- m_lines.Add( new wxSourceLine( wxT("") ) );
+ m_lines.Add( new wxSourceLine( wxEmptyString ) );
}
else
{
wxString wxTextCtrl::GetLineText(long lineNo) const
{
if (lineNo >= (long)m_lines.GetCount())
- return wxT("");
+ return wxEmptyString;
return m_lines[lineNo].m_text;
}
ClearSelection();
m_lines.Clear();
- m_lines.Add( new wxSourceLine( wxT("") ) );
+ m_lines.Add( new wxSourceLine( wxEmptyString ) );
SetScrollbars( m_charWidth, m_lineHeight, 0, 0, 0, 0 );
Refresh();
#if 0 // there is no middle button on iPAQs
if (event.MiddleDown())
{
- Paste( TRUE );
+ Paste( true );
return;
}
#endif
{
switch (event.GetKeyCode())
{
- case '4': event.m_keyCode = WXK_LEFT; break;
- case '8': event.m_keyCode = WXK_UP; break;
- case '6': event.m_keyCode = WXK_RIGHT; break;
- case '2': event.m_keyCode = WXK_DOWN; break;
- case '9': event.m_keyCode = WXK_PRIOR; break;
- case '3': event.m_keyCode = WXK_NEXT; break;
- case '7': event.m_keyCode = WXK_HOME; break;
- case '1': event.m_keyCode = WXK_END; break;
- case '0': event.m_keyCode = WXK_INSERT; break;
+ case '4': event.m_keyCode = WXK_LEFT; break;
+ case '8': event.m_keyCode = WXK_UP; break;
+ case '6': event.m_keyCode = WXK_RIGHT; break;
+ case '2': event.m_keyCode = WXK_DOWN; break;
+ case '9': event.m_keyCode = WXK_PAGEUP; break;
+ case '3': event.m_keyCode = WXK_PAGEDOWN; break;
+ case '7': event.m_keyCode = WXK_HOME; break;
+ case '1': event.m_keyCode = WXK_END; break;
+ case '0': event.m_keyCode = WXK_INSERT; break;
}
}
m_ignoreInput = true;
return;
}
- case WXK_PRIOR:
+ case WXK_PAGEUP:
{
if (m_ignoreInput) return;
MoveCursor( m_cursorX, wxMax( 0, m_cursorY-size_y ), event.ShiftDown() );
return false;
}
-
projects / wxWidgets.git / commitdiff
