piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small build fix

Browse Source 
isn't there a nicer way to make wxString into c_str?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@767 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-10-04 19:50:04 +00:00
parent c7ae1fd402
commit 27d3191f4d
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -110,7 +110,7 @@ void CGameListCtrl::BrowseForDirectory()
wxGetHomeDir(&dirHome); wxGetHomeDir(&dirHome);
// browse // browse
wxDirDialog dialog(this, _T("Browse directory"), dirHome, wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); wxDirDialog dialog(this, _("Browse directory"), dirHome, wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)
{ {
@ -133,13 +133,13 @@ void CGameListCtrl::Update()
if (m_ISOFiles.size() != 0) if (m_ISOFiles.size() != 0)
{ {
// add columns // add columns
InsertColumn(COLUMN_BANNER, _T("Banner")); InsertColumn(COLUMN_BANNER, _("Banner"));
InsertColumn(COLUMN_TITLE, _T("Title")); InsertColumn(COLUMN_TITLE, _("Title"));
InsertColumn(COLUMN_COMPANY, _T("Company")); InsertColumn(COLUMN_COMPANY, _("Company"));
InsertColumn(COLUMN_NOTES, _T("Notes")); InsertColumn(COLUMN_NOTES, _("Notes"));
InsertColumn(COLUMN_COUNTRY, _T("")); InsertColumn(COLUMN_COUNTRY, _(""));
InsertColumn(COLUMN_SIZE, _T("Size")); InsertColumn(COLUMN_SIZE, _("Size"));
InsertColumn(COLUMN_EMULATION_STATE, _T("Emulation")); InsertColumn(COLUMN_EMULATION_STATE, _("Emulation"));
// set initial sizes for columns // set initial sizes for columns
SetColumnWidth(COLUMN_BANNER, 106); SetColumnWidth(COLUMN_BANNER, 106);
@ -159,10 +159,10 @@ void CGameListCtrl::Update()
} }
else else
{ {
InsertColumn(COLUMN_BANNER, _T("No ISOs found")); InsertColumn(COLUMN_BANNER, _("No ISOs found"));
// data // data
wxString buf(_T("Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files...")); wxString buf(_("Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for files..."));
long item = InsertItem(0, buf, -1); long item = InsertItem(0, buf, -1);
SetItemFont(item, *wxITALIC_FONT); SetItemFont(item, *wxITALIC_FONT);
SetColumnWidth(item, wxLIST_AUTOSIZE); SetColumnWidth(item, wxLIST_AUTOSIZE);
@ -629,11 +629,11 @@ void CGameListCtrl::OnFilesystemViewer(wxCommandEvent& WXUNUSED (event))
void CGameListCtrl::MultiCompressCB(const char* text, float percent, void* arg) void CGameListCtrl::MultiCompressCB(const char* text, float percent, void* arg)
{ {
wxString textString(wxString::Format("%s (%i/%i) - %s", m_currentFilename.c_str(), m_currentItem+1, m_numberItem, text)); wxString textString(wxString::Format(wxT("%s (%i/%i) - %s"), m_currentFilename.c_str(), m_currentItem+1, m_numberItem, text));
percent = (((float)m_currentItem) + percent) / (float)m_numberItem; percent = (((float)m_currentItem) + percent) / (float)m_numberItem;
wxProgressDialog* pDialog = (wxProgressDialog*)arg; wxProgressDialog* pDialog = (wxProgressDialog*)arg;
pDialog->Update((int)(percent*1000), textString); pDialog->Update((int)(percent*1000), textString);
} }
void CGameListCtrl::OnMultiCompressGCM(wxCommandEvent& /*event*/) void CGameListCtrl::OnMultiCompressGCM(wxCommandEvent& /*event*/)
@ -651,12 +651,12 @@ void CGameListCtrl::CompressSelection(bool _compress)
wxString dirHome; wxString dirHome;
wxGetHomeDir(&dirHome); wxGetHomeDir(&dirHome);
wxDirDialog browseDialog(this, _T("Browse for output directory"), dirHome, wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); wxDirDialog browseDialog(this, _("Browse for output directory"), dirHome, wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
if (browseDialog.ShowModal() != wxID_OK) if (browseDialog.ShowModal() != wxID_OK)
return; return;
wxProgressDialog progressDialog(_compress ? _T("Compressing ISO") : _T("Decompressing ISO"), wxProgressDialog progressDialog(_compress ? _("Compressing ISO") : _("Decompressing ISO"),
_T("Working..."), _("Working..."),
1000, // range 1000, // range
this, // parent this, // parent
wxPD_APP_MODAL | wxPD_APP_MODAL |
@ -672,7 +672,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
m_currentItem = 0; m_currentItem = 0;
m_numberItem = GetSelectedItemCount(); m_numberItem = GetSelectedItemCount();
for (size_t i=0; i<GetItemCount(); i++) for (int i=0; i<GetItemCount(); i++)
{ {
const GameListItem& rISOFile = m_ISOFiles[i]; const GameListItem& rISOFile = m_ISOFiles[i];
if (GetItemState(i, wxLIST_STATE_SELECTED) == wxLIST_STATE_SELECTED) if (GetItemState(i, wxLIST_STATE_SELECTED) == wxLIST_STATE_SELECTED)
@ -685,7 +685,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
FileName.append(".gcz"); FileName.append(".gcz");
std::string OutputFileName; std::string OutputFileName;
BuildCompleteFilename(OutputFileName, browseDialog.GetPath().ToAscii(), FileName); BuildCompleteFilename(OutputFileName, (const char *)browseDialog.GetPath().mb_str(wxConvUTF8), FileName);
DiscIO::CompressFileToBlob(rISOFile.GetFileName().c_str(), OutputFileName.c_str(), 0, 16384, &MultiCompressCB, &progressDialog); DiscIO::CompressFileToBlob(rISOFile.GetFileName().c_str(), OutputFileName.c_str(), 0, 16384, &MultiCompressCB, &progressDialog);
} }
@ -697,7 +697,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
FileName.append(".gcm"); FileName.append(".gcm");
std::string OutputFileName; std::string OutputFileName;
BuildCompleteFilename(OutputFileName, browseDialog.GetPath().ToAscii(), FileName); BuildCompleteFilename(OutputFileName, (const char *)browseDialog.GetPath().mb_str(wxConvUTF8), FileName);
DiscIO::DecompressBlobToFile(rISOFile.GetFileName().c_str(), OutputFileName.c_str(), &MultiCompressCB, &progressDialog); DiscIO::DecompressBlobToFile(rISOFile.GetFileName().c_str(), OutputFileName.c_str(), &MultiCompressCB, &progressDialog);
} }
@ -847,9 +847,9 @@ void CGameListCtrl::AutomaticColumnWidth()
void CGameListCtrl::UnselectAll() void CGameListCtrl::UnselectAll()
{ {
for (size_t i=0; i<GetItemCount(); i++) for (int i=0; i<GetItemCount(); i++)
{ {
SetItemState(i, 0, wxLIST_STATE_SELECTED); SetItemState(i, 0, wxLIST_STATE_SELECTED);
} }
} }