check for WXWIN_COMPATIBLITY settings, they affect binary compatibility

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 724ac878d140c91af6999e4e8cdd50414b599158..618b51f855c226a5f32190708c0e94a9a1723af6 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -18,7 +18,7 @@
 #ifndef _WX_WXSTRINGH__
 #define _WX_WXSTRINGH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "string.h"
 #endif
 
@@ -243,6 +243,9 @@ class WXDLLIMPEXP_BASE wxStringBase
 #if !wxUSE_STL
 friend class WXDLLIMPEXP_BASE wxArrayString;
 #endif
+public :
+  // an 'invalid' value for string index, moved to this place due to a CW bug
+  static const size_t npos;
 protected:
   // points to data preceded by wxStringData structure with ref count info
   wxChar *m_pchData;
@@ -291,9 +294,6 @@ public:
   typedef value_type *iterator;
   typedef const value_type *const_iterator;
 
-  // an 'invalid' value for string index
-  static const size_t npos;
-
   // constructors and destructor
     // ctor for an empty string
   wxStringBase() { Init(); }