X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/caret.h diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index bffe9be1b1..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" + +#ifdef wxHAS_NATIVE_OVERLAY + #define wxHAS_CARET_USING_OVERLAYS +#endif -class wxCaret; +class WXDLLIMPEXP_FWD_CORE wxCaret; class WXDLLEXPORT wxCaretTimer : public wxTimer { @@ -30,7 +32,7 @@ private: wxCaret *m_caret; }; -class wxCaret : public wxCaretBase +class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase { public: // ctors @@ -59,6 +61,7 @@ protected: virtual void DoShow(); virtual void DoHide(); virtual void DoMove(); + virtual void DoSize(); // blink the caret once void Blink(); @@ -68,20 +71,25 @@ protected: // draw the caret on the given DC void DoDraw(wxDC *dc); - + 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 - m_hasFocus; // TRUE => our window has focus + bool m_blinkedOut, // true => caret hidden right now + m_hasFocus; // true => our window has focus }; #endif // _WX_CARET_H_