X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/generic/caret.h diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h index 9b2340de44..1fdd096d4e 100644 --- a/include/wx/generic/caret.h +++ b/include/wx/generic/caret.h @@ -12,7 +12,7 @@ #ifndef _WX_CARET_H_ #define _WX_CARET_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "caret.h" #endif @@ -20,7 +20,7 @@ class wxCaret; -class wxCaretTimer : public wxTimer +class WXDLLEXPORT wxCaretTimer : public wxTimer { public: wxCaretTimer(wxCaret *caret); @@ -73,6 +73,12 @@ private: // GTK specific initialization void InitGeneric(); + // 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; + wxCaretTimer m_timer; bool m_blinkedOut, // TRUE => caret hidden right now m_hasFocus; // TRUE => our window has focus