piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinWX: Kill off trivial event tables

Browse Source 
Also fixes some of the wonky stuff in Main where we would fire an event to do post-init stuff which isn't necessary anymore.
This commit is contained in:
Lioncash
2014-11-08 19:26:20 -05:00
parent 2a79d2343d
commit ac387031a4
17 changed files with 234 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/HotkeyDlg.cpp
View File

@ -27,11 +27,6 @@
#include "DolphinWX/HotkeyDlg.h"
#include "DolphinWX/WXInputBase.h"
BEGIN_EVENT_TABLE(HotkeyConfigDialog,wxDialog)
EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1, wxEVT_BUTTON, HotkeyConfigDialog::OnButtonClick)
EVT_TIMER(wxID_ANY, HotkeyConfigDialog::OnButtonTimer)
END_EVENT_TABLE()
HotkeyConfigDialog::HotkeyConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style)
@ -39,6 +34,9 @@ HotkeyConfigDialog::HotkeyConfigDialog(wxWindow *parent, wxWindowID id, const wx
{
CreateHotkeyGUIControls();
Bind(wxEVT_BUTTON, &HotkeyConfigDialog::OnButtonClick, this, 0, NUM_HOTKEYS - 1);
Bind(wxEVT_TIMER, &HotkeyConfigDialog::OnButtonTimer, this);
g_Pressed = 0;
g_Modkey = 0;
ClickedButton = nullptr;