X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/789295bf7bd4b58b0270800fb689fce0786dae15..c077ee943391930e0a7550f7ce810cb72a6d5820:/include/wx/msw/caret.h?ds=sidebyside diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h index c42da02842..f1075aa471 100644 --- a/include/wx/msw/caret.h +++ b/include/wx/msw/caret.h @@ -12,7 +12,7 @@ #ifndef _WX_CARET_H_ #define _WX_CARET_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "caret.h" #endif @@ -31,7 +31,7 @@ public: // same as above wxCaret(wxWindowBase *window, const wxSize& size) { - wxCaretBase::Init(); + Init(); (void)Create(window, size); } @@ -52,12 +52,15 @@ protected: virtual void DoMove(); virtual void DoShow(); virtual void DoHide(); + virtual void DoSize(); // helper function which creates the system caret bool MSWCreateCaret(); private: bool m_hasCaret; + + DECLARE_NO_COPY_CLASS(wxCaret) }; #endif // _WX_CARET_H_