From 6687f3e79186ce4c8edb30b4f1869cf665ac70c5 Mon Sep 17 00:00:00 2001 From: nakeee Date: Fri, 28 May 2010 09:33:31 +0000 Subject: [PATCH] Linux compile fix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5525 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DiscIO/Src/NANDContentLoader.h | 4 ++-- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h index d2b3357831..1dc1ad65c2 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.h +++ b/Source/Core/DiscIO/Src/NANDContentLoader.h @@ -132,8 +132,8 @@ public: u32 GetUIDFromTitle(u64 _Title); bool AddTitle(u64 _Title); - bool cUIDsys::CheckTitleTMD(u64 _TitleID); - bool cUIDsys::CheckTitleTIK(u64 _TitleID); + bool CheckTitleTMD(u64 _TitleID); + bool CheckTitleTIK(u64 _TitleID); void GetTitleIDs(std::vector& _TitleIDs); private: diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 7540a1fbd0..37ef22c91a 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -1191,7 +1191,8 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) wxString::Format ( _T("All GC/Wii ISO files (%s)|%s|All files (%s)|%s"), - Ext.After('.'), Ext, + (char *)Ext.After('.').char_str(wxConvUTF8), + (char *)Ext.char_str(wxConvUTF8), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr ),