From b6375686ffcca87218999ee905aadfcc4b2b5d6b Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Mon, 8 Jun 2015 03:46:28 +0100
Subject: [PATCH] Use standard allocator for pxEventList/wxEventList

wxWidgets3.0 does not have the WXObjectAllocator anymore, so remove it.
---
 common/include/Utilities/wxAppWithHelpers.h | 6 +-----
 pcsx2/gui/pxEventThread.h                   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/include/Utilities/wxAppWithHelpers.h b/common/include/Utilities/wxAppWithHelpers.h
index b9deec52b3..9714f5f3f7 100644
--- a/common/include/Utilities/wxAppWithHelpers.h
+++ b/common/include/Utilities/wxAppWithHelpers.h
@@ -58,11 +58,7 @@ public:
 	virtual void OnActionButtonClicked( wxCommandEvent& evt );
 };
 
-#ifdef _MSC_VER
-	typedef std::list< wxEvent*, WXObjectAllocator(wxEvent*) > wxEventList;
-#else
-	typedef std::list< wxEvent* > wxEventList;
-#endif
+typedef std::list< wxEvent* > wxEventList;
 
 // --------------------------------------------------------------------------------------
 //  wxAppWithHelpers
diff --git a/pcsx2/gui/pxEventThread.h b/pcsx2/gui/pxEventThread.h
index cfd66f6c5a..304021df97 100644
--- a/pcsx2/gui/pxEventThread.h
+++ b/pcsx2/gui/pxEventThread.h
@@ -171,11 +171,7 @@ protected:
 	}
 };
 
-#ifdef _MSC_VER
-	typedef std::list< SysExecEvent*, WXObjectAllocator(SysExecEvent*) > pxEvtList;
-#else
-	typedef std::list<SysExecEvent*> pxEvtList;
-#endif
+typedef std::list<SysExecEvent*> pxEvtList;
 
 // --------------------------------------------------------------------------------------
 //  pxEvtQueue