X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6df09f32fd0bbc2324a6a96683109e6c6cc47db5..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/buffer.h?ds=sidebyside diff --git a/include/wx/buffer.h b/include/wx/buffer.h index 66450e77f7..ec0e1fc765 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -15,9 +15,7 @@ #include "wx/chartype.h" #include "wx/wxcrtbase.h" -#ifndef __WXPALMOS5__ #include // malloc() and free() -#endif // ! __WXPALMOS5__ class WXDLLIMPEXP_FWD_BASE wxCStrData; @@ -56,12 +54,8 @@ struct UntypedBufferData bool m_owned; }; -// this has to be defined inside the DLL (and not e.g. as a static variable -// inside an inline function) as otherwise MSVC gives link errors when the -// functions are effectively inlined (i.e. in non-debug build) -// // NB: this is defined in string.cpp and not the (non-existent) buffer.cpp -extern WXDLLIMPEXP_DATA_BASE(UntypedBufferData * const) untypedNullDataPtr; +WXDLLIMPEXP_BASE UntypedBufferData * GetUntypedNullData(); } // namespace wxPrivate @@ -99,7 +93,7 @@ public: // Creates "owned" buffer, i.e. takes over ownership of 'str' and frees it // in dtor (if ref.count reaches 0). static - const wxScopedCharTypeBuffer CreateOwned(const CharType *str, + const wxScopedCharTypeBuffer CreateOwned(CharType *str, size_t len = wxNO_LEN ) { if ( len == wxNO_LEN ) @@ -107,7 +101,7 @@ public: wxScopedCharTypeBuffer buf; if ( str ) - buf.m_data = new Data(StrCopy(str, len), len); + buf.m_data = new Data(str, len); return buf; } @@ -142,8 +136,8 @@ public: if ( m_data == GetNullData() ) return NULL; - 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") ); + wxASSERT_MSG( m_data->m_owned, wxT("can't release non-owned buffer") ); + wxASSERT_MSG( m_data->m_ref == 1, wxT("can't release shared buffer") ); CharType * const p = m_data->Get(); @@ -186,7 +180,7 @@ protected: // placeholder for NULL string, to simplify this code static Data *GetNullData() { - return static_cast(wxPrivate::untypedNullDataPtr); + return static_cast(wxPrivate::GetUntypedNullData()); } void IncRef() @@ -264,7 +258,7 @@ public: { if ( len == wxNO_LEN ) len = wxStrlen(str); - this->m_data = new Data(StrCopy(str, len), len); + this->m_data = new Data(this->StrCopy(str, len), len); } else { @@ -299,7 +293,7 @@ public: wxCharTypeBuffer(const wxScopedCharTypeBuffer& src) { - MakeOwnedCopyOf(src); + this->MakeOwnedCopyOf(src); } wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer& src) @@ -318,6 +312,10 @@ public: if ( !str ) return false; + // For consistency with the ctor taking just the length, NUL-terminate + // the buffer. + str[len] = (CharType)0; + if ( this->m_data == this->GetNullData() ) { this->m_data = new Data(str, len); @@ -330,8 +328,20 @@ public: return true; } + + void shrink(size_t len) + { + wxASSERT_MSG( this->m_data->m_owned, "cannot shrink non-owned buffer" ); + wxASSERT_MSG( this->m_data->m_ref == 1, "can't shrink shared buffer" ); + + wxASSERT( len <= this->length() ); + + this->m_data->m_length = len; + this->data()[len] = 0; + } }; +WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer ) WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) class wxCharBuffer : public wxCharTypeBuffer @@ -351,7 +361,7 @@ public: wxCharBuffer(const wxCStrData& cstr); }; -#if wxUSE_WCHAR_T +WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer ) WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) class wxWCharBuffer : public wxCharTypeBuffer @@ -370,7 +380,6 @@ public: wxWCharBuffer(const wxCStrData& cstr); }; -#endif // wxUSE_WCHAR_T // wxCharTypeBuffer implicitly convertible to T* template @@ -416,13 +425,6 @@ 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) // ---------------------------------------------------------------------------- @@ -468,6 +470,21 @@ private: delete this; } + void *release() + { + if ( m_data == NULL ) + return NULL; + + wxASSERT_MSG( m_ref == 1, "can't release shared buffer" ); + + void *p = m_data; + m_data = NULL; + m_len = + m_size = 0; + + return p; + } + // the buffer containing the data void *m_data; @@ -522,6 +539,8 @@ public: size_t GetBufSize() const { return m_bufdata->m_size; } size_t GetDataLen() const { return m_bufdata->m_len; } + bool IsEmpty() const { return GetDataLen() == 0; } + void SetBufSize(size_t size) { m_bufdata->ResizeIfNeeded(size); } void SetDataLen(size_t len) { @@ -529,6 +548,8 @@ public: m_bufdata->m_len = len; } + void Clear() { SetDataLen(0); } + // Ensure the buffer is big enough and return a pointer to it void *GetWriteBuf(size_t sizeNeeded) { @@ -555,7 +576,7 @@ public: // Other ways to append to the buffer void AppendByte(char data) { - wxCHECK_RET( m_bufdata->m_data, _T("invalid wxMemoryBuffer") ); + wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") ); m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1); *(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data; @@ -570,6 +591,13 @@ public: operator const char *() const { return (const char*)GetData(); } + // gives up ownership of data, returns the pointer; after this call, + // data isn't freed by the buffer and its content is resent to empty + void *release() + { + return m_bufdata->release(); + } + private: wxMemoryBufferData* m_bufdata; };