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

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index b89796ff88062fbd26b0a8f7ab821bf5db276f0e..e6e9728ff8f6e10bf850e1f5246927849db2fd9d 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -147,7 +146,7 @@ public:
     virtual void OnKillFocus() { }
 
 protected:
     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)
     {
     // 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:
     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)) {}
 
 public:
     wxCaretSuspend(wxWindow *WXUNUSED(win)) {}
 

-    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
+    wxDECLARE_NO_COPY_CLASS(wxCaretSuspend);

 };
 
 #else // !wxHAS_CARET_USING_OVERLAYS
 };
 
 #else // !wxHAS_CARET_USING_OVERLAYS


@@ -242,7 +241,7 @@ private:
     wxCaret *m_caret;
     bool     m_show;
 
     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
 };
 
 #endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS