X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa06b433fc7ed4137d7fe5195cbbec88a10291af..7848088476db284a94f19eeb24411b45d676ac46:/src/msw/caret.cpp

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index ee761165a1..a043aa174a 100644
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "caret.h"
 #endif
 
@@ -35,21 +35,17 @@
 
 #include "wx/caret.h"
 
+#if wxUSE_CARET
+
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 // 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
@@ -192,3 +188,5 @@ void wxCaret::DoSize()
         OnSetFocus();
     }
 }
+
+#endif