From: Vadim Zeitlin Date: Tue, 20 Mar 2012 23:31:25 +0000 (+0000) Subject: Remove empty and unnecessary wxFontDialogBase destructor. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/996de8322b2a9f5e77e94a49eb5a97e0b25fc1ca Remove empty and unnecessary wxFontDialogBase destructor. This fixes build with wxUSE_FONTMAP==0 as this dtor was only defined inside "#if wxUSE_FONTMAP" section. Instead of fixing this, just get rid of this dtor entirely as it was unnecessary anyhow. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 2c2e4d13c1..c963c73364 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -37,8 +37,6 @@ public: bool Create(wxWindow *parent, const wxFontData& data) { InitFontData(&data); return Create(parent); } - virtual ~wxFontDialogBase(); - // retrieve the font data const wxFontData& GetFontData() const { return m_fontData; } wxFontData& GetFontData() { return m_fontData; } diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index fc7975c5f2..4f969fa5d4 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -518,10 +518,4 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding, return wxTestFontEncoding(info); } -#if wxUSE_FONTDLG -wxFontDialogBase::~wxFontDialogBase() -{ -} -#endif - #endif // wxUSE_FONTMAP