Insure suitable choices of path/drive separator on OS/2.

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 618b51f855c226a5f32190708c0e94a9a1723af6..45e8aa038436923a2ac1d13e4068605777ac2962 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -32,10 +32,6 @@
     #include <ctype.h>
 #endif
 
     #include <ctype.h>
 #endif
 

-#ifdef __EMX__
-    #include <std.h>
-#endif
-

 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
    // problem in VACPP V4 with including stdlib.h multiple times
    // strconv includes it anyway
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
    // problem in VACPP V4 with including stdlib.h multiple times
    // strconv includes it anyway


@@ -177,7 +173,7 @@ inline const wxString& wxGetEmptyString() { return *(wxString *)&wxEmptyString;
 #include "wx/afterstd.h"
 
 #if wxUSE_UNICODE
 #include "wx/afterstd.h"
 
 #if wxUSE_UNICODE

-    #if HAVE_STD_WSTRING
+    #ifdef HAVE_STD_WSTRING

         typedef std::wstring wxStringBase;
     #else
         typedef std::basic_string<wxChar> wxStringBase;
         typedef std::wstring wxStringBase;
     #else
         typedef std::basic_string<wxChar> wxStringBase;


@@ -527,6 +523,7 @@ public:
     { return find_first_of(str.c_str(), nStart); }
     // same as above
   size_t find_first_of(const wxChar* sz, size_t nStart = 0) const;
     { return find_first_of(str.c_str(), nStart); }
     // same as above
   size_t find_first_of(const wxChar* sz, size_t nStart = 0) const;

+  size_t find_first_of(const wxChar* sz, size_t nStart, size_t n) const;

     // same as find(char, size_t)
   size_t find_first_of(wxChar c, size_t nStart = 0) const
     { return find(c, nStart); }
     // same as find(char, size_t)
   size_t find_first_of(wxChar c, size_t nStart = 0) const
     { return find(c, nStart); }


@@ -535,6 +532,7 @@ public:
     { return find_last_of(str.c_str(), nStart); }
     // same as above
   size_t find_last_of (const wxChar* sz, size_t nStart = npos) const;
     { return find_last_of(str.c_str(), nStart); }
     // same as above
   size_t find_last_of (const wxChar* sz, size_t nStart = npos) const;

+  size_t find_last_of(const wxChar* sz, size_t nStart, size_t n) const;

     // same as above
   size_t find_last_of(wxChar c, size_t nStart = npos) const
     { return rfind(c, nStart); }
     // same as above
   size_t find_last_of(wxChar c, size_t nStart = npos) const
     { return rfind(c, nStart); }


@@ -546,13 +544,15 @@ public:
     { return find_first_not_of(str.c_str(), nStart); }
     // same as above
   size_t find_first_not_of(const wxChar* sz, size_t nStart = 0) const;
     { return find_first_not_of(str.c_str(), nStart); }
     // same as above
   size_t find_first_not_of(const wxChar* sz, size_t nStart = 0) const;

+  size_t find_first_not_of(const wxChar* sz, size_t nStart, size_t n) const;

     // same as above
   size_t find_first_not_of(wxChar ch, size_t nStart = 0) const;
     //  as strcspn()
   size_t find_last_not_of(const wxStringBase& str, size_t nStart = npos) const
     // same as above
   size_t find_first_not_of(wxChar ch, size_t nStart = 0) const;
     //  as strcspn()
   size_t find_last_not_of(const wxStringBase& str, size_t nStart = npos) const

-    { return find_first_not_of(str.c_str(), nStart); }
+    { return find_last_not_of(str.c_str(), nStart); }

     // same as above
   size_t find_last_not_of(const wxChar* sz, size_t nStart = npos) const;
     // same as above
   size_t find_last_not_of(const wxChar* sz, size_t nStart = npos) const;

+  size_t find_last_not_of(const wxChar* sz, size_t nStart, size_t n) const;

     // same as above
   size_t find_last_not_of(wxChar ch, size_t nStart = npos) const;
 
     // same as above
   size_t find_last_not_of(wxChar ch, size_t nStart = npos) const;