wxNotebook interface (it may change!), implementation file is not yet

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 55b4812624da2506c4e7e68e59016ec9a26ae600..0b413e841fa66652e030d6f87d9eb3a69d029ec9 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -548,8 +548,12 @@ public:
         //@{
           /// find a substring
           size_t find(const wxString& str, size_t nStart = 0) const;
         //@{
           /// find a substring
           size_t find(const wxString& str, size_t nStart = 0) const;

+
+          // VC++ 1.5 can't cope with this syntax.
+#if ! (defined(_MSC_VER) && !defined(__WIN32__))

           /// find first n characters of sz
           size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const;
           /// find first n characters of sz
           size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const;

+#endif

           /// find the first occurence of character ch after nStart
           size_t find(char ch, size_t nStart = 0) const;
 
           /// find the first occurence of character ch after nStart
           size_t find(char ch, size_t nStart = 0) const;
 


@@ -565,10 +569,13 @@ public:
         /// as find, but from the end
         size_t rfind(const wxString& str, size_t nStart = npos) const;
         /// as find, but from the end
         /// as find, but from the end
         size_t rfind(const wxString& str, size_t nStart = npos) const;
         /// as find, but from the end

+        // VC++ 1.5 can't cope with this syntax.
+#if ! (defined(_MSC_VER) && !defined(__WIN32__))

         size_t rfind(const char* sz, size_t nStart = npos, 
                      size_t n = npos) const;
         /// as find, but from the end
         size_t rfind(char ch, size_t nStart = npos) const;
         size_t rfind(const char* sz, size_t nStart = npos, 
                      size_t n = npos) const;
         /// as find, but from the end
         size_t rfind(char ch, size_t nStart = npos) const;

+#endif

         //@}
         
         /**
         //@}
         
         /**