Various bug fixes, cosmetic changes

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 55b4812624da2506c4e7e68e59016ec9a26ae600..62a5730f58bf8448c5cadd493dde66ff61ff137d 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -13,7 +13,7 @@
 #define __WXSTRINGH__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "string.h"
 #endif
 
 /* Dependencies (should be included before this header):
@@ -349,7 +349,7 @@ public:
     //@}
   //@}
 
-  /** @name formated output */
+  /** @name formated input/output */
   //@{
     /// as sprintf(), returns the number of characters written or < 0 on error
   int Printf(const char *pszFormat, ...);
@@ -548,8 +548,12 @@ public:
         //@{
           /// 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;
+#endif
           /// 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
+        // 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;
+#endif
         //@}
         
         /**