From 3c2a41c2903d962cd217f15b4d37408d2bfd27b3 Mon Sep 17 00:00:00 2001 From: nakeee Date: Sat, 13 Dec 2008 19:49:19 +0000 Subject: [PATCH] linux compile fix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1522 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/CheatsWindow.cpp | 4 ++-- Source/Core/DolphinWX/Src/MemcardManager.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index 415bcde170..7edbb7c875 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -199,7 +199,7 @@ void wxCheatsWindow::OnEvent_ButtonUpdateLog_Press(wxCommandEvent& WXUNUSED (eve { m_TextCtrl_Log->Clear(); const std::vector &arLog = ActionReplay_GetSelfLog(); - for (int i = 0; i < arLog.size(); i++) + for (u32 i = 0; i < arLog.size(); i++) { m_TextCtrl_Log->AppendText(wxString::FromAscii(arLog[i].c_str())); } @@ -208,4 +208,4 @@ void wxCheatsWindow::OnEvent_ButtonUpdateLog_Press(wxCommandEvent& WXUNUSED (eve void wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& WXUNUSED (event)) { ActionReplay_EnableSelfLogging(m_CheckBox_LogAR->IsChecked()); -} \ No newline at end of file +} diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index f9836d2fe7..1527d25e1a 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -624,7 +624,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) if (temp.length() > 0) { if (!CopyDeleteSwitch(memoryCard[slot]->ExportGci(index, fileName), -1)) - File::Delete(temp.c_str()); + File::Delete(temp.ToAscii()); } } break;