X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968eb2ef396c78442ffea7a2463f3777ca6d1632..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/caret.h diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index d69587dc72..63166298dc 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -12,13 +12,15 @@ #ifndef _WX_CARET_H_ #define _WX_CARET_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "caret.h" -#endif - #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 { @@ -74,11 +76,16 @@ private: // GTK specific initialization void InitGeneric(); +#ifdef wxHAS_CARET_USING_OVERLAYS + // the overlay for displaying the caret + wxOverlay m_overlay; +#else // the bitmap holding the part of window hidden by the caret when it was // at (m_xOld, m_yOld) wxBitmap m_bmpUnderCaret; int m_xOld, m_yOld; +#endif wxCaretTimer m_timer; bool m_blinkedOut, // true => caret hidden right now