X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/665e6a875343506ffe2b72e7a6cc26348ebffb99..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/buffer.h diff --git a/include/wx/buffer.h b/include/wx/buffer.h index 7daf8a8e71..3244323737 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -12,14 +12,14 @@ #ifndef _WX_BUFFER_H #define _WX_BUFFER_H -#include "wx/wxchar.h" +#include "wx/chartype.h" +#include "wx/wxcrtbase.h" +#ifndef __WXPALMOS5__ #include // malloc() and free() +#endif // ! __WXPALMOS5__ -inline char *wxStrDup(const char *s) { return wxStrdupA(s); } -#if wxUSE_WCHAR_T - inline wchar_t *wxStrDup(const wchar_t *ws) { return wxStrdupW(ws); } -#endif +class WXDLLIMPEXP_FWD_BASE wxCStrData; // ---------------------------------------------------------------------------- // Special classes for (wide) character strings: they use malloc/free instead @@ -27,122 +27,207 @@ inline char *wxStrDup(const char *s) { return wxStrdupA(s); } // ---------------------------------------------------------------------------- template -class wxCharTypeBuffer +class WXDLLIMPEXP_BASE wxCharTypeBuffer { public: typedef T CharType; wxCharTypeBuffer(const CharType *str = NULL) - : m_str(str ? wxStrDup(str) : NULL) { + if ( str ) + m_data = new Data(wxStrdup(str)); + else + m_data = &NullData; } wxCharTypeBuffer(size_t len) - : m_str((CharType *)malloc((len + 1)*sizeof(CharType))) { - m_str[len] = (CharType)0; + m_data = new Data((CharType *)malloc((len + 1)*sizeof(CharType))); + m_data->m_str[len] = (CharType)0; } - /* no need to check for NULL, free() does it */ - ~wxCharTypeBuffer() { free(m_str); } + static const wxCharTypeBuffer CreateNonOwned(const CharType *str) + { + wxCharTypeBuffer buf; + if ( str ) + buf.m_data = new Data(wx_const_cast(CharType*, str), Data::NonOwned); + return buf; + } - /* - WARNING: + ~wxCharTypeBuffer() + { + DecRef(); + } - the copy ctor and assignment operators change the passed in object - even although it is declared as "const", so: + // NB: this method is only const for backward compatibility. It used to + // be needed for auto_ptr-like semantics of the copy ctor, but now + // that ref-counting is used, it's not really needed. + CharType *release() const + { + if ( m_data == &NullData ) + return NULL; - a) it shouldn't be really const - b) you shouldn't use it afterwards (or know that it was reset) + wxASSERT_MSG( m_data->m_owned, _T("can't release non-owned buffer") ); + wxASSERT_MSG( m_data->m_ref == 1, _T("can't release shared buffer") ); - This is very ugly but is unfortunately needed to make the normal use\ - of wxCharTypeBuffer buffer objects possible and is very similar to what - std::auto_ptr<> does (as if it were an excuse...) - */ + CharType *p = m_data->m_str; + + wxCharTypeBuffer *self = wx_const_cast(wxCharTypeBuffer*, this); + self->m_data->m_str = NULL; + self->DecRef(); - /* - because of the remark above, release() is declared const even if it - isn't really const - */ - CharType *release() const - { - CharType *p = m_str; - ((wxCharTypeBuffer *)this)->m_str = NULL; return p; } void reset() { - free(m_str); - m_str = NULL; + DecRef(); } wxCharTypeBuffer(const wxCharTypeBuffer& src) - : m_str(src.release()) { + m_data = src.m_data; + IncRef(); } wxCharTypeBuffer& operator=(const CharType *str) { - free(m_str); - m_str = str ? wxStrDup(str) : NULL; + DecRef(); + + if ( str ) + m_data = new Data(wxStrdup(str)); return *this; } wxCharTypeBuffer& operator=(const wxCharTypeBuffer& src) { - free(m_str); - m_str = src.release(); + if ( &src == this ) + return *this; + + DecRef(); + m_data = src.m_data; + IncRef(); return *this; } bool extend(size_t len) { - CharType * - str = (CharType *)realloc(m_str, (len + 1)*sizeof(CharType)); + wxASSERT_MSG( m_data->m_owned, _T("cannot extend non-owned buffer") ); + wxASSERT_MSG( m_data->m_ref == 1, _T("can't extend shared buffer") ); + + CharType *str = + (CharType *)realloc(data(), (len + 1) * sizeof(CharType)); if ( !str ) return false; - m_str = str; + if ( m_data == &NullData ) + { + m_data = new Data(str); + } + else + { + m_data->m_str = str; + m_data->m_owned = true; + } return true; } - CharType *data() { return m_str; } - const CharType *data() const { return m_str; } - operator const CharType *() const { return m_str; } - CharType operator[](size_t n) const { return m_str[n]; } + CharType *data() { return m_data->m_str; } + const CharType *data() const { return m_data->m_str; } + operator const CharType *() const { return data(); } + CharType operator[](size_t n) const { return data()[n]; } + +private: + // reference-counted data + struct Data + { + enum Kind + { + Owned, + NonOwned + }; + + Data(CharType *str, Kind kind = Owned) + : m_str(str), m_ref(1), m_owned(kind == Owned) {} + + ~Data() + { + if ( m_owned ) + free(m_str); + } + + CharType *m_str; + + // "short" to have sizeof(Data)=8 on 32bit archs + unsigned short m_ref; + + bool m_owned; + }; + + // placeholder for NULL string, to simplify this code + // NB: this is defined in string.cpp, not (non-existent) buffer.cpp +#ifdef __MINGW32__ + // MinGW requires explicit WXDLLIMPEXP_DATA_BASE to avoid compilation + // errors + static WXDLLIMPEXP_DATA_BASE(Data) NullData; +#else + // but Visual C++ doesn't like it + static Data NullData; +#endif + + void IncRef() + { + if ( m_data == &NullData ) // exception, not ref-counted + return; + m_data->m_ref++; + } + + void DecRef() + { + if ( m_data == &NullData ) // exception, not ref-counted + return; + if ( --m_data->m_ref == 0 ) + delete m_data; + m_data = &NullData; + } private: - CharType *m_str; + Data *m_data; }; +WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) + class WXDLLIMPEXP_BASE wxCharBuffer : public wxCharTypeBuffer { public: typedef wxCharTypeBuffer wxCharTypeBufferBase; + wxCharBuffer(const wxCharTypeBufferBase& buf) + : wxCharTypeBufferBase(buf) {} + wxCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {} wxCharBuffer(size_t len) : wxCharTypeBufferBase(len) {} -#if !wxUSE_UNICODE wxCharBuffer(const wxCStrData& cstr); -#endif }; #if wxUSE_WCHAR_T +WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) + class WXDLLIMPEXP_BASE wxWCharBuffer : public wxCharTypeBuffer { public: typedef wxCharTypeBuffer wxCharTypeBufferBase; + wxWCharBuffer(const wxCharTypeBufferBase& buf) + : wxCharTypeBufferBase(buf) {} + wxWCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {} wxWCharBuffer(size_t len) : wxCharTypeBufferBase(len) {} -#if wxUSE_UNICODE wxWCharBuffer(const wxCStrData& cstr); -#endif }; #endif // wxUSE_WCHAR_T @@ -172,8 +257,13 @@ typedef wxWritableCharTypeBuffer wxWritableWCharBuffer; #define wxMB2WXbuf wxWCharBuffer #define wxWX2MBbuf wxCharBuffer - #define wxWC2WXbuf wxChar* - #define wxWX2WCbuf wxChar* + #if wxUSE_UNICODE_WCHAR + #define wxWC2WXbuf wxChar* + #define wxWX2WCbuf wxChar* + #elif wxUSE_UNICODE_UTF8 + #define wxWC2WXbuf wxWCharBuffer + #define wxWX2WCbuf wxWCharBuffer + #endif #else // ANSI #define wxWxCharBuffer wxCharBuffer @@ -183,6 +273,13 @@ typedef wxWritableCharTypeBuffer wxWritableWCharBuffer; #define wxWX2WCbuf wxWCharBuffer #endif // Unicode/ANSI +// type of the value returned by wxString::utf8_str() +#if wxUSE_UNICODE_UTF8 + #define wxUTF8Buf char * +#else + #define wxUTF8Buf wxCharBuffer +#endif + // ---------------------------------------------------------------------------- // A class for holding growable data buffers (not necessarily strings) // ---------------------------------------------------------------------------- @@ -245,7 +342,7 @@ private: }; -class wxMemoryBuffer +class WXDLLIMPEXP_BASE wxMemoryBuffer { public: // ctor and dtor @@ -267,9 +364,12 @@ public: wxMemoryBuffer& operator=(const wxMemoryBuffer& src) { - m_bufdata->DecRef(); - m_bufdata = src.m_bufdata; - m_bufdata->IncRef(); + if (&src != this) + { + m_bufdata->DecRef(); + m_bufdata = src.m_bufdata; + m_bufdata->IncRef(); + } return *this; }