X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4b67f95d2bd56876030aaf6e5582493f2b08664..c19a8a9a7187281b757808e651358198352b8f11:/include/wx/string.h diff --git a/include/wx/string.h b/include/wx/string.h index 645e8c49c1..474f23d3b6 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -257,14 +257,23 @@ public: size_t Len() const { return GetStringData()->nDataLength; } /// string contains any characters? bool IsEmpty() const { return Len() == 0; } - /// reinitialize string (and free data!) + /// empty string contents void Empty() { - if ( GetStringData()->nDataLength != 0 ) + if ( !IsEmpty() ) Reinit(); + // should be empty wxASSERT( GetStringData()->nDataLength == 0 ); - wxASSERT( GetStringData()->nAllocLength == 0 ); + } + /// empty the string and free memory + void Clear() + { + if ( !GetStringData()->IsEmpty() ) + Reinit(); + + wxASSERT( GetStringData()->nDataLength == 0 ); // should be empty + wxASSERT( GetStringData()->nAllocLength == 0 ); // and not own any memory } /// Is an ascii value @@ -294,9 +303,12 @@ public: char& Last() { wxASSERT( !IsEmpty() ); CopyBeforeWrite(); return m_pchData[Len()-1]; } + // on alpha-linux this gives overload problems: +#if ! defined(__ALPHA__) /// operator version of GetChar char operator[](size_t n) const { ASSERT_VALID_INDEX( n ); return m_pchData[n]; } +#endif /// operator version of GetChar char operator[](int n) const { ASSERT_VALID_INDEX( n ); return m_pchData[n]; } @@ -360,18 +372,28 @@ public: /** @name return resulting string */ //@{ /// - friend wxString operator+(const wxString& string1, const wxString& string2); + friend wxString WXDLLEXPORT operator+(const wxString& string1, const wxString& string2); /// - friend wxString operator+(const wxString& string, char ch); + friend wxString WXDLLEXPORT operator+(const wxString& string, char ch); /// - friend wxString operator+(char ch, const wxString& string); + friend wxString WXDLLEXPORT operator+(char ch, const wxString& string); /// - friend wxString operator+(const wxString& string, const char *psz); + friend wxString WXDLLEXPORT operator+(const wxString& string, const char *psz); /// - friend wxString operator+(const char *psz, const wxString& string); + friend wxString WXDLLEXPORT operator+(const char *psz, const wxString& string); //@} //@} + /** @name stream-like functions */ + //@{ + /// insert an int into string + wxString& operator<<(int i); + /// insert a float into string + wxString& operator<<(float f); + /// insert a double into string + wxString& operator<<(double d); + //@} + /** @name string comparison */ //@{ /** @@ -686,7 +708,7 @@ public: size_t find(char ch, size_t nStart = 0) const; // wxWin compatibility - inline bool Contains(const wxString& str) { return Find(str) != -1; } + inline bool Contains(const wxString& str) const { return Find(str) != -1; } //@} @@ -909,6 +931,11 @@ inline bool operator>=(const wxString& s1, const char * s2) { return s1.Cmp(s2) /// 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+(char ch, const wxString& string); +wxString WXDLLEXPORT operator+(const wxString& string, const char *psz); +wxString WXDLLEXPORT operator+(const char *psz, const wxString& string); // --------------------------------------------------------------------------- /** @name Global functions complementing standard C string library @@ -919,9 +946,20 @@ inline bool operator>=(const char * s1, const wxString& s2) { return s2.Cmp(s1) #ifdef STD_STRING_COMPATIBILITY // fwd decl -class WXDLLEXPORT istream; +// 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 +#else +#include +# ifdef _MSC_VER + using namespace std; +# endif +#endif -istream& WXDLLEXPORT operator>>(istream& is, wxString& str); +WXDLLEXPORT istream& operator>>(istream& is, wxString& str); #endif //std::string compatibility