diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 2ccba91535..75226a4e91 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -285,9 +285,10 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) case IDM_RENAME_SYMBOLS: { wxString path = wxFileSelector( - _T("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString, - _T("Dolphin Symbole Rename File (*.sym)|*.sym;"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, - this); + _T("Apply signature file"), wxEmptyString, + wxEmptyString, wxEmptyString, + _T("Dolphin Symbol Rename File (*.sym)|*.sym"), + wxFD_OPEN | wxFD_FILE_MUST_EXIST, this); if (! path.IsEmpty()) { FILE *f = fopen(path.mb_str(), "r"); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 24fe21797c..e4c304623b 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1086,12 +1086,7 @@ void CFrame::OnLoadWiiMenu(wxCommandEvent& event) wxString path = wxFileSelector( _T("Select the System Menu wad extracted from the update partition of a disc"), wxEmptyString, wxEmptyString, wxEmptyString, - wxString::Format - ( - _T("System Menu wad|*.wad"), - wxFileSelectorDefaultWildcardStr, - wxFileSelectorDefaultWildcardStr - ), + _T("System Menu (*.wad)|*.wad"), wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, this); diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 898d843c0a..fa3702b9cc 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -556,26 +556,23 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) slot = SLOT_A; case ID_SAVEIMPORT_B: { - wxString fileName = wxFileSelector(wxT("Select a save file to import"), - (strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0) ? wxString::FromAscii(""): wxString::From8BitData(DefaultIOPath.c_str()), wxEmptyString, wxEmptyString, wxString::Format - ( - wxT("Gamecube save files(*.gci,*.gcs,*.sav)|*.gci;*.gcs;*.sav|") - wxT("Native GCI files (*.gci)|*.gci|") - wxT("MadCatz Gameshark files(*.gcs)|*.gcs|") - wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"), - wxFileSelectorDefaultWildcardStr, - wxFileSelectorDefaultWildcardStr - ), + wxString fileName = wxFileSelector( + wxT("Select a save file to import"), + (strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0) + ? wxString::FromAscii("") + : wxString::From8BitData(DefaultIOPath.c_str()), + wxEmptyString, wxEmptyString, + wxT("Gamecube save files(*.gci,*.gcs,*.sav)" + "|*.gci;*.gcs;*.sav|") + wxT("Native GCI files(*.gci)|*.gci|" + "MadCatz Gameshark files(*.gcs)|*.gcs|" + "Datel MaxDrive/Pro files(*.sav)|*.sav"), wxFD_OPEN | wxFD_FILE_MUST_EXIST); if (!fileName.empty() && !fileName2.empty()) { wxString temp2 = wxFileSelector(wxT("Save GCI as.."), - wxEmptyString, wxEmptyString, wxT(".gci"), wxString::Format - ( - wxT("GCI File(*.gci)|*.gci"), - wxFileSelectorDefaultWildcardStr, - wxFileSelectorDefaultWildcardStr - ), + wxEmptyString, wxEmptyString, wxT(".gci"), + wxT("GCI File(*.gci)|*.gci"), wxFD_OVERWRITE_PROMPT|wxFD_SAVE); if (temp2.empty()) break; fileName2 = temp2.mb_str(); @@ -597,15 +594,13 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) memoryCard[slot]->DEntry_GameCode(index,tempC); memoryCard[slot]->DEntry_FileName(index,tempC2); sprintf(tempC, "%s_%s.gci", tempC, tempC2); - wxString fileName = wxFileSelector(wxT("Export save as.."), wxString::From8BitData(DefaultIOPath.c_str()), - wxString::From8BitData(tempC), wxT(".gci"), wxString::Format - ( - wxT("Native GCI files (*.gci)|*.gci|") - wxT("MadCatz Gameshark files(*.gcs)|*.gcs|") - wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"), - wxFileSelectorDefaultWildcardStr, - wxFileSelectorDefaultWildcardStr - ), + wxString fileName = wxFileSelector( + wxT("Export save as.."), + wxString::From8BitData(DefaultIOPath.c_str()), + wxString::From8BitData(tempC), wxT(".gci"), + wxT("Native GCI files (*.gci)|*.gci|" + "MadCatz Gameshark files(*.gcs)|*.gcs|" + "Datel MaxDrive/Pro files(*.sav)|*.sav"), wxFD_OVERWRITE_PROMPT|wxFD_SAVE); if (fileName.length() > 0)