Merge pull request #826 from lioncash/wx-events

DolphinWX: Use the typesafe equivalents for declaring wx event types
dolphin-emu · Aug 20, 2014 · b5337ea · b5337ea
2 parents d29e333 + 6a8dfda
commit b5337ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp
@@ -38,7 +38,7 @@
 #include "DolphinWX/Debugger/CodeView.h"
 #include "DolphinWX/Debugger/DebuggerUIUtil.h"
 
-DEFINE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE);
+wxDEFINE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
 
 enum
 {

diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h
@@ -16,7 +16,7 @@
 
 #include "Common/Common.h"
 
-DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1);
+wxDECLARE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
 
 class DebugInterface;
 class SymbolDB;

diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp
@@ -45,11 +45,8 @@
 
 class wxWindow;
 
-DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1)
-DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT)
-
-DECLARE_EVENT_TYPE(FRAME_WRITTEN_EVENT, -1)
-DEFINE_EVENT_TYPE(FRAME_WRITTEN_EVENT)
+wxDEFINE_EVENT(RECORDING_FINISHED_EVENT, wxCommandEvent);
+wxDEFINE_EVENT(FRAME_WRITTEN_EVENT, wxCommandEvent);
 
 static std::recursive_mutex sMutex;
 wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = nullptr;