fixed wxEVT_CONTEXT_MENU generation (it works differently under w2k/XP than under...

[wxWidgets.git] / src / msw / caret.cpp

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index ee761165a116c557f584ee47b56964c92a115f7d..63fc43ac088e8f11c4ff5d5361e6fc172aaf182b 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "caret.h"
 #endif
 
     #pragma implementation "caret.h"
 #endif
 


@@ -35,6 +35,8 @@
 
 #include "wx/caret.h"
 
 
 #include "wx/caret.h"
 

+#if wxUSE_CARET
+

 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------


@@ -192,3 +194,5 @@ void wxCaret::DoSize()
         OnSetFocus();
     }
 }
         OnSetFocus();
     }
 }

+
+#endif