#ifdef wxUSE_LIBJPEG changed to #if wxUSELIBJPEG

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

diff --git a/include/wx/string.h b/include/wx/string.h
index e88f2e992b91893b01c8f2dca04ba55b23e96bcd..fbe3c9e36d0ebd787f66fe326819685f1f694e15 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -16,15 +16,10 @@
 #pragma interface "string.h"
 #endif
 
 #pragma interface "string.h"
 #endif
 

-/* Dependencies (should be included before this header):
- *         string.h
- *         stdio.h
- *         stdarg.h
- *         limits.h
- */

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-#include <ctype.h>
+    #include <ctype.h>

 #endif
 #endif

+

 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>


@@ -32,11 +27,12 @@
 #include <stdlib.h>
 
 #ifndef  WX_PRECOMP
 #include <stdlib.h>
 
 #ifndef  WX_PRECOMP

-  #include "wx/defs.h"     // Robert Roebling
+  #include "wx/defs.h"
+

   #ifdef    WXSTRING_IS_WXOBJECT
     #include "wx/object.h"
   #endif
   #ifdef    WXSTRING_IS_WXOBJECT
     #include "wx/object.h"
   #endif

-#endif
+#endif // !PCH

 
 #include "wx/debug.h"
 
 
 #include "wx/debug.h"
 


@@ -54,7 +50,9 @@
 #define   wxSTD_STRING_COMPATIBILITY
 
 // define to derive wxString from wxObject
 #define   wxSTD_STRING_COMPATIBILITY
 
 // define to derive wxString from wxObject

+#ifdef    WXSTRING_IS_WXOBJECT

 #undef    WXSTRING_IS_WXOBJECT
 #undef    WXSTRING_IS_WXOBJECT

+#endif

 
 // maximum possible length for a string means "take all string" everywhere
 //  (as sizeof(StringData) is unknown here we substract 100)
 
 // maximum possible length for a string means "take all string" everywhere
 //  (as sizeof(StringData) is unknown here we substract 100)


@@ -81,10 +79,12 @@ inline size_t WXDLLEXPORT Strlen(const char *psz)
 // portable strcasecmp/_stricmp
 inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
 {
 // portable strcasecmp/_stricmp
 inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
 {

-#if     defined(_MSC_VER)
+#if     defined(__VISUALC__) || defined(__MWERKS__)

   return _stricmp(psz1, psz2);
 #elif     defined(__SC__)
   return _stricmp(psz1, psz2);
   return _stricmp(psz1, psz2);
 #elif     defined(__SC__)
   return _stricmp(psz1, psz2);

+#elif     defined(__SALFORDC__)
+  return stricmp(psz1, psz2);

 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);
 #elif defined(__WATCOMC__)
 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);
 #elif defined(__WATCOMC__)


@@ -226,6 +226,13 @@ private:
   void CopyBeforeWrite();
   void AllocBeforeWrite(size_t);
 
   void CopyBeforeWrite();
   void AllocBeforeWrite(size_t);
 

+  // this method is not implemented - there is _no_ conversion from int to
+  // string, you're doing something wrong if the compiler wants to call it!
+  //
+  // try `s << i' or `s.Printf("%d", i)' instead
+  wxString(int);
+  wxString(long);
+

 public:
   // constructors and destructor
     // ctor for an empty string
 public:
   // constructors and destructor
     // ctor for an empty string


@@ -262,6 +269,8 @@ public:
   size_t Len() const { return GetStringData()->nDataLength; }
     // string contains any characters?
   bool IsEmpty() const { return Len() == 0; }
   size_t Len() const { return GetStringData()->nDataLength; }
     // string contains any characters?
   bool IsEmpty() const { return Len() == 0; }

