summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2010-07-24 07:31:48 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2010-07-24 07:31:48 +0000
commit7828a689e716bb3f1165b6f2d4d7f4d39e05a4fc (patch)
tree82f198dbe67a12caccfa8609d4ff89cf3d1d613b /Source/Core
parent43cbff64b5c5041815ada20e384a0e601c32dbf5 (diff)
Hopefully fix string concatenation on unicode builds.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5960 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/MemcardManager.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index fa3702b9cc..f19d01a66b 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -562,11 +562,9 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
? 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"),
+ wxT("Native GCI files(*.gci)|*.gci|")
+ wxT("MadCatz Gameshark files(*.gcs)|*.gcs|")
+ wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"),
wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (!fileName.empty() && !fileName2.empty())
{
@@ -598,9 +596,9 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
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"),
+ wxT("Native GCI files(*.gci)|*.gci|")
+ wxT("MadCatz Gameshark files(*.gcs)|*.gcs|")
+ wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"),
wxFD_OVERWRITE_PROMPT|wxFD_SAVE);
if (fileName.length() > 0)