Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 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

33
src/x11/textctrl.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: textctrl.cpp
// Name: src/x11/textctrl.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -50,7 +50,7 @@ wxSourceUndoStep::wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtr
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 );
}
@@ -285,7 +285,7 @@ void wxTextCtrl::SetValue(const wxString& value)
if (value.empty())
{
m_lines.Add( new wxSourceLine( wxT("") ) );
m_lines.Add( new wxSourceLine( wxEmptyString ) );
}
else
{
@@ -350,7 +350,7 @@ int wxTextCtrl::GetLineLength(long lineNo) const
wxString wxTextCtrl::GetLineText(long lineNo) const
{
if (lineNo >= (long)m_lines.GetCount())
return wxT("");
return wxEmptyString;
return m_lines[lineNo].m_text;
}
@@ -393,7 +393,7 @@ void wxTextCtrl::Clear()
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();
@@ -1736,7 +1736,7 @@ void wxTextCtrl::OnMouse( wxMouseEvent &event )
#if 0 // there is no middle button on iPAQs
if (event.MiddleDown())
{
Paste( TRUE );
Paste( true );
return;
}
#endif
@@ -1792,15 +1792,15 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
{
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;
}
}
@@ -1868,7 +1868,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
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() );
@@ -2407,4 +2407,3 @@ bool wxTextCtrl::ScrollPages(int pages)
return false;
}