diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-01-14 00:21:09 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-01-14 00:21:09 +1300 |
| commit | 1deeff47c1791e601516a3954ec9eff7e706f5e5 (patch) | |
| tree | 987ad1826e3316b73b736fa9f583b962671fb0d0 /Source/Core | |
| parent | 20b43ac1c58859e786caca1211ee59fc9f79f9b1 (diff) | |
| parent | 429324a773fad3a840ac87f42f7d697305585d55 (diff) | |
Merge branch 'master' into wii-network
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/MemcardManager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index d11a8575ff..3f8f0de7a7 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -252,7 +252,6 @@ void CMemcardManager::CreateGUIControls() SetSizerAndFit(sMain); Center(); - SetFocus(); for (int i = SLOT_A; i <= SLOT_B; i++) { @@ -525,13 +524,13 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) _("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) + _("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) + _("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")), - wxFD_OPEN | wxFD_FILE_MUST_EXIST); + wxFD_OPEN | wxFD_FILE_MUST_EXIST, this); if (!fileName.empty() && !fileName2.empty()) { wxString temp2 = wxFileSelector(_("Save GCI as..."), wxEmptyString, wxEmptyString, wxT(".gci"), _("GCI File(*.gci)") + wxString(_T("|*.gci")), - wxFD_OVERWRITE_PROMPT|wxFD_SAVE); + wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this); if (temp2.empty()) break; fileName2 = temp2.mb_str(); } @@ -561,7 +560,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) _("Native GCI files(*.gci)") + wxString(wxT("|*.gci|")) + _("MadCatz Gameshark files(*.gcs)") + wxString(wxT("|*.gcs|")) + _("Datel MaxDrive/Pro files(*.sav)") + wxString(wxT("|*.sav")), - wxFD_OVERWRITE_PROMPT|wxFD_SAVE); + wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this); if (fileName.length() > 0) { |