X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af76254d1930da6287fca442f3d10369fcb633f7..9a7b7798282622e445efc3318b6c85ff0bed9af8:/src/generic/caret.cpp?ds=sidebyside

diff --git a/src/generic/caret.cpp b/src/generic/caret.cpp
index 54cab63e4b..5cad74d086 100644
--- a/src/generic/caret.cpp
+++ b/src/generic/caret.cpp
@@ -88,7 +88,7 @@ void wxCaret::InitGeneric()
 {
     m_hasFocus = true;
     m_blinkedOut = true;
-#if wxUSE_OVERLAY == 0
+#ifndef wxHAS_CARET_USING_OVERLAYS
     m_xOld =
     m_yOld = -1;
     m_bmpUnderCaret.Create(m_width, m_height);
@@ -131,6 +131,9 @@ void wxCaret::DoHide()
 
 void wxCaret::DoMove()
 {
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#endif
     if ( IsVisible() )
     {
         if ( !m_blinkedOut )
@@ -155,7 +158,9 @@ void wxCaret::DoSize()
         m_countVisible = 0;
         DoHide();
     }
-#if wxUSE_OVERLAY == 0
+#ifdef wxHAS_CARET_USING_OVERLAYS
+    m_overlay.Reset();
+#else
     // Change bitmap size
     m_bmpUnderCaret = wxBitmap(m_width, m_height);
 #endif
@@ -212,7 +217,7 @@ void wxCaret::Refresh()
 {
     wxClientDC dcWin(GetWindow());
 // this is the new code, switch to 0 if this gives problems
-#if wxUSE_OVERLAY
+#ifdef wxHAS_CARET_USING_OVERLAYS
     wxDCOverlay dcOverlay( m_overlay, &dcWin, m_x, m_y, m_width , m_height );
     if ( m_blinkedOut )
     {