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

base class must have virtual dtors and wxMBConv is no exception

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-09-20 23:01:58 +00:00
parent 302adc47d6
commit b254accad1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/strconv.h
View File

@@ -54,6 +54,9 @@ public:
const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); } const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); }
const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); } const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
#endif // Unicode/ANSI #endif // Unicode/ANSI
// virtual dtor for any base class
virtual ~wxMBConv();
}; };
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc; WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;

5
src/common/strconv.cpp
View File

@@ -188,6 +188,11 @@ static size_t decode_utf16(const wchar_t* input, wxUint32& output)
#define IGNORE_LIBC 0 #define IGNORE_LIBC 0
wxMBConv::~wxMBConv()
{
// nothing to do here
}
size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
#if IGNORE_LIBC #if IGNORE_LIBC