diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 7b4b2255f3..050fbac84a 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -54,6 +54,9 @@ public: const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); } const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); } #endif // Unicode/ANSI + + // virtual dtor for any base class + virtual ~wxMBConv(); }; WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc; @@ -115,7 +118,7 @@ public: virtual ~wxCSConv(); wxCSConv& operator=(const wxCSConv& conv); - + void LoadNow(); virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const; diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index dafd61269a..7c861f9daf 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -188,6 +188,11 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output) #define IGNORE_LIBC 0 +wxMBConv::~wxMBConv() +{ + // nothing to do here +} + size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const { #if IGNORE_LIBC