ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: remove a gcc 4.6 hack 

Not supported anymore
This commit is contained in:
Gregory Hainaut 2016-11-29 17:36:39 +01:00
parent 2b8a808fe3
commit 310181b97f
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/Utilities/wxHelpers.cpp
View File

@ -19,17 +19,7 @@
#include "Threading.h" #include "Threading.h"
#include "IniInterface.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
// <wx/cshelp.h> -- Gregory
#define GCC_4_6_LTO_COMPILATION_ISSUE
#endif
#ifndef GCC_4_6_LTO_COMPILATION_ISSUE
#include <wx/cshelp.h> #include <wx/cshelp.h>
#endif
#include <wx/tooltip.h> #include <wx/tooltip.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
@ -161,10 +151,8 @@ void wxDialogWithHelpers::Init(const pxDialogCreationFlags &cflags)
m_extraButtonSizer = NULL; m_extraButtonSizer = NULL;
#ifndef GCC_4_6_LTO_COMPILATION_ISSUE
if (m_hasContextHelp) if (m_hasContextHelp)
delete wxHelpProvider::Set(new wxSimpleHelpProvider()); delete wxHelpProvider::Set(new wxSimpleHelpProvider());
#endif
Bind(pxEvt_OnDialogCreated, &wxDialogWithHelpers::OnDialogCreated, this); Bind(pxEvt_OnDialogCreated, &wxDialogWithHelpers::OnDialogCreated, this);
@ -328,7 +316,6 @@ void wxDialogWithHelpers::AddOkCancel(wxSizer &sizer, bool hasApply)
m_extraButtonSizer = new wxBoxSizer(wxHORIZONTAL); m_extraButtonSizer = new wxBoxSizer(wxHORIZONTAL);
#ifndef GCC_4_6_LTO_COMPILATION_ISSUE
// Add the context-sensitive help button on the caption for the platforms // Add the context-sensitive help button on the caption for the platforms
// which support it (currently MSW only) // which support it (currently MSW only)
if (m_hasContextHelp) { if (m_hasContextHelp) {
@ -337,7 +324,6 @@ void wxDialogWithHelpers::AddOkCancel(wxSizer &sizer, bool hasApply)
*m_extraButtonSizer += new wxContextHelpButton(this) | StdButton(); *m_extraButtonSizer += new wxContextHelpButton(this) | StdButton();
#endif #endif
} }
#endif
// create a sizer to hold the help and ok/cancel buttons, for platforms // 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] // that need a custom help icon. [fixme: help icon prolly better off somewhere else]