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

Merge pull request #136 from Sonicadvance1/gui-pointers 

Fix two conversions of pointers to integer in the GUI.
This commit is contained in:
sudonim1 2014-07-15 22:20:37 +01:00
parent 7a1ebd22ed 0af0db6593
commit 91f23938b5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/Dialogs/FirstTimeWizard.cpp
View File

@ -193,7 +193,7 @@ void FirstTimeWizard::OnPageChanging( wxWizardEvent& evt )
{ {
if( evt.GetPage() == NULL ) return; // safety valve! if( evt.GetPage() == NULL ) return; // safety valve!
int page = (int)evt.GetPage()->GetClientData(); sptr page = (sptr)evt.GetPage()->GetClientData();
if( evt.GetDirection() ) if( evt.GetDirection() )
{ {

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

@ -139,7 +139,7 @@ void Panels::BiosSelectorPanel::Apply()
) ); ) );
} }
g_Conf->BaseFilenames.Bios = (*m_BiosList)[(int)m_ComboBox->GetClientData(sel)]; g_Conf->BaseFilenames.Bios = (*m_BiosList)[(sptr)m_ComboBox->GetClientData(sel)];
} }
void Panels::BiosSelectorPanel::AppStatusEvent_OnSettingsApplied() void Panels::BiosSelectorPanel::AppStatusEvent_OnSettingsApplied()