diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-17 16:18:54 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-17 16:18:58 -0400 |
| commit | 6a8dfda0ea0cb9b566a536e3cc76b2bed003fe83 (patch) | |
| tree | 307c6453829794728d13f71405ee3bd50f25643d /Source | |
| parent | 9e2fbaf40551b6d037a94274433b03c580dc1604 (diff) | |
DolphinWX: Use the typesafe equivalents for declaring wx event types
The others were used when wx 2.4 was around
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeView.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeView.h | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/FifoPlayerDlg.cpp | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index 0c74b3dbd9..d723d9aa6b 100644 --- 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 index dd5d9425a3..b6e643fae6 100644 --- 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 index b98b3a0b8b..0a5d30c132 100644 --- 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; |
