renamed to WX_DECLARE_LIST_WITH_DECL for consistency

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

diff --git a/include/wx/string.h b/include/wx/string.h
index cddfe30b9a81804d6294b06c7f175c0ee1d0b355..6e9003595bdf99d72dba02ec49fb72a55e9ef7a5 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -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(); }
@@ -505,11 +505,9 @@ public:
   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;
-#endif
+
     // rfind() family is exactly like find() but works right to left
 
     // as find, but from the end
@@ -771,11 +769,11 @@ public:
 #ifndef wxSIZE_T_IS_UINT
     // operator version of GetChar
     wxChar operator[](unsigned int n) const
-      { return operator[](n); }
+      { return wxStringBase::operator[](n); }
 
     // operator version of GetWriteableChar
     wxChar& operator[](unsigned int n)
-      { return operator[](n); }
+      { return wxStringBase::operator[](n); }
 #endif // size_t != unsigned int
 
     // implicit conversion to C string