fix the bug which prevented the same wxFile/DirDialog object from being used twice...

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

diff --git a/include/wx/string.h b/include/wx/string.h
index ad2ec51b9d01a58e6fe00d712de10f5f63fa93fe..c2202864cbc48862e1a149c0b4cfcb8ae53ee269 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -314,7 +314,6 @@ public:
       iterator_type base() const { return m_cur; }                            \
                                                                               \
       reference operator*() const { return *(m_cur - 1); }                    \
       iterator_type base() const { return m_cur; }                            \
                                                                               \
       reference operator*() const { return *(m_cur - 1); }                    \

-      pointer operator->() const { return m_cur - 1; }                        \

                                                                               \
       name& operator++() { --m_cur; return *this; }                           \
       name operator++(int) { name tmp = *this; --m_cur; return tmp; }         \
                                                                               \
       name& operator++() { --m_cur; return *this; }                           \
       name operator++(int) { name tmp = *this; --m_cur; return tmp; }         \


@@ -1057,10 +1056,14 @@ public:
   wxString  operator()(size_t start, size_t len) const
     { return Mid(start, len); }
 
   wxString  operator()(size_t start, size_t len) const
     { return Mid(start, len); }
 

-      // check that the string starts with prefix and return the rest of the
-      // string in the provided pointer if it is not NULL, otherwise return
-      // false
+      // check if the string starts with the given prefix and return the rest
+      // of the string in the provided pointer if it is not NULL; otherwise
+      // return false

   bool StartsWith(const wxChar *prefix, wxString *rest = NULL) const;
   bool StartsWith(const wxChar *prefix, wxString *rest = NULL) const;

+      // check if the string ends with the given suffix and return the
+      // beginning of the string before the suffix in the provided pointer if
+      // it is not NULL; otherwise return false
+  bool EndsWith(const wxChar *suffix, wxString *rest = NULL) const;

 
       // get first nCount characters
   wxString Left(size_t nCount) const;
 
       // get first nCount characters
   wxString Left(size_t nCount) const;