compilation fix after incorrectly resolved conflict

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index bdc4279c56031c6f9b4db4d7def85be84fb5e930..f16884bd9035f7d485bfc36ad2efec3865e88242 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -12,6 +12,10 @@
 #ifndef _WX_CARET_H_BASE_
 #define _WX_CARET_H_BASE_
 
+#ifdef __GNUG__
+#pragma interface "caret.h"
+#endif
+
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
@@ -178,8 +182,6 @@ private:
 
 #if defined(__WXMSW__)
     #include "wx/msw/caret.h"
-#elif  defined(__WXPM__)
-    #include "wx/os2/caret.h"
 #else
     #include "wx/generic/caret.h"
 #endif // platform