X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/generic/caret.h?ds=sidebyside diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index d840b7d8c8..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: @@ -12,15 +12,17 @@ #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 wxCaret; +#ifdef wxHAS_NATIVE_OVERLAY + #define wxHAS_CARET_USING_OVERLAYS +#endif -class WXDLLEXPORT wxCaretTimer : public wxTimer +class WXDLLIMPEXP_FWD_CORE wxCaret; + +class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); @@ -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(); @@ -67,17 +70,22 @@ 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(); +#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