+    // empty string is "FALSE", so !str will return TRUE
+  bool operator!() const { return IsEmpty(); }

     // empty string contents
   void Empty()
   {
     // empty string contents
   void Empty()
   {


@@ -399,7 +408,7 @@ public:
   wxString& operator<<(float f);
       // insert a double into string
   wxString& operator<<(double d);
   wxString& operator<<(float f);
       // insert a double into string
   wxString& operator<<(double d);

-  
+

   // string comparison
     // case-sensitive comparison: return 0 if =, +1 if > or -1 if <
   int  Cmp(const char *psz) const { return strcmp(c_str(), psz); }
   // string comparison
     // case-sensitive comparison: return 0 if =, +1 if > or -1 if <
   int  Cmp(const char *psz) const { return strcmp(c_str(), psz); }


@@ -437,14 +446,19 @@ public:
   wxString AfterLast(char ch) const;
 
     // for compatibility only, use more explicitly named functions above
   wxString AfterLast(char ch) const;
 
     // for compatibility only, use more explicitly named functions above

-  wxString Before(char ch) const { return BeforeLast(ch); } 
-  wxString After(char ch) const { return AfterFirst(ch); } 
+  wxString Before(char ch) const { return BeforeLast(ch); }
+  wxString After(char ch) const { return AfterFirst(ch); }

 
   // case conversion
 
   // case conversion

-      // convert to upper case, return the string itself
+      // convert to upper case in place, return the string itself

   wxString& MakeUpper();
   wxString& MakeUpper();

-      // convert to lower case, return the string itself
+      // convert to upper case, return the copy of the string
+      // Here's something to remember: BC++ doesn't like returns in inlines.
+  wxString Upper() const ;
+      // convert to lower case in place, return the string itself

   wxString& MakeLower();
   wxString& MakeLower();

+      // convert to lower case, return the copy of the string
+  wxString Lower() const ;

 
   // trimming/padding whitespace (either side) and truncating
       // remove spaces from left or from right (default) side
 
   // trimming/padding whitespace (either side) and truncating
       // remove spaces from left or from right (default) side


@@ -496,15 +510,9 @@ public:
   enum caseCompare {exact, ignoreCase};
     // values for first parameter of Strip function
   enum stripType {leading = 0x1, trailing = 0x2, both = 0x3};
   enum caseCompare {exact, ignoreCase};
     // values for first parameter of Strip function
   enum stripType {leading = 0x1, trailing = 0x2, both = 0x3};

+

     // use Printf()
     // use Printf()

-  inline int sprintf(const char *pszFormat, ...)
-  {
-    va_list argptr;
-    va_start(argptr, pszFormat);
-    int iLen = PrintfV(pszFormat, argptr);
-    va_end(argptr);
-    return iLen;
-  }
+  int sprintf(const char *pszFormat, ...);

 
     // use Cmp()
   inline int CompareTo(const char* psz, caseCompare cmp = exact) const
 
     // use Cmp()
   inline int CompareTo(const char* psz, caseCompare cmp = exact) const


@@ -640,7 +648,7 @@ public:
   size_t find(const wxString& str, size_t nStart = 0) const;
 
   // VC++ 1.5 can't cope with this syntax.
   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__))
+#if !defined(__VISUALC__) || 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 first n characters of sz
   size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const;
 #endif


@@ -656,7 +664,7 @@ public:
   size_t rfind(const wxString& str, size_t nStart = npos) const;
 
   // VC++ 1.5 can't cope with this syntax.
   size_t rfind(const wxString& str, size_t nStart = npos) const;
 
   // VC++ 1.5 can't cope with this syntax.

-#if ! (defined(_MSC_VER) && !defined(__WIN32__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

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


@@ -801,41 +809,41 @@ private:
 // wxString comparison functions: operator versions are always case sensitive
 // ---------------------------------------------------------------------------
 //
 // wxString comparison functions: operator versions are always case sensitive
 // ---------------------------------------------------------------------------
 //

-inline bool operator==(const wxString& s1, const wxString& s2) { return s1.Cmp(s2) == 0; }
+inline bool operator==(const wxString& s1, const wxString& s2) { return (s1.Cmp(s2) == 0); }

 //
 //

-inline bool operator==(const wxString& s1, const char  * s2) { return s1.Cmp(s2) == 0; }
+inline bool operator==(const wxString& s1, const char  * s2) { return (s1.Cmp(s2) == 0); }

 //
 //

-inline bool operator==(const char  * s1, const wxString& s2) { return s2.Cmp(s1) == 0; }
+inline bool operator==(const char  * s1, const wxString& s2) { return (s2.Cmp(s1) == 0); }

 //
 //

-inline bool operator!=(const wxString& s1, const wxString& s2) { return s1.Cmp(s2) != 0; }
+inline bool operator!=(const wxString& s1, const wxString& s2) { return (s1.Cmp(s2) != 0); }

 //
 //

