Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / msw / caret.h

diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index c42da02842f40175746bb8b98a918304a96a2d22..c179032d08e4a77175bf7c324d9fdd26475c729c 100644 (file)
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -1,22 +1,17 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/caret.h
+// Name:        wx/msw/caret.h

 // Purpose:     wxCaret class - the MSW implementation of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
 // Purpose:     wxCaret class - the MSW implementation of wxCaret
 // Author:      Vadim Zeitlin
 // 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_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 

-#ifdef __GNUG__
-    #pragma interface "caret.h"
-#endif
-
-class WXDLLEXPORT wxCaret : public wxCaretBase
+class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase

 {
 public:
     wxCaret() { Init(); }
 {
 public:
     wxCaret() { Init(); }


@@ -31,7 +26,7 @@ public:
         // same as above
     wxCaret(wxWindowBase *window, const wxSize& size)
     {
         // same as above
     wxCaret(wxWindowBase *window, const wxSize& size)
     {

-        wxCaretBase::Init();
+        Init();

 
         (void)Create(window, size);
     }
 
         (void)Create(window, size);
     }


@@ -45,19 +40,22 @@ protected:
     {
         wxCaretBase::Init();
 
     {
         wxCaretBase::Init();
 

-        m_hasCaret = FALSE;
+        m_hasCaret = false;

     }
 
     // override base class virtuals
     virtual void DoMove();
     virtual void DoShow();
     virtual void DoHide();
     }
 
     // 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;
 
     // helper function which creates the system caret
     bool MSWCreateCaret();
 
 private:
     bool m_hasCaret;

+
+    wxDECLARE_NO_COPY_CLASS(wxCaret);

 };
 
 #endif // _WX_CARET_H_
 };
 
 #endif // _WX_CARET_H_