X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dea36ef6d117e0562f0079345a77ff1696d3a49..ff1865910312d960737474a75a77737d5ce94864:/include/wx/strconv.h diff --git a/include/wx/strconv.h b/include/wx/strconv.h index fa3e22c42d..9ed3790af0 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -23,6 +23,7 @@ #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 # undef __BSEXCPT__ #endif + #include #if wxUSE_WCHAR_T @@ -46,7 +47,7 @@ public: const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); } const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); } const wchar_t* cWC2WX(const wchar_t *psz) const { return psz; } - const wchar_t* cMB2WC(const wchar_t *psz) const { return psz; } + const wchar_t* cWX2WC(const wchar_t *psz) const { return psz; } #else // ANSI const char* cMB2WX(const char *psz) const { return psz; } const char* cWX2MB(const char *psz) const { return psz; } @@ -133,6 +134,8 @@ public: private: void SetName(const wxChar *charset); + // note that we can't use wxString here because of compilation + // dependencies: we're included from wx/string.h wxChar *m_name; wxCharacterSet *m_cset; bool m_deferred;