mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-16 07:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #573 from Aslaville/UI

Browse Source 
fix broken commit (2267c84d6a)
This commit is contained in:
Hykem 2014-07-17 13:40:52 +01:00
commit e6a660a200
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Gui/VFSManager.cpp
View File

@ -139,10 +139,10 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent)
m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VFSManagerDialog::OnEntryConfig, this); m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VFSManagerDialog::OnEntryConfig, this);
m_list->Bind(wxEVT_RIGHT_DOWN, &VFSManagerDialog::OnRightClick, this); m_list->Bind(wxEVT_RIGHT_DOWN, &VFSManagerDialog::OnRightClick, this);
Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add); Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add);
Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove);
Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config); Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config);
Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this, wxID_OK); Bind(wxEVT_BUTTON, &VFSManagerDialog::OnOK, this, wxID_OK);
LoadEntries(); LoadEntries();
UpdateList(); UpdateList();
@ -214,7 +214,7 @@ void VFSManagerDialog::OnRemove(wxCommandEvent& event)
UpdateList(); UpdateList();
} }
void VFSManagerDialog::OnClose(wxCloseEvent& event) void VFSManagerDialog::OnOK(wxCommandEvent& event)
{ {
SaveEntries(); SaveEntries();
event.Skip(); event.Skip();

4
rpcs3/Gui/VFSManager.h
View File

@ -33,7 +33,7 @@ public:
void OnAdd(wxCommandEvent& event); void OnAdd(wxCommandEvent& event);
void OnRemove(wxCommandEvent& event); void OnRemove(wxCommandEvent& event);
void OnClose(wxCloseEvent& event); void OnOK(wxCommandEvent& event);
void LoadEntries(); void LoadEntries();
void SaveEntries(); void SaveEntries();
}; };

4
rpcs3/Gui/VHDDManager.cpp
View File

@ -406,7 +406,7 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent)
Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open); Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open);
Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove); Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove);
Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd); Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd);
Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this, wxID_OK); Bind(wxEVT_BUTTON, &VHDDManagerDialog::OnOk, this, wxID_OK);
LoadPaths(); LoadPaths();
UpdateList(); UpdateList();
} }
@ -521,7 +521,7 @@ void VHDDManagerDialog::OnCreateHDD(wxCommandEvent& event)
} }
} }
void VHDDManagerDialog::OnClose(wxCloseEvent& event) void VHDDManagerDialog::OnOk(wxCommandEvent& event)
{ {
SavePaths(); SavePaths();
event.Skip(); event.Skip();

2
rpcs3/Gui/VHDDManager.h
View File

@ -82,7 +82,7 @@ public:
void OnRemove(wxCommandEvent& event); void OnRemove(wxCommandEvent& event);
void OnCreateHDD(wxCommandEvent& event); void OnCreateHDD(wxCommandEvent& event);
void OnClose(wxCloseEvent& event); void OnOk(wxCommandEvent& event);
void LoadPaths(); void LoadPaths();
void SavePaths(); void SavePaths();
}; };