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

latest changes: added word-wise movement (buggy, esp. backwards), more minor

Browse Source 
fixes, big problems (scrolling/selection) still remain under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-05 01:03:54 +00:00
parent 9bf84618af
commit 052cbfee35
4 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
user/wxLayout/wxlwindow.cpp
View File

@@ -75,7 +75,9 @@ END_EVENT_TABLE()
wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
: wxScrolledWindow(parent, -1,
wxDefaultPosition, wxDefaultSize,
wxHSCROLL | wxVSCROLL | wxBORDER)
wxHSCROLL | wxVSCROLL |
wxBORDER |
wxWANTS_CHARS)
{
SetStatusBar(NULL); // don't use statusbar
@@ -138,15 +140,6 @@ wxLayoutWindow::Clear(int family,
DoPaint((wxRect *)NULL);
}
#ifdef __WXMSW__
long
wxLayoutWindow::MSWGetDlgCode()
{
// if we don't return this, we won't get OnChar() events for TABs and ENTER
return DLGC_WANTCHARS | DLGC_WANTARROWS | DLGC_WANTMESSAGE;
}
#endif //MSW
void
wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
{
@@ -308,13 +301,20 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
cursor, etc. It's default will process all keycodes causing
modifications to the buffer, but only if editing is allowed.
*/
bool ctrlDown = event.ControlDown();
switch(keyCode)
{
case WXK_RIGHT:
m_llist->MoveCursorHorizontally(1);
if ( ctrlDown )
m_llist->MoveCursorWord(1);
else
m_llist->MoveCursorHorizontally(1);
break;
case WXK_LEFT:
m_llist->MoveCursorHorizontally(-1);
if ( ctrlDown )
m_llist->MoveCursorWord(-1);
else
m_llist->MoveCursorHorizontally(-1);
break;
case WXK_UP:
m_llist->MoveCursorVertically(-1);
@@ -329,18 +329,26 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
m_llist->MoveCursorVertically(20);
break;
case WXK_HOME:
m_llist->MoveCursorToBeginOfLine();
if ( ctrlDown )
m_llist->MoveCursorTo(wxPoint(0, 0));
else
m_llist->MoveCursorToBeginOfLine();
break;
case WXK_END:
if ( ctrlDown )
{
// TODO VZ: how to move the cursor to the last line of the text?
m_llist->MoveCursorVertically(1000);
}
m_llist->MoveCursorToEndOfLine();
break;
default:
if(keyCode == 'c' && event.ControlDown())
if(keyCode == 'c' && ctrlDown)
{
// this should work even in read-only mode
Copy();
}
if( IsEditable() )
else if( IsEditable() )
{
/* First, handle control keys */
if(event.ControlDown() && ! event.AltDown())