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

wx3.0: rename some deprecated API call 

Avoid various gcc warning

Note: Compatible with recent wx2.8 version
This commit is contained in:
Gregory Hainaut 2014-07-03 20:10:10 +02:00
parent deb69c4c72
commit ac41ba1f73
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/MainFrame.cpp
View File

@ -596,7 +596,7 @@ void MainEmuFrame::ApplyCoreStatus()
if( !CoreThread.IsClosing() ) if( !CoreThread.IsClosing() )
{ {
susres->Enable(); susres->Enable();
susres->SetText(_("Pause")); susres->SetItemLabel(_("Pause"));
susres->SetHelp(_("Safely pauses emulation and preserves the PS2 state.")); susres->SetHelp(_("Safely pauses emulation and preserves the PS2 state."));
} }
else else
@ -604,12 +604,12 @@ void MainEmuFrame::ApplyCoreStatus()
susres->Enable(vm); susres->Enable(vm);
if( vm ) if( vm )
{ {
susres->SetText(_("Resume")); susres->SetItemLabel(_("Resume"));
susres->SetHelp(_("Resumes the suspended emulation state.")); susres->SetHelp(_("Resumes the suspended emulation state."));
} }
else else
{ {
susres->SetText(_("Pause/Resume")); susres->SetItemLabel(_("Pause/Resume"));
susres->SetHelp(_("No emulation state is active; cannot suspend or resume.")); susres->SetHelp(_("No emulation state is active; cannot suspend or resume."));
} }
} }
@ -619,7 +619,7 @@ void MainEmuFrame::ApplyCoreStatus()
{ {
if( vm ) if( vm )
{ {
restart->SetText(_("Restart")); restart->SetItemLabel(_("Restart"));
restart->SetHelp(_("Simulates hardware reset of the PS2 virtual machine.")); restart->SetHelp(_("Simulates hardware reset of the PS2 virtual machine."));
} }
else else
@ -633,12 +633,12 @@ void MainEmuFrame::ApplyCoreStatus()
{ {
if( vm ) if( vm )
{ {
cdvd->SetText(_("Reboot CDVD (full)")); cdvd->SetItemLabel(_("Reboot CDVD (full)"));
cdvd->SetHelp(_("Hard reset of the active VM.")); cdvd->SetHelp(_("Hard reset of the active VM."));
} }
else else
{ {
cdvd->SetText(_("Boot CDVD (full)")); cdvd->SetItemLabel(_("Boot CDVD (full)"));
cdvd->SetHelp(_("Boot the VM using the current DVD or Iso source media")); cdvd->SetHelp(_("Boot the VM using the current DVD or Iso source media"));
} }
} }
@ -647,12 +647,12 @@ void MainEmuFrame::ApplyCoreStatus()
{ {
if( vm ) if( vm )
{ {
cdvd2->SetText(_("Reboot CDVD (fast)")); cdvd2->SetItemLabel(_("Reboot CDVD (fast)"));
cdvd2->SetHelp(_("Reboot using fast BOOT (skips splash screens)")); cdvd2->SetHelp(_("Reboot using fast BOOT (skips splash screens)"));
} }
else else
{ {
cdvd2->SetText(_("Boot CDVD (fast)")); cdvd2->SetItemLabel(_("Boot CDVD (fast)"));
cdvd2->SetHelp(_("Use fast boot to skip PS2 startup and splash screens")); cdvd2->SetHelp(_("Use fast boot to skip PS2 startup and splash screens"));
} }
} }

4
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -54,7 +54,11 @@ Panels::BaseSelectorPanel::~BaseSelectorPanel() throw()
void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt) void Panels::BaseSelectorPanel::OnShow(wxShowEvent& evt)
{ {
evt.Skip(); evt.Skip();
#if defined (_MSC_VER) && (wxMAJOR_VERSION < 3)
if( !evt.GetShow() ) return; if( !evt.GetShow() ) return;
#else
if( !evt.IsShown() ) return;
#endif
OnShown(); OnShown();
} }

2
pcsx2/gui/Saveslots.cpp
View File

@ -148,7 +148,7 @@ void Sstates_updateLoadBackupMenuItem( bool isBeforeSave )
g_loadBackupMenuItem->Enable( wxFileExists( isBeforeSave && g_Conf->EmuOptions.BackupSavestate ? file : file + L".backup" ) ); g_loadBackupMenuItem->Enable( wxFileExists( isBeforeSave && g_Conf->EmuOptions.BackupSavestate ? file : file + L".backup" ) );
wxString label; wxString label;
label.Printf(L"%s %d", _("Backup"), slot ); label.Printf(L"%s %d", _("Backup"), slot );
g_loadBackupMenuItem->SetText( label ); g_loadBackupMenuItem->SetItemLabel( label );
} }
void States_SetCurrentSlot( int slot ) void States_SetCurrentSlot( int slot )