From 8bf239f8e4b0d9cec2b13c9c9cd8a0af60eb81dc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 2 Nov 2017 01:27:24 +0100 Subject: [PATCH] Make wxMBConv dtor inline 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. --- include/wx/strconv.h | 2 +- src/common/strconv.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 8f5569356d..6822ca62d1 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -160,7 +160,7 @@ public: virtual wxMBConv *Clone() const = 0; // virtual dtor for any base class - virtual ~wxMBConv(); + virtual ~wxMBConv() { } }; // ---------------------------------------------------------------------------- diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index e22f22bbea..94ff70d1b0 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -394,11 +394,6 @@ size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) cons return rc; } -wxMBConv::~wxMBConv() -{ - // nothing to do here (necessary for Darwin linking probably) -} - wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const { if ( psz )