From ee22d091a0058eb12acad673bfc4e7346a195484 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 5 Nov 2014 22:19:52 -0500 Subject: DolphinWX: Eliminate most usages of event tables in the debugger. Moves things over to Bind. --- Source/Core/DolphinWX/Debugger/CodeView.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'Source/Core/DolphinWX/Debugger/CodeView.cpp') diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index 5abd5f606f..2a6f53fe5c 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeView.cpp @@ -58,19 +58,6 @@ enum IDM_ADDFUNCTION, }; -BEGIN_EVENT_TABLE(CCodeView, wxControl) - EVT_ERASE_BACKGROUND(CCodeView::OnErase) - EVT_PAINT(CCodeView::OnPaint) - EVT_MOUSEWHEEL(CCodeView::OnScrollWheel) - EVT_LEFT_DOWN(CCodeView::OnMouseDown) - EVT_LEFT_UP(CCodeView::OnMouseUpL) - EVT_MOTION(CCodeView::OnMouseMove) - EVT_RIGHT_DOWN(CCodeView::OnMouseDown) - EVT_RIGHT_UP(CCodeView::OnMouseUpR) - EVT_MENU(-1, CCodeView::OnPopupMenu) - EVT_SIZE(CCodeView::OnResize) -END_EVENT_TABLE() - CCodeView::CCodeView(DebugInterface* debuginterface, SymbolDB *symboldb, wxWindow* parent, wxWindowID Id) : wxControl(parent, Id), @@ -86,6 +73,16 @@ CCodeView::CCodeView(DebugInterface* debuginterface, SymbolDB *symboldb, m_lx(-1), m_ly(-1) { + Bind(wxEVT_ERASE_BACKGROUND, &CCodeView::OnErase, this); + Bind(wxEVT_PAINT, &CCodeView::OnPaint, this); + Bind(wxEVT_MOUSEWHEEL, &CCodeView::OnScrollWheel, this); + Bind(wxEVT_LEFT_DOWN, &CCodeView::OnMouseDown, this); + Bind(wxEVT_LEFT_UP, &CCodeView::OnMouseUpL, this); + Bind(wxEVT_MOTION, &CCodeView::OnMouseMove, this); + Bind(wxEVT_RIGHT_DOWN, &CCodeView::OnMouseDown, this); + Bind(wxEVT_RIGHT_UP, &CCodeView::OnMouseUpR, this); + Bind(wxEVT_MENU, &CCodeView::OnPopupMenu, this); + Bind(wxEVT_SIZE, &CCodeView::OnResize, this); } int CCodeView::YToAddress(int y) -- cgit v1.2.3