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

Merge pull request #826 from lioncash/wx-events 

DolphinWX: Use the typesafe equivalents for declaring wx event types
This commit is contained in:
Lioncash 2014-08-20 14:34:17 -04:00
parent d29e333142 6a8dfda0ea
commit b5337ea1b5
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/CodeView.cpp
View File

@ -38,7 +38,7 @@
#include "DolphinWX/Debugger/CodeView.h" #include "DolphinWX/Debugger/CodeView.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h"
DEFINE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE); wxDEFINE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
enum enum
{ {

2
Source/Core/DolphinWX/Debugger/CodeView.h
View File

@ -16,7 +16,7 @@
#include "Common/Common.h" #include "Common/Common.h"
DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1); wxDECLARE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
class DebugInterface; class DebugInterface;
class SymbolDB; class SymbolDB;

7
Source/Core/DolphinWX/FifoPlayerDlg.cpp
View File

@ -45,11 +45,8 @@
class wxWindow; class wxWindow;
DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) wxDEFINE_EVENT(RECORDING_FINISHED_EVENT, wxCommandEvent);
DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) wxDEFINE_EVENT(FRAME_WRITTEN_EVENT, wxCommandEvent);
DECLARE_EVENT_TYPE(FRAME_WRITTEN_EVENT, -1)
DEFINE_EVENT_TYPE(FRAME_WRITTEN_EVENT)
static std::recursive_mutex sMutex; static std::recursive_mutex sMutex;
wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = nullptr; wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = nullptr;