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

pcsx2|utilities: Remove Windows wx2.8 code 

It's not used anymore.
This commit is contained in:
Jonathan Li 2015-10-28 00:02:11 +00:00
parent dc5885790a
commit 344d6c201e
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/AppMain.cpp
View File

@ -339,9 +339,6 @@ class pxMessageOutputMessageBox : public wxMessageOutput
public: public:
pxMessageOutputMessageBox() { } pxMessageOutputMessageBox() { }
#if wxMAJOR_VERSION < 3
virtual void Printf(const wxChar* format, ...);
#endif
// DoPrintf in wxMessageOutputBase (wxWidgets 3.0) uses this. // DoPrintf in wxMessageOutputBase (wxWidgets 3.0) uses this.
virtual void Output(const wxString &out); 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 // commandline window using an identifier we know is contained in it, and then format our own window
// display. :D --air // 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) void pxMessageOutputMessageBox::Output(const wxString& out)
{ {
using namespace pxSizerFlags; using namespace pxSizerFlags;

8
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -54,12 +54,8 @@ Panels::BaseSelectorPanel::~BaseSelectorPanel() throw()
void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt) void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt)
{ {
evt.Skip(); evt.Skip();
#if defined (_MSC_VER) && (wxMAJOR_VERSION < 3) if( evt.IsShown() )
if( !evt.GetShow() ) return; OnShown();
#else
if( !evt.IsShown() ) return;
#endif
OnShown();
} }
void Panels::BaseSelectorPanel::OnShown() void Panels::BaseSelectorPanel::OnShown()