From 310181b97f5d10d4b7605c5e8408f750e7eb6c52 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Tue, 29 Nov 2016 17:36:39 +0100 Subject: [PATCH] common: remove a gcc 4.6 hack Not supported anymore --- common/src/Utilities/wxHelpers.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/common/src/Utilities/wxHelpers.cpp b/common/src/Utilities/wxHelpers.cpp index 822468a9d3..d490544ed4 100644 --- a/common/src/Utilities/wxHelpers.cpp +++ b/common/src/Utilities/wxHelpers.cpp @@ -19,17 +19,7 @@ #include "Threading.h" #include "IniInterface.h" -#ifdef __linux__ -// I do not know if it is a GCC issue or a bug in wxwidget ! -// Anyway the code isn't used (m_hasContextHelp always false) so I remove -// it for linux. The 'vtable' issue appears with the include of -// -- Gregory -#define GCC_4_6_LTO_COMPILATION_ISSUE -#endif - -#ifndef GCC_4_6_LTO_COMPILATION_ISSUE #include -#endif #include #include @@ -161,10 +151,8 @@ void wxDialogWithHelpers::Init(const pxDialogCreationFlags &cflags) m_extraButtonSizer = NULL; -#ifndef GCC_4_6_LTO_COMPILATION_ISSUE if (m_hasContextHelp) delete wxHelpProvider::Set(new wxSimpleHelpProvider()); -#endif Bind(pxEvt_OnDialogCreated, &wxDialogWithHelpers::OnDialogCreated, this); @@ -328,7 +316,6 @@ void wxDialogWithHelpers::AddOkCancel(wxSizer &sizer, bool hasApply) m_extraButtonSizer = new wxBoxSizer(wxHORIZONTAL); -#ifndef GCC_4_6_LTO_COMPILATION_ISSUE // Add the context-sensitive help button on the caption for the platforms // which support it (currently MSW only) if (m_hasContextHelp) { @@ -337,7 +324,6 @@ void wxDialogWithHelpers::AddOkCancel(wxSizer &sizer, bool hasApply) *m_extraButtonSizer += new wxContextHelpButton(this) | StdButton(); #endif } -#endif // create a sizer to hold the help and ok/cancel buttons, for platforms // that need a custom help icon. [fixme: help icon prolly better off somewhere else]