X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/caret.h?ds=sidebyside diff --git a/include/wx/caret.h b/include/wx/caret.h index b89796ff88..e6e9728ff8 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 23.05.99 -// RCS-ID: $Id$ // Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -147,7 +146,7 @@ public: virtual void OnKillFocus() { } protected: - // these functions may be overriden in the derived classes, but they + // these functions may be overridden in the derived classes, but they // should call the base class version first virtual bool DoCreate(wxWindowBase *window, int width, int height) { @@ -186,7 +185,7 @@ protected: int m_countVisible; private: - DECLARE_NO_COPY_CLASS(wxCaretBase) + wxDECLARE_NO_COPY_CLASS(wxCaretBase); }; // --------------------------------------------------------------------------- @@ -213,7 +212,7 @@ class WXDLLIMPEXP_CORE wxCaretSuspend public: wxCaretSuspend(wxWindow *WXUNUSED(win)) {} - DECLARE_NO_COPY_CLASS(wxCaretSuspend) + wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); }; #else // !wxHAS_CARET_USING_OVERLAYS @@ -242,7 +241,7 @@ private: wxCaret *m_caret; bool m_show; - DECLARE_NO_COPY_CLASS(wxCaretSuspend) + wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); }; #endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS