diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-09 08:51:57 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-09 08:51:57 +0000 |
| commit | e1eb51a01034348f3eeb94f2e951a1665b5c641b (patch) | |
| tree | 129c37e9191527adb7770cbeeb8f1fc26721b72d /Source/Core/DolphinWX/Src/FilesystemViewer.cpp | |
| parent | c343b8b8bbd39b748fa4b17ace1027490de18e70 (diff) | |
Fix Building in Linux, removed the define for _T() in Common.h so now we can have wx headers after including Common.h. Also, InterlockedExchange isn't in Linux so I just made it assign the variable
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@809 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FilesystemViewer.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FilesystemViewer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Src/FilesystemViewer.cpp b/Source/Core/DolphinWX/Src/FilesystemViewer.cpp index 118edb881e..0b5b56bb9c 100644 --- a/Source/Core/DolphinWX/Src/FilesystemViewer.cpp +++ b/Source/Core/DolphinWX/Src/FilesystemViewer.cpp @@ -55,7 +55,7 @@ CFilesystemViewer::CFilesystemViewer(const std::string fileName, wxWindow* paren wxTreeItemId dirId = NULL;
for(u32 a = 1; a < Our_Files.size(); ++a)
{
- m_Treectrl->AppendItem(RootId, wxString::Format("%s", Our_Files[a]->m_FullPath));
+ m_Treectrl->AppendItem(RootId, wxString::Format(_T("%s"), Our_Files[a]->m_FullPath));
//if(Our_Files[a]->IsDirectory())
}
@@ -66,23 +66,23 @@ CFilesystemViewer::CFilesystemViewer(const std::string fileName, wxWindow* paren m_Serial->SetValue(wxString(OpenISO->GetUniqueID().c_str(), wxConvUTF8));
switch (OpenISO->GetCountry())
{
- case OpenISO->COUNTRY_EUROPE:
- case OpenISO->COUNTRY_FRANCE:
+ case DiscIO::IVolume::COUNTRY_EUROPE:
+ case DiscIO::IVolume::COUNTRY_FRANCE:
m_Country->SetValue(wxString::FromAscii("EUR"));
break;
- case OpenISO->COUNTRY_USA:
+ case DiscIO::IVolume::COUNTRY_USA:
m_Country->SetValue(wxString::FromAscii("USA"));
break;
- case OpenISO->COUNTRY_JAP:
+ case DiscIO::IVolume::COUNTRY_JAP:
m_Country->SetValue(wxString::FromAscii("JAP"));
break;
default:
m_Country->SetValue(wxString::FromAscii("UNKNOWN"));
break;
}
- m_MakerID->SetValue(wxString::Format("0x%s", OpenISO->GetMakerID().c_str()));
+ m_MakerID->SetValue(wxString::Format(_T("0x%s"), OpenISO->GetMakerID().c_str()));
m_Date->SetValue(wxString(OpenISO->GetApploaderDate().c_str(), wxConvUTF8));
- m_TOC->SetValue(wxString::Format("%u", OpenISO->GetFSTSize()));
+ m_TOC->SetValue(wxString::Format(_T("%u"), OpenISO->GetFSTSize()));
// Banner
// ...all the BannerLoader functions are bool...gross
|