moved wxOverlay into overlay.* files and out of dc.h/dcbase.cpp; implemented wxOverla...

[wxWidgets.git] / include / wx / generic / caret.h

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 78ca72141ea88a900313af0f3ca1a9046acb3864..8845f4cd8d3112e02faeadc2f7d9be5ab997d392 100644 (file)
--- 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"
+
+#if wxHAS_NATIVE_OVERLAY
+    #define wxHAS_CARET_USING_OVERLAYS 1
+#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
+#if wxHAS_CARET_USING_OVERLAYS
     // the overlay for displaying the caret
     wxOverlay   m_overlay;
 #else