The cursor is back! (Someone corrected wxGTK's idea of XOR. :-)

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

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 6511e8f7259711bdfc0af2c7cb6bdf1e14cd8a6c..6548ea34ebd80d51651adc1ec855460a33e72d62 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -2350,7 +2350,8 @@ wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate)
 #ifdef WXLAYOUT_USE_CARET
    m_caret->Move(coords);
 #else // !WXLAYOUT_USE_CARET
-   dc.SetBrush(*wxBLACK_BRUSH);
+   dc.SetBrush(*wxWHITE_BRUSH);
+   //FIXME: wxGTK XOR is borken at the moment!!!dc.SetLogicalFunction(wxXOR);
    dc.SetLogicalFunction(wxXOR);
    dc.SetPen(wxPen(*wxBLACK,1,wxSOLID));
    if(active)

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index 0745527116c6e1a093e9865d14652494cb8bfaf9..c4e292a1a9757dcbf5ea24ad1d9da5cdb219966d 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -887,6 +887,7 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
       m_maxx = max.x + X_SCROLL_PAGE;
       m_maxy = max.y + Y_SCROLL_PAGE;
    }
+#if 0
    else
    {
       // check if the window hasn't become too big, thus making the scrollbars
@@ -905,6 +906,7 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
          m_hasVScrollbar = false;
       }
    }
+#endif
 }
 
 // ----------------------------------------------------------------------------