From 344d6c201eb6aface08ea4b592c919086b099245 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Wed, 28 Oct 2015 00:02:11 +0000 Subject: [PATCH] pcsx2|utilities: Remove Windows wx2.8 code It's not used anymore. --- pcsx2/gui/AppMain.cpp | 16 ---------------- pcsx2/gui/Panels/BiosSelectorPanel.cpp | 8 ++------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index defcf15a04..3f4ecd5a5d 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -339,9 +339,6 @@ class pxMessageOutputMessageBox : public wxMessageOutput public: pxMessageOutputMessageBox() { } -#if wxMAJOR_VERSION < 3 - virtual void Printf(const wxChar* format, ...); -#endif // DoPrintf in wxMessageOutputBase (wxWidgets 3.0) uses this. virtual void Output(const wxString &out); }; @@ -353,19 +350,6 @@ public: // commandline window using an identifier we know is contained in it, and then format our own window // display. :D --air -#if wxMAJOR_VERSION < 3 -void pxMessageOutputMessageBox::Printf(const wxChar* format, ...) -{ - va_list args; - va_start(args, format); - wxString out; - out.PrintfV(format, args); - va_end(args); - - Output(out); -} -#endif - void pxMessageOutputMessageBox::Output(const wxString& out) { using namespace pxSizerFlags; diff --git a/pcsx2/gui/Panels/BiosSelectorPanel.cpp b/pcsx2/gui/Panels/BiosSelectorPanel.cpp index 2154127a37..dd8a1a401d 100644 --- a/pcsx2/gui/Panels/BiosSelectorPanel.cpp +++ b/pcsx2/gui/Panels/BiosSelectorPanel.cpp @@ -54,12 +54,8 @@ Panels::BaseSelectorPanel::~BaseSelectorPanel() throw() void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt) { evt.Skip(); -#if defined (_MSC_VER) && (wxMAJOR_VERSION < 3) - if( !evt.GetShow() ) return; -#else - if( !evt.IsShown() ) return; -#endif - OnShown(); + if( evt.IsShown() ) + OnShown(); } void Panels::BaseSelectorPanel::OnShown()