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

pcsx2: Use Bind compatible event declarations/definitions 

Also remove some unused event types.
This commit is contained in:
Jonathan Li 2016-06-14 22:03:03 +01:00
parent aee0d4c0c8
commit 7ac47676e2
7 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/gui/App.h
View File

@ -35,12 +35,7 @@ class DisassemblyDialog;
typedef void FnType_OnThreadComplete(const wxCommandEvent& evt); typedef void FnType_OnThreadComplete(const wxCommandEvent& evt);
typedef void (Pcsx2App::*FnPtr_Pcsx2App)(); typedef void (Pcsx2App::*FnPtr_Pcsx2App)();
BEGIN_DECLARE_EVENT_TYPES() wxDECLARE_EVENT(pxEvt_SetSettingsPage, wxCommandEvent);
DECLARE_EVENT_TYPE( pxEvt_LoadPluginsComplete, -1 )
DECLARE_EVENT_TYPE( pxEvt_LogicalVsync, -1 )
DECLARE_EVENT_TYPE( pxEvt_ThreadTaskTimeout_SysExec, -1 )
DECLARE_EVENT_TYPE( pxEvt_SetSettingsPage, -1 )
END_DECLARE_EVENT_TYPES()
// This is used when the GS plugin is handling its own window. Messages from the PAD // This is used when the GS plugin is handling its own window. Messages from the PAD
// are piped through to an app-level message handler, which dispatches them through // are piped through to an app-level message handler, which dispatches them through

5
pcsx2/gui/AppMain.cpp
View File

@ -61,11 +61,6 @@
IMPLEMENT_APP(Pcsx2App) IMPLEMENT_APP(Pcsx2App)
DEFINE_EVENT_TYPE( pxEvt_LoadPluginsComplete );
DEFINE_EVENT_TYPE( pxEvt_LogicalVsync );
DEFINE_EVENT_TYPE( pxEvt_ThreadTaskTimeout_SysExec );
std::unique_ptr<AppConfig> g_Conf; std::unique_ptr<AppConfig> g_Conf;
AspectRatioType iniAR; AspectRatioType iniAR;

4
pcsx2/gui/ApplyState.h
View File

@ -23,9 +23,7 @@
class BaseApplicableConfigPanel; class BaseApplicableConfigPanel;
class BaseApplicableDialog; class BaseApplicableDialog;
BEGIN_DECLARE_EVENT_TYPES() wxDECLARE_EVENT(pxEvt_ApplySettings, wxCommandEvent);
DECLARE_EVENT_TYPE( pxEvt_ApplySettings, -1 )
END_DECLARE_EVENT_TYPES()
namespace Exception namespace Exception
{ {

6
pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp
View File

@ -27,9 +27,9 @@
#include <wx/listbook.h> #include <wx/listbook.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
DEFINE_EVENT_TYPE( pxEvt_ApplySettings ) wxDEFINE_EVENT(pxEvt_ApplySettings, wxCommandEvent);
DEFINE_EVENT_TYPE( pxEvt_SetSettingsPage ) wxDEFINE_EVENT(pxEvt_SetSettingsPage, wxCommandEvent);
DEFINE_EVENT_TYPE( pxEvt_SomethingChanged ) wxDEFINE_EVENT(pxEvt_SomethingChanged, wxCommandEvent);
using namespace Panels; using namespace Panels;

4
pcsx2/gui/Dialogs/ConfigurationDialog.h
View File

@ -29,9 +29,7 @@ namespace Panels
class BaseMcdListPanel; class BaseMcdListPanel;
} }
BEGIN_DECLARE_EVENT_TYPES() wxDECLARE_EVENT(pxEvt_SomethingChanged, wxCommandEvent);
DECLARE_EVENT_TYPE( pxEvt_SomethingChanged, -1 );
END_DECLARE_EVENT_TYPES()
namespace Dialogs namespace Dialogs
{ {

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

@ -176,7 +176,6 @@ bool McdSlotItem::operator!=( const McdSlotItem& right ) const
return operator==( right ); return operator==( right );
} }
//DEFINE_EVENT_TYPE( pxEvt_RefreshSelections );
// ===================================================================================================== // =====================================================================================================
// BaseMcdListPanel (implementations) // BaseMcdListPanel (implementations)
@ -196,7 +195,6 @@ Panels::BaseMcdListPanel::BaseMcdListPanel( wxWindow* parent )
m_btn_Refresh = new wxButton( this, wxID_ANY, _("Refresh list") ); m_btn_Refresh = new wxButton( this, wxID_ANY, _("Refresh list") );
Connect( m_btn_Refresh->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BaseMcdListPanel::OnRefreshSelections) ); Connect( m_btn_Refresh->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BaseMcdListPanel::OnRefreshSelections) );
//Connect( pxEvt_RefreshSelections, wxCommandEventHandler(BaseMcdListPanel::OnRefreshSelections) );
} }
void Panels::BaseMcdListPanel::RefreshMcds() const void Panels::BaseMcdListPanel::RefreshMcds() const

15
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -40,15 +40,14 @@ static const bool DisableThreading =
using namespace pxSizerFlags; using namespace pxSizerFlags;
using namespace Threading; using namespace Threading;
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(pxEvt_EnumeratedNext, -1)
DECLARE_EVENT_TYPE(pxEvt_EnumerationFinished, -1)
DECLARE_EVENT_TYPE(pxEVT_ShowStatusBar, -1)
END_DECLARE_EVENT_TYPES()
DEFINE_EVENT_TYPE(pxEvt_EnumeratedNext); wxDECLARE_EVENT(pxEvt_EnumeratedNext, wxCommandEvent);
DEFINE_EVENT_TYPE(pxEvt_EnumerationFinished); wxDECLARE_EVENT(pxEvt_EnumerationFinished, wxCommandEvent);
DEFINE_EVENT_TYPE(pxEVT_ShowStatusBar); wxDECLARE_EVENT(pxEVT_ShowStatusBar, wxCommandEvent);
wxDEFINE_EVENT(pxEvt_EnumeratedNext, wxCommandEvent);
wxDEFINE_EVENT(pxEvt_EnumerationFinished, wxCommandEvent);
wxDEFINE_EVENT(pxEVT_ShowStatusBar, wxCommandEvent);
typedef s32 (CALLBACK* TestFnptr)(); typedef s32 (CALLBACK* TestFnptr)();
typedef void (CALLBACK* ConfigureFnptr)(); typedef void (CALLBACK* ConfigureFnptr)();