X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/861410228d37a914cb2d906cfd528b3c60fa017d..6d8978f030996c834fcd29d85d95ebe261b8defc:/include/wx/generic/caret.h diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 78ca72141e..83fd6e1aae 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -13,10 +13,16 @@ #define _WX_CARET_H_ #include "wx/timer.h" +#include "wx/dc.h" +#include "wx/overlay.h" -class WXDLLIMPEXP_CORE wxCaret; +#ifdef wxHAS_NATIVE_OVERLAY + #define wxHAS_CARET_USING_OVERLAYS +#endif + +class WXDLLIMPEXP_FWD_CORE wxCaret; -class WXDLLEXPORT wxCaretTimer : public wxTimer +class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); @@ -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: @@ -76,13 +70,13 @@ protected: void Refresh(); // draw the caret on the given DC - void DoDraw(wxDC *dc); + void DoDraw(wxDC *dc, wxWindow* win); private: // GTK specific initialization void InitGeneric(); -#if wxUSE_OVERLAY +#ifdef wxHAS_CARET_USING_OVERLAYS // the overlay for displaying the caret wxOverlay m_overlay; #else