From 6e7254a7a12efba2e4d85048c0208d3c2ad0005c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 2 Nov 2017 01:04:02 +0100 Subject: [PATCH] Move both wxMBConv::cXX2YY() overloads together No real changes, just group the overloads in a more logical way. --- include/wx/strconv.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/include/wx/strconv.h b/include/wx/strconv.h index d2f6fe4a8c..a916349f60 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -77,6 +77,10 @@ public: const wxWCharBuffer cMB2WC(const char *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 // NULs and don't have to be NUL-terminated. // @@ -97,12 +101,6 @@ public: const wxCharBuffer 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 #if wxUSE_UNICODE const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); }