diff options
| author | skidau <skidau@gmail.com> | 2015-02-27 13:25:46 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-02-27 13:25:46 +1100 |
| commit | 2a41ac40721a9104ca8c47996b0c9e5b704722a0 (patch) | |
| tree | a6c584cbb7101c3fad188a79f5dd8f691833f6ba /Source/Core/DolphinWX/ARCodeAddEdit.cpp | |
| parent | 85359d51690ce71efcd836acab0cec15cc68ac1e (diff) | |
| parent | 2df8190e1ad88e6051cd709641ab2b42a3d251e0 (diff) | |
Merge pull request #2123 from RachelBryk/nonmodal-isoprops
Make iso properties non modal.
Diffstat (limited to 'Source/Core/DolphinWX/ARCodeAddEdit.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ARCodeAddEdit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index 95866a32e4..07240e63f7 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -26,12 +26,12 @@ #include "Core/ActionReplay.h" #include "Core/ARDecrypt.h" #include "DolphinWX/ARCodeAddEdit.h" -#include "DolphinWX/ISOProperties.h" #include "DolphinWX/WxUtils.h" -CARCodeAddEdit::CARCodeAddEdit(int _selection, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style) +CARCodeAddEdit::CARCodeAddEdit(int _selection, const std::vector<ActionReplay::ARCode>& _arCodes, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style) : wxDialog(parent, id, title, position, size, style) , selection(_selection) + , arCodes(_arCodes) { Bind(wxEVT_BUTTON, &CARCodeAddEdit::SaveCheatData, this, wxID_OK); |