From de6b7752d4f01ffe126a1d18e3e5dfb46610e52e Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Wed, 27 Apr 2016 23:03:16 +0100 Subject: [PATCH] ConsoleLogger: Define events in a Bind compatible way Also remove the pxEvt_LogWrite event, since that isn't used. --- pcsx2/gui/ConsoleLogger.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index a0c3887575..cf7badfde0 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -26,15 +26,11 @@ #include -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(pxEvt_LogWrite, -1) - DECLARE_EVENT_TYPE(pxEvt_SetTitleText, -1) - DECLARE_EVENT_TYPE(pxEvt_FlushQueue, -1) -END_DECLARE_EVENT_TYPES() +wxDECLARE_EVENT(pxEvt_SetTitleText, wxCommandEvent); +wxDECLARE_EVENT(pxEvt_FlushQueue, wxCommandEvent); -DEFINE_EVENT_TYPE(pxEvt_LogWrite) -DEFINE_EVENT_TYPE(pxEvt_SetTitleText) -DEFINE_EVENT_TYPE(pxEvt_FlushQueue) +wxDEFINE_EVENT(pxEvt_SetTitleText, wxCommandEvent); +wxDEFINE_EVENT(pxEvt_FlushQueue, wxCommandEvent); // C++ requires abstract destructors to exist, even though they're abstract. PipeRedirectionBase::~PipeRedirectionBase() throw() {}