now we can even edit again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -121,7 +121,6 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
|
|||||||
PrepareDC( dc );
|
PrepareDC( dc );
|
||||||
SetFocus();
|
SetFocus();
|
||||||
|
|
||||||
|
|
||||||
wxPoint findPos;
|
wxPoint findPos;
|
||||||
findPos.x = dc.DeviceToLogicalX(event.GetX());
|
findPos.x = dc.DeviceToLogicalX(event.GetX());
|
||||||
findPos.y = dc.DeviceToLogicalY(event.GetY());
|
findPos.y = dc.DeviceToLogicalY(event.GetY());
|
||||||
@@ -164,7 +163,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
|
|||||||
{
|
{
|
||||||
m_llist->MoveCursorTo(cursorPos);
|
m_llist->MoveCursorTo(cursorPos);
|
||||||
ScrollToCursor();
|
ScrollToCursor();
|
||||||
Refresh();
|
Refresh(FALSE); // DoPaint suppresses flicker under GTK
|
||||||
}
|
}
|
||||||
if(!m_doSendEvents) // nothing to do
|
if(!m_doSendEvents) // nothing to do
|
||||||
return;
|
return;
|
||||||
@@ -263,7 +262,6 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
|
|||||||
default:
|
default:
|
||||||
if(keyCode == 'c' && event.ControlDown())
|
if(keyCode == 'c' && event.ControlDown())
|
||||||
Copy();
|
Copy();
|
||||||
break;
|
|
||||||
if( IsEditable() )
|
if( IsEditable() )
|
||||||
{
|
{
|
||||||
/* First, handle control keys */
|
/* First, handle control keys */
|
||||||
@@ -352,7 +350,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
|
|||||||
}// first switch()
|
}// first switch()
|
||||||
ScrollToCursor();
|
ScrollToCursor();
|
||||||
wxRect r = *m_llist->GetUpdateRect();
|
wxRect r = *m_llist->GetUpdateRect();
|
||||||
Refresh( FALSE, &r);
|
DoPaint(&r);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -674,12 +672,12 @@ void
|
|||||||
wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
|
wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
|
||||||
{
|
{
|
||||||
m_HaveFocus = true;
|
m_HaveFocus = true;
|
||||||
//FIXME DoPaint(); // to repaint the cursor
|
//FIXME: need argument DoPaint(); // to repaint the cursor
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
|
wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
|
||||||
{
|
{
|
||||||
m_HaveFocus = false;
|
m_HaveFocus = false;
|
||||||
//FIXME DoPaint(); // to repaint the cursor
|
//FIXME: need argument DoPaint(); // to repaint the cursor
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user