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

Make wxMBConv dtor inline

Browse Source 
The Darwin linking problem mentioned in the comment doesn't exist in any
of the still supported macOS versions, so it doesn't make sense to
continue working around it.
This commit is contained in:
Vadim Zeitlin
2017-11-02 01:27:24 +01:00
parent b3fe07942f
commit 8bf239f8e4
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/strconv.h
View File

@@ -160,7 +160,7 @@ public:
virtual wxMBConv *Clone() const = 0; virtual wxMBConv *Clone() const = 0;
// virtual dtor for any base class // virtual dtor for any base class
virtual ~wxMBConv(); virtual ~wxMBConv() { }
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

5
src/common/strconv.cpp
View File

@@ -394,11 +394,6 @@ size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) cons
return rc; return rc;
} }
wxMBConv::~wxMBConv()
{
// nothing to do here (necessary for Darwin linking probably)
}
wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{ {
if ( psz ) if ( psz )