X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb25206791c8324c946fb724f21c913b5f3b295e..6f41c10973643552837c6bd38b23779e65a2eaa3:/include/wx/stringimpl.h diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h index 7a9adb99bf..674a3eb5f9 100644 --- a/include/wx/stringimpl.h +++ b/include/wx/stringimpl.h @@ -11,7 +11,7 @@ /* This header implements std::string-like string class, wxStringImpl, that is - used by wxString to store the data. Alternatively, if wxUSE_STL=1, + used by wxString to store the data. Alternatively, if wxUSE_STD_STRING=1, wxStringImpl is just a typedef to std:: string class. */ @@ -34,7 +34,7 @@ // implementation only #define wxASSERT_VALID_INDEX(i) \ - wxASSERT_MSG( (size_t)(i) <= length(), _T("invalid index in wxString") ) + wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") ) // ---------------------------------------------------------------------------- @@ -50,10 +50,15 @@ extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; // ---------------------------------------------------------------------------- -// deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING +// deal with various build options // ---------------------------------------------------------------------------- -#define wxUSE_STL_BASED_WXSTRING wxUSE_STL +// we use STL-based string internally if we use std::string at all now, there +// should be no reason to prefer our internal implement but if you really need +// it you can predefine wxUSE_STL_BASED_WXSTRING as 0 when building the library +#ifndef wxUSE_STL_BASED_WXSTRING + #define wxUSE_STL_BASED_WXSTRING wxUSE_STD_STRING +#endif // in both cases we need to define wxStdString #if wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING @@ -83,8 +88,10 @@ extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; #undef wxUSE_STD_STRING #define wxUSE_STD_STRING 1 + // the versions of std::string included with gcc 2.95 and VC6 (for which + // _MSC_VER == 1200) and eVC4 (_MSC_VER == 1201) lack clear() method #if (defined(__GNUG__) && (__GNUG__ < 3)) || \ - (defined(_MSC_VER) && (_MSC_VER <= 1200)) + !wxCHECK_VISUALC_VERSION(7) || defined(__EVC4__) #define wxSTRING_BASE_HASNT_CLEAR #endif @@ -287,7 +294,7 @@ public: wxStringImpl(const wxStringImpl& stringSrc) { wxASSERT_MSG( stringSrc.GetStringData()->IsValid(), - _T("did you forget to call UngetWriteBuf()?") ); + wxT("did you forget to call UngetWriteBuf()?") ); if ( stringSrc.empty() ) { // nothing to do for an empty string @@ -310,7 +317,7 @@ public: wxStringImpl(const wxStringImpl& str, size_t nPos, size_t nLen) { wxASSERT_MSG( str.GetStringData()->IsValid(), - _T("did you forget to call UngetWriteBuf()?") ); + wxT("did you forget to call UngetWriteBuf()?") ); Init(); size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen; InitWith(str.c_str(), nPos, nLen); @@ -328,23 +335,24 @@ public: { return wxStdString(c_str(), length()); } #endif +#if defined(__VISUALC__) && (__VISUALC__ >= 1200) + // disable warning about Unlock() below not being inlined (first, it + // seems to be inlined nevertheless and second, even if it isn't, there + // is nothing we can do about this + #pragma warning(push) + #pragma warning (disable:4714) +#endif // dtor is not virtual, this class must not be inherited from! ~wxStringImpl() { -#if defined(__VISUALC__) && (__VISUALC__ >= 1200) - //RN - according to the above VC++ does indeed inline this, - //even though it spits out two warnings - #pragma warning (disable:4714) -#endif - GetStringData()->Unlock(); } #if defined(__VISUALC__) && (__VISUALC__ >= 1200) - //re-enable inlining warning - #pragma warning (default:4714) + #pragma warning(pop) #endif + // overloaded assignment // from another wxString wxStringImpl& operator=(const wxStringImpl& stringSrc); @@ -371,9 +379,11 @@ public: // lib.string.access // return the character at position n + value_type operator[](size_type n) const { return m_pchData[n]; } value_type at(size_type n) const { wxASSERT_VALID_INDEX( n ); return m_pchData[n]; } // returns the writable character at position n + reference operator[](size_type n) { CopyBeforeWrite(); return m_pchData[n]; } reference at(size_type n) { wxASSERT_VALID_INDEX( n );