X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/789295bf7bd4b58b0270800fb689fce0786dae15..aa96f01c02ca602769785fa4bad0dd69ae6cad05:/include/wx/msw/caret.h?ds=sidebyside

diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index c42da02842..1a996fefc9 100644
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     23.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__
+#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);
     }
@@ -45,19 +45,22 @@ protected:
     {
         wxCaretBase::Init();
 
-        m_hasCaret = FALSE;
+        m_hasCaret = false;
     }
 
     // override base class virtuals
     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_