deprecate wxSTRING_MAXLEN in favour of wxString::npos

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 2ab5d20b57424db8d719757a90837a30dea1bf62..dc60c22a889858b765b81301b5b23866ca9057ca 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -76,9 +76,15 @@ class WXDLLIMPEXP_BASE wxString;
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6
+
+// deprecated in favour of wxString::npos, don't use in new code
+//

 // maximum possible length for a string means "take all string" everywhere
 #define wxSTRING_MAXLEN wxStringBase::npos
 
 // maximum possible length for a string means "take all string" everywhere
 #define wxSTRING_MAXLEN wxStringBase::npos
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 // ----------------------------------------------------------------------------
 // global data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global data
 // ----------------------------------------------------------------------------


@@ -407,7 +413,7 @@ public:
     // return the length of the string
   size_type size() const { return length(); }
     // return the maximum size of the string
     // return the length of the string
   size_type size() const { return length(); }
     // return the maximum size of the string

-  size_type max_size() const { return wxSTRING_MAXLEN; }
+  size_type max_size() const { return npos; }

     // resize the string, filling the space with c if c != 0
   void resize(size_t nSize, wxChar ch = wxT('\0'));
     // delete the contents of the string
     // resize the string, filling the space with c if c != 0
   void resize(size_t nSize, wxChar ch = wxT('\0'));
     // delete the contents of the string