ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hopefully fix string concatenation on unicode builds. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5960 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-07-24 07:31:48 +00:00
parent 43cbff64b5
commit 7828a689e7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -562,11 +562,9 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
? wxString::FromAscii("") ? wxString::FromAscii("")
: wxString::From8BitData(DefaultIOPath.c_str()), : wxString::From8BitData(DefaultIOPath.c_str()),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxT("Gamecube save files(*.gci,*.gcs,*.sav)" wxT("Native GCI files(*.gci)|*.gci|")
"|*.gci;*.gcs;*.sav|") wxT("MadCatz Gameshark files(*.gcs)|*.gcs|")
wxT("Native GCI files(*.gci)|*.gci|" wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"),
"MadCatz Gameshark files(*.gcs)|*.gcs|"
"Datel MaxDrive/Pro files(*.sav)|*.sav"),
wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (!fileName.empty() && !fileName2.empty()) if (!fileName.empty() && !fileName2.empty())
{ {
@ -598,9 +596,9 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
wxT("Export save as.."), wxT("Export save as.."),
wxString::From8BitData(DefaultIOPath.c_str()), wxString::From8BitData(DefaultIOPath.c_str()),
wxString::From8BitData(tempC), wxT(".gci"), wxString::From8BitData(tempC), wxT(".gci"),
wxT("Native GCI files (*.gci)|*.gci|" wxT("Native GCI files(*.gci)|*.gci|")
"MadCatz Gameshark files(*.gcs)|*.gcs|" wxT("MadCatz Gameshark files(*.gcs)|*.gcs|")
"Datel MaxDrive/Pro files(*.sav)|*.sav"), wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"),
wxFD_OVERWRITE_PROMPT|wxFD_SAVE); wxFD_OVERWRITE_PROMPT|wxFD_SAVE);
if (fileName.length() > 0) if (fileName.length() > 0)