diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index 7240b666c0..7e2d3c0486 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -240,10 +240,10 @@ void CopySettingsFile(std::string DeviceName) else Source += "setting-eur.txt"; - std::string Target = FULL_WII_USER_DIR + DeviceName; + std::string Target = FULL_WII_USER_DIR + File::SanitizePath(DeviceName.c_str()); // Check if the target dir exists, otherwise create it - std::string TargetDir = Target.substr(0, Target.find_last_of("/")); + std::string TargetDir = Target.substr(0, Target.find_last_of(DIR_SEP)); if(!File::IsDirectory(TargetDir.c_str())) File::CreateDirectoryStructure(Target.c_str()); if (File::Copy(Source.c_str(), Target.c_str())) diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index 1ceabc2a0c..6adac00b83 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -700,7 +700,7 @@ void CCodeWindow::UpdateLists() u32 caller_addr = symbol->callers[i].callAddress; Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr); if (caller_symbol) { - int idx = callers->Append(wxString::Format( _T("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr)); + int idx = callers->Append(wxString::Format( wxT("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr)); callers->SetClientData(idx, (void*)caller_addr); } } diff --git a/Source/Core/DebuggerWX/Src/RegisterView.cpp b/Source/Core/DebuggerWX/Src/RegisterView.cpp index 9c2996bf81..91a0096b0c 100644 --- a/Source/Core/DebuggerWX/Src/RegisterView.cpp +++ b/Source/Core/DebuggerWX/Src/RegisterView.cpp @@ -90,7 +90,7 @@ CRegisterView::Update() Refresh(); } - +#ifdef _WIN32 bool CRegisterView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem) { @@ -130,11 +130,7 @@ CRegisterView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem) } break; } - - // #endif - return(Result); } - - +#endif diff --git a/Source/Core/DebuggerWX/Src/RegisterView.h b/Source/Core/DebuggerWX/Src/RegisterView.h index 912ae48c1a..e1529bb1b6 100644 --- a/Source/Core/DebuggerWX/Src/RegisterView.h +++ b/Source/Core/DebuggerWX/Src/RegisterView.h @@ -39,7 +39,9 @@ class CRegisterView u32 m_CachedRegs[32]; bool m_CachedRegHasChanged[32]; + #ifdef _WIN32 virtual bool MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem); + #endif }; #endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.cpp index 485bb630ef..80e048f574 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.cpp @@ -60,7 +60,7 @@ void CPBView::Update() Refresh(); } - +#ifdef _WIN32 bool CPBView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem) { bool Result = false; @@ -121,3 +121,4 @@ bool CPBView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem) return Result; } } +#endif diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.h b/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.h index e9429f3b75..c86eb598fd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.h @@ -33,7 +33,10 @@ public: private: DECLARE_EVENT_TABLE() bool m_CachedRegHasChanged[64]; + + #ifdef _WIN32 virtual bool MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem); + #endif }; #endif