piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetPlayDiag: Get rid of event table

Browse Source
This commit is contained in:
Lioncash 2014-11-10 23:28:09 -05:00
parent 5891266e67
commit 3fed975bac
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/NetWindow.cpp
View File

@ -49,10 +49,6 @@
#define INITIAL_PAD_BUFFER_SIZE 5 #define INITIAL_PAD_BUFFER_SIZE 5
BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
END_EVENT_TABLE()
static NetPlayServer* netplay_server = nullptr; static NetPlayServer* netplay_server = nullptr;
static NetPlayClient* netplay_client = nullptr; static NetPlayClient* netplay_client = nullptr;
NetPlayDiag *NetPlayDiag::npd = nullptr; NetPlayDiag *NetPlayDiag::npd = nullptr;
@ -309,6 +305,8 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
, m_start_btn(nullptr) , m_start_btn(nullptr)
, m_game_list(game_list) , m_game_list(game_list)
{ {
Bind(wxEVT_THREAD, &NetPlayDiag::OnThread, this);
wxPanel* const panel = new wxPanel(this); wxPanel* const panel = new wxPanel(this);
// top crap // top crap
@ -534,7 +532,7 @@ void NetPlayDiag::OnQuit(wxCommandEvent&)
} }
// update gui // update gui
void NetPlayDiag::OnThread(wxCommandEvent& event) void NetPlayDiag::OnThread(wxThreadEvent& event)
{ {
// player list // player list
m_playerids.clear(); m_playerids.clear();
@ -582,7 +580,9 @@ void NetPlayDiag::OnThread(wxCommandEvent& event)
// update selected game :/ // update selected game :/
{ {
m_selected_game.assign(WxStrToStr(event.GetString())); m_selected_game.assign(WxStrToStr(event.GetString()));
m_game_btn->SetLabel(event.GetString().Prepend(_(" Game : ")));
wxString button_label = event.GetString();
m_game_btn->SetLabel(button_label.Prepend(_(" Game : ")));
} }
break; break;
case NP_GUI_EVT_START_GAME : case NP_GUI_EVT_START_GAME :

4
Source/Core/DolphinWX/NetWindow.h
View File

@ -82,11 +82,9 @@ public:
bool IsRecording() override; bool IsRecording() override;
private: private:
DECLARE_EVENT_TABLE()
void OnChat(wxCommandEvent& event); void OnChat(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnThread(wxCommandEvent& event); void OnThread(wxThreadEvent& event);
void OnChangeGame(wxCommandEvent& event); void OnChangeGame(wxCommandEvent& event);
void OnAdjustBuffer(wxCommandEvent& event); void OnAdjustBuffer(wxCommandEvent& event);
void OnConfigPads(wxCommandEvent& event); void OnConfigPads(wxCommandEvent& event);