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

Fixing stuff 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@857 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-10-14 04:32:49 +00:00
parent 0629cc6690
commit d84fa6195c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -168,7 +168,7 @@ CFrame::CFrame(wxFrame* parent,
m_GameListCtrl->Update(); m_GameListCtrl->Update();
sizerPanel->SetSizeHints(m_Panel); //sizerPanel->SetSizeHints(m_Panel);
wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN,
wxKeyEventHandler(CFrame::OnKeyDown), wxKeyEventHandler(CFrame::OnKeyDown),

12
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
View File

@ -613,7 +613,7 @@ u32 GCMemcard::ImportGci(const char *fileName, int endFile, const char *fileNam
{ {
if(!mcdFile && !fileName2) return 0; if(!mcdFile && !fileName2) return 0;
wxFFile gci(fileName,"rb"); wxFFile gci(wxString::FromAscii(fileName), _T("rb"));
if(!gci.IsOpened())return 0; if(!gci.IsOpened())return 0;
enum enum
@ -628,12 +628,12 @@ u32 GCMemcard::ImportGci(const char *fileName, int endFile, const char *fileNam
const char * fileType= (char*)fileName+ endFile-3; const char * fileType= (char*)fileName+ endFile-3;
if(!_stricmp(fileType,"gci") && !fileName2)//Extension can be either case if(!strcasecmp(fileType,"gci") && !fileName2)//Extension can be either case
offset = GCI; offset = GCI;
else else
{ {
gci.Read(tmp,0xD); gci.Read(tmp,0xD);
if(!_stricmp(fileType,"gcs"))//Extension can be either case if(!strcasecmp(fileType,"gcs"))//Extension can be either case
{ {
if(!memcmp(tmp,"GCSAVE",6)) //Header must be uppercase if(!memcmp(tmp,"GCSAVE",6)) //Header must be uppercase
offset = GCS; offset = GCS;
@ -644,7 +644,7 @@ u32 GCMemcard::ImportGci(const char *fileName, int endFile, const char *fileNam
} }
} }
else{ else{
if(!_stricmp(fileType,"sav"))//Extension can be either case if(!strcasecmp(fileType,"sav"))//Extension can be either case
{ {
if(!memcmp(tmp,"DATELGC_SAVE",0xC))//Header must be uppercase if(!memcmp(tmp,"DATELGC_SAVE",0xC))//Header must be uppercase
offset = SAV; offset = SAV;
@ -713,7 +713,7 @@ u32 GCMemcard::ImportGci(const char *fileName, int endFile, const char *fileNam
u32 ret = 0; u32 ret = 0;
if(!fileName2) if(!fileName2)
{ {
wxFFile gci2(fileName2,"wb"); wxFFile gci2(wxString::FromAscii(fileName2), _T("wb"));
if(!gci2.IsOpened())return 0; if(!gci2.IsOpened())return 0;
gci2.Seek(0,wxFromStart); gci2.Seek(0,wxFromStart);
gci2.Write(d,0x40); gci2.Write(d,0x40);
@ -733,7 +733,7 @@ u32 GCMemcard::ImportGci(const char *fileName, int endFile, const char *fileNam
bool GCMemcard::ExportGci(u32 index, const char *fileName) bool GCMemcard::ExportGci(u32 index, const char *fileName)
{ {
wxFFile gci(fileName,"wb"); wxFFile gci(wxString::FromAscii(fileName), _T("wb"));
if(!gci.IsOpened())return false; if(!gci.IsOpened())return false;