piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #376 from lioncash/wx

Browse Source 
Wx cleanup
This commit is contained in:
shuffle2
2014-05-21 21:54:00 -07:00
parent 7a7aa8c5a3 554207a87c
commit c308657779
44 changed files with 536 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -308,8 +308,8 @@ void CGameListCtrl::Update()
InitBitmaps();
// add columns
InsertColumn(COLUMN_DUMMY,_T(""));
InsertColumn(COLUMN_PLATFORM, _T(""));
InsertColumn(COLUMN_DUMMY, "");
InsertColumn(COLUMN_PLATFORM, "");
InsertColumn(COLUMN_BANNER, _("Banner"));
InsertColumn(COLUMN_TITLE, _("Title"));
@ -317,7 +317,7 @@ void CGameListCtrl::Update()
// wii titles We show in the same column : company for GC games and
// description for wii/wad games
InsertColumn(COLUMN_NOTES, _("Notes"));
InsertColumn(COLUMN_COUNTRY, _T(""));
InsertColumn(COLUMN_COUNTRY, "");
InsertColumn(COLUMN_SIZE, _("Size"));
InsertColumn(COLUMN_EMULATION_STATE, _("State"));
@ -1196,16 +1196,16 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
{
wxString FileType;
if (iso->GetPlatform() == GameListItem::WII_DISC)
FileType = _("All Wii ISO files (iso)") + wxString(wxT("|*.iso"));
FileType = _("All Wii ISO files (iso)") + "|*.iso";
else
FileType = _("All Gamecube GCM files (gcm)") + wxString(wxT("|*.gcm"));
FileType = _("All Gamecube GCM files (gcm)") + "|*.gcm";
path = wxFileSelector(
_("Save decompressed GCM/ISO"),
StrToWxStr(FilePath),
StrToWxStr(FileName) + FileType.After('*'),
wxEmptyString,
FileType + wxT("|") + wxGetTranslation(wxALL_FILES),
FileType + "|" + wxGetTranslation(wxALL_FILES),
wxFD_SAVE,
this);
}
@ -1214,10 +1214,10 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
path = wxFileSelector(
_("Save compressed GCM/ISO"),
StrToWxStr(FilePath),
StrToWxStr(FileName) + _T(".gcz"),
StrToWxStr(FileName) + ".gcz",
wxEmptyString,
_("All compressed GC/Wii ISO files (gcz)") +
wxString::Format(wxT("|*.gcz|%s"), wxGetTranslation(wxALL_FILES)),
wxString::Format("|*.gcz|%s", wxGetTranslation(wxALL_FILES)),
wxFD_SAVE,
this);
}
@ -1331,7 +1331,7 @@ void CGameListCtrl::OnDropFiles(wxDropFilesEvent& event)
}
if (Movie::PlayInput(WxStrToStr(file.GetFullPath())))
main_frame->BootGame(std::string(""));
main_frame->BootGame("");
}
else if (!Core::IsRunning())
{