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

Move both wxMBConv::cXX2YY() overloads together

Browse Source 
No real changes, just group the overloads in a more logical way.
This commit is contained in:
Vadim Zeitlin
2017-11-02 01:04:02 +01:00
parent 18063f38ff
commit 6e7254a7a1
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/strconv.h
View File

@@ -77,6 +77,10 @@ public:
const wxWCharBuffer cMB2WC(const char *in) const; const wxWCharBuffer cMB2WC(const char *in) const;
const wxCharBuffer cWC2MB(const wchar_t *in) const; const wxCharBuffer cWC2MB(const wchar_t *in) const;
const wxWCharBuffer cMB2WC(const wxScopedCharBuffer& in) const;
const wxCharBuffer cWC2MB(const wxScopedWCharBuffer& in) const;
// Convenience functions for converting strings which may contain embedded // Convenience functions for converting strings which may contain embedded
// NULs and don't have to be NUL-terminated. // NULs and don't have to be NUL-terminated.
// //
@@ -97,12 +101,6 @@ public:
const wxCharBuffer const wxCharBuffer
cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const; cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const;
// And yet more convenience functions for converting the entire buffers:
// these are the simplest and least error-prone as you never need to bother
// with lengths/sizes directly.
const wxWCharBuffer cMB2WC(const wxScopedCharBuffer& in) const;
const wxCharBuffer cWC2MB(const wxScopedWCharBuffer& in) const;
// convenience functions for converting MB or WC to/from wxWin default // convenience functions for converting MB or WC to/from wxWin default
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); } const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); }