-inline bool operator!=(const wxString& s1, const char  * s2) { return s1.Cmp(s2) != 0; }
+inline bool operator!=(const wxString& s1, const char  * s2) { return (s1.Cmp(s2) != 0); }

 //
 //

-inline bool operator!=(const char  * s1, const wxString& s2) { return s2.Cmp(s1) != 0; }
+inline bool operator!=(const char  * s1, const wxString& s2) { return (s2.Cmp(s1) != 0); }

 //
 //

-inline bool operator< (const wxString& s1, const wxString& s2) { return s1.Cmp(s2) <  0; }
+inline bool operator< (const wxString& s1, const wxString& s2) { return (s1.Cmp(s2) < 0); }

 //
 //

-inline bool operator< (const wxString& s1, const char  * s2) { return s1.Cmp(s2) <  0; }
+inline bool operator< (const wxString& s1, const char  * s2) { return (s1.Cmp(s2) <  0); }

 //
 //

-inline bool operator< (const char  * s1, const wxString& s2) { return s2.Cmp(s1) >  0; }
+inline bool operator< (const char  * s1, const wxString& s2) { return (s2.Cmp(s1) >  0); }

 //
 //

-inline bool operator> (const wxString& s1, const wxString& s2) { return s1.Cmp(s2) >  0; }
+inline bool operator> (const wxString& s1, const wxString& s2) { return (s1.Cmp(s2) >  0); }

 //
 //

-inline bool operator> (const wxString& s1, const char  * s2) { return s1.Cmp(s2) >  0; }
+inline bool operator> (const wxString& s1, const char  * s2) { return (s1.Cmp(s2) >  0); }

 //
 //

-inline bool operator> (const char  * s1, const wxString& s2) { return s2.Cmp(s1) <  0; }
+inline bool operator> (const char  * s1, const wxString& s2) { return (s2.Cmp(s1) <  0); }

 //
 //

-inline bool operator<=(const wxString& s1, const wxString& s2) { return s1.Cmp(s2) <= 0; }
+inline bool operator<=(const wxString& s1, const wxString& s2) { return (s1.Cmp(s2) <= 0); }

 //
 //

-inline bool operator<=(const wxString& s1, const char  * s2) { return s1.Cmp(s2) <= 0; }
+inline bool operator<=(const wxString& s1, const char  * s2) { return (s1.Cmp(s2) <= 0); }

 //
 //

-inline bool operator<=(const char  * s1, const wxString& s2) { return s2.Cmp(s1) >= 0; }
+inline bool operator<=(const char  * s1, const wxString& s2) { return (s2.Cmp(s1) >= 0); }

 //
 //

-inline bool operator>=(const wxString& s1, const wxString& s2) { return s1.Cmp(s2) >= 0; }
+inline bool operator>=(const wxString& s1, const wxString& s2) { return (s1.Cmp(s2) >= 0); }

 //
 //

-inline bool operator>=(const wxString& s1, const char  * s2) { return s1.Cmp(s2) >= 0; }
+inline bool operator>=(const wxString& s1, const char  * s2) { return (s1.Cmp(s2) >= 0); }

 //
 //

-inline bool operator>=(const char  * s1, const wxString& s2) { return s2.Cmp(s1) <= 0; }
+inline bool operator>=(const char  * s1, const wxString& s2) { return (s2.Cmp(s1) <= 0); }

 
 wxString WXDLLEXPORT operator+(const wxString& string1,  const wxString& string2);
 wxString WXDLLEXPORT operator+(const wxString& string, char ch);
 
 wxString WXDLLEXPORT operator+(const wxString& string1,  const wxString& string2);
 wxString WXDLLEXPORT operator+(const wxString& string, char ch);


@@ -849,19 +857,7 @@ wxString WXDLLEXPORT operator+(const char *psz, const wxString& string);
 
 #ifdef wxSTD_STRING_COMPATIBILITY
 
 
 #ifdef wxSTD_STRING_COMPATIBILITY
 

-// forward declare iostream
-// Known not to work with wxUSE_IOSTREAMH set to 0, so
-// replacing with includes (on advice of ungod@pasdex.com.au)
-// class WXDLLEXPORT istream;
-#if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-#include <iostream.h>
-#else
-#include <istream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#include "wx/ioswrap.h"

 
 WXDLLEXPORT istream& operator>>(istream& is, wxString& str);
 
 
 WXDLLEXPORT istream& operator>>(istream& is, wxString& str);