now we can even edit again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index 8902e04eff69b9a5d8272c7aed41cfc2104d166a..a64e4286ae5f0841bbcbf4b4b4cdf9793aa8039b 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -121,7 +121,6 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
    PrepareDC( dc );     
    SetFocus();
 
    PrepareDC( dc );     
    SetFocus();
 

-   

    wxPoint findPos;
    findPos.x = dc.DeviceToLogicalX(event.GetX());
    findPos.y = dc.DeviceToLogicalY(event.GetY());
    wxPoint findPos;
    findPos.x = dc.DeviceToLogicalX(event.GetX());
    findPos.y = dc.DeviceToLogicalY(event.GetY());


@@ -164,7 +163,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
    {
       m_llist->MoveCursorTo(cursorPos);
       ScrollToCursor();
    {
       m_llist->MoveCursorTo(cursorPos);
       ScrollToCursor();

-      Refresh();
+      Refresh(FALSE); // DoPaint suppresses flicker under GTK

    }
    if(!m_doSendEvents) // nothing to do
       return;
    }
    if(!m_doSendEvents) // nothing to do
       return;


@@ -263,7 +262,6 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
    default:
       if(keyCode == 'c' && event.ControlDown())
          Copy();
    default:
       if(keyCode == 'c' && event.ControlDown())
          Copy();

-      break;

       if( IsEditable() )
       {
          /* First, handle control keys */
       if( IsEditable() )
       {
          /* First, handle control keys */


@@ -352,7 +350,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
    }// first switch()
    ScrollToCursor();
    wxRect r = *m_llist->GetUpdateRect();
    }// first switch()
    ScrollToCursor();
    wxRect r = *m_llist->GetUpdateRect();

-   Refresh( FALSE, &r);
+   DoPaint(&r);

 }
 
 void
 }
 
 void


@@ -674,12 +672,12 @@ void
 wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;
 wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;

-//FIXME   DoPaint(); // to repaint the cursor
+//FIXME: need argument   DoPaint(); // to repaint the cursor

 }
 
 void
 wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;
 }
 
 void
 wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;

-//FIXME   DoPaint(); // to repaint the cursor
+//FIXME: need argument   DoPaint(); // to repaint the cursor

 }
 }