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

wx: Replace a bunch of wx 2.8 macros with the wx 3.x versions.

This commit is contained in:
Shanoah Alkire 2019-05-11 20:43:47 -07:00
parent 5d4ae31ba1
commit 2941fd9b87
31 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/Utilities/ThreadingDialogs.h
View File

@ -33,7 +33,7 @@ namespace Threading
// //
class WaitForTaskDialog : public wxDialogWithHelpers class WaitForTaskDialog : public wxDialogWithHelpers
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(WaitForTaskDialog) wxDECLARE_DYNAMIC_CLASS_NO_COPY(WaitForTaskDialog);
typedef wxDialogWithHelpers _parent; typedef wxDialogWithHelpers _parent;

16
common/include/Utilities/pxEvents.h
View File

@ -68,7 +68,7 @@ public:
// //
class pxSimpleEvent : public wxEvent class pxSimpleEvent : public wxEvent
{ {
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxSimpleEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxSimpleEvent);
public: public:
explicit pxSimpleEvent(int evtid = 0) explicit pxSimpleEvent(int evtid = 0)
@ -94,7 +94,7 @@ wxDECLARE_EVENT(pxEvt_InvokeAction, pxActionEvent);
class pxActionEvent : public wxEvent class pxActionEvent : public wxEvent
{ {
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxActionEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxActionEvent);
protected: protected:
SynchronousActionState *m_state; SynchronousActionState *m_state;
@ -121,8 +121,8 @@ public:
virtual void _DoInvokeEvent(); virtual void _DoInvokeEvent();
protected: protected:
// Extending classes should implement this method to perfoem whatever action it is // Extending classes should implement this method to perform whatever action it is
// the event is supposed to do. :) Thread affinity is garaunteed to be the Main/UI // the event is supposed to do. :) Thread affinity is guaranteed to be the Main/UI
// thread, and exceptions will be handled automatically. // thread, and exceptions will be handled automatically.
// //
// Exception note: exceptions are passed back to the thread that posted the event // Exception note: exceptions are passed back to the thread that posted the event
@ -166,7 +166,7 @@ protected:
class pxSynchronousCommandEvent : public wxCommandEvent class pxSynchronousCommandEvent : public wxCommandEvent
{ {
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxSynchronousCommandEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxSynchronousCommandEvent);
protected: protected:
SynchronousActionState *m_sync; SynchronousActionState *m_sync;
@ -199,7 +199,7 @@ wxDECLARE_EVENT(pxEvt_SynchronousCommand, pxSynchronousCommandEvent);
class BaseMessageBoxEvent : public pxActionEvent class BaseMessageBoxEvent : public pxActionEvent
{ {
typedef pxActionEvent _parent; typedef pxActionEvent _parent;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(BaseMessageBoxEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(BaseMessageBoxEvent);
protected: protected:
wxString m_Content; wxString m_Content;
@ -374,7 +374,7 @@ public:
class pxMessageBoxEvent : public BaseMessageBoxEvent class pxMessageBoxEvent : public BaseMessageBoxEvent
{ {
typedef BaseMessageBoxEvent _parent; typedef BaseMessageBoxEvent _parent;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxMessageBoxEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxMessageBoxEvent);
protected: protected:
wxString m_Title; wxString m_Title;
@ -399,7 +399,7 @@ protected:
class pxAssertionEvent : public BaseMessageBoxEvent class pxAssertionEvent : public BaseMessageBoxEvent
{ {
typedef BaseMessageBoxEvent _parent; typedef BaseMessageBoxEvent _parent;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxAssertionEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxAssertionEvent);
protected: protected:
wxString m_Stacktrace; wxString m_Stacktrace;

2
common/include/Utilities/wxAppWithHelpers.h
View File

@ -67,7 +67,7 @@ class wxAppWithHelpers : public wxApp
{ {
typedef wxApp _parent; typedef wxApp _parent;
DECLARE_DYNAMIC_CLASS(wxAppWithHelpers) wxDECLARE_DYNAMIC_CLASS(wxAppWithHelpers);
protected: protected:
wxEventList m_IdleEventQueue; wxEventList m_IdleEventQueue;

4
common/include/Utilities/wxGuiTools.h
View File

@ -501,7 +501,7 @@ public:
class wxDialogWithHelpers : public wxDialog class wxDialogWithHelpers : public wxDialog
{ {
typedef wxDialog _parent; typedef wxDialog _parent;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDialogWithHelpers) wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDialogWithHelpers);
protected: protected:
bool m_hasContextHelp; bool m_hasContextHelp;
@ -565,7 +565,7 @@ protected:
// //
class wxPanelWithHelpers : public wxPanel class wxPanelWithHelpers : public wxPanel
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanelWithHelpers) wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanelWithHelpers);
public: public:
wxPanelWithHelpers(wxWindow *parent, wxOrientation orient, const wxString &staticBoxLabel); wxPanelWithHelpers(wxWindow *parent, wxOrientation orient, const wxString &staticBoxLabel);

2
common/src/Utilities/ThreadingDialogs.cpp
View File

@ -24,7 +24,7 @@ wxDEFINE_EVENT(pxEvt_ThreadedTaskComplete, wxCommandEvent);
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// WaitForTaskDialog Implementations // WaitForTaskDialog Implementations
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(WaitForTaskDialog, wxDialogWithHelpers) wxIMPLEMENT_DYNAMIC_CLASS(WaitForTaskDialog, wxDialogWithHelpers);
Threading::WaitForTaskDialog::WaitForTaskDialog(const wxString &title, const wxString &heading) Threading::WaitForTaskDialog::WaitForTaskDialog(const wxString &title, const wxString &heading)
: wxDialogWithHelpers(NULL, _("Waiting for tasks...")) : wxDialogWithHelpers(NULL, _("Waiting for tasks..."))

12
common/src/Utilities/wxAppWithHelpers.cpp
View File

@ -25,7 +25,7 @@ wxDEFINE_EVENT(pxEvt_DeleteThread, wxCommandEvent);
wxDEFINE_EVENT(pxEvt_InvokeAction, pxActionEvent); wxDEFINE_EVENT(pxEvt_InvokeAction, pxActionEvent);
wxDEFINE_EVENT(pxEvt_SynchronousCommand, pxSynchronousCommandEvent); wxDEFINE_EVENT(pxEvt_SynchronousCommand, pxSynchronousCommandEvent);
IMPLEMENT_DYNAMIC_CLASS(pxSimpleEvent, wxEvent) wxIMPLEMENT_DYNAMIC_CLASS(pxSimpleEvent, wxEvent);
ConsoleLogSource_App::ConsoleLogSource_App() ConsoleLogSource_App::ConsoleLogSource_App()
{ {
@ -115,7 +115,7 @@ void SynchronousActionState::PostResult()
// pxActionEvent Implementations // pxActionEvent Implementations
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(pxActionEvent, wxEvent) wxIMPLEMENT_DYNAMIC_CLASS(pxActionEvent, wxEvent);
pxActionEvent::pxActionEvent(SynchronousActionState *sema, int msgtype) pxActionEvent::pxActionEvent(SynchronousActionState *sema, int msgtype)
: wxEvent(0, msgtype) : wxEvent(0, msgtype)
@ -156,7 +156,7 @@ void pxActionEvent::SetException(BaseException *ex)
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxSynchronousCommandEvent // pxSynchronousCommandEvent
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(pxSynchronousCommandEvent, wxCommandEvent) wxIMPLEMENT_DYNAMIC_CLASS(pxSynchronousCommandEvent, wxCommandEvent);
pxSynchronousCommandEvent::pxSynchronousCommandEvent(SynchronousActionState *sema, wxEventType commandType, int winid) pxSynchronousCommandEvent::pxSynchronousCommandEvent(SynchronousActionState *sema, wxEventType commandType, int winid)
: wxCommandEvent(pxEvt_SynchronousCommand, winid) : wxCommandEvent(pxEvt_SynchronousCommand, winid)
@ -221,7 +221,7 @@ void pxSynchronousCommandEvent::SetException(BaseException *ex)
// //
class pxRpcEvent : public pxActionEvent class pxRpcEvent : public pxActionEvent
{ {
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxRpcEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(pxRpcEvent);
typedef pxActionEvent _parent; typedef pxActionEvent _parent;
@ -263,7 +263,7 @@ protected:
} }
}; };
IMPLEMENT_DYNAMIC_CLASS(pxRpcEvent, pxActionEvent) wxIMPLEMENT_DYNAMIC_CLASS(pxRpcEvent, pxActionEvent);
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxExceptionEvent implementations // pxExceptionEvent implementations
@ -288,7 +288,7 @@ void pxExceptionEvent::InvokeEvent()
// would mean checking only one list of events per idle event, instead of two. (ie, ping // would mean checking only one list of events per idle event, instead of two. (ie, ping
// events can be appended to the idle event list, instead of into their own custom list). // events can be appended to the idle event list, instead of into their own custom list).
// //
IMPLEMENT_DYNAMIC_CLASS(wxAppWithHelpers, wxApp) wxIMPLEMENT_DYNAMIC_CLASS(wxAppWithHelpers, wxApp);
// Posts a method to the main thread; non-blocking. Post occurs even when called from the // Posts a method to the main thread; non-blocking. Post occurs even when called from the

4
common/src/Utilities/wxHelpers.cpp
View File

@ -109,7 +109,7 @@ bool pxDialogExists(const wxString &name)
wxDEFINE_EVENT(pxEvt_OnDialogCreated, wxCommandEvent); wxDEFINE_EVENT(pxEvt_OnDialogCreated, wxCommandEvent);
IMPLEMENT_DYNAMIC_CLASS(wxDialogWithHelpers, wxDialog) wxIMPLEMENT_DYNAMIC_CLASS(wxDialogWithHelpers, wxDialog);
wxDialogWithHelpers::wxDialogWithHelpers() wxDialogWithHelpers::wxDialogWithHelpers()
{ {
@ -368,7 +368,7 @@ int wxDialogWithHelpers::GetCharHeight() const
// wxPanelWithHelpers Implementations // wxPanelWithHelpers Implementations
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxPanelWithHelpers, wxPanel) wxIMPLEMENT_DYNAMIC_CLASS(wxPanelWithHelpers, wxPanel);
void wxPanelWithHelpers::Init() void wxPanelWithHelpers::Init()
{ {

2
pcsx2/gui/App.h
View File

@ -697,7 +697,7 @@ protected:
}; };
DECLARE_APP(Pcsx2App) wxDECLARE_APP(Pcsx2App);
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// s* macros! ['s' stands for 'shortcut'] // s* macros! ['s' stands for 'shortcut']

8
pcsx2/gui/AppCorePlugins.cpp
View File

@ -131,7 +131,7 @@ protected:
class LoadSinglePluginEvent : public pxActionEvent class LoadSinglePluginEvent : public pxActionEvent
{ {
typedef pxActionEvent _parent; typedef pxActionEvent _parent;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(LoadSinglePluginEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(LoadSinglePluginEvent);
protected: protected:
wxString m_filename; wxString m_filename;
@ -161,7 +161,7 @@ protected:
class SinglePluginMethodEvent : public pxActionEvent class SinglePluginMethodEvent : public pxActionEvent
{ {
typedef pxActionEvent _parent; typedef pxActionEvent _parent;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(SinglePluginMethodEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(SinglePluginMethodEvent);
protected: protected:
PluginsEnum_t m_pid; PluginsEnum_t m_pid;
@ -186,8 +186,8 @@ protected:
} }
}; };
IMPLEMENT_DYNAMIC_CLASS( LoadSinglePluginEvent, pxActionEvent ); wxIMPLEMENT_DYNAMIC_CLASS( LoadSinglePluginEvent, pxActionEvent );
IMPLEMENT_DYNAMIC_CLASS( SinglePluginMethodEvent, pxActionEvent ); wxIMPLEMENT_DYNAMIC_CLASS( SinglePluginMethodEvent, pxActionEvent );
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// AppCorePlugins // AppCorePlugins

6
pcsx2/gui/AppMain.cpp
View File

@ -64,7 +64,7 @@
#include <wx/osx/private.h> // needed to implement the app! #include <wx/osx/private.h> // needed to implement the app!
#endif #endif
IMPLEMENT_APP(Pcsx2App) wxIMPLEMENT_APP(Pcsx2App);
std::unique_ptr<AppConfig> g_Conf; std::unique_ptr<AppConfig> g_Conf;
@ -232,7 +232,7 @@ void Pcsx2App::PostMenuAction( MenuIdentifiers menu_id ) const
class Pcsx2AppMethodEvent : public pxActionEvent class Pcsx2AppMethodEvent : public pxActionEvent
{ {
typedef pxActionEvent _parent; typedef pxActionEvent _parent;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(Pcsx2AppMethodEvent) wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(Pcsx2AppMethodEvent);
protected: protected:
FnPtr_Pcsx2App m_Method; FnPtr_Pcsx2App m_Method;
@ -272,7 +272,7 @@ protected:
}; };
IMPLEMENT_DYNAMIC_CLASS( Pcsx2AppMethodEvent, pxActionEvent ) wxIMPLEMENT_DYNAMIC_CLASS( Pcsx2AppMethodEvent, pxActionEvent );
#ifdef __WXMSW__ #ifdef __WXMSW__
extern int TranslateVKToWXK( u32 keysym ); extern int TranslateVKToWXK( u32 keysym );

4
pcsx2/gui/ApplyState.h
View File

@ -114,7 +114,7 @@ class BaseApplicableDialog
: public wxDialogWithHelpers : public wxDialogWithHelpers
, public IApplyState , public IApplyState
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(BaseApplicableDialog) wxDECLARE_DYNAMIC_CLASS_NO_COPY(BaseApplicableDialog);
public: public:
BaseApplicableDialog() {} BaseApplicableDialog() {}
@ -226,7 +226,7 @@ public:
class ApplicableWizardPage : public wxWizardPageSimple, public IApplyState class ApplicableWizardPage : public wxWizardPageSimple, public IApplyState
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(ApplicableWizardPage) wxDECLARE_DYNAMIC_CLASS_NO_COPY(ApplicableWizardPage);
public: public:
ApplicableWizardPage( ApplicableWizardPage(

4
pcsx2/gui/Debugger/BreakpointWindow.cpp
View File

@ -17,10 +17,10 @@
#include "BreakpointWindow.h" #include "BreakpointWindow.h"
BEGIN_EVENT_TABLE(BreakpointWindow, wxDialog) wxBEGIN_EVENT_TABLE(BreakpointWindow, wxDialog)
EVT_RADIOBUTTON(wxID_ANY, BreakpointWindow::onRadioChange) EVT_RADIOBUTTON(wxID_ANY, BreakpointWindow::onRadioChange)
EVT_BUTTON(wxID_OK, BreakpointWindow::onButtonOk) EVT_BUTTON(wxID_OK, BreakpointWindow::onButtonOk)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
BreakpointWindow::BreakpointWindow( wxWindow* parent, DebugInterface* _cpu ) BreakpointWindow::BreakpointWindow( wxWindow* parent, DebugInterface* _cpu )

2
pcsx2/gui/Debugger/BreakpointWindow.h
View File

@ -27,7 +27,7 @@ public:
void initBreakpoint(u32 _address); void initBreakpoint(u32 _address);
void addBreakpoint(); void addBreakpoint();
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
protected: protected:
void onRadioChange(wxCommandEvent& evt); void onRadioChange(wxCommandEvent& evt);
void onButtonOk(wxCommandEvent& evt); void onButtonOk(wxCommandEvent& evt);

4
pcsx2/gui/Debugger/CtrlDisassemblyView.cpp
View File

@ -32,7 +32,7 @@
#include "Resources/Breakpoint_Active.h" #include "Resources/Breakpoint_Active.h"
#include "Resources/Breakpoint_Inactive.h" #include "Resources/Breakpoint_Inactive.h"
BEGIN_EVENT_TABLE(CtrlDisassemblyView, wxWindow) wxBEGIN_EVENT_TABLE(CtrlDisassemblyView, wxWindow)
EVT_PAINT(CtrlDisassemblyView::paintEvent) EVT_PAINT(CtrlDisassemblyView::paintEvent)
EVT_MOUSEWHEEL(CtrlDisassemblyView::mouseEvent) EVT_MOUSEWHEEL(CtrlDisassemblyView::mouseEvent)
EVT_LEFT_DOWN(CtrlDisassemblyView::mouseEvent) EVT_LEFT_DOWN(CtrlDisassemblyView::mouseEvent)
@ -49,7 +49,7 @@ BEGIN_EVENT_TABLE(CtrlDisassemblyView, wxWindow)
EVT_SIZE(CtrlDisassemblyView::sizeEvent) EVT_SIZE(CtrlDisassemblyView::sizeEvent)
EVT_SET_FOCUS(CtrlDisassemblyView::focusEvent) EVT_SET_FOCUS(CtrlDisassemblyView::focusEvent)
EVT_KILL_FOCUS(CtrlDisassemblyView::focusEvent) EVT_KILL_FOCUS(CtrlDisassemblyView::focusEvent)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
enum DisassemblyMenuIdentifiers enum DisassemblyMenuIdentifiers
{ {

2
pcsx2/gui/Debugger/CtrlDisassemblyView.h
View File

@ -49,7 +49,7 @@ public:
void gotoAddress(u32 addr); void gotoAddress(u32 addr);
void gotoPc() { gotoAddress(cpu->getPC()); }; void gotoPc() { gotoAddress(cpu->getPC()); };
void scrollStepping(u32 newPc); void scrollStepping(u32 newPc);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
private: private:
void drawBranchLine(wxDC& dc, std::map<u32,int>& addressPositions, BranchLine& line); void drawBranchLine(wxDC& dc, std::map<u32,int>& addressPositions, BranchLine& line);
void render(wxDC& dc); void render(wxDC& dc);

4
pcsx2/gui/Debugger/CtrlMemView.cpp
View File

@ -25,7 +25,7 @@
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
BEGIN_EVENT_TABLE(CtrlMemView, wxWindow) wxBEGIN_EVENT_TABLE(CtrlMemView, wxWindow)
EVT_PAINT(CtrlMemView::paintEvent) EVT_PAINT(CtrlMemView::paintEvent)
EVT_MOUSEWHEEL(CtrlMemView::mouseEvent) EVT_MOUSEWHEEL(CtrlMemView::mouseEvent)
EVT_LEFT_DOWN(CtrlMemView::mouseEvent) EVT_LEFT_DOWN(CtrlMemView::mouseEvent)
@ -40,7 +40,7 @@ BEGIN_EVENT_TABLE(CtrlMemView, wxWindow)
EVT_SCROLLWIN_LINEDOWN(CtrlMemView::scrollbarEvent) EVT_SCROLLWIN_LINEDOWN(CtrlMemView::scrollbarEvent)
EVT_SCROLLWIN_PAGEUP(CtrlMemView::scrollbarEvent) EVT_SCROLLWIN_PAGEUP(CtrlMemView::scrollbarEvent)
EVT_SCROLLWIN_PAGEDOWN(CtrlMemView::scrollbarEvent) EVT_SCROLLWIN_PAGEDOWN(CtrlMemView::scrollbarEvent)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
enum MemoryViewMenuIdentifiers enum MemoryViewMenuIdentifiers
{ {

2
pcsx2/gui/Debugger/CtrlMemView.h
View File

@ -33,7 +33,7 @@ public:
void gotoAddress(u32 address, bool pushInHistory = false); void gotoAddress(u32 address, bool pushInHistory = false);
void updateReference(u32 address); void updateReference(u32 address);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
private: private:
void render(wxDC& dc); void render(wxDC& dc);
int hexGroupPositionFromIndex(int idx); int hexGroupPositionFromIndex(int idx);

4
pcsx2/gui/Debugger/CtrlRegisterList.cpp
View File

@ -21,14 +21,14 @@
#include "AppConfig.h" #include "AppConfig.h"
#include "DisassemblyDialog.h" #include "DisassemblyDialog.h"
BEGIN_EVENT_TABLE(CtrlRegisterList, wxWindow) wxBEGIN_EVENT_TABLE(CtrlRegisterList, wxWindow)
EVT_SIZE(CtrlRegisterList::sizeEvent) EVT_SIZE(CtrlRegisterList::sizeEvent)
EVT_LEFT_DOWN(CtrlRegisterList::mouseEvent) EVT_LEFT_DOWN(CtrlRegisterList::mouseEvent)
EVT_RIGHT_DOWN(CtrlRegisterList::mouseEvent) EVT_RIGHT_DOWN(CtrlRegisterList::mouseEvent)
EVT_RIGHT_UP(CtrlRegisterList::mouseEvent) EVT_RIGHT_UP(CtrlRegisterList::mouseEvent)
EVT_MOTION(CtrlRegisterList::mouseEvent) EVT_MOTION(CtrlRegisterList::mouseEvent)
EVT_KEY_DOWN(CtrlRegisterList::keydownEvent) EVT_KEY_DOWN(CtrlRegisterList::keydownEvent)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
enum DisassemblyMenuIdentifiers enum DisassemblyMenuIdentifiers
{ {

2
pcsx2/gui/Debugger/CtrlRegisterList.h
View File

@ -30,7 +30,7 @@ public:
void onPopupClick(wxCommandEvent& evt); void onPopupClick(wxCommandEvent& evt);
void sizeEvent(wxSizeEvent& evt); void sizeEvent(wxSizeEvent& evt);
void redraw(); void redraw();
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
virtual wxSize GetMinClientSize() const virtual wxSize GetMinClientSize() const
{ {

4
pcsx2/gui/Debugger/DebuggerLists.cpp
View File

@ -18,14 +18,14 @@
#include "BreakpointWindow.h" #include "BreakpointWindow.h"
#include "DebugEvents.h" #include "DebugEvents.h"
BEGIN_EVENT_TABLE(GenericListView, wxWindow) wxBEGIN_EVENT_TABLE(GenericListView, wxWindow)
EVT_SIZE(GenericListView::sizeEvent) EVT_SIZE(GenericListView::sizeEvent)
EVT_KEY_DOWN(GenericListView::keydownEvent) EVT_KEY_DOWN(GenericListView::keydownEvent)
EVT_RIGHT_DOWN(GenericListView::mouseEvent) EVT_RIGHT_DOWN(GenericListView::mouseEvent)
EVT_RIGHT_UP(GenericListView::mouseEvent) EVT_RIGHT_UP(GenericListView::mouseEvent)
EVT_LEFT_DCLICK(GenericListView::mouseEvent) EVT_LEFT_DCLICK(GenericListView::mouseEvent)
EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY,GenericListView::listEvent) EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY,GenericListView::listEvent)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
GenericListView::GenericListView(wxWindow* parent, GenericListViewColumn* columns, int columnCount) GenericListView::GenericListView(wxWindow* parent, GenericListViewColumn* columns, int columnCount)
: wxListView(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxLC_VIRTUAL|wxLC_REPORT|wxLC_SINGLE_SEL|wxNO_BORDER) : wxListView(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxLC_VIRTUAL|wxLC_REPORT|wxLC_SINGLE_SEL|wxNO_BORDER)

2
pcsx2/gui/Debugger/DebuggerLists.h
View File

@ -33,7 +33,7 @@ public:
GenericListView(wxWindow* parent, GenericListViewColumn* columns, int columnCount); GenericListView(wxWindow* parent, GenericListViewColumn* columns, int columnCount);
void update(); void update();
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
protected: protected:
void sizeEvent(wxSizeEvent& evt); void sizeEvent(wxSizeEvent& evt);
void keydownEvent(wxKeyEvent& evt); void keydownEvent(wxKeyEvent& evt);

8
pcsx2/gui/Debugger/DisassemblyDialog.cpp
View File

@ -27,7 +27,7 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
BEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame) wxBEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame)
EVT_COMMAND( wxID_ANY, debEVT_SETSTATUSBARTEXT, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_SETSTATUSBARTEXT, DisassemblyDialog::onDebuggerEvent )
EVT_COMMAND( wxID_ANY, debEVT_UPDATELAYOUT, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_UPDATELAYOUT, DisassemblyDialog::onDebuggerEvent )
EVT_COMMAND( wxID_ANY, debEVT_GOTOINMEMORYVIEW, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_GOTOINMEMORYVIEW, DisassemblyDialog::onDebuggerEvent )
@ -42,11 +42,11 @@ BEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame)
EVT_COMMAND( wxID_ANY, debEVT_MAPLOADED, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_MAPLOADED, DisassemblyDialog::onDebuggerEvent )
EVT_SIZE(DisassemblyDialog::onSizeEvent) EVT_SIZE(DisassemblyDialog::onSizeEvent)
EVT_CLOSE( DisassemblyDialog::onClose ) EVT_CLOSE( DisassemblyDialog::onClose )
END_EVENT_TABLE() wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(CpuTabPage, wxPanel) wxBEGIN_EVENT_TABLE(CpuTabPage, wxPanel)
EVT_LISTBOX_DCLICK( wxID_ANY, CpuTabPage::listBoxHandler) EVT_LISTBOX_DCLICK( wxID_ANY, CpuTabPage::listBoxHandler)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
DebuggerHelpDialog::DebuggerHelpDialog(wxWindow* parent) DebuggerHelpDialog::DebuggerHelpDialog(wxWindow* parent)
: wxDialog(parent,wxID_ANY,L"Help") : wxDialog(parent,wxID_ANY,L"Help")

4
pcsx2/gui/Debugger/DisassemblyDialog.h
View File

@ -57,7 +57,7 @@ public:
u32 getStepOutAddress(); u32 getStepOutAddress();
void listBoxHandler(wxCommandEvent& event); void listBoxHandler(wxCommandEvent& event);
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
private: private:
void setBottomTabPage(wxWindow* win); void setBottomTabPage(wxWindow* win);
void postEvent(wxEventType type, int value); void postEvent(wxEventType type, int value);
@ -93,7 +93,7 @@ public:
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
#endif #endif
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
protected: protected:
void onBreakRunClicked(wxCommandEvent& evt); void onBreakRunClicked(wxCommandEvent& evt);
void onStepOverClicked(wxCommandEvent& evt); void onStepOverClicked(wxCommandEvent& evt);

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

@ -86,7 +86,7 @@ public:
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// BaseApplicableDialog (implementations) // BaseApplicableDialog (implementations)
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(BaseApplicableDialog, wxDialogWithHelpers) wxIMPLEMENT_DYNAMIC_CLASS(BaseApplicableDialog, wxDialogWithHelpers);
BaseApplicableDialog::BaseApplicableDialog( wxWindow* parent, const wxString& title, const pxDialogCreationFlags& cflags ) BaseApplicableDialog::BaseApplicableDialog( wxWindow* parent, const wxString& title, const pxDialogCreationFlags& cflags )
: wxDialogWithHelpers( parent, title, cflags.MinWidth(425).Minimize() ) : wxDialogWithHelpers( parent, title, cflags.MinWidth(425).Minimize() )

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

@ -26,7 +26,7 @@
using namespace Panels; using namespace Panels;
using namespace pxSizerFlags; using namespace pxSizerFlags;
IMPLEMENT_DYNAMIC_CLASS(ApplicableWizardPage, wxWizardPageSimple) wxIMPLEMENT_DYNAMIC_CLASS(ApplicableWizardPage, wxWizardPageSimple);
ApplicableWizardPage::ApplicableWizardPage( wxWizard* parent, wxWizardPage* prev, wxWizardPage* next, const wxBitmap& bitmap ) ApplicableWizardPage::ApplicableWizardPage( wxWizard* parent, wxWizardPage* prev, wxWizardPage* next, const wxBitmap& bitmap )
: wxWizardPageSimple( parent, prev, next, bitmap ) : wxWizardPageSimple( parent, prev, next, bitmap )

6
pcsx2/gui/MessageBoxes.cpp
View File

@ -45,7 +45,7 @@ static int pxMessageDialog( const wxString& caption, const wxString& content, co
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// BaseMessageBoxEvent Implementation // BaseMessageBoxEvent Implementation
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( BaseMessageBoxEvent, pxActionEvent ) wxIMPLEMENT_DYNAMIC_CLASS( BaseMessageBoxEvent, pxActionEvent );
BaseMessageBoxEvent::BaseMessageBoxEvent( const wxString& content, SynchronousActionState& instdata ) BaseMessageBoxEvent::BaseMessageBoxEvent( const wxString& content, SynchronousActionState& instdata )
: m_Content( content ) : m_Content( content )
@ -81,7 +81,7 @@ int BaseMessageBoxEvent::_DoDialog() const
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxMessageBoxEvent Implementation // pxMessageBoxEvent Implementation
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( pxMessageBoxEvent, BaseMessageBoxEvent ) wxIMPLEMENT_DYNAMIC_CLASS( pxMessageBoxEvent, BaseMessageBoxEvent );
pxMessageBoxEvent::pxMessageBoxEvent( const wxString& title, const wxString& content, const MsgButtons& buttons, SynchronousActionState& instdata ) pxMessageBoxEvent::pxMessageBoxEvent( const wxString& title, const wxString& content, const MsgButtons& buttons, SynchronousActionState& instdata )
: BaseMessageBoxEvent( content, instdata ) : BaseMessageBoxEvent( content, instdata )
@ -105,7 +105,7 @@ int pxMessageBoxEvent::_DoDialog() const
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxAssertionEvent Implementation // pxAssertionEvent Implementation
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( pxAssertionEvent, BaseMessageBoxEvent ) wxIMPLEMENT_DYNAMIC_CLASS( pxAssertionEvent, BaseMessageBoxEvent );
pxAssertionEvent::pxAssertionEvent( const wxString& content, const wxString& trace, SynchronousActionState& instdata ) pxAssertionEvent::pxAssertionEvent( const wxString& content, const wxString& trace, SynchronousActionState& instdata )
: BaseMessageBoxEvent( content, instdata ) : BaseMessageBoxEvent( content, instdata )

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

@ -150,7 +150,7 @@ public:
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
class ApplyPluginsDialog : public WaitForTaskDialog class ApplyPluginsDialog : public WaitForTaskDialog
{ {
DECLARE_DYNAMIC_CLASS_NO_COPY(ApplyPluginsDialog) wxDECLARE_DYNAMIC_CLASS_NO_COPY(ApplyPluginsDialog);
typedef wxDialogWithHelpers _parent; typedef wxDialogWithHelpers _parent;
@ -222,7 +222,7 @@ protected:
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// ApplyPluginsDialog Implementations // ApplyPluginsDialog Implementations
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(ApplyPluginsDialog, WaitForTaskDialog) wxIMPLEMENT_DYNAMIC_CLASS(ApplyPluginsDialog, WaitForTaskDialog);
ApplyPluginsDialog::ApplyPluginsDialog( BaseApplicableConfigPanel* panel ) ApplyPluginsDialog::ApplyPluginsDialog( BaseApplicableConfigPanel* panel )
: WaitForTaskDialog(_("Applying settings...")), m_panel(NULL) : WaitForTaskDialog(_("Applying settings...")), m_panel(NULL)

4
plugins/onepad/wx_dialog/opPanel.cpp
View File

@ -127,9 +127,9 @@ void opPanel::MoveJoystick(int axe, int value)
} }
} }
BEGIN_EVENT_TABLE(opPanel, wxPanel) wxBEGIN_EVENT_TABLE(opPanel, wxPanel)
EVT_PAINT(opPanel::OnPaint) EVT_PAINT(opPanel::OnPaint)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
void opPanel::OnPaint(wxPaintEvent &event) void opPanel::OnPaint(wxPaintEvent &event)
{ {

2
plugins/onepad/wx_dialog/opPanel.h
View File

@ -64,7 +64,7 @@ class opPanel : public wxPanel
wxBitmap m_picture[NB_IMG]; wxBitmap m_picture[NB_IMG];
bool m_show_image[NB_IMG]; bool m_show_image[NB_IMG];
int m_left_cursor_x, m_left_cursor_y, m_right_cursor_x, m_right_cursor_y; int m_left_cursor_x, m_left_cursor_y, m_right_cursor_x, m_right_cursor_y;
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
void OnPaint(wxPaintEvent &event); void OnPaint(wxPaintEvent &event);
public: public:

4
plugins/onepad_legacy/wx_dialog/opPanel.cpp
View File

@ -137,9 +137,9 @@ void opPanel::MoveJoystick(int axe, int value)
} }
} }
BEGIN_EVENT_TABLE(opPanel, wxPanel) wxBEGIN_EVENT_TABLE(opPanel, wxPanel)
EVT_PAINT(opPanel::OnPaint) EVT_PAINT(opPanel::OnPaint)
END_EVENT_TABLE() wxEND_EVENT_TABLE()
void opPanel::OnPaint(wxPaintEvent &event) void opPanel::OnPaint(wxPaintEvent &event)
{ {

2
plugins/onepad_legacy/wx_dialog/opPanel.h
View File

@ -64,7 +64,7 @@ class opPanel : public wxPanel
wxBitmap m_picture[NB_IMG]; wxBitmap m_picture[NB_IMG];
bool m_show_image[NB_IMG]; bool m_show_image[NB_IMG];
int m_left_cursor_x, m_left_cursor_y, m_right_cursor_x, m_right_cursor_y; int m_left_cursor_x, m_left_cursor_y, m_right_cursor_x, m_right_cursor_y;
DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE();
void OnPaint(wxPaintEvent &event); void OnPaint(wxPaintEvent &event);
public: public: