X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38aa6e420c1dde8dc8c2a6512a314328bcf8a28f..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/generic/caret.h diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index f9dd4d3866..36380b6ea5 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/caret.h +// Name: wx/generic/caret.h // Purpose: generic wxCaret class // Author: Vadim Zeitlin (original code by Robert Roebling) // Modified by: @@ -16,15 +16,13 @@ #include "wx/dc.h" #include "wx/overlay.h" -#if wxHAS_NATIVE_OVERLAY - #define wxHAS_CARET_USING_OVERLAYS 1 -#else - #define wxHAS_CARET_USING_OVERLAYS 0 +#ifdef wxHAS_NATIVE_OVERLAY + #define wxHAS_CARET_USING_OVERLAYS #endif -class WXDLLIMPEXP_CORE wxCaret; +class WXDLLIMPEXP_FWD_CORE wxCaret; -class WXDLLEXPORT wxCaretTimer : public wxTimer +class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); @@ -72,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 wxHAS_CARET_USING_OVERLAYS +#ifdef wxHAS_CARET_USING_OVERLAYS // the overlay for displaying the caret wxOverlay m_overlay; #else