Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. reverted previous (1.23.2.1) change -- copy ctor and operator=() now

Browse Source 
take const arguments again
2. added operator=(char *)
3. both wxCharBuffer and wxWCharBuffer are now created from the same macro


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-30 22:18:34 +00:00
parent 934a9da8db
commit 748b03e9c0
1 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
include/wx/buffer.h
View File

@@ -23,95 +23,96 @@
// of new/delete // of new/delete
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxCharBuffer #define DEFINE_BUFFER(classname, chartype, strdupfunc) \
{ class classname \
public: { \
wxCharBuffer(const char *str) public: \
: m_str(str ? strdup(str) : NULL) 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) \
\
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 ? strdup(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; \
}
wxCharBuffer(size_t len) DEFINE_BUFFER(wxCharBuffer, char, strdup);
: m_str((char *)malloc((len + 1)*sizeof(char)))
{
m_str[len] = '\0';
}
// no need to check for NULL, free() does it
~wxCharBuffer() { free(m_str); }
wxCharBuffer(/* non const! */ wxCharBuffer& src)
: m_str(src.m_str)
{
// no reference count yet...
src.m_str = (char *)NULL;
}
wxCharBuffer& operator=(/* non const! */ wxCharBuffer& src)
{
m_str = src.m_str;
// no reference count yet...
src.m_str = (char *)NULL;
return *this;
}
char *data() { return m_str; }
const char *data() const { return m_str; }
operator const char *() const { return m_str; }
char operator[](size_t n) const { return m_str[n]; }
private:
char *m_str;
};
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
class wxWCharBuffer inline wchar_t *wxWcsdupReplacement(const wchar_t *wcs)
{ {
public: const size_t siz = (wxWcslen(wcs) + 1)*sizeof(wchar_t);
wxWCharBuffer(const wchar_t *wcs) wchar_t *wcsCopy = (wchar_t *)malloc(siz);
: m_wcs((wchar_t *)NULL) memcpy(wcsCopy, wcs, siz);
{ return wcsCopy;
if (wcs) { }
size_t siz = (wxWcslen(wcs) + 1)*sizeof(wchar_t);
m_wcs = (wchar_t *)malloc(siz);
memcpy(m_wcs, wcs, siz);
}
}
wxWCharBuffer(size_t len)
: m_wcs((wchar_t *)malloc((len + 1)*sizeof(wchar_t)))
{
m_wcs[len] = L'\0';
}
// no need to check for NULL, free() does it DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxWcsdupReplacement);
~wxWCharBuffer() { free(m_wcs); }
wxWCharBuffer(/* non const! */ wxWCharBuffer& src)
: m_wcs(src.m_wcs)
{
// no reference count yet...
src.m_wcs = (wchar_t *)NULL;
}
wxWCharBuffer& operator=(/* non const! */ wxWCharBuffer& src)
{
m_wcs = src.m_wcs;
// no reference count yet...
src.m_wcs = (wchar_t *)NULL;
return *this;
}
wchar_t *data() { return m_wcs; }
const wchar_t *data() const { return m_wcs; }
operator const wchar_t *() const { return m_wcs; }
wchar_t operator[](size_t n) const { return m_wcs[n]; }
private:
wchar_t *m_wcs;
};
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
#undef DEFINE_BUFFER
#if wxUSE_UNICODE #if wxUSE_UNICODE
#define wxMB2WXbuf wxWCharBuffer #define wxMB2WXbuf wxWCharBuffer
#define wxWX2MBbuf wxCharBuffer #define wxWX2MBbuf wxCharBuffer