wxString::substr() bug fixed

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 29be6c677036cb01ece4225420b36dca423cd135..a47ca920c5a4c4b48c936cfe43946b57c4807e0c 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -859,7 +859,8 @@ public:
               const wxChar* sz, size_t nCount = npos) const;
 
   // substring extraction
-  wxString substr(size_t nStart = 0, size_t nLen = npos) const;
+  wxString substr(size_t nStart = 0, size_t nLen = npos) const
+    { return Mid(nStart, nLen); }
 #endif // wxSTD_STRING_COMPATIBILITY
 };
 

diff --git a/src/common/string.cpp b/src/common/string.cpp
index fe8480cd452c4676141eb87c8521424e19ae92b1..ed777353a7e37d8cc35e9183dc453a3f34b63b16 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1643,17 +1643,6 @@ size_t wxString::find_last_not_of(wxChar ch, size_t nStart) const
     return npos;
 }
 
-wxString wxString::substr(size_t nStart, size_t nLen) const
-{
-  // npos means 'take all'
-  if ( nLen == npos )
-    nLen = 0;
-
-  wxASSERT( nStart + nLen <= Len() );
-
-  return wxString(c_str() + nStart, nLen == npos ? 0 : nLen);
-}
-
 wxString& wxString::erase(size_t nStart, size_t nLen)
 {
   wxString strTmp(c_str(), nStart);