diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2008-12-02 00:12:42 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2008-12-02 00:12:42 +0000 |
| commit | e033e310648335f433f5262b01a34af6074f3c22 (patch) | |
| tree | 8f27c98254af07ab59521ea1795d70ad681d5edf /Source/Core | |
| parent | 9a7a02fe636a3f74c5d9c79e297b79ea709dae8a (diff) | |
fixed up CopySettingsFile and idef'd away MSWDrawSubItem
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1371 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/RegisterView.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/RegisterView.h | 2 |
4 files changed, 7 insertions, 9 deletions
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
|