applied fixes for CodeWarrior compilation

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 0d8bcc184cfc8c24250def6a6467b4930f553528..618b51f855c226a5f32190708c0e94a9a1723af6 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -18,7 +18,7 @@
 #ifndef _WX_WXSTRINGH__
 #define _WX_WXSTRINGH__
 
 #ifndef _WX_WXSTRINGH__
 #define _WX_WXSTRINGH__
 

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

     #pragma interface "string.h"
 #endif
 
     #pragma interface "string.h"
 #endif
 


@@ -243,6 +243,9 @@ class WXDLLIMPEXP_BASE wxStringBase
 #if !wxUSE_STL
 friend class WXDLLIMPEXP_BASE wxArrayString;
 #endif
 #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;
 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;
 
   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(); }
   // constructors and destructor
     // ctor for an empty string
   wxStringBase() { Init(); }


@@ -505,11 +505,9 @@ public:
   size_t find(const wxChar* sz, size_t nStart = 0, size_t n = npos) const;
 #endif // VC++ 1.5
 
   size_t find(const wxChar* sz, size_t nStart = 0, size_t n = npos) const;
 #endif // VC++ 1.5
 

-  // Gives a duplicate symbol (presumably a case-insensitivity problem)
-#if !defined(__BORLANDC__)

     // find the first occurence of character ch after nStart
   size_t find(wxChar ch, size_t nStart = 0) const;
     // find the first occurence of character ch after nStart
   size_t find(wxChar ch, size_t nStart = 0) const;

-#endif
+

     // rfind() family is exactly like find() but works right to left
 
     // as find, but from the end
     // rfind() family is exactly like find() but works right to left
 
     // as find, but from the end