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

added wxABI_VERSION checks around wxString::[w]char_str()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-02 17:09:30 +00:00
parent 205886cded
commit 01020cb2dc
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/buffer.h
View File

@@ -111,6 +111,7 @@ private: \
chartype *m_str; \ chartype *m_str; \
} }
#if wxABI_VERSION >= 20804
// needed for wxString::char_str() and wchar_str() // needed for wxString::char_str() and wchar_str()
#define DEFINE_WRITABLE_BUFFER(classname, baseclass, chartype) \ #define DEFINE_WRITABLE_BUFFER(classname, baseclass, chartype) \
class WXDLLIMPEXP_BASE classname : public baseclass \ class WXDLLIMPEXP_BASE classname : public baseclass \
@@ -121,14 +122,19 @@ public: \
\ \
operator chartype*() { return this->data(); } \ operator chartype*() { return this->data(); } \
} }
#endif // wxABI_VERSION >= 20804
DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA); DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA);
#if wxABI_VERSION >= 20804
DEFINE_WRITABLE_BUFFER(wxWritableCharBuffer, wxCharBuffer, char); DEFINE_WRITABLE_BUFFER(wxWritableCharBuffer, wxCharBuffer, char);
#endif
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW); DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW);
#if wxABI_VERSION >= 20804
DEFINE_WRITABLE_BUFFER(wxWritableWCharBuffer, wxWCharBuffer, wchar_t); DEFINE_WRITABLE_BUFFER(wxWritableWCharBuffer, wxWCharBuffer, wchar_t);
#endif
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T

2
include/wx/string.h
View File

@@ -836,6 +836,7 @@ public:
// identical to c_str(), for MFC compatibility // identical to c_str(), for MFC compatibility
const wxChar* GetData() const { return c_str(); } const wxChar* GetData() const { return c_str(); }
#if wxABI_VERSION >= 20804
// conversion to *non-const* multibyte or widestring buffer; modifying // conversion to *non-const* multibyte or widestring buffer; modifying
// returned buffer won't affect the string, these methods are only useful // returned buffer won't affect the string, these methods are only useful
// for passing values to const-incorrect functions // for passing values to const-incorrect functions
@@ -844,6 +845,7 @@ public:
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
wxWritableWCharBuffer wchar_str() const { return wc_str(wxConvLibc); } wxWritableWCharBuffer wchar_str() const { return wc_str(wxConvLibc); }
#endif #endif
#endif // wxABI_VERSION >= 20804
// conversion to/from plain (i.e. 7 bit) ASCII: this is useful for // conversion to/from plain (i.e. 7 bit) ASCII: this is useful for
// converting numbers or strings which are certain not to contain special // converting numbers or strings which are certain not to contain special