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

fixed up CopySettingsFile and idef'd away MSWDrawSubItem 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1371 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2008-12-02 00:12:42 +00:00
parent 9a7a02fe63
commit e033e31064
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -240,10 +240,10 @@ void CopySettingsFile(std::string DeviceName)
else else
Source += "setting-eur.txt"; 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 // 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::IsDirectory(TargetDir.c_str())) File::CreateDirectoryStructure(Target.c_str());
if (File::Copy(Source.c_str(), Target.c_str())) if (File::Copy(Source.c_str(), Target.c_str()))

2
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -700,7 +700,7 @@ void CCodeWindow::UpdateLists()
u32 caller_addr = symbol->callers[i].callAddress; u32 caller_addr = symbol->callers[i].callAddress;
Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr); Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
if (caller_symbol) { 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); callers->SetClientData(idx, (void*)caller_addr);
} }
} }

8
Source/Core/DebuggerWX/Src/RegisterView.cpp
View File

@ -90,7 +90,7 @@ CRegisterView::Update()
Refresh(); Refresh();
} }
#ifdef _WIN32
bool bool
CRegisterView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem) CRegisterView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem)
{ {
@ -130,11 +130,7 @@ CRegisterView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem)
} }
break; break;
} }
//
#endif #endif
return(Result); return(Result);
} }
#endif

2
Source/Core/DebuggerWX/Src/RegisterView.h
View File

@ -39,7 +39,9 @@ class CRegisterView
u32 m_CachedRegs[32]; u32 m_CachedRegs[32];
bool m_CachedRegHasChanged[32]; bool m_CachedRegHasChanged[32];
#ifdef _WIN32
virtual bool MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem); virtual bool MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem);
#endif
}; };
#endif #endif

3
Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.cpp
View File

@ -60,7 +60,7 @@ void CPBView::Update()
Refresh(); Refresh();
} }
#ifdef _WIN32
bool CPBView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem) bool CPBView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem)
{ {
bool Result = false; bool Result = false;
@ -121,3 +121,4 @@ bool CPBView::MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem)
return Result; return Result;
} }
} }
#endif

3
Source/Plugins/Plugin_VideoOGL/Src/Debugger/PBView.h
View File

@ -33,7 +33,10 @@ public:
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
bool m_CachedRegHasChanged[64]; bool m_CachedRegHasChanged[64];
#ifdef _WIN32
virtual bool MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem); virtual bool MSWDrawSubItem(wxPaintDC& rPainDC, int item, int subitem);
#endif
}; };
#endif #endif