X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/buffer.h?ds=sidebyside diff --git a/include/wx/buffer.h b/include/wx/buffer.h index 864bb64eb7..254605edf7 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -56,12 +56,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 +95,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 +103,7 @@ public: wxScopedCharTypeBuffer buf; if ( str ) - buf.m_data = new Data(StrCopy(str, len), len); + buf.m_data = new Data(str, len); return buf; } @@ -186,7 +182,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 +260,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 +295,7 @@ public: wxCharTypeBuffer(const wxScopedCharTypeBuffer& src) { - MakeOwnedCopyOf(src); + this->MakeOwnedCopyOf(src); } wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer& src) @@ -363,7 +359,6 @@ public: wxCharBuffer(const wxCStrData& cstr); }; -#if wxUSE_WCHAR_T WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer ) WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer ) @@ -383,7 +378,6 @@ public: wxWCharBuffer(const wxCStrData& cstr); }; -#endif // wxUSE_WCHAR_T // wxCharTypeBuffer implicitly convertible to T* template @@ -474,6 +468,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; @@ -576,6 +585,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; };