From dbfd07f11e87668963dd053369556ec2094edf7f Mon Sep 17 00:00:00 2001 From: David Kiarie Date: Tue, 15 Jul 2014 18:04:37 +0300 Subject: [PATCH 1/2] fix broken commit (2267c84d6a6ff071fea59bebd68135523d979e78) --- rpcs3/Gui/VFSManager.cpp | 10 +++++----- rpcs3/Gui/VFSManager.h | 4 ++-- rpcs3/Gui/VHDDManager.cpp | 4 ++-- rpcs3/Gui/VHDDManager.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index d1ba3365e4..af4fe3d1ed 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -139,10 +139,10 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VFSManagerDialog::OnEntryConfig, this); m_list->Bind(wxEVT_RIGHT_DOWN, &VFSManagerDialog::OnRightClick, this); - Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add); - Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove); - Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config); - Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this, wxID_OK); + Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add); + Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove); + Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config); + Bind(wxEVT_BUTTON, &VFSManagerDialog::OnClose, this, wxID_OK); LoadEntries(); UpdateList(); @@ -214,7 +214,7 @@ void VFSManagerDialog::OnRemove(wxCommandEvent& event) UpdateList(); } -void VFSManagerDialog::OnClose(wxCloseEvent& event) +void VFSManagerDialog::OnClose(wxCommandEvent& event) { SaveEntries(); event.Skip(); diff --git a/rpcs3/Gui/VFSManager.h b/rpcs3/Gui/VFSManager.h index 309f9882e1..7f3e14d445 100644 --- a/rpcs3/Gui/VFSManager.h +++ b/rpcs3/Gui/VFSManager.h @@ -33,7 +33,7 @@ public: void OnAdd(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); - void OnClose(wxCloseEvent& event); + void OnClose(wxCommandEvent& event); void LoadEntries(); void SaveEntries(); -}; \ No newline at end of file +}; diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index 27b4327ec1..7aa6ceb950 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -406,7 +406,7 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open); Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd); - Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this, wxID_OK); + Bind(wxEVT_BUTTON, &VHDDManagerDialog::OnClose, this, wxID_OK); LoadPaths(); UpdateList(); } @@ -521,7 +521,7 @@ void VHDDManagerDialog::OnCreateHDD(wxCommandEvent& event) } } -void VHDDManagerDialog::OnClose(wxCloseEvent& event) +void VHDDManagerDialog::OnClose(wxCommandEvent& event) { SavePaths(); event.Skip(); diff --git a/rpcs3/Gui/VHDDManager.h b/rpcs3/Gui/VHDDManager.h index aec9f55fc4..044b1bd341 100644 --- a/rpcs3/Gui/VHDDManager.h +++ b/rpcs3/Gui/VHDDManager.h @@ -82,7 +82,7 @@ public: void OnRemove(wxCommandEvent& event); void OnCreateHDD(wxCommandEvent& event); - void OnClose(wxCloseEvent& event); + void OnClose(wxCommandEvent& event); void LoadPaths(); void SavePaths(); }; From 78aef474a5a802b328ba82ba200cd234bab59b00 Mon Sep 17 00:00:00 2001 From: David Kiarie Date: Tue, 15 Jul 2014 18:29:48 +0300 Subject: [PATCH 2/2] rename some functions as per their function --- rpcs3/Gui/VFSManager.cpp | 4 ++-- rpcs3/Gui/VFSManager.h | 2 +- rpcs3/Gui/VHDDManager.cpp | 4 ++-- rpcs3/Gui/VHDDManager.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index af4fe3d1ed..9df763384f 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -142,7 +142,7 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add); Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config); - Bind(wxEVT_BUTTON, &VFSManagerDialog::OnClose, this, wxID_OK); + Bind(wxEVT_BUTTON, &VFSManagerDialog::OnOK, this, wxID_OK); LoadEntries(); UpdateList(); @@ -214,7 +214,7 @@ void VFSManagerDialog::OnRemove(wxCommandEvent& event) UpdateList(); } -void VFSManagerDialog::OnClose(wxCommandEvent& event) +void VFSManagerDialog::OnOK(wxCommandEvent& event) { SaveEntries(); event.Skip(); diff --git a/rpcs3/Gui/VFSManager.h b/rpcs3/Gui/VFSManager.h index 7f3e14d445..63260b3e6c 100644 --- a/rpcs3/Gui/VFSManager.h +++ b/rpcs3/Gui/VFSManager.h @@ -33,7 +33,7 @@ public: void OnAdd(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); - void OnClose(wxCommandEvent& event); + void OnOK(wxCommandEvent& event); void LoadEntries(); void SaveEntries(); }; diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index 7aa6ceb950..5808848259 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -406,7 +406,7 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open); Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd); - Bind(wxEVT_BUTTON, &VHDDManagerDialog::OnClose, this, wxID_OK); + Bind(wxEVT_BUTTON, &VHDDManagerDialog::OnOk, this, wxID_OK); LoadPaths(); UpdateList(); } @@ -521,7 +521,7 @@ void VHDDManagerDialog::OnCreateHDD(wxCommandEvent& event) } } -void VHDDManagerDialog::OnClose(wxCommandEvent& event) +void VHDDManagerDialog::OnOk(wxCommandEvent& event) { SavePaths(); event.Skip(); diff --git a/rpcs3/Gui/VHDDManager.h b/rpcs3/Gui/VHDDManager.h index 044b1bd341..b3b8ad9a49 100644 --- a/rpcs3/Gui/VHDDManager.h +++ b/rpcs3/Gui/VHDDManager.h @@ -82,7 +82,7 @@ public: void OnRemove(wxCommandEvent& event); void OnCreateHDD(wxCommandEvent& event); - void OnClose(wxCommandEvent& event); + void OnOk(wxCommandEvent& event); void LoadPaths(); void SavePaths(); };