X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adf9e09990c79a3645eaa1f69b44d852c11a72f0..3f4a2351e4c677c88c18ea812b609477adee7380:/src/msw/caret.cpp

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index dac2949001..8574c2acc7 100644
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "caret.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -43,15 +39,9 @@
 // macros
 // ---------------------------------------------------------------------------
 
-// under Win16 the caret APIs are void but under Win32 they may return an
-// error code which we want to check - this macro does just this
-#ifdef __WIN16__
-    #define CALL_CARET_API(api, args)   api args
-#else // Win32
-    #define CALL_CARET_API(api, args)   \
+#define CALL_CARET_API(api, args)   \
         if ( !api args )                \
             wxLogLastError(_T(#api))
-#endif // Win16/32
 
 // ===========================================================================
 // implementation
@@ -93,7 +83,7 @@ bool wxCaret::MSWCreateCaret()
         CALL_CARET_API(CreateCaret, (GetWinHwnd(GetWindow()), 0,
                                      m_width, m_height));
 
-        m_hasCaret = TRUE;
+        m_hasCaret = true;
     }
 
     return m_hasCaret;
@@ -119,7 +109,7 @@ void wxCaret::OnKillFocus()
 {
     if ( m_hasCaret )
     {
-        m_hasCaret = FALSE;
+        m_hasCaret = false;
 
         CALL_CARET_API(DestroyCaret, ());
     }
@@ -188,7 +178,7 @@ void wxCaret::DoSize()
 {
     if ( m_hasCaret )
     {
-        m_hasCaret = FALSE;
+        m_hasCaret = false;
         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();
         OnSetFocus();