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

added wxString::From/To8BitData() for forward compatibility with wx3

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

19
include/wx/string.h
View File

@@ -863,6 +863,25 @@ public:
const char *ToAscii() const { return c_str(); }
#endif // Unicode/!Unicode
#if wxABI_VERSION >= 20804
// functions for storing binary data in wxString:
#if wxUSE_UNICODE
static wxString From8BitData(const char *data, size_t len)
{ return wxString(data, wxConvISO8859_1, len); }
// version for NUL-terminated data:
static wxString From8BitData(const char *data)
{ return wxString(data, wxConvISO8859_1); }
const wxCharBuffer To8BitData() const { return mb_str(wxConvISO8859_1); }
#else // ANSI
static wxString From8BitData(const char *data, size_t len)
{ return wxString(data, len); }
// version for NUL-terminated data:
static wxString From8BitData(const char *data)
{ return wxString(data); }
const char *To8BitData() const { return c_str(); }
#endif // Unicode/ANSI
#endif // wxABI_VERSION >= 20804
// conversions with (possible) format conversions: have to return a
// buffer with temporary data
//