X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c328d0ad10f2c7c6726ef9db0a7933cf555b303e..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/generic/caret.cpp

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 08dd830068..5cad74d086 100644
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "caret.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -92,10 +88,11 @@ void wxCaret::InitGeneric()
 {
     m_hasFocus = true;
     m_blinkedOut = true;
-
+#ifndef wxHAS_CARET_USING_OVERLAYS
     m_xOld =
     m_yOld = -1;
     m_bmpUnderCaret.Create(m_width, m_height);
+#endif
 }
 
 wxCaret::~wxCaret()
@@ -134,6 +131,9 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#endif
     if ( IsVisible() )
     {
         if ( !m_blinkedOut )
@@ -158,8 +158,12 @@ void wxCaret::DoSize()
         m_countVisible = 0;
         DoHide();
     }
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#else
     // Change bitmap size
     m_bmpUnderCaret = wxBitmap(m_width, m_height);
+#endif
     if (countVisible > 0)
     {
         m_countVisible = countVisible;
@@ -212,6 +216,18 @@ void wxCaret::Blink()
 void wxCaret::Refresh()
 {
     wxClientDC dcWin(GetWindow());
+// this is the new code, switch to 0 if this gives problems
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height );
+    if ( m_blinkedOut )
+    {
+        dcOverlay.Clear();
+    }
+    else
+    {
+        DoDraw( &dcWin );
+    }
+#else
     wxMemoryDC dcMem;
     dcMem.SelectObject(m_bmpUnderCaret);
     if ( m_blinkedOut )
@@ -247,6 +263,7 @@ void wxCaret::Refresh()
         // and draw the caret there
         DoDraw(&dcWin);
     }
+#endif
 }
 
 void wxCaret::DoDraw(wxDC *dc)