X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/generic/caret.h diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 9b2340de44..83fd6e1aae 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -5,22 +5,24 @@ // Modified by: // Created: 25.05.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_CARET_H_ #define _WX_CARET_H_ -#ifdef __GNUG__ -#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 wxCaretTimer : public wxTimer +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,15 +70,26 @@ 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 - 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_