X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..b3fcfa4d89d44425ed28050462c6064100fe7b05:/include/wx/buffer.h diff --git a/include/wx/buffer.h b/include/wx/buffer.h index b913e75100..85c986a3e9 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -6,7 +6,7 @@ // Created: 12.04.99 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // these classes are for private use only for now, they're not documented @@ -16,7 +16,7 @@ #include "wx/wxchar.h" -#include // strdup +#include // malloc() and free() // ---------------------------------------------------------------------------- // Special classes for (wide) character strings: they use malloc/free instead @@ -95,19 +95,11 @@ private: \ chartype *m_str; \ } -DEFINE_BUFFER(wxCharBuffer, char, strdup); +DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA); #if wxUSE_WCHAR_T -inline wchar_t *wxWcsdupReplacement(const wchar_t *wcs) -{ - const size_t siz = (wxWcslen(wcs) + 1)*sizeof(wchar_t); - wchar_t *wcsCopy = (wchar_t *)malloc(siz); - memcpy(wcsCopy, wcs, siz); - return wcsCopy; -} - -DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxWcsdupReplacement); +DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW); #endif // wxUSE_WCHAR_T @@ -182,6 +174,8 @@ private: // the reference count size_t m_ref; + + DECLARE_NO_COPY_CLASS(wxMemoryBufferData) };