X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b386ecadb0f98fb92cfaad786dcc26915a070bd..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/buffer.h diff --git a/include/wx/buffer.h b/include/wx/buffer.h index 1396ef5d26..c9232820fe 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -16,99 +16,146 @@ #include // malloc() and free() +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 + // ---------------------------------------------------------------------------- // Special classes for (wide) character strings: they use malloc/free instead // of new/delete // ---------------------------------------------------------------------------- -#define DEFINE_BUFFER(classname, chartype, strdupfunc) \ -class classname \ -{ \ -public: \ - classname(const chartype *str) \ - : m_str(str ? strdupfunc(str) : NULL) \ - { \ - } \ - \ - classname(size_t len) \ - : m_str((chartype *)malloc((len + 1)*sizeof(chartype))) \ - { \ - m_str[len] = (chartype)0; \ - } \ - \ - /* no need to check for NULL, free() does it */ \ - ~classname() { free(m_str); } \ - \ - /* \ - WARNING: \ - \ - the copy ctor and assignment operators change the passed in object \ - even although it is declared as "const", so: \ - \ - a) it shouldn't be really const \ - b) you shouldn't use it afterwards (or know that it was reset) \ - \ +template +class wxCharTypeBuffer +{ +public: + typedef T CharType; + + wxCharTypeBuffer(const CharType *str = NULL) + : m_str(str ? wxStrDup(str) : NULL) + { + } + + wxCharTypeBuffer(size_t len) + : m_str((CharType *)malloc((len + 1)*sizeof(CharType))) + { + m_str[len] = (CharType)0; + } + + /* no need to check for NULL, free() does it */ + ~wxCharTypeBuffer() { free(m_str); } + + /* + WARNING: + + the copy ctor and assignment operators change the passed in object + even although it is declared as "const", so: + + a) it shouldn't be really const + b) you shouldn't use it afterwards (or know that it was reset) + This is very ugly but is unfortunately needed to make the normal use\ - of classname buffer objects possible and is very similar to what \ - std::auto_ptr<> does (as if it were an excuse...) \ - */ \ - \ - /* \ - because of the remark above, release() is declared const even if it \ - isn't really const \ - */ \ - chartype *release() const \ - { \ - chartype *p = m_str; \ - ((classname *)this)->m_str = NULL; \ - return p; \ - } \ - \ - classname(const classname& src) \ - : m_str(src.release()) \ - { \ - } \ - \ - classname& operator=(const chartype *str) \ - { \ - free(m_str); \ - m_str = str ? strdupfunc(str) : NULL; \ - return *this; \ - } \ - \ - classname& operator=(const classname& src) \ - { \ - free(m_str); \ - m_str = src.release(); \ - \ - return *this; \ - } \ - \ - 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]; } \ - \ -private: \ - chartype *m_str; \ -} - -DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA); + of wxCharTypeBuffer buffer objects possible and is very similar to what + std::auto_ptr<> does (as if it were an excuse...) + */ + + /* + 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; + } + + wxCharTypeBuffer(const wxCharTypeBuffer& src) + : m_str(src.release()) + { + } + + wxCharTypeBuffer& operator=(const CharType *str) + { + free(m_str); + m_str = str ? wxStrDup(str) : NULL; + return *this; + } + + wxCharTypeBuffer& operator=(const wxCharTypeBuffer& src) + { + free(m_str); + m_str = src.release(); + + return *this; + } + + bool extend(size_t len) + { + CharType * + str = (CharType *)realloc(m_str, (len + 1)*sizeof(CharType)); + if ( !str ) + return false; + + m_str = str; + + 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]; } + +private: + CharType *m_str; +}; + +class WXDLLIMPEXP_BASE wxCharBuffer : public wxCharTypeBuffer +{ +public: + typedef wxCharTypeBuffer wxCharTypeBufferBase; + + 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 +class WXDLLIMPEXP_BASE wxWCharBuffer : public wxCharTypeBuffer +{ +public: + typedef wxCharTypeBuffer wxCharTypeBufferBase; -DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW); + 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 -#undef DEFINE_BUFFER - #if wxUSE_UNICODE + #define wxWxCharBuffer wxWCharBuffer + #define wxMB2WXbuf wxWCharBuffer #define wxWX2MBbuf wxCharBuffer #define wxWC2WXbuf wxChar* #define wxWX2WCbuf wxChar* #else // ANSI + #define wxWxCharBuffer wxCharBuffer + #define wxMB2WXbuf wxChar* #define wxWX2MBbuf wxChar* #define wxWC2WXbuf wxCharBuffer @@ -124,13 +171,13 @@ class wxMemoryBufferData { public: // the initial size and also the size added by ResizeIfNeeded() - enum { BLOCK_SIZE = 1024 }; + enum { DefBufSize = 1024 }; friend class wxMemoryBuffer; // everyting is private as it can only be used by wxMemoryBuffer private: - wxMemoryBufferData(size_t size = wxMemoryBufferData::BLOCK_SIZE) + wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize) : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0) { } @@ -142,13 +189,13 @@ private: if (newSize > m_size) { void *dataOld = m_data; - m_data = realloc(m_data, newSize + wxMemoryBufferData::BLOCK_SIZE); + m_data = realloc(m_data, newSize + wxMemoryBufferData::DefBufSize); if ( !m_data ) { free(dataOld); } - m_size = newSize + wxMemoryBufferData::BLOCK_SIZE; + m_size = newSize + wxMemoryBufferData::DefBufSize; } } @@ -181,7 +228,7 @@ class wxMemoryBuffer { public: // ctor and dtor - wxMemoryBuffer(size_t size = wxMemoryBufferData::BLOCK_SIZE) + wxMemoryBuffer(size_t size = wxMemoryBufferData::DefBufSize) { m_bufdata = new wxMemoryBufferData(size); m_bufdata->IncRef(); @@ -251,7 +298,7 @@ public: m_bufdata->m_len += 1; } - void AppendData(void* data, size_t len) + void AppendData(const void *data, size_t len) { memcpy(GetAppendBuf(len), data, len); UngetAppendBuf(len);