From 7d13f96e2800a2baa55957d05d9fff0dda0f6e22 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 30 Jul 2014 18:25:13 -0500
Subject: [PATCH] Fixes a few casts in the DisassemblyDialog and
 PluginSelectorPanel.

We are casting wxWidget's events userdata from void* to integers.
So use uptr instead since it'll work on both x86_32 and x86_64.
---
 pcsx2/gui/Debugger/DisassemblyDialog.cpp |  4 ++--
 pcsx2/gui/Panels/PluginSelectorPanel.cpp | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
index a5ae590670..768886d6cb 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
@@ -133,7 +133,7 @@ void CpuTabPage::listBoxHandler(wxCommandEvent& event)
 	int index = functionList->GetSelection();
 	if (event.GetEventObject() == functionList && index >= 0)
 	{
-		u32 pos = (u32) functionList->GetClientData(index);
+		uptr pos = (uptr) functionList->GetClientData(index);
 		postEvent(debEVT_GOTOINDISASM,pos);
 	}
 }
@@ -538,4 +538,4 @@ void DisassemblyDialog::setDebugMode(bool debugMode, bool switchPC)
 	}
 
 	update();
-}
\ No newline at end of file
+}
diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp
index 8dfaf589a3..961a17cc9c 100644
--- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp
+++ b/pcsx2/gui/Panels/PluginSelectorPanel.cpp
@@ -364,7 +364,7 @@ Panels::PluginSelectorPanel::ComboBoxPanel::ComboBoxPanel( PluginSelectorPanel*
 		m_combobox[pid] = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
 
 		m_configbutton[pid] = new wxButton( this, ButtonId_Configure, _("Configure...") );
-		m_configbutton[pid]->SetClientData( (void*)(int)pid );
+		m_configbutton[pid]->SetClientData( (void*)pid );
 
 		s_plugin	+= Label( pi->GetShortname() )	| pxBorder( wxTOP | wxLEFT, 2 );
 		s_plugin	+= m_combobox[pid]				| pxExpand;
@@ -405,7 +405,7 @@ void Panels::PluginSelectorPanel::DispatchEvent( const PluginEventType& evt )
 
 		m_ComponentBoxes->GetConfigButton(pi->id).Enable(
 			(m_FileList==NULL || m_FileList->Count() == 0) ? false :
-			g_Conf->FullpathMatchTest( pi->id,(*m_FileList)[((int)box.GetClientData(sel))] )
+			g_Conf->FullpathMatchTest( pi->id,(*m_FileList)[((uptr)box.GetClientData(sel))] )
 		);
 	} while( ++pi, pi->shortname != NULL );
 
@@ -474,7 +474,7 @@ void Panels::PluginSelectorPanel::Apply()
 				.SetUserMsg(pxsFmt( _("Please select a valid plugin for the %s."), WX_STR(plugname) ) + L"\n\n" + GetApplyFailedMsg() );
 		}
 
-		g_Conf->BaseFilenames.Plugins[pid] = GetFilename((int)m_ComponentBoxes->Get(pid).GetClientData(sel));
+		g_Conf->BaseFilenames.Plugins[pid] = GetFilename((uptr)m_ComponentBoxes->Get(pid).GetClientData(sel));
 	} while( ++pi, pi->shortname != NULL );
 
 	// ----------------------------------------------------------------------------
@@ -602,7 +602,7 @@ void Panels::PluginSelectorPanel::OnPluginSelected( wxCommandEvent& evt )
 			//   (a) plugins aren't even loaded yet.
 			//   (b) current selection matches exactly the currently configured/loaded plugin.
 
-			bool isSame = (!CorePlugins.AreLoaded()) || g_Conf->FullpathMatchTest( pi->id, (*m_FileList)[(int)box.GetClientData(box.GetSelection())] );
+			bool isSame = (!CorePlugins.AreLoaded()) || g_Conf->FullpathMatchTest( pi->id, (*m_FileList)[(uptr)box.GetClientData(box.GetSelection())] );
 			m_ComponentBoxes->GetConfigButton( pi->id ).Enable( isSame );
 			
 			if( !isSame ) evt.Skip();		// enabled Apply button! :D
@@ -615,7 +615,7 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
 {
 	if( IsBeingDeleted() ) return;
 
-	PluginsEnum_t pid = (PluginsEnum_t)(int)((wxEvtHandler*)evt.GetEventObject())->GetClientData();
+	PluginsEnum_t pid = (PluginsEnum_t)(uptr)((wxEvtHandler*)evt.GetEventObject())->GetClientData();
 
 	int sel = m_ComponentBoxes->Get(pid).GetSelection();
 	if( sel == wxNOT_FOUND ) return;
@@ -624,7 +624,7 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
 	// Otherwise who knows what sort of funny business could happen configuring a plugin while
 	// another instance/version is running. >_<
 
-	const wxString filename( (*m_FileList)[(int)m_ComponentBoxes->Get(pid).GetClientData(sel)] );
+	const wxString filename( (*m_FileList)[(uptr)m_ComponentBoxes->Get(pid).GetClientData(sel)] );
 
 	if( CorePlugins.AreLoaded() && !g_Conf->FullpathMatchTest( pid, filename ) )
 	{