X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/861410228d37a914cb2d906cfd528b3c60fa017d..ad667945478cda0c0a33e154f1d4403402cffb9e:/include/wx/generic/caret.h

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 78ca72141e..e19212316d 100644
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -13,6 +13,12 @@
 #define _WX_CARET_H_
 
 #include "wx/timer.h"
+#include "wx/dc.h"
+#include "wx/overlay.h"
+
+#ifdef wxHAS_NATIVE_OVERLAY
+    #define wxHAS_CARET_USING_OVERLAYS
+#endif
 
 class WXDLLIMPEXP_CORE wxCaret;
 
@@ -26,18 +32,6 @@ private:
     wxCaret *m_caret;
 };
 
-#ifndef wxUSE_OVERLAY
-    #if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
-        #define wxUSE_OVERLAY 1
-    #else
-        #define wxUSE_OVERLAY 0
-    #endif
-#endif
-
-#if wxUSE_OVERLAY
-    #include "wx/dc.h"
-#endif
-
 class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
 {
 public:
@@ -82,7 +76,7 @@ private:
     // GTK specific initialization
     void InitGeneric();
 
-#if wxUSE_OVERLAY
+#ifdef wxHAS_CARET_USING_OVERLAYS
     // the overlay for displaying the caret
     wxOverlay   m_overlay;
 #else