diff --git a/rpcs3/AppConnector.cpp b/rpcs3/AppConnector.cpp deleted file mode 100644 index 212965ee2f..0000000000 --- a/rpcs3/AppConnector.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "stdafx.h" -#include "AppConnector.h" - -AppConnector::~AppConnector() -{ - for(auto& connection : m_connect_arr) - { - wxGetApp().Disconnect( - connection.winid, - connection.lastId, - connection.eventType, - connection.func, - connection.userData, - connection.eventSink); - } -} - -void AppConnector::Connect(int winid, int lastId, int eventType, wxObjectEventFunction func, wxObject* userData, wxEvtHandler* eventSink) -{ - m_connect_arr.emplace_back(winid, lastId, eventType, func, userData, eventSink); - wxGetApp().Connect(winid, lastId, eventType, func, userData, eventSink); -} - -void AppConnector::Connect(int winid, int eventType, wxObjectEventFunction func, wxObject* userData, wxEvtHandler* eventSink) -{ - Connect(winid, wxID_ANY, eventType, func, userData, eventSink); -} - -void AppConnector::Connect(int eventType, wxObjectEventFunction func, wxObject* userData, wxEvtHandler* eventSink) -{ - Connect(wxID_ANY, wxID_ANY, eventType, func, userData, eventSink); -} diff --git a/rpcs3/AppConnector.h b/rpcs3/AppConnector.h deleted file mode 100644 index 93067c3524..0000000000 --- a/rpcs3/AppConnector.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -class AppConnector -{ - struct ConnectInfo - { - int winid; - int lastId; - int eventType; - wxObjectEventFunction func; - wxObject* userData; - wxEvtHandler* eventSink; - - ConnectInfo(int winid, int lastId, int eventType, wxObjectEventFunction func, wxObject* userData, wxEvtHandler* eventSink) - : winid(winid) - , lastId(lastId) - , eventType(eventType) - , func(func) - , userData(userData) - , eventSink(eventSink) - { - } - }; - - std::vector m_connect_arr; - -public: - ~AppConnector(); - - void Connect(int winid, int lastId, int eventType, wxObjectEventFunction func, wxObject* userData = nullptr, wxEvtHandler* eventSink = nullptr); - void Connect(int winid, int eventType, wxObjectEventFunction func, wxObject* userData = nullptr, wxEvtHandler* eventSink = nullptr); - void Connect(int eventType, wxObjectEventFunction func, wxObject* userData = nullptr, wxEvtHandler* eventSink = nullptr); -}; diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index bcd24f9917..68ef012f69 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -71,7 +71,6 @@ file( GLOB_RECURSE RPCS3_SRC "${RPCS3_SRC_DIR}/rpcs3.cpp" -"${RPCS3_SRC_DIR}/AppConnector.cpp" "${RPCS3_SRC_DIR}/Ini.cpp" "${RPCS3_SRC_DIR}/Emu/*" "${RPCS3_SRC_DIR}/Gui/*" diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 4c79809716..3b3b5aaf25 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -6,7 +6,7 @@ #define CMD_DEBUG 0 #define DUMP_VERTEX_DATA 0 -#if CMD_DEBUG +#if CMD_DEBUG #define CMD_LOG ConLog.Write #else #define CMD_LOG(...) @@ -43,7 +43,7 @@ GLGSFrame::GLGSFrame() canvas = new wxGLCanvas(this, wxID_ANY, NULL); canvas->SetSize(GetClientSize()); - canvas->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(GSFrame::OnLeftDclick), (wxObject*)0, this); + canvas->Bind(wxEVT_LEFT_DCLICK, &GSFrame::OnLeftDclick, this); } void GLGSFrame::Flip(wxGLContext *context) diff --git a/rpcs3/Emu/GS/GSRender.cpp b/rpcs3/Emu/GS/GSRender.cpp index e07efaff07..6b86e63363 100644 --- a/rpcs3/Emu/GS/GSRender.cpp +++ b/rpcs3/Emu/GS/GSRender.cpp @@ -23,8 +23,8 @@ GSFrame::GSFrame(wxWindow* parent, const wxString& title) : wxFrame(parent, wxID { CellVideoOutResolution res = ResolutionTable[ResolutionIdToNum(Ini.GSResolution.GetValue())]; SetClientSize(res.width, res.height); - wxGetApp().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(GSFrame::OnKeyDown), (wxObject*)0, this); - Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(GSFrame::OnClose)); + wxGetApp().Bind(wxEVT_KEY_DOWN, &GSFrame::OnKeyDown, this); + Bind(wxEVT_CLOSE_WINDOW, &GSFrame::OnClose, this); } void GSFrame::OnPaint(wxPaintEvent& event) diff --git a/rpcs3/Emu/GS/Null/NullGSRender.h b/rpcs3/Emu/GS/Null/NullGSRender.h index cb9717a2dd..aaba2ec398 100644 --- a/rpcs3/Emu/GS/Null/NullGSRender.h +++ b/rpcs3/Emu/GS/Null/NullGSRender.h @@ -3,9 +3,9 @@ struct NullGSFrame : public GSFrame { - NullGSFrame() : GSFrame(NULL, "GSFrame[Null]") + NullGSFrame() : GSFrame(nullptr, "GSFrame[Null]") { - Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(GSFrame::OnLeftDclick)); + Bind(wxEVT_LEFT_DCLICK, &GSFrame::OnLeftDclick, this); } void Draw() diff --git a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h index dbdfdbb72d..3ecb827d4b 100644 --- a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h @@ -8,13 +8,11 @@ class WindowsKeyboardHandler final : public wxWindow , public KeyboardHandlerBase { - AppConnector m_app_connector; - public: WindowsKeyboardHandler() : wxWindow() { - m_app_connector.Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(WindowsKeyboardHandler::KeyDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_KEY_UP, wxKeyEventHandler(WindowsKeyboardHandler::KeyUp), (wxObject*)0, this); + wxGetApp().Bind(wxEVT_KEY_DOWN, &WindowsKeyboardHandler::KeyDown, this); + wxGetApp().Bind(wxEVT_KEY_UP, &WindowsKeyboardHandler::KeyUp, this); } virtual void KeyDown(wxKeyEvent& event) { Key(event.GetKeyCode(), 1); event.Skip(); } diff --git a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h index 5b5d3faae0..06f095e9b4 100644 --- a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h @@ -7,19 +7,17 @@ class WindowsMouseHandler final : public wxWindow , public MouseHandlerBase { - AppConnector m_app_connector; - public: WindowsMouseHandler() : wxWindow() { - m_app_connector.Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(WindowsMouseHandler::MouseButtonDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(WindowsMouseHandler::MouseButtonDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(WindowsMouseHandler::MouseButtonDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_LEFT_UP, wxMouseEventHandler(WindowsMouseHandler::MouseButtonUp), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(WindowsMouseHandler::MouseButtonUp), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(WindowsMouseHandler::MouseButtonUp), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(WindowsMouseHandler::MouseScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_MOTION, wxMouseEventHandler(WindowsMouseHandler::MouseMove), (wxObject*)0, this); + wxGetApp().Bind(wxEVT_LEFT_DOWN, &WindowsMouseHandler::MouseButtonDown, this); + wxGetApp().Bind(wxEVT_RIGHT_DOWN, &WindowsMouseHandler::MouseButtonDown, this); + wxGetApp().Bind(wxEVT_MIDDLE_DOWN, &WindowsMouseHandler::MouseButtonDown, this); + wxGetApp().Bind(wxEVT_LEFT_UP, &WindowsMouseHandler::MouseButtonUp, this); + wxGetApp().Bind(wxEVT_RIGHT_UP, &WindowsMouseHandler::MouseButtonUp, this); + wxGetApp().Bind(wxEVT_MIDDLE_UP, &WindowsMouseHandler::MouseButtonUp, this); + wxGetApp().Bind(wxEVT_MOUSEWHEEL, &WindowsMouseHandler::MouseScroll, this); + wxGetApp().Bind(wxEVT_MOTION, &WindowsMouseHandler::MouseMove, this); } virtual void MouseButtonDown(wxMouseEvent& event) diff --git a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h index 571c5adcca..74f8e2ee4f 100644 --- a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h @@ -7,13 +7,11 @@ class WindowsPadHandler final : public wxWindow , public PadHandlerBase { - AppConnector m_app_connector; - public: WindowsPadHandler() : wxWindow() { - m_app_connector.Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(WindowsPadHandler::KeyDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_KEY_UP, wxKeyEventHandler(WindowsPadHandler::KeyUp), (wxObject*)0, this); + wxGetApp().Bind(wxEVT_KEY_DOWN, &WindowsPadHandler::KeyDown, this); + wxGetApp().Bind(wxEVT_KEY_UP, &WindowsPadHandler::KeyUp, this); } virtual void KeyDown(wxKeyEvent& event) { Key(event.GetKeyCode(), 1); event.Skip(); } diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp index 04a42ec123..e5a94cca11 100644 --- a/rpcs3/Gui/CompilerELF.cpp +++ b/rpcs3/Gui/CompilerELF.cpp @@ -23,24 +23,18 @@ CompilerELF::CompilerELF(wxWindow* parent) m_aui_mgr.SetManagedWindow(this); - wxMenuBar& menubar(*new wxMenuBar()); - wxMenu& menu_code(*new wxMenu()); - menubar.Append(&menu_code, "Code"); + wxMenuBar* menubar = new wxMenuBar(); + wxMenu* menu_code = new wxMenu(); + menubar->Append(menu_code, "Code"); //menu_code.Append(id_analyze_code, "Analyze"); - menu_code.Append(id_compile_code, "Compile"); - menu_code.Append(id_load_elf, "Load ELF"); + menu_code->Append(id_compile_code, "Compile"); + menu_code->Append(id_load_elf, "Load ELF"); - SetMenuBar(&menubar); - - asm_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1), - wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_RICH2); - - hex_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(155, -1), - wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_READONLY | wxTE_RICH2); - - err_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(140, 200), - wxTE_MULTILINE | wxTE_READONLY); + SetMenuBar(menubar); + asm_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1), wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_RICH2); + hex_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(155, -1), wxTE_MULTILINE | wxTE_DONTWRAP | wxTE_READONLY | wxTE_RICH2); + err_list = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(140, 200), wxTE_MULTILINE | wxTE_READONLY); const wxSize& client_size = GetClientSize(); @@ -54,26 +48,27 @@ CompilerELF::CompilerELF(wxWindow* parent) FrameBase::LoadInfo(); - Connect(asm_list->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(CompilerELF::OnUpdate)); - Connect(id_analyze_code, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::AnalyzeCode)); - Connect(id_compile_code, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::CompileCode)); - Connect(id_load_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::LoadElf)); + Bind(wxEVT_MENU, &CompilerELF::AnalyzeCode, this, id_analyze_code); + Bind(wxEVT_MENU, &CompilerELF::CompileCode, this, id_compile_code); + Bind(wxEVT_MENU, (void (CompilerELF::*)(wxCommandEvent&)) &CompilerELF::LoadElf, this, id_load_elf); asm_list->SetFont(wxFont(-1, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); hex_list->SetFont(wxFont(-1, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - m_app_connector.Connect(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_LINEUP, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + asm_list->Bind(wxEVT_TEXT, &CompilerELF::OnUpdate, this); - m_app_connector.Connect(asm_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(CompilerELF::MouseWheel), (wxObject*)0, this); - m_app_connector.Connect(hex_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(CompilerELF::MouseWheel), (wxObject*)0, this); + Bind(wxEVT_SCROLLWIN_TOP, &CompilerELF::OnScroll, this); + Bind(wxEVT_SCROLLWIN_BOTTOM, &CompilerELF::OnScroll, this); + Bind(wxEVT_SCROLLWIN_LINEUP, &CompilerELF::OnScroll, this); + Bind(wxEVT_SCROLLWIN_LINEDOWN, &CompilerELF::OnScroll, this); + Bind(wxEVT_SCROLLWIN_THUMBTRACK, &CompilerELF::OnScroll, this); + Bind(wxEVT_SCROLLWIN_THUMBRELEASE, &CompilerELF::OnScroll, this); - m_app_connector.Connect(asm_list->GetId(), wxEVT_KEY_DOWN, wxKeyEventHandler(CompilerELF::OnKeyDown), (wxObject*)0, this); - m_app_connector.Connect(hex_list->GetId(), wxEVT_KEY_DOWN, wxKeyEventHandler(CompilerELF::OnKeyDown), (wxObject*)0, this); + asm_list->Bind(wxEVT_MOUSEWHEEL, &CompilerELF::MouseWheel, this); + hex_list->Bind(wxEVT_MOUSEWHEEL, &CompilerELF::MouseWheel, this); + + asm_list->Bind(wxEVT_KEY_DOWN, &CompilerELF::OnKeyDown, this); + hex_list->Bind(wxEVT_KEY_DOWN, &CompilerELF::OnKeyDown, this); asm_list->WriteText( ".int [sys_tty_write, 0x193]\n" @@ -306,8 +301,8 @@ void CompilerELF::OnScroll(wxScrollWinEvent& event) const int id = event.GetEventObject() ? ((wxScrollBar*)event.GetEventObject())->GetId() : -1; - wxTextCtrl* src = NULL; - wxTextCtrl* dst = NULL; + wxTextCtrl* src = nullptr; + wxTextCtrl* dst = nullptr; if(id == hex_list->GetId()) { diff --git a/rpcs3/Gui/CompilerELF.h b/rpcs3/Gui/CompilerELF.h index 8d7321c5c3..6e1c4df161 100644 --- a/rpcs3/Gui/CompilerELF.h +++ b/rpcs3/Gui/CompilerELF.h @@ -1,8 +1,8 @@ #pragma once #include "Emu/Cell/PPUOpcodes.h" -#include #include "Loader/ELF64.h" +#include #include class CompilerELF : public FrameBase @@ -10,7 +10,6 @@ class CompilerELF : public FrameBase wxAuiManager m_aui_mgr; wxStatusBar& m_status_bar; bool m_disable_scroll; - AppConnector m_app_connector; public: CompilerELF(wxWindow* parent); diff --git a/rpcs3/Gui/ConLog.cpp b/rpcs3/Gui/ConLog.cpp index 9632e02256..6b4dbb6c33 100644 --- a/rpcs3/Gui/ConLog.cpp +++ b/rpcs3/Gui/ConLog.cpp @@ -176,9 +176,9 @@ LogFrame::LogFrame(wxWindow* parent) m_log.InsertColumn(1, "Log"); m_log.SetBackgroundColour(wxColour("Black")); - wxBoxSizer& s_main = *new wxBoxSizer(wxVERTICAL); - s_main.Add(&m_log, 1, wxEXPAND); - SetSizer(&s_main); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(&m_log, 1, wxEXPAND); + SetSizer(s_main); Layout(); Show(); diff --git a/rpcs3/Gui/Debugger.cpp b/rpcs3/Gui/Debugger.cpp index 53a907b1b3..2e80468ecc 100644 --- a/rpcs3/Gui/Debugger.cpp +++ b/rpcs3/Gui/Debugger.cpp @@ -7,8 +7,6 @@ class DbgEmuPanel : public wxPanel { - AppConnector m_app_connector; - wxButton* m_btn_run; wxButton* m_btn_stop; wxButton* m_btn_restart; @@ -16,26 +14,26 @@ class DbgEmuPanel : public wxPanel public: DbgEmuPanel(wxWindow* parent) : wxPanel(parent) { - m_btn_run = new wxButton(this, wxID_ANY, "Run"); - m_btn_stop = new wxButton(this, wxID_ANY, "Stop"); + m_btn_run = new wxButton(this, wxID_ANY, "Run"); + m_btn_run->Bind(wxEVT_BUTTON, &DbgEmuPanel::OnRun, this); + + m_btn_stop = new wxButton(this, wxID_ANY, "Stop"); + m_btn_stop->Bind(wxEVT_BUTTON, &DbgEmuPanel::OnStop, this); + m_btn_restart = new wxButton(this, wxID_ANY, "Restart"); + m_btn_restart->Bind(wxEVT_BUTTON, &DbgEmuPanel::OnRestart, this); - wxBoxSizer& s_b_main = *new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_b_main = new wxBoxSizer(wxHORIZONTAL); + s_b_main->Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(m_btn_stop, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL), 0, wxEXPAND); + s_b_main->Add(m_btn_restart, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_stop, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL), 0, wxEXPAND); - s_b_main.Add(m_btn_restart, wxSizerFlags().Border(wxALL, 5)); - - SetSizerAndFit(&s_b_main); + SetSizerAndFit(s_b_main); Layout(); UpdateUI(); - Connect(m_btn_run->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnRun)); - Connect(m_btn_stop->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnStop)); - Connect(m_btn_restart->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnRestart)); - - m_app_connector.Connect(wxEVT_DBG_COMMAND, wxCommandEventHandler(DbgEmuPanel::HandleCommand), (wxObject*)0, this); + wxGetApp().Bind(wxEVT_DBG_COMMAND, &DbgEmuPanel::HandleCommand, this); } void UpdateUI() diff --git a/rpcs3/Gui/DisAsmFrame.cpp b/rpcs3/Gui/DisAsmFrame.cpp index 8bcb5b36f2..2391523fd5 100644 --- a/rpcs3/Gui/DisAsmFrame.cpp +++ b/rpcs3/Gui/DisAsmFrame.cpp @@ -10,59 +10,56 @@ #include "Emu/Cell/SPUDisAsm.h" DisAsmFrame::DisAsmFrame(PPCThread& cpu) - : wxFrame(NULL, wxID_ANY, "DisAsm") + : wxFrame(nullptr, wxID_ANY, "DisAsm") , CPU(cpu) { exit = false; count = 0; - wxBoxSizer& s_panel( *new wxBoxSizer(wxVERTICAL) ); - wxBoxSizer& s_b_panel( *new wxBoxSizer(wxHORIZONTAL) ); + wxBoxSizer* s_panel = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_b_panel = new wxBoxSizer(wxHORIZONTAL); m_disasm_list = new wxListView(this); + m_disasm_list->Bind(wxEVT_MOUSEWHEEL, &DisAsmFrame::MouseWheel, this); - wxButton& b_fprev = *new wxButton(this, wxID_ANY, L"<<"); - wxButton& b_prev = *new wxButton(this, wxID_ANY, L"<"); - wxButton& b_next = *new wxButton(this, wxID_ANY, L">"); - wxButton& b_fnext = *new wxButton(this, wxID_ANY, L">>"); + wxButton* b_fprev = new wxButton(this, wxID_ANY, L"<<"); + wxButton* b_prev = new wxButton(this, wxID_ANY, L"<"); + wxButton* b_next = new wxButton(this, wxID_ANY, L">"); + wxButton* b_fnext = new wxButton(this, wxID_ANY, L">>"); + b_fprev->Bind(wxEVT_BUTTON, &DisAsmFrame::fPrev, this); + b_prev->Bind(wxEVT_BUTTON, &DisAsmFrame::Prev, this); + b_next->Bind(wxEVT_BUTTON, &DisAsmFrame::Next, this); + b_fnext->Bind(wxEVT_BUTTON, &DisAsmFrame::fNext, this); - wxButton& b_dump = *new wxButton(this, wxID_ANY, L"Dump code"); + wxButton* b_dump = new wxButton(this, wxID_ANY, L"Dump code"); + b_dump->Bind(wxEVT_BUTTON, &DisAsmFrame::Dump, this); - wxButton& b_setpc = *new wxButton(this, wxID_ANY, L"Set PC"); + wxButton* b_setpc = new wxButton(this, wxID_ANY, L"Set PC"); + b_setpc->Bind(wxEVT_BUTTON, &DisAsmFrame::SetPc, this); - s_b_panel.Add(&b_fprev); - s_b_panel.Add(&b_prev); - s_b_panel.AddSpacer(5); - s_b_panel.Add(&b_next); - s_b_panel.Add(&b_fnext); - s_b_panel.AddSpacer(8); - s_b_panel.Add(&b_dump); + s_b_panel->Add(b_fprev); + s_b_panel->Add(b_prev); + s_b_panel->AddSpacer(5); + s_b_panel->Add(b_next); + s_b_panel->Add(b_fnext); + s_b_panel->AddSpacer(8); + s_b_panel->Add(b_dump); - s_panel.Add(&s_b_panel); - s_panel.Add(&b_setpc); - s_panel.Add(m_disasm_list); + s_panel->Add(s_b_panel); + s_panel->Add(b_setpc); + s_panel->Add(m_disasm_list); m_disasm_list->InsertColumn(0, "PC"); m_disasm_list->InsertColumn(1, "ASM"); - m_disasm_list->SetColumnWidth( 0, 50 ); + m_disasm_list->SetColumnWidth(0, 50); - for(uint i=0; iInsertItem(i, -1); - - SetSizerAndFit( &s_panel ); + for(uint i=0; iInsertItem(i, -1); + SetSizerAndFit(s_panel); SetSize(50, 660); - Connect( wxEVT_SIZE, wxSizeEventHandler(DisAsmFrame::OnResize) ); - - m_app_connector.Connect(m_disasm_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(DisAsmFrame::MouseWheel), (wxObject*)0, this); - - Connect(b_prev.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DisAsmFrame::Prev)); - Connect(b_next.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DisAsmFrame::Next)); - Connect(b_fprev.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DisAsmFrame::fPrev)); - Connect(b_fnext.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DisAsmFrame::fNext)); - Connect(b_setpc.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DisAsmFrame::SetPc)); - - Connect(b_dump.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DisAsmFrame::Dump)); + Bind(wxEVT_SIZE, &DisAsmFrame::OnResize, this); } void DisAsmFrame::OnResize(wxSizeEvent& event) diff --git a/rpcs3/Gui/DisAsmFrame.h b/rpcs3/Gui/DisAsmFrame.h index a863b4af13..82290e2427 100644 --- a/rpcs3/Gui/DisAsmFrame.h +++ b/rpcs3/Gui/DisAsmFrame.h @@ -5,7 +5,6 @@ class DisAsmFrame : public wxFrame static const uint LINES_OPCODES = 40; u32 count; - AppConnector m_app_connector; wxListView* m_disasm_list; PPCThread& CPU; diff --git a/rpcs3/Gui/FnIdGenerator.cpp b/rpcs3/Gui/FnIdGenerator.cpp index 19a11dd095..667872c581 100644 --- a/rpcs3/Gui/FnIdGenerator.cpp +++ b/rpcs3/Gui/FnIdGenerator.cpp @@ -2,19 +2,22 @@ #include "FnIdGenerator.h" FnIdGenerator::FnIdGenerator(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "FunctionID Generator", wxDefaultPosition) + : wxDialog(parent, wxID_ANY, "FunctionID Generator") , m_list(nullptr) { - wxBoxSizer* s_panel(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_subpanel(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel2(new wxBoxSizer(wxHORIZONTAL)); + wxBoxSizer* s_panel = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_subpanel = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel2 = new wxBoxSizer(wxHORIZONTAL); m_list = new wxListView(this, wxID_ANY, wxDefaultPosition, wxSize(300, 450)); m_list->InsertColumn(0, "Function Name", 0, 200); m_list->InsertColumn(1, "Function ID", 0, 100); wxButton *b_input_name = new wxButton(this, wxID_ANY, "Input Function Name", wxDefaultPosition, wxSize(140, -1)); + b_input_name->Bind(wxEVT_BUTTON, &FnIdGenerator::OnInput, this); + wxButton *b_clear = new wxButton(this, wxID_ANY, "Clear List", wxDefaultPosition, wxSize(140, -1)); + b_clear->Bind(wxEVT_BUTTON, &FnIdGenerator::OnClear, this); s_subpanel2->Add(b_input_name); s_subpanel2->AddSpacer(10); @@ -29,10 +32,7 @@ FnIdGenerator::FnIdGenerator(wxWindow* parent) s_panel->Add(s_subpanel); s_panel->AddSpacer(5); - this->SetSizerAndFit(s_panel); - - Connect(b_input_name->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FnIdGenerator::OnInput)); - Connect(b_clear->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FnIdGenerator::OnClear)); + SetSizerAndFit(s_panel); } FnIdGenerator::~FnIdGenerator() diff --git a/rpcs3/Gui/FrameBase.h b/rpcs3/Gui/FrameBase.h index b35a5edd40..5e601d6aee 100644 --- a/rpcs3/Gui/FrameBase.h +++ b/rpcs3/Gui/FrameBase.h @@ -23,9 +23,9 @@ protected: m_ini.Init(ininame.empty() ? fmt::ToUTF8(framename) : ininame, "GuiSettings"); LoadInfo(); - Connect(GetId(), wxEVT_CLOSE_WINDOW, wxCloseEventHandler(FrameBase::OnClose)); - Connect(GetId(), wxEVT_MOVE, wxMoveEventHandler(FrameBase::OnMove)); - Connect(wxEVT_SIZE, wxSizeEventHandler(FrameBase::OnResize)); + Bind(wxEVT_CLOSE_WINDOW, &FrameBase::OnClose, this); + Bind(wxEVT_MOVE, &FrameBase::OnMove, this); + Bind(wxEVT_SIZE, &FrameBase::OnSize, this); } ~FrameBase() diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp index e7a9cb3511..eb3d41aa6e 100644 --- a/rpcs3/Gui/GameViewer.cpp +++ b/rpcs3/Gui/GameViewer.cpp @@ -10,7 +10,7 @@ GameViewer::GameViewer(wxWindow* parent) : wxListView(parent) m_path = "/dev_hdd0/game/"; - Connect(GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(GameViewer::DClick)); + Bind(wxEVT_LIST_ITEM_ACTIVATED, &GameViewer::DClick, this); Refresh(); } diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index 051c1b3e65..6dffef62cf 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -25,25 +25,25 @@ InterpreterDisAsmFrame::InterpreterDisAsmFrame(wxWindow* parent) , decoder(nullptr) , disasm(nullptr) { - wxBoxSizer& s_p_main = *new wxBoxSizer(wxVERTICAL); - wxBoxSizer& s_b_main = *new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_p_main = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_b_main = new wxBoxSizer(wxHORIZONTAL); m_list = new wxListView(this); m_choice_units = new wxChoice(this, wxID_ANY); - wxButton& b_go_to_addr = *new wxButton(this, wxID_ANY, "Go To Address"); - wxButton& b_go_to_pc = *new wxButton(this, wxID_ANY, "Go To PC"); + wxButton* b_go_to_addr = new wxButton(this, wxID_ANY, "Go To Address"); + wxButton* b_go_to_pc = new wxButton(this, wxID_ANY, "Go To PC"); m_btn_step = new wxButton(this, wxID_ANY, "Step"); m_btn_run = new wxButton(this, wxID_ANY, "Run"); m_btn_pause = new wxButton(this, wxID_ANY, "Pause"); - s_b_main.Add(&b_go_to_addr, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(&b_go_to_pc, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_step, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_pause, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_choice_units, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(b_go_to_addr, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(b_go_to_pc, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(m_btn_step, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(m_btn_pause, wxSizerFlags().Border(wxALL, 5)); + s_b_main->Add(m_choice_units, wxSizerFlags().Border(wxALL, 5)); //Registers m_regs = new wxTextCtrl(this, wxID_ANY, wxEmptyString, @@ -59,15 +59,15 @@ InterpreterDisAsmFrame::InterpreterDisAsmFrame(wxWindow* parent) m_regs ->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); m_calls->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - wxBoxSizer& s_w_list = *new wxBoxSizer(wxHORIZONTAL); - s_w_list.Add(m_list, 2, wxEXPAND | wxLEFT | wxDOWN, 5); - s_w_list.Add(m_regs, 1, wxEXPAND | wxRIGHT | wxDOWN, 5); - s_w_list.Add(m_calls,1, wxEXPAND | wxRIGHT | wxDOWN, 5); + wxBoxSizer* s_w_list = new wxBoxSizer(wxHORIZONTAL); + s_w_list->Add(m_list, 2, wxEXPAND | wxLEFT | wxDOWN, 5); + s_w_list->Add(m_regs, 1, wxEXPAND | wxRIGHT | wxDOWN, 5); + s_w_list->Add(m_calls,1, wxEXPAND | wxRIGHT | wxDOWN, 5); - s_p_main.Add(&s_b_main, 0, wxEXPAND | wxLEFT | wxRIGHT, 5); - s_p_main.Add(&s_w_list, 1, wxEXPAND | wxDOWN, 5); + s_p_main->Add(s_b_main, 0, wxEXPAND | wxLEFT | wxRIGHT, 5); + s_p_main->Add(s_w_list, 1, wxEXPAND | wxDOWN, 5); - SetSizer(&s_p_main); + SetSizer(s_p_main); Layout(); m_list->InsertColumn(0, "ASM"); @@ -76,19 +76,20 @@ InterpreterDisAsmFrame::InterpreterDisAsmFrame(wxWindow* parent) m_list->InsertItem(m_list->GetItemCount(), wxEmptyString); } - Connect(m_regs->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(InterpreterDisAsmFrame::OnUpdate)); - Connect(b_go_to_addr.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::Show_Val)); - Connect(b_go_to_pc.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::Show_PC)); - Connect(m_btn_step->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoStep)); - Connect(m_btn_run->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoRun)); - Connect(m_btn_pause->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoPause)); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_KEY_DOWN, wxListEventHandler(InterpreterDisAsmFrame::InstrKey)); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(InterpreterDisAsmFrame::DClick)); - Connect(m_choice_units->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(InterpreterDisAsmFrame::OnSelectUnit)); - Connect(wxEVT_SIZE, wxSizeEventHandler(InterpreterDisAsmFrame::OnResize)); - m_app_connector.Connect(m_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(InterpreterDisAsmFrame::MouseWheel), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(InterpreterDisAsmFrame::OnKeyDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_DBG_COMMAND, wxCommandEventHandler(InterpreterDisAsmFrame::HandleCommand), (wxObject*)0, this); + m_regs ->Bind(wxEVT_TEXT, &InterpreterDisAsmFrame::OnUpdate, this); + b_go_to_addr ->Bind(wxEVT_BUTTON, &InterpreterDisAsmFrame::Show_Val, this); + b_go_to_pc ->Bind(wxEVT_BUTTON, &InterpreterDisAsmFrame::Show_PC, this); + m_btn_step ->Bind(wxEVT_BUTTON, &InterpreterDisAsmFrame::DoStep, this); + m_btn_run ->Bind(wxEVT_BUTTON, &InterpreterDisAsmFrame::DoRun, this); + m_btn_pause ->Bind(wxEVT_BUTTON, &InterpreterDisAsmFrame::DoPause, this); + m_list ->Bind(wxEVT_LIST_KEY_DOWN, &InterpreterDisAsmFrame::InstrKey, this); + m_list ->Bind(wxEVT_LIST_ITEM_ACTIVATED, &InterpreterDisAsmFrame::DClick, this); + m_list ->Bind(wxEVT_MOUSEWHEEL, &InterpreterDisAsmFrame::MouseWheel, this); + m_choice_units->Bind(wxEVT_CHOICE, &InterpreterDisAsmFrame::OnSelectUnit, this); + + Bind(wxEVT_SIZE, &InterpreterDisAsmFrame::OnResize, this); + Bind(wxEVT_KEY_DOWN, &InterpreterDisAsmFrame::OnKeyDown, this); + wxGetApp().Bind(wxEVT_DBG_COMMAND, &InterpreterDisAsmFrame::HandleCommand, this); ShowAddr(CentrePc(PC)); UpdateUnitList(); diff --git a/rpcs3/Gui/InterpreterDisAsm.h b/rpcs3/Gui/InterpreterDisAsm.h index 217202f22d..0233527f91 100644 --- a/rpcs3/Gui/InterpreterDisAsm.h +++ b/rpcs3/Gui/InterpreterDisAsm.h @@ -15,7 +15,6 @@ class InterpreterDisAsmFrame : public wxPanel wxButton* m_btn_step; wxButton* m_btn_run; wxButton* m_btn_pause; - AppConnector m_app_connector; u32 m_item_count; wxChoice* m_choice_units; diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 93fc4a6453..ab5ce3c3e6 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -60,43 +60,43 @@ MainFrame::MainFrame() SetLabel(wxString::Format(_PRGNAME_ " " _PRGVER_)); #endif - wxMenuBar& menubar(*new wxMenuBar()); + wxMenuBar* menubar = new wxMenuBar(); - wxMenu& menu_boot(*new wxMenu()); - menubar.Append(&menu_boot, "Boot"); - menu_boot.Append(id_boot_game, "Boot game"); - menu_boot.Append(id_install_pkg, "Install PKG"); - menu_boot.AppendSeparator(); - menu_boot.Append(id_boot_elf, "Boot (S)ELF"); + wxMenu* menu_boot = new wxMenu(); + menubar->Append(menu_boot, "Boot"); + menu_boot->Append(id_boot_game, "Boot game"); + menu_boot->Append(id_install_pkg, "Install PKG"); + menu_boot->AppendSeparator(); + menu_boot->Append(id_boot_elf, "Boot (S)ELF"); - wxMenu& menu_sys(*new wxMenu()); - menubar.Append(&menu_sys, "System"); - menu_sys.Append(id_sys_pause, "Pause")->Enable(false); - menu_sys.Append(id_sys_stop, "Stop\tCtrl + S")->Enable(false); - menu_sys.AppendSeparator(); - menu_sys.Append(id_sys_send_open_menu, "Send open system menu cmd")->Enable(false); - menu_sys.Append(id_sys_send_exit, "Send exit cmd")->Enable(false); + wxMenu* menu_sys = new wxMenu(); + menubar->Append(menu_sys, "System"); + menu_sys->Append(id_sys_pause, "Pause")->Enable(false); + menu_sys->Append(id_sys_stop, "Stop\tCtrl + S")->Enable(false); + menu_sys->AppendSeparator(); + menu_sys->Append(id_sys_send_open_menu, "Send open system menu cmd")->Enable(false); + menu_sys->Append(id_sys_send_exit, "Send exit cmd")->Enable(false); - wxMenu& menu_conf(*new wxMenu()); - menubar.Append(&menu_conf, "Config"); - menu_conf.Append(id_config_emu, "Settings"); - menu_conf.Append(id_config_pad, "PAD Settings"); - menu_conf.AppendSeparator(); - menu_conf.Append(id_config_vfs_manager, "Virtual File System Manager"); - menu_conf.Append(id_config_vhdd_manager, "Virtual HDD Manager"); + wxMenu* menu_conf = new wxMenu(); + menubar->Append(menu_conf, "Config"); + menu_conf->Append(id_config_emu, "Settings"); + menu_conf->Append(id_config_pad, "PAD Settings"); + menu_conf->AppendSeparator(); + menu_conf->Append(id_config_vfs_manager, "Virtual File System Manager"); + menu_conf->Append(id_config_vhdd_manager, "Virtual HDD Manager"); - wxMenu& menu_tools(*new wxMenu()); - menubar.Append(&menu_tools, "Tools"); - menu_tools.Append(id_tools_compiler, "ELF Compiler"); - menu_tools.Append(id_tools_memory_viewer, "Memory Viewer"); - menu_tools.Append(id_tools_rsx_debugger, "RSX Debugger"); - menu_tools.Append(id_tools_fnid_generator, "FunctionID Generator"); + wxMenu* menu_tools = new wxMenu(); + menubar->Append(menu_tools, "Tools"); + menu_tools->Append(id_tools_compiler, "ELF Compiler"); + menu_tools->Append(id_tools_memory_viewer, "Memory Viewer"); + menu_tools->Append(id_tools_rsx_debugger, "RSX Debugger"); + menu_tools->Append(id_tools_fnid_generator, "FunctionID Generator"); - wxMenu& menu_help(*new wxMenu()); - menubar.Append(&menu_help, "Help"); - menu_help.Append(id_help_about, "About..."); + wxMenu* menu_help = new wxMenu(); + menubar->Append(menu_help, "Help"); + menu_help->Append(id_help_about, "About..."); - SetMenuBar(&menubar); + SetMenuBar(menubar); // Panels m_game_viewer = new GameViewer(this); @@ -108,31 +108,31 @@ MainFrame::MainFrame() AddPane(m_debugger_frame, "Debugger", wxAUI_DOCK_RIGHT); // Events - Connect( id_boot_game, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootGame) ); - Connect( id_install_pkg, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::InstallPkg) ); - Connect( id_boot_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootElf) ); + Bind(wxEVT_MENU, &MainFrame::BootGame, this, id_boot_game); + Bind(wxEVT_MENU, &MainFrame::InstallPkg, this, id_install_pkg); + Bind(wxEVT_MENU, &MainFrame::BootElf, this, id_boot_elf); - Connect( id_sys_pause, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::Pause) ); - Connect( id_sys_stop, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::Stop) ); - Connect( id_sys_send_open_menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::SendOpenCloseSysMenu) ); - Connect( id_sys_send_exit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::SendExit) ); + Bind(wxEVT_MENU, &MainFrame::Pause, this, id_sys_pause); + Bind(wxEVT_MENU, &MainFrame::Stop, this, id_sys_stop); + Bind(wxEVT_MENU, &MainFrame::SendOpenCloseSysMenu, this, id_sys_send_open_menu); + Bind(wxEVT_MENU, &MainFrame::SendExit, this, id_sys_send_exit); - Connect( id_config_emu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::Config) ); - Connect( id_config_pad, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigPad) ); - Connect( id_config_vfs_manager, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigVFS) ); - Connect( id_config_vhdd_manager, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigVHDD) ); + Bind(wxEVT_MENU, &MainFrame::Config, this, id_config_emu); + Bind(wxEVT_MENU, &MainFrame::ConfigPad, this, id_config_pad); + Bind(wxEVT_MENU, &MainFrame::ConfigVFS, this, id_config_vfs_manager); + Bind(wxEVT_MENU, &MainFrame::ConfigVHDD, this, id_config_vhdd_manager); - Connect( id_tools_compiler, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenELFCompiler)); - Connect( id_tools_memory_viewer, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenMemoryViewer)); - Connect( id_tools_rsx_debugger, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenRSXDebugger)); - Connect(id_tools_fnid_generator, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenFnIdGenerator)); + Bind(wxEVT_MENU, &MainFrame::OpenELFCompiler, this, id_tools_compiler); + Bind(wxEVT_MENU, &MainFrame::OpenMemoryViewer, this, id_tools_memory_viewer); + Bind(wxEVT_MENU, &MainFrame::OpenRSXDebugger, this, id_tools_rsx_debugger); + Bind(wxEVT_MENU, &MainFrame::OpenFnIdGenerator, this, id_tools_fnid_generator); - Connect( id_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::AboutDialogHandler) ); + Bind(wxEVT_MENU, &MainFrame::AboutDialogHandler, this, id_help_about); - Connect( id_update_dbg, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::UpdateUI) ); + Bind(wxEVT_MENU, &MainFrame::UpdateUI, this, id_update_dbg); - m_app_connector.Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainFrame::OnKeyDown), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_DBG_COMMAND, wxCommandEventHandler(MainFrame::UpdateUI), (wxObject*)0, this); + Bind(wxEVT_KEY_DOWN, &MainFrame::OnKeyDown, this); + wxGetApp().Bind(wxEVT_DBG_COMMAND, &MainFrame::UpdateUI, this); } MainFrame::~MainFrame() @@ -187,7 +187,7 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event)) } else { - ConLog.Error("Ps3 executable not found in selected folder (%s)", ctrl.GetPath().wx_str()); + ConLog.Error("PS3 executable not found in selected folder (%s)", ctrl.GetPath().wx_str()); } } @@ -326,35 +326,35 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) nb_config->AddPage(p_hle, wxT("HLE / Misc.")); nb_config->AddPage(p_system, wxT("System")); - wxBoxSizer* s_subpanel_system(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel_cpu(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel_graphics(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel_audio(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel_io(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel_hle(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_subpanel_system = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_cpu = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_graphics = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_audio = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_io = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_hle = new wxBoxSizer(wxVERTICAL); // CPU/SPU settings - wxStaticBoxSizer* s_round_cpu_decoder( new wxStaticBoxSizer( wxVERTICAL, p_cpu, _("CPU") ) ); - wxStaticBoxSizer* s_round_spu_decoder( new wxStaticBoxSizer( wxVERTICAL, p_cpu, _("SPU") ) ); + wxStaticBoxSizer* s_round_cpu_decoder = new wxStaticBoxSizer(wxVERTICAL, p_cpu, _("CPU")); + wxStaticBoxSizer* s_round_spu_decoder = new wxStaticBoxSizer(wxVERTICAL, p_cpu, _("SPU")); // Graphics - wxStaticBoxSizer* s_round_gs_render( new wxStaticBoxSizer( wxVERTICAL, p_graphics, _("Render") ) ); - wxStaticBoxSizer* s_round_gs_res( new wxStaticBoxSizer( wxVERTICAL, p_graphics, _("Default resolution") ) ); - wxStaticBoxSizer* s_round_gs_aspect( new wxStaticBoxSizer( wxVERTICAL, p_graphics, _("Default aspect ratio") ) ); + wxStaticBoxSizer* s_round_gs_render = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Render")); + wxStaticBoxSizer* s_round_gs_res = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Default resolution")); + wxStaticBoxSizer* s_round_gs_aspect = new wxStaticBoxSizer(wxVERTICAL, p_graphics, _("Default aspect ratio")); // Input / Output - wxStaticBoxSizer* s_round_io_pad_handler( new wxStaticBoxSizer( wxVERTICAL, p_io, _("Pad Handler") ) ); - wxStaticBoxSizer* s_round_io_keyboard_handler( new wxStaticBoxSizer( wxVERTICAL, p_io, _("Keyboard Handler") ) ); - wxStaticBoxSizer* s_round_io_mouse_handler( new wxStaticBoxSizer( wxVERTICAL, p_io, _("Mouse Handler") ) ); + wxStaticBoxSizer* s_round_io_pad_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Pad Handler")); + wxStaticBoxSizer* s_round_io_keyboard_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Keyboard Handler")); + wxStaticBoxSizer* s_round_io_mouse_handler = new wxStaticBoxSizer(wxVERTICAL, p_io, _("Mouse Handler")); // Audio - wxStaticBoxSizer* s_round_audio_out( new wxStaticBoxSizer( wxVERTICAL, p_audio, _("Audio Out") ) ); + wxStaticBoxSizer* s_round_audio_out = new wxStaticBoxSizer(wxVERTICAL, p_audio, _("Audio Out")); // HLE / Misc. - wxStaticBoxSizer* s_round_hle_log_lvl( new wxStaticBoxSizer( wxVERTICAL, p_hle, _("Log lvl") ) ); + wxStaticBoxSizer* s_round_hle_log_lvl = new wxStaticBoxSizer(wxVERTICAL, p_hle, _("Log lvl")); // System - wxStaticBoxSizer* s_round_sys_lang( new wxStaticBoxSizer( wxVERTICAL, p_system, _("Language") ) ); + wxStaticBoxSizer* s_round_sys_lang = new wxStaticBoxSizer(wxVERTICAL, p_system, _("Language")); wxComboBox* cbox_cpu_decoder = new wxComboBox(p_cpu, wxID_ANY); wxComboBox* cbox_spu_decoder = new wxComboBox(p_cpu, wxID_ANY); diff --git a/rpcs3/Gui/MainFrame.h b/rpcs3/Gui/MainFrame.h index 4ea1d2b2f7..f0262bac0e 100644 --- a/rpcs3/Gui/MainFrame.h +++ b/rpcs3/Gui/MainFrame.h @@ -10,7 +10,6 @@ class MainFrame : public FrameBase DebuggerPanel* m_debugger_frame; GameViewer* m_game_viewer; wxAuiManager m_aui_mgr; - AppConnector m_app_connector; bool m_sys_menu_opened; public: diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp index 90e36a0175..5081efa847 100644 --- a/rpcs3/Gui/MemoryViewer.cpp +++ b/rpcs3/Gui/MemoryViewer.cpp @@ -10,79 +10,79 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) m_rowcount = 16; this->SetBackgroundColour(wxColour(240,240,240)); //This fix the ugly background color under Windows - wxBoxSizer& s_panel = *new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_panel = new wxBoxSizer(wxVERTICAL); //Tools - wxBoxSizer& s_tools = *new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_tools = new wxBoxSizer(wxHORIZONTAL); //Tools: Memory Viewer Options - wxStaticBoxSizer& s_tools_mem = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Memory Viewer Options"); + wxStaticBoxSizer* s_tools_mem = new wxStaticBoxSizer(wxHORIZONTAL, this, "Memory Viewer Options"); - wxStaticBoxSizer& s_tools_mem_addr = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Address"); + wxStaticBoxSizer* s_tools_mem_addr = new wxStaticBoxSizer(wxHORIZONTAL, this, "Address"); t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60,-1)); t_addr->SetMaxLength(8); - s_tools_mem_addr.Add(t_addr); + s_tools_mem_addr->Add(t_addr); - wxStaticBoxSizer& s_tools_mem_bytes = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Bytes"); + wxStaticBoxSizer* s_tools_mem_bytes = new wxStaticBoxSizer(wxHORIZONTAL, this, "Bytes"); sc_bytes = new wxSpinCtrl(this, wxID_ANY, "16", wxDefaultPosition, wxSize(44,-1)); sc_bytes->SetRange(1, 16); - s_tools_mem_bytes.Add(sc_bytes); + s_tools_mem_bytes->Add(sc_bytes); - wxStaticBoxSizer& s_tools_mem_buttons = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Control"); + wxStaticBoxSizer* s_tools_mem_buttons = new wxStaticBoxSizer(wxHORIZONTAL, this, "Control"); wxButton* b_fprev = new wxButton(this, wxID_ANY, "<<", wxDefaultPosition, wxSize(21, 21)); wxButton* b_prev = new wxButton(this, wxID_ANY, "<", wxDefaultPosition, wxSize(21, 21)); wxButton* b_next = new wxButton(this, wxID_ANY, ">", wxDefaultPosition, wxSize(21, 21)); wxButton* b_fnext = new wxButton(this, wxID_ANY, ">>", wxDefaultPosition, wxSize(21, 21)); - s_tools_mem_buttons.Add(b_fprev); - s_tools_mem_buttons.Add(b_prev); - s_tools_mem_buttons.Add(b_next); - s_tools_mem_buttons.Add(b_fnext); + s_tools_mem_buttons->Add(b_fprev); + s_tools_mem_buttons->Add(b_prev); + s_tools_mem_buttons->Add(b_next); + s_tools_mem_buttons->Add(b_fnext); - s_tools_mem.Add(&s_tools_mem_addr); - s_tools_mem.Add(&s_tools_mem_bytes); - s_tools_mem.Add(&s_tools_mem_buttons); + s_tools_mem->Add(s_tools_mem_addr); + s_tools_mem->Add(s_tools_mem_bytes); + s_tools_mem->Add(s_tools_mem_buttons); //Tools: Raw Image Preview Options - wxStaticBoxSizer& s_tools_img = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Raw Image Preview"); + wxStaticBoxSizer* s_tools_img = new wxStaticBoxSizer(wxHORIZONTAL, this, "Raw Image Preview"); - wxStaticBoxSizer& s_tools_img_size = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Size"); + wxStaticBoxSizer* s_tools_img_size = new wxStaticBoxSizer(wxHORIZONTAL, this, "Size"); sc_img_size_x = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60,-1)); sc_img_size_y = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60,-1)); - s_tools_img_size.Add(sc_img_size_x); - s_tools_img_size.Add(new wxStaticText(this, wxID_ANY, " x ")); - s_tools_img_size.Add(sc_img_size_y); + s_tools_img_size->Add(sc_img_size_x); + s_tools_img_size->Add(new wxStaticText(this, wxID_ANY, " x ")); + s_tools_img_size->Add(sc_img_size_y); sc_img_size_x->SetRange(1, 8192); sc_img_size_y->SetRange(1, 8192); - wxStaticBoxSizer& s_tools_img_mode = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Mode"); + wxStaticBoxSizer* s_tools_img_mode = new wxStaticBoxSizer(wxHORIZONTAL, this, "Mode"); cbox_img_mode = new wxComboBox(this, wxID_ANY); cbox_img_mode->Append("RGB"); cbox_img_mode->Append("ARGB"); cbox_img_mode->Append("RGBA"); cbox_img_mode->Append("ABGR"); cbox_img_mode->Select(1); //ARGB - s_tools_img_mode.Add(cbox_img_mode); + s_tools_img_mode->Add(cbox_img_mode); - s_tools_img.Add(&s_tools_img_size); - s_tools_img.Add(&s_tools_img_mode); + s_tools_img->Add(s_tools_img_size); + s_tools_img->Add(s_tools_img_mode); //Tools: Run tools - wxStaticBoxSizer& s_tools_buttons = *new wxStaticBoxSizer(wxVERTICAL, this, "Tools"); + wxStaticBoxSizer* s_tools_buttons = new wxStaticBoxSizer(wxVERTICAL, this, "Tools"); wxButton* b_img = new wxButton(this, wxID_ANY, "View\nimage", wxDefaultPosition, wxSize(52,-1)); - s_tools_buttons.Add(b_img); + s_tools_buttons->Add(b_img); //Tools: Tools = Memory Viewer Options + Raw Image Preview Options + Buttons - s_tools.AddSpacer(10); - s_tools.Add(&s_tools_mem); - s_tools.AddSpacer(10); - s_tools.Add(&s_tools_img); - s_tools.AddSpacer(10); - s_tools.Add(&s_tools_buttons); - s_tools.AddSpacer(10); + s_tools->AddSpacer(10); + s_tools->Add(s_tools_mem); + s_tools->AddSpacer(10); + s_tools->Add(s_tools_img); + s_tools->AddSpacer(10); + s_tools->Add(s_tools_buttons); + s_tools->AddSpacer(10); //Memory Panel - wxBoxSizer& s_mem_panel = *new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_mem_panel = new wxBoxSizer(wxHORIZONTAL); t_mem_addr = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER|wxTE_READONLY); t_mem_hex = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER|wxTE_READONLY); t_mem_ascii = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxNO_BORDER|wxTE_READONLY); @@ -96,11 +96,11 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) t_mem_hex ->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); t_mem_ascii->SetFont(wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - s_mem_panel.AddSpacer(10); - s_mem_panel.Add(t_mem_addr); - s_mem_panel.Add(t_mem_hex); - s_mem_panel.Add(t_mem_ascii); - s_mem_panel.AddSpacer(10); + s_mem_panel->AddSpacer(10); + s_mem_panel->Add(t_mem_addr); + s_mem_panel->Add(t_mem_hex); + s_mem_panel->Add(t_mem_ascii); + s_mem_panel->AddSpacer(10); //Memory Panel: Set size of the wxTextCtrl's int x, y; @@ -111,27 +111,29 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) t_mem_ascii->SetMaxSize(wxSize(x * m_colcount + 6, 228)); //Merge and display everything - s_panel.AddSpacer(10); - s_panel.Add(&s_tools); - s_panel.AddSpacer(10); - s_panel.Add(&s_mem_panel, 0, 0, 100); - s_panel.AddSpacer(10); - SetSizerAndFit(&s_panel); + s_panel->AddSpacer(10); + s_panel->Add(s_tools); + s_panel->AddSpacer(10); + s_panel->Add(s_mem_panel, 0, 0, 100); + s_panel->AddSpacer(10); + SetSizerAndFit(s_panel); //Events - Connect(t_addr->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(MemoryViewerPanel::OnChangeToolsAddr) ); - Connect(sc_bytes->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(MemoryViewerPanel::OnChangeToolsBytes) ); - Connect(sc_bytes->GetId(), wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler(MemoryViewerPanel::OnChangeToolsBytes) ); + t_addr ->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsAddr, this); + sc_bytes->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsBytes, this); + t_addr ->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsAddr, this); + sc_bytes->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsBytes, this); + sc_bytes->Bind(wxEVT_SPINCTRL, &MemoryViewerPanel::OnChangeToolsBytes, this); - Connect(b_prev->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MemoryViewerPanel::Prev)); - Connect(b_next->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MemoryViewerPanel::Next)); - Connect(b_fprev->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MemoryViewerPanel::fPrev)); - Connect(b_fnext->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MemoryViewerPanel::fNext)); - Connect(b_img->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MemoryViewerPanel::OnShowImage)); + b_prev ->Bind(wxEVT_BUTTON, &MemoryViewerPanel::Prev, this); + b_next ->Bind(wxEVT_BUTTON, &MemoryViewerPanel::Next, this); + b_fprev->Bind(wxEVT_BUTTON, &MemoryViewerPanel::fPrev, this); + b_fnext->Bind(wxEVT_BUTTON, &MemoryViewerPanel::fNext, this); + b_img ->Bind(wxEVT_BUTTON, &MemoryViewerPanel::OnShowImage, this); - t_mem_addr ->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(MemoryViewerPanel::OnScrollMemory), NULL, this); - t_mem_hex ->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(MemoryViewerPanel::OnScrollMemory), NULL, this); - t_mem_ascii->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(MemoryViewerPanel::OnScrollMemory), NULL, this); + t_mem_addr ->Bind(wxEVT_MOUSEWHEEL, &MemoryViewerPanel::OnScrollMemory, this); + t_mem_hex ->Bind(wxEVT_MOUSEWHEEL, &MemoryViewerPanel::OnScrollMemory, this); + t_mem_ascii->Bind(wxEVT_MOUSEWHEEL, &MemoryViewerPanel::OnScrollMemory, this); //Fill the wxTextCtrl's ShowMemory(); diff --git a/rpcs3/Gui/PADManager.cpp b/rpcs3/Gui/PADManager.cpp index 957458c606..58accb4581 100644 --- a/rpcs3/Gui/PADManager.cpp +++ b/rpcs3/Gui/PADManager.cpp @@ -2,7 +2,7 @@ #include "PADManager.h" PADManager::PADManager(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "PAD Settings", wxDefaultPosition) + : wxDialog(parent, wxID_ANY, "PAD Settings") , m_button_id(0) , m_key_pressed(false) , m_emu_paused(false) @@ -13,62 +13,62 @@ PADManager::PADManager(wxWindow* parent) m_emu_paused = true; } - wxBoxSizer* s_panel(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_subpanel(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel2(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_panel = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_subpanel = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel2 = new wxBoxSizer(wxVERTICAL); // Left Analog Stick - wxStaticBoxSizer* s_round_stick_l( new wxStaticBoxSizer( wxVERTICAL, this, _("Left Analog Stick") ) ); - wxBoxSizer* s_subpanel_lstick_1( new wxBoxSizer( wxVERTICAL) ); - wxBoxSizer* s_subpanel_lstick_2( new wxBoxSizer( wxHORIZONTAL) ); - wxBoxSizer* s_subpanel_lstick_3( new wxBoxSizer( wxVERTICAL) ); + wxStaticBoxSizer* s_round_stick_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left Analog Stick")); + wxBoxSizer* s_subpanel_lstick_1 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_lstick_2 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_subpanel_lstick_3 = new wxBoxSizer(wxVERTICAL); // D-Pad - wxStaticBoxSizer* s_round_pad_controls( new wxStaticBoxSizer( wxVERTICAL, this, _("D-Pad") ) ); - wxBoxSizer* s_subpanel_pad_1( new wxBoxSizer( wxVERTICAL) ); - wxBoxSizer* s_subpanel_pad_2( new wxBoxSizer( wxHORIZONTAL) ); - wxBoxSizer* s_subpanel_pad_3( new wxBoxSizer( wxVERTICAL) ); + wxStaticBoxSizer* s_round_pad_controls = new wxStaticBoxSizer(wxVERTICAL, this, _("D-Pad")); + wxBoxSizer* s_subpanel_pad_1 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_pad_2 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_subpanel_pad_3 = new wxBoxSizer(wxVERTICAL); // Left shifts - wxStaticBoxSizer* s_round_pad_shifts_l( new wxStaticBoxSizer( wxVERTICAL, this, _("Left Shifts") ) ); - wxStaticBoxSizer* s_round_pad_l1( new wxStaticBoxSizer( wxVERTICAL, this, _("L1") ) ); - wxStaticBoxSizer* s_round_pad_l2( new wxStaticBoxSizer( wxVERTICAL, this, _("L2") ) ); - wxStaticBoxSizer* s_round_pad_l3( new wxStaticBoxSizer( wxVERTICAL, this, _("L3") ) ); + wxStaticBoxSizer* s_round_pad_shifts_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left Shifts")); + wxStaticBoxSizer* s_round_pad_l1 = new wxStaticBoxSizer(wxVERTICAL, this, _("L1")); + wxStaticBoxSizer* s_round_pad_l2 = new wxStaticBoxSizer(wxVERTICAL, this, _("L2")); + wxStaticBoxSizer* s_round_pad_l3 = new wxStaticBoxSizer(wxVERTICAL, this, _("L3")); // Start / Select - wxStaticBoxSizer* s_round_pad_system( new wxStaticBoxSizer( wxVERTICAL, this, _("System") ) ); - wxStaticBoxSizer* s_round_pad_select( new wxStaticBoxSizer( wxVERTICAL, this, _("Select") ) ); - wxStaticBoxSizer* s_round_pad_start( new wxStaticBoxSizer( wxVERTICAL, this, _("Start") ) ); + wxStaticBoxSizer* s_round_pad_system = new wxStaticBoxSizer(wxVERTICAL, this, _("System")); + wxStaticBoxSizer* s_round_pad_select = new wxStaticBoxSizer(wxVERTICAL, this, _("Select")); + wxStaticBoxSizer* s_round_pad_start = new wxStaticBoxSizer(wxVERTICAL, this, _("Start")); // Right shifts - wxStaticBoxSizer* s_round_pad_shifts_r( new wxStaticBoxSizer( wxVERTICAL, this, _("Right Shifts") ) ); - wxStaticBoxSizer* s_round_pad_r1( new wxStaticBoxSizer( wxVERTICAL, this, _("R1") ) ); - wxStaticBoxSizer* s_round_pad_r2( new wxStaticBoxSizer( wxVERTICAL, this, _("R2") ) ); - wxStaticBoxSizer* s_round_pad_r3( new wxStaticBoxSizer( wxVERTICAL, this, _("R3") ) ); + wxStaticBoxSizer* s_round_pad_shifts_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right Shifts")); + wxStaticBoxSizer* s_round_pad_r1 = new wxStaticBoxSizer(wxVERTICAL, this, _("R1")); + wxStaticBoxSizer* s_round_pad_r2 = new wxStaticBoxSizer(wxVERTICAL, this, _("R2")); + wxStaticBoxSizer* s_round_pad_r3 = new wxStaticBoxSizer(wxVERTICAL, this, _("R3")); // Action buttons - wxStaticBoxSizer* s_round_pad_buttons( new wxStaticBoxSizer( wxVERTICAL, this, _("Buttons") ) ); - wxStaticBoxSizer* s_round_pad_square( new wxStaticBoxSizer( wxVERTICAL, this, _("Square") ) ); - wxStaticBoxSizer* s_round_pad_cross( new wxStaticBoxSizer( wxVERTICAL, this, _("Cross") ) ); - wxStaticBoxSizer* s_round_pad_circle( new wxStaticBoxSizer( wxVERTICAL, this, _("Circle") ) ); - wxStaticBoxSizer* s_round_pad_triangle( new wxStaticBoxSizer( wxVERTICAL, this, _("Triangle") ) ); - wxBoxSizer* s_subpanel_buttons_1( new wxBoxSizer( wxVERTICAL) ); - wxBoxSizer* s_subpanel_buttons_2( new wxBoxSizer( wxHORIZONTAL) ); - wxBoxSizer* s_subpanel_buttons_3( new wxBoxSizer( wxVERTICAL) ); + wxStaticBoxSizer* s_round_pad_buttons = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons")); + wxStaticBoxSizer* s_round_pad_square = new wxStaticBoxSizer(wxVERTICAL, this, _("Square")); + wxStaticBoxSizer* s_round_pad_cross = new wxStaticBoxSizer(wxVERTICAL, this, _("Cross")); + wxStaticBoxSizer* s_round_pad_circle = new wxStaticBoxSizer(wxVERTICAL, this, _("Circle")); + wxStaticBoxSizer* s_round_pad_triangle = new wxStaticBoxSizer(wxVERTICAL, this, _("Triangle")); + wxBoxSizer* s_subpanel_buttons_1 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_buttons_2 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_subpanel_buttons_3 = new wxBoxSizer(wxVERTICAL); // Right Analog Stick - wxStaticBoxSizer* s_round_stick_r( new wxStaticBoxSizer( wxVERTICAL, this, _("Right Analog Stick") ) ); - wxBoxSizer* s_subpanel_rstick_1( new wxBoxSizer( wxVERTICAL) ); - wxBoxSizer* s_subpanel_rstick_2( new wxBoxSizer( wxHORIZONTAL) ); - wxBoxSizer* s_subpanel_rstick_3( new wxBoxSizer( wxVERTICAL) ); + wxStaticBoxSizer* s_round_stick_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right Analog Stick")); + wxBoxSizer* s_subpanel_rstick_1 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_subpanel_rstick_2 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_subpanel_rstick_3 = new wxBoxSizer(wxVERTICAL); // Ok / Cancel wxBoxSizer* s_b_panel(new wxBoxSizer(wxHORIZONTAL)); wxBoxSizer* s_reset_panel(new wxBoxSizer(wxHORIZONTAL)); - #define ButtonParameters wxEmptyString, wxDefaultPosition, wxSize(60,-1) - #define SizerFlags wxSizerFlags().Border(wxALL, 3).Center() + #define ButtonParameters wxEmptyString, wxDefaultPosition, wxSize(60,-1) + #define SizerFlags wxSizerFlags().Border(wxALL, 3).Center() // Buttons @@ -206,45 +206,45 @@ PADManager::PADManager(wxWindow* parent) s_panel->Add(s_round_pad_buttons); s_panel->Add(s_round_stick_r); - this->SetSizerAndFit(s_panel); + SetSizerAndFit(s_panel); - // Connect buttons - m_app_connector.Connect(wxID_ANY, wxEVT_KEY_UP, wxKeyEventHandler(PADManager::OnKeyUp), (wxObject*)0, this); - m_app_connector.Connect(wxID_ANY, wxEVT_KEY_DOWN, wxKeyEventHandler(PADManager::OnKeyDown), (wxObject*)0, this); - Connect(b_up_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_down_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_left_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_right_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + // Bind buttons + wxGetApp().Bind(wxEVT_KEY_UP, &PADManager::OnKeyUp, this); + wxGetApp().Bind(wxEVT_KEY_DOWN, &PADManager::OnKeyDown, this); + b_up_lstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_down_lstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_left_lstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_right_lstick->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_up->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (PADManager::OnButtonClicked)); - Connect(b_down->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_left->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_right->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_up ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_down ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_left ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_right->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_shift_l1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_shift_l2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_shift_l3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_shift_l1->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_shift_l2->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_shift_l3->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_start->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_select->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_start ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_select->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_shift_r1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_shift_r2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_shift_r3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_shift_r1->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_shift_r2->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_shift_r3->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_square->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_cross->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_circle->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_triangle->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_square ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_cross ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_circle ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_triangle->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_up_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_down_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_left_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_right_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_up_rstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_down_rstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_left_rstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_right_rstick->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); - Connect(b_ok->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_reset->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); - Connect(b_cancel->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked)); + b_ok->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_reset->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); + b_cancel->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this); } void PADManager::OnKeyDown(wxKeyEvent &keyEvent) diff --git a/rpcs3/Gui/PADManager.h b/rpcs3/Gui/PADManager.h index 49e7d51943..edc0d3167b 100644 --- a/rpcs3/Gui/PADManager.h +++ b/rpcs3/Gui/PADManager.h @@ -79,7 +79,6 @@ struct PadButtons class PADManager : public wxDialog, PadButtons { private: - AppConnector m_app_connector; u32 m_seconds; u32 m_button_id; bool m_key_pressed, m_emu_paused; diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index cb7a39adbb..a0b285685a 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -22,39 +22,39 @@ RSXDebugger::RSXDebugger(wxWindow* parent) , exit(false) { this->SetBackgroundColour(wxColour(240,240,240)); //This fix the ugly background color under Windows - wxBoxSizer& s_panel = *new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_panel = new wxBoxSizer(wxHORIZONTAL); //Tools - wxBoxSizer& s_tools = *new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_tools = new wxBoxSizer(wxVERTICAL); // Controls - wxStaticBoxSizer& s_controls = *new wxStaticBoxSizer(wxHORIZONTAL, this, "RSX Debugger Controls"); + wxStaticBoxSizer* s_controls = new wxStaticBoxSizer(wxHORIZONTAL, this, "RSX Debugger Controls"); // Controls: Address - wxStaticBoxSizer& s_controls_addr = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Address:"); + wxStaticBoxSizer* s_controls_addr = new wxStaticBoxSizer(wxHORIZONTAL, this, "Address:"); t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60,-1)); t_addr->SetMaxLength(8); - s_controls_addr.Add(t_addr); + s_controls_addr->Add(t_addr); // Controls: Go to - wxStaticBoxSizer& s_controls_goto = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Go to:"); + wxStaticBoxSizer* s_controls_goto = new wxStaticBoxSizer(wxHORIZONTAL, this, "Go to:"); wxButton* b_goto_get = new wxButton(this, wxID_ANY, "Get", wxDefaultPosition, wxSize(40,-1)); wxButton* b_goto_put = new wxButton(this, wxID_ANY, "Put", wxDefaultPosition, wxSize(40,-1)); - s_controls_goto.Add(b_goto_get); - s_controls_goto.Add(b_goto_put); + s_controls_goto->Add(b_goto_get); + s_controls_goto->Add(b_goto_put); // Controls: Breaks - wxStaticBoxSizer& s_controls_breaks = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Break on:"); + wxStaticBoxSizer* s_controls_breaks = new wxStaticBoxSizer(wxHORIZONTAL, this, "Break on:"); wxButton* b_break_frame = new wxButton(this, wxID_ANY, "Frame", wxDefaultPosition, wxSize(60,-1)); wxButton* b_break_text = new wxButton(this, wxID_ANY, "Texture", wxDefaultPosition, wxSize(60,-1)); wxButton* b_break_draw = new wxButton(this, wxID_ANY, "Draw", wxDefaultPosition, wxSize(60,-1)); wxButton* b_break_prim = new wxButton(this, wxID_ANY, "Primitive", wxDefaultPosition, wxSize(60,-1)); wxButton* b_break_inst = new wxButton(this, wxID_ANY, "Command", wxDefaultPosition, wxSize(60,-1)); - s_controls_breaks.Add(b_break_frame); - s_controls_breaks.Add(b_break_text); - s_controls_breaks.Add(b_break_draw); - s_controls_breaks.Add(b_break_prim); - s_controls_breaks.Add(b_break_inst); + s_controls_breaks->Add(b_break_frame); + s_controls_breaks->Add(b_break_text); + s_controls_breaks->Add(b_break_draw); + s_controls_breaks->Add(b_break_prim); + s_controls_breaks->Add(b_break_inst); // TODO: This feature is not yet implemented b_break_frame->Disable(); @@ -63,9 +63,9 @@ RSXDebugger::RSXDebugger(wxWindow* parent) b_break_prim->Disable(); b_break_inst->Disable(); - s_controls.Add(&s_controls_addr); - s_controls.Add(&s_controls_goto); - s_controls.Add(&s_controls_breaks); + s_controls->Add(s_controls_addr); + s_controls->Add(s_controls_goto); + s_controls->Add(s_controls_breaks); //Tabs wxNotebook* nb_rsx = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxSize(482,475)); @@ -134,22 +134,22 @@ RSXDebugger::RSXDebugger(wxWindow* parent) } //Tools: Tools = Controls + Notebook Tabs - s_tools.AddSpacer(10); - s_tools.Add(&s_controls); - s_tools.AddSpacer(10); - s_tools.Add(nb_rsx); - s_tools.AddSpacer(10); + s_tools->AddSpacer(10); + s_tools->Add(s_controls); + s_tools->AddSpacer(10); + s_tools->Add(nb_rsx); + s_tools->AddSpacer(10); //Buffers - wxBoxSizer& s_buffers1 = *new wxBoxSizer(wxVERTICAL); - wxBoxSizer& s_buffers2 = *new wxBoxSizer(wxVERTICAL); - wxStaticBoxSizer& s_buffers_colorA = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer A"); - wxStaticBoxSizer& s_buffers_colorB = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer B"); - wxStaticBoxSizer& s_buffers_colorC = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer C"); - wxStaticBoxSizer& s_buffers_colorD = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer D"); - wxStaticBoxSizer& s_buffers_depth = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Depth Buffer"); - wxStaticBoxSizer& s_buffers_stencil = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Stencil Buffer"); - wxStaticBoxSizer& s_buffers_text = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Texture"); + wxBoxSizer* s_buffers1 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_buffers2 = new wxBoxSizer(wxVERTICAL); + wxStaticBoxSizer* s_buffers_colorA = new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer A"); + wxStaticBoxSizer* s_buffers_colorB = new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer B"); + wxStaticBoxSizer* s_buffers_colorC = new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer C"); + wxStaticBoxSizer* s_buffers_colorD = new wxStaticBoxSizer(wxHORIZONTAL, this, "Color Buffer D"); + wxStaticBoxSizer* s_buffers_depth = new wxStaticBoxSizer(wxHORIZONTAL, this, "Depth Buffer"); + wxStaticBoxSizer* s_buffers_stencil = new wxStaticBoxSizer(wxHORIZONTAL, this, "Stencil Buffer"); + wxStaticBoxSizer* s_buffers_text = new wxStaticBoxSizer(wxHORIZONTAL, this, "Texture"); //Buffers and textures CellVideoOutResolution res = ResolutionTable[ResolutionIdToNum(Ini.GSResolution.GetValue())]; @@ -166,62 +166,62 @@ RSXDebugger::RSXDebugger(wxWindow* parent) p_buffer_depth = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(m_panel_width, m_panel_height)); p_buffer_stencil = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(m_panel_width, m_panel_height)); p_buffer_tex = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(m_text_width, m_text_height)); - s_buffers_colorA.Add(p_buffer_colorA); - s_buffers_colorB.Add(p_buffer_colorB); - s_buffers_colorC.Add(p_buffer_colorC); - s_buffers_colorD.Add(p_buffer_colorD); - s_buffers_depth.Add(p_buffer_depth); - s_buffers_stencil.Add(p_buffer_stencil); - s_buffers_text.Add(p_buffer_tex); + s_buffers_colorA->Add(p_buffer_colorA); + s_buffers_colorB->Add(p_buffer_colorB); + s_buffers_colorC->Add(p_buffer_colorC); + s_buffers_colorD->Add(p_buffer_colorD); + s_buffers_depth->Add(p_buffer_depth); + s_buffers_stencil->Add(p_buffer_stencil); + s_buffers_text->Add(p_buffer_tex); //Merge and display everything - s_buffers1.AddSpacer(10); - s_buffers1.Add(&s_buffers_colorA); - s_buffers1.AddSpacer(10); - s_buffers1.Add(&s_buffers_colorC); - s_buffers1.AddSpacer(10); - s_buffers1.Add(&s_buffers_depth); - s_buffers1.AddSpacer(10); - s_buffers1.Add(&s_buffers_text); - s_buffers1.AddSpacer(10); + s_buffers1->AddSpacer(10); + s_buffers1->Add(s_buffers_colorA); + s_buffers1->AddSpacer(10); + s_buffers1->Add(s_buffers_colorC); + s_buffers1->AddSpacer(10); + s_buffers1->Add(s_buffers_depth); + s_buffers1->AddSpacer(10); + s_buffers1->Add(s_buffers_text); + s_buffers1->AddSpacer(10); - s_buffers2.AddSpacer(10); - s_buffers2.Add(&s_buffers_colorB); - s_buffers2.AddSpacer(10); - s_buffers2.Add(&s_buffers_colorD); - s_buffers2.AddSpacer(10); - s_buffers2.Add(&s_buffers_stencil); - s_buffers2.AddSpacer(10); + s_buffers2->AddSpacer(10); + s_buffers2->Add(s_buffers_colorB); + s_buffers2->AddSpacer(10); + s_buffers2->Add(s_buffers_colorD); + s_buffers2->AddSpacer(10); + s_buffers2->Add(s_buffers_stencil); + s_buffers2->AddSpacer(10); - s_panel.AddSpacer(10); - s_panel.Add(&s_tools); - s_panel.AddSpacer(10); - s_panel.Add(&s_buffers1); - s_panel.AddSpacer(10); - s_panel.Add(&s_buffers2); - s_panel.AddSpacer(10); - SetSizerAndFit(&s_panel); + s_panel->AddSpacer(10); + s_panel->Add(s_tools); + s_panel->AddSpacer(10); + s_panel->Add(s_buffers1); + s_panel->AddSpacer(10); + s_panel->Add(s_buffers2); + s_panel->AddSpacer(10); + SetSizerAndFit(s_panel); //Events - m_app_connector.Connect(wxID_ANY, wxEVT_KEY_DOWN, wxKeyEventHandler(RSXDebugger::OnKeyDown), nullptr, this); - Connect(t_addr->GetId(), wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler(RSXDebugger::OnChangeToolsAddr)); + Bind(wxEVT_KEY_DOWN, &RSXDebugger::OnKeyDown, this); + t_addr->Bind(wxEVT_TEXT_ENTER, &RSXDebugger::OnChangeToolsAddr, this); - Connect(b_goto_get->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RSXDebugger::GoToGet)); - Connect(b_goto_put->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RSXDebugger::GoToPut)); + b_goto_get->Bind(wxEVT_BUTTON, &RSXDebugger::GoToGet, this); + b_goto_put->Bind(wxEVT_BUTTON, &RSXDebugger::GoToPut, this); - p_buffer_colorA->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(RSXDebugger::OnClickBuffer), nullptr, this); - p_buffer_colorB->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(RSXDebugger::OnClickBuffer), nullptr, this); - p_buffer_colorC->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(RSXDebugger::OnClickBuffer), nullptr, this); - p_buffer_colorD->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(RSXDebugger::OnClickBuffer), nullptr, this); - //Connect(p_buffer_depth->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RSXDebugger::OnClickBuffer)); - //Connect(p_buffer_stencil->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(RSXDebugger::OnClickBuffer)); - p_buffer_tex->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(RSXDebugger::OnClickBuffer), nullptr, this); + p_buffer_colorA->Bind(wxEVT_LEFT_DOWN, &RSXDebugger::OnClickBuffer, this); + p_buffer_colorB->Bind(wxEVT_LEFT_DOWN, &RSXDebugger::OnClickBuffer, this); + p_buffer_colorC->Bind(wxEVT_LEFT_DOWN, &RSXDebugger::OnClickBuffer, this); + p_buffer_colorD->Bind(wxEVT_LEFT_DOWN, &RSXDebugger::OnClickBuffer, this); + //p_buffer_depth->Bind(wxEVT_BUTTON, &RSXDebugger::OnClickBuffer, this); + //p_buffer_stencil->Bind(wxEVT_BUTTON, &RSXDebugger::OnClickBuffer, this); + p_buffer_tex->Bind(wxEVT_LEFT_DOWN, &RSXDebugger::OnClickBuffer, this); - m_list_commands->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(RSXDebugger::OnScrollMemory), nullptr, this); - m_list_flags->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(RSXDebugger::SetFlags), nullptr, this); - m_list_programs->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(RSXDebugger::SetPrograms), nullptr, this); + m_list_commands->Bind(wxEVT_MOUSEWHEEL, &RSXDebugger::OnScrollMemory, this); + m_list_flags->Bind(wxEVT_LIST_ITEM_ACTIVATED, &RSXDebugger::SetFlags, this); + m_list_programs->Bind(wxEVT_LIST_ITEM_ACTIVATED, &RSXDebugger::SetPrograms, this); - m_list_texture->Connect(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(RSXDebugger::OnSelectTexture), nullptr, this); + m_list_texture->Bind(wxEVT_LIST_ITEM_ACTIVATED, &RSXDebugger::OnSelectTexture, this); //Fill the frame UpdateInformation(); diff --git a/rpcs3/Gui/RSXDebugger.h b/rpcs3/Gui/RSXDebugger.h index 872735b4db..bcdae7d6cb 100644 --- a/rpcs3/Gui/RSXDebugger.h +++ b/rpcs3/Gui/RSXDebugger.h @@ -21,8 +21,6 @@ extern std::vector m_debug_programs; class RSXDebugger : public wxFrame { - AppConnector m_app_connector; - u32 m_addr; u32 m_panel_width; diff --git a/rpcs3/Gui/RegisterEditor.h b/rpcs3/Gui/RegisterEditor.h index 56557f4b7f..9fac56a567 100644 --- a/rpcs3/Gui/RegisterEditor.h +++ b/rpcs3/Gui/RegisterEditor.h @@ -18,23 +18,23 @@ public: }; RegisterEditorDialog::RegisterEditorDialog(wxPanel *parent, u64 _pc, CPUThread* _CPU, CPUDecoder* _decoder, CPUDisAsm* _disasm) - : wxDialog(parent, wxID_ANY, "Edit registers", wxDefaultPosition) + : wxDialog(parent, wxID_ANY, "Edit registers") , pc(_pc) , CPU(_CPU) , decoder(_decoder) , disasm(_disasm) { - wxBoxSizer* s_panel_margin_x(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_panel_margin_y(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_panel_margin_x = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_panel_margin_y = new wxBoxSizer(wxVERTICAL); - wxBoxSizer* s_panel(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_t1_panel(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_t2_panel(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_t3_panel(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_b_panel(new wxBoxSizer(wxHORIZONTAL)); + wxBoxSizer* s_panel = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* s_t1_panel = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_t2_panel = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_t3_panel = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* s_b_panel = new wxBoxSizer(wxHORIZONTAL); wxStaticText* t1_text = new wxStaticText(this, wxID_ANY, "Register: "); - t1_register = new wxComboBox(this, wxID_ANY, wxEmptyString); + t1_register = new wxComboBox(this, wxID_ANY); wxStaticText* t2_text = new wxStaticText(this, wxID_ANY, "Value (Hex):"); t2_value = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200,-1)); @@ -63,7 +63,7 @@ RegisterEditorDialog::RegisterEditorDialog(wxPanel *parent, u64 _pc, CPUThread* s_panel_margin_x->Add(s_panel_margin_y); s_panel_margin_x->AddSpacer(12); - Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(RegisterEditorDialog::updateRegister)); + Bind(wxEVT_COMBOBOX, &RegisterEditorDialog::updateRegister, this); switch(CPU->GetType()) { diff --git a/rpcs3/Gui/TextInputDialog.cpp b/rpcs3/Gui/TextInputDialog.cpp index d4a42d99e7..071904d779 100644 --- a/rpcs3/Gui/TextInputDialog.cpp +++ b/rpcs3/Gui/TextInputDialog.cpp @@ -2,27 +2,27 @@ #include "TextInputDialog.h" TextInputDialog::TextInputDialog(wxWindow* parent, const std::string& defvalue, const std::string& label) - : wxDialog(parent, wxID_ANY, label, wxDefaultPosition) + : wxDialog(parent, wxID_ANY, label) { m_tctrl_text = new wxTextCtrl(this, wxID_ANY, fmt::ToUTF8(defvalue)); - wxBoxSizer& s_text(*new wxBoxSizer(wxVERTICAL)); - s_text.Add(m_tctrl_text, 1, wxEXPAND); + wxBoxSizer* s_text = new wxBoxSizer(wxVERTICAL); + s_text->Add(m_tctrl_text, 1, wxEXPAND); - wxBoxSizer& s_btns(*new wxBoxSizer(wxHORIZONTAL)); - s_btns.Add(new wxButton(this, wxID_OK)); - s_btns.AddSpacer(30); - s_btns.Add(new wxButton(this, wxID_CANCEL)); + wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL); + s_btns->Add(new wxButton(this, wxID_OK)); + s_btns->AddSpacer(30); + s_btns->Add(new wxButton(this, wxID_CANCEL)); - wxBoxSizer& s_main(*new wxBoxSizer(wxVERTICAL)); - s_main.Add(&s_text, 1, wxEXPAND | wxUP | wxLEFT | wxRIGHT, 5); - s_main.AddSpacer(30); - s_main.Add(&s_btns, 0, wxCENTER | wxDOWN | wxLEFT | wxRIGHT, 5); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(s_text, 1, wxEXPAND | wxUP | wxLEFT | wxRIGHT, 5); + s_main->AddSpacer(30); + s_main->Add(s_btns, 0, wxCENTER | wxDOWN | wxLEFT | wxRIGHT, 5); - SetSizerAndFit(&s_main); + SetSizerAndFit(s_main); SetSize(250, -1); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TextInputDialog::OnOk)); + Bind(wxEVT_BUTTON, &TextInputDialog::OnOk, this); } void TextInputDialog::OnOk(wxCommandEvent& event) diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index 594063645a..d9828ede5d 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -12,34 +12,34 @@ VFSEntrySettingsDialog::VFSEntrySettingsDialog(wxWindow* parent, VFSManagerEntry m_tctrl_mount = new wxTextCtrl(this, wxID_ANY); m_ch_type = new wxChoice(this, wxID_ANY); - wxBoxSizer& s_type(*new wxBoxSizer(wxHORIZONTAL)); - s_type.Add(m_ch_type, 1, wxEXPAND); + wxBoxSizer* s_type = new wxBoxSizer(wxHORIZONTAL); + s_type->Add(m_ch_type, 1, wxEXPAND); - wxBoxSizer& s_dev_path(*new wxBoxSizer(wxHORIZONTAL)); - s_dev_path.Add(m_tctrl_dev_path, 1, wxEXPAND); - s_dev_path.Add(m_btn_select_dev_path, 0, wxLEFT, 5); + wxBoxSizer* s_dev_path = new wxBoxSizer(wxHORIZONTAL); + s_dev_path->Add(m_tctrl_dev_path, 1, wxEXPAND); + s_dev_path->Add(m_btn_select_dev_path, 0, wxLEFT, 5); - wxBoxSizer& s_path(*new wxBoxSizer(wxHORIZONTAL)); - s_path.Add(m_tctrl_path, 1, wxEXPAND); - s_path.Add(m_btn_select_path, 0, wxLEFT, 5); + wxBoxSizer* s_path = new wxBoxSizer(wxHORIZONTAL); + s_path->Add(m_tctrl_path, 1, wxEXPAND); + s_path->Add(m_btn_select_path, 0, wxLEFT, 5); - wxBoxSizer& s_mount(*new wxBoxSizer(wxHORIZONTAL)); - s_mount.Add(m_tctrl_mount, 1, wxEXPAND); + wxBoxSizer* s_mount = new wxBoxSizer(wxHORIZONTAL); + s_mount->Add(m_tctrl_mount, 1, wxEXPAND); - wxBoxSizer& s_btns(*new wxBoxSizer(wxHORIZONTAL)); - s_btns.Add(new wxButton(this, wxID_OK)); - s_btns.AddSpacer(30); - s_btns.Add(new wxButton(this, wxID_CANCEL)); + wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL); + s_btns->Add(new wxButton(this, wxID_OK)); + s_btns->AddSpacer(30); + s_btns->Add(new wxButton(this, wxID_CANCEL)); - wxBoxSizer& s_main(*new wxBoxSizer(wxVERTICAL)); - s_main.Add(&s_type, 1, wxEXPAND | wxALL, 10); - s_main.Add(&s_dev_path, 1, wxEXPAND | wxALL, 10); - s_main.Add(&s_path, 1, wxEXPAND | wxALL, 10); - s_main.Add(&s_mount, 1, wxEXPAND | wxALL, 10); - s_main.AddSpacer(10); - s_main.Add(&s_btns, 0, wxALL | wxCENTER, 10); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(s_type, 1, wxEXPAND | wxALL, 10); + s_main->Add(s_dev_path, 1, wxEXPAND | wxALL, 10); + s_main->Add(s_path, 1, wxEXPAND | wxALL, 10); + s_main->Add(s_mount, 1, wxEXPAND | wxALL, 10); + s_main->AddSpacer(10); + s_main->Add(s_btns, 0, wxALL | wxCENTER, 10); - SetSizerAndFit(&s_main); + SetSizerAndFit(s_main); SetSize(350, -1); @@ -48,10 +48,11 @@ VFSEntrySettingsDialog::VFSEntrySettingsDialog(wxWindow* parent, VFSManagerEntry m_ch_type->Append(i); } - Connect(m_ch_type->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(VFSEntrySettingsDialog::OnSelectType)); - Connect(m_btn_select_path->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(VFSEntrySettingsDialog::OnSelectPath)); - Connect(m_btn_select_dev_path->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(VFSEntrySettingsDialog::OnSelectDevPath)); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(VFSEntrySettingsDialog::OnOk)); + + m_ch_type->Bind(wxEVT_CHOICE, &VFSEntrySettingsDialog::OnSelectType, this); + m_btn_select_path->Bind(wxEVT_BUTTON, &VFSEntrySettingsDialog::OnSelectPath, this); + m_btn_select_dev_path->Bind(wxEVT_BUTTON, &VFSEntrySettingsDialog::OnSelectDevPath, this); + Bind(wxEVT_BUTTON, &VFSEntrySettingsDialog::OnOk, this, wxID_OK); m_tctrl_dev_path->SetValue(m_entry.device_path); m_tctrl_path->SetValue(m_entry.path); @@ -115,10 +116,10 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) { m_list = new wxListView(this); - wxBoxSizer& s_main(*new wxBoxSizer(wxVERTICAL)); - s_main.Add(m_list, 1, wxEXPAND); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(m_list, 1, wxEXPAND); - SetSizerAndFit(&s_main); + SetSizerAndFit(s_main); SetSize(800, 600); m_list->InsertColumn(0, "Path"); @@ -126,12 +127,12 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent) m_list->InsertColumn(2, "Path to Device"); m_list->InsertColumn(3, "Device"); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxCommandEventHandler(VFSManagerDialog::OnEntryConfig)); - Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VFSManagerDialog::OnRightClick)); - Connect(id_add, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VFSManagerDialog::OnAdd)); - Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VFSManagerDialog::OnRemove)); - Connect(id_config, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VFSManagerDialog::OnEntryConfig)); - Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VFSManagerDialog::OnClose)); + m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VFSManagerDialog::OnEntryConfig, this); + m_list->Bind(wxEVT_RIGHT_DOWN, &VFSManagerDialog::OnRightClick, this); + Bind(wxEVT_MENU, &VFSManagerDialog::OnAdd, this, id_add); + Bind(wxEVT_MENU, &VFSManagerDialog::OnRemove, this, id_remove); + Bind(wxEVT_MENU, &VFSManagerDialog::OnEntryConfig, this, id_config); + Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this); LoadEntries(); UpdateList(); @@ -165,7 +166,7 @@ void VFSManagerDialog::OnEntryConfig(wxCommandEvent& event) } } -void VFSManagerDialog::OnRightClick(wxCommandEvent& event) +void VFSManagerDialog::OnRightClick(wxMouseEvent& event) { wxMenu* menu = new wxMenu(); int idx = m_list->GetFirstSelected(); @@ -175,7 +176,7 @@ void VFSManagerDialog::OnRightClick(wxCommandEvent& event) menu->AppendSeparator(); menu->Append(id_config, "Config")->Enable(idx != wxNOT_FOUND); - PopupMenu( menu ); + PopupMenu(menu); } void VFSManagerDialog::OnAdd(wxCommandEvent& event) diff --git a/rpcs3/Gui/VFSManager.h b/rpcs3/Gui/VFSManager.h index a14358ae42..309f9882e1 100644 --- a/rpcs3/Gui/VFSManager.h +++ b/rpcs3/Gui/VFSManager.h @@ -29,7 +29,7 @@ public: void UpdateList(); void OnEntryConfig(wxCommandEvent& event); - void OnRightClick(wxCommandEvent& event); + void OnRightClick(wxMouseEvent& event); void OnAdd(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index 6683715d81..57d7daca8b 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -57,9 +57,9 @@ VHDDExplorer::VHDDExplorer(wxWindow* parent, const std::string& hdd_path) : wxDi m_list->SetDropTarget(m_drop_target); m_list->DragAcceptFiles(true); - wxBoxSizer& s_main(*new wxBoxSizer(wxVERTICAL)); - s_main.Add(m_list, 1, wxEXPAND | wxALL, 5); - SetSizerAndFit(&s_main); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(m_list, 1, wxEXPAND | wxALL, 5); + SetSizerAndFit(s_main); SetSize(800, 600); m_list->InsertColumn(0, "Name"); @@ -69,18 +69,18 @@ VHDDExplorer::VHDDExplorer(wxWindow* parent, const std::string& hdd_path) : wxDi m_hdd = new vfsHDD(nullptr, hdd_path); UpdateList(); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEventHandler(VHDDExplorer::OnListDrag)); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(VHDDExplorer::DClick)); - Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VHDDExplorer::OnContextMenu)); - m_list->Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(VHDDExplorer::OnDropFiles), (wxObject*)0, this); + m_list->Bind(wxEVT_LIST_BEGIN_DRAG, &VHDDExplorer::OnListDrag, this); + m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VHDDExplorer::DClick, this); + m_list->Bind(wxEVT_RIGHT_DOWN, &VHDDExplorer::OnContextMenu, this); + m_list->Bind(wxEVT_DROP_FILES, &VHDDExplorer::OnDropFiles, this); - Connect(id_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnOpen)); - Connect(id_rename, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnRename)); - Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnRemove)); - Connect(id_create_dir, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnCreateDir)); - Connect(id_create_file, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnCreateFile)); - Connect(id_import, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnImport)); - Connect(id_export, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnExport)); + Bind(wxEVT_MENU, &VHDDExplorer::OnOpen, this, id_open); + Bind(wxEVT_MENU, &VHDDExplorer::OnRename, this, id_rename); + Bind(wxEVT_MENU, &VHDDExplorer::OnRemove, this, id_remove); + Bind(wxEVT_MENU, &VHDDExplorer::OnCreateDir, this, id_create_dir); + Bind(wxEVT_MENU, &VHDDExplorer::OnCreateFile, this, id_create_file); + Bind(wxEVT_MENU, &VHDDExplorer::OnImport, this, id_import); + Bind(wxEVT_MENU, &VHDDExplorer::OnExport, this, id_export); } void VHDDExplorer::UpdateList() @@ -200,7 +200,7 @@ void VHDDExplorer::DClick(wxListEvent& event) OpenDir(event.GetIndex()); } -void VHDDExplorer::OnContextMenu(wxCommandEvent& event) +void VHDDExplorer::OnContextMenu(wxMouseEvent& event) { wxMenu* menu = new wxMenu(); int idx = m_list->GetFirstSelected(); @@ -215,7 +215,7 @@ void VHDDExplorer::OnContextMenu(wxCommandEvent& event) menu->Append(id_import, "Import"); menu->Append(id_export, "Export")->Enable(idx != wxNOT_FOUND); - PopupMenu( menu ); + PopupMenu(menu); } void VHDDExplorer::OnOpen(wxCommandEvent& event) @@ -319,28 +319,28 @@ void VHDDExplorer::OnExport(wxCommandEvent& event) UpdateList(); } -VHDDSetInfoDialog::VHDDSetInfoDialog(wxWindow* parent) : wxDialog(parent, wxID_ANY, "HDD Settings", wxDefaultPosition) +VHDDSetInfoDialog::VHDDSetInfoDialog(wxWindow* parent) : wxDialog(parent, wxID_ANY, "HDD Settings") { m_spin_size = new wxSpinCtrl(this); m_ch_type = new wxChoice(this, wxID_ANY); m_spin_block_size = new wxSpinCtrl(this); - wxBoxSizer& s_sinf(*new wxBoxSizer(wxHORIZONTAL)); - s_sinf.Add(m_spin_size, wxSizerFlags().Border(wxALL, 5).Expand()); - s_sinf.Add(m_ch_type, wxSizerFlags().Border(wxALL, 5).Expand()); + wxBoxSizer* s_sinf = new wxBoxSizer(wxHORIZONTAL); + s_sinf->Add(m_spin_size, wxSizerFlags().Border(wxALL, 5).Expand()); + s_sinf->Add(m_ch_type, wxSizerFlags().Border(wxALL, 5).Expand()); - wxBoxSizer& s_binf(*new wxBoxSizer(wxHORIZONTAL)); - s_binf.Add(m_spin_block_size, wxSizerFlags().Border(wxALL, 5).Expand()); + wxBoxSizer* s_binf = new wxBoxSizer(wxHORIZONTAL); + s_binf->Add(m_spin_block_size, wxSizerFlags().Border(wxALL, 5).Expand()); - wxBoxSizer& s_btns(*new wxBoxSizer(wxHORIZONTAL)); - s_btns.Add(new wxButton(this, wxID_OK), wxSizerFlags().Align(wxALIGN_LEFT).Border(wxALL, 5)); - s_btns.Add(new wxButton(this, wxID_CANCEL), wxSizerFlags().Align(wxALIGN_RIGHT).Border(wxALL, 5)); + wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL); + s_btns->Add(new wxButton(this, wxID_OK), wxSizerFlags().Align(wxALIGN_LEFT).Border(wxALL, 5)); + s_btns->Add(new wxButton(this, wxID_CANCEL), wxSizerFlags().Align(wxALIGN_RIGHT).Border(wxALL, 5)); - wxBoxSizer& s_main(*new wxBoxSizer(wxVERTICAL)); - s_main.Add(&s_sinf, wxSizerFlags().Align(wxALIGN_TOP).Expand()); - s_main.Add(&s_binf, wxSizerFlags().Align(wxALIGN_TOP).Expand()); - s_main.Add(&s_btns, wxSizerFlags().Align(wxALIGN_BOTTOM).Expand()); - SetSizerAndFit(&s_main); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(s_sinf, wxSizerFlags().Align(wxALIGN_TOP).Expand()); + s_main->Add(s_binf, wxSizerFlags().Align(wxALIGN_TOP).Expand()); + s_main->Add(s_btns, wxSizerFlags().Align(wxALIGN_BOTTOM).Expand()); + SetSizerAndFit(s_main); m_ch_type->Append("B"); m_ch_type->Append("KB"); @@ -352,7 +352,8 @@ VHDDSetInfoDialog::VHDDSetInfoDialog(wxWindow* parent) : wxDialog(parent, wxID_A m_ch_type->SetSelection(3); m_spin_block_size->SetRange(64, 0x7fffffff); m_spin_block_size->SetValue(2048); - Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(VHDDSetInfoDialog::OnOk)); + + Bind(wxEVT_BUTTON, &VHDDSetInfoDialog::OnOk, this, wxID_OK); } void VHDDSetInfoDialog::OnOk(wxCommandEvent& event) @@ -376,27 +377,28 @@ void VHDDSetInfoDialog::GetResult(u64& size, u64& block_size) } VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) - : wxDialog(parent, wxID_ANY, "Virtual HDD Manager", wxDefaultPosition) + : wxDialog(parent, wxID_ANY, "Virtual HDD Manager") { m_list = new wxListView(this); - wxBoxSizer& s_main(*new wxBoxSizer(wxVERTICAL)); - s_main.Add(m_list, 1, wxEXPAND | wxALL, 5); + wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL); + s_main->Add(m_list, 1, wxEXPAND | wxALL, 5); - SetSizerAndFit(&s_main); + SetSizerAndFit(s_main); SetSize(800, 600); m_list->InsertColumn(0, "Path"); //m_list->InsertColumn(1, "Size"); //m_list->InsertColumn(2, "Block size"); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(VHDDManagerDialog::DClick)); - Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VHDDManagerDialog::OnContextMenu)); - Connect(id_add_hdd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::AddHDD)); - Connect(id_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnOpen)); - Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnRemove)); - Connect(id_create_hdd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnCreateHDD)); - Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VHDDManagerDialog::OnClose)); + m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VHDDManagerDialog::DClick, this); + m_list->Bind(wxEVT_RIGHT_DOWN, &VHDDManagerDialog::OnContextMenu, this); + + Bind(wxEVT_MENU, &VHDDManagerDialog::AddHDD, this, id_add_hdd); + Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open); + Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove); + Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd); + Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this); LoadPaths(); UpdateList(); } @@ -461,7 +463,7 @@ void VHDDManagerDialog::AddHDD(wxCommandEvent& event) UpdateList(); } -void VHDDManagerDialog::OnContextMenu(wxCommandEvent& event) +void VHDDManagerDialog::OnContextMenu(wxMouseEvent& event) { wxMenu* menu = new wxMenu(); int idx = m_list->GetFirstSelected(); diff --git a/rpcs3/Gui/VHDDManager.h b/rpcs3/Gui/VHDDManager.h index e598a10161..aec9f55fc4 100644 --- a/rpcs3/Gui/VHDDManager.h +++ b/rpcs3/Gui/VHDDManager.h @@ -38,7 +38,7 @@ public: void OnDropFiles(wxDropFilesEvent& event); void OpenDir(int sel); void DClick(wxListEvent& event); - void OnContextMenu(wxCommandEvent& event); + void OnContextMenu(wxMouseEvent& event); void OnOpen(wxCommandEvent& event); void OnRename(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); @@ -77,7 +77,7 @@ public: void Open(int sel); void DClick(wxListEvent& event); void AddHDD(wxCommandEvent& event); - void OnContextMenu(wxCommandEvent& event); + void OnContextMenu(wxMouseEvent& event); void OnOpen(wxCommandEvent& event); void OnRemove(wxCommandEvent& event); void OnCreateHDD(wxCommandEvent& event); diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index e46eea3d9a..3bf28ccc5e 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -11,7 +11,7 @@ #include #endif -const wxEventType wxEVT_DBG_COMMAND = wxNewEventType(); +wxDEFINE_EVENT(wxEVT_DBG_COMMAND, wxCommandEvent); IMPLEMENT_APP(Rpcs3App) Rpcs3App* TheApp; @@ -82,4 +82,4 @@ CPUThread& GetCPU(const u8 core) return Emu.GetCPU().Get(core); }*/ -GameInfo CurGameInfo; \ No newline at end of file +GameInfo CurGameInfo; diff --git a/rpcs3/rpcs3.h b/rpcs3/rpcs3.h index d68d3d03d5..5727484759 100644 --- a/rpcs3/rpcs3.h +++ b/rpcs3/rpcs3.h @@ -12,7 +12,7 @@ template T max(const T a, const T b) { return a > b ? a : b; } template T re(const T val) { T res; se_t::func(res, val); return res; } template void re(T1& dst, const T2 val) { se_t::func(dst, val); } -extern const wxEventType wxEVT_DBG_COMMAND; +wxDECLARE_EVENT(wxEVT_DBG_COMMAND, wxCommandEvent); enum DbgCommand { diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 6a5a0f9b2e..4b53458454 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -292,7 +292,6 @@ - @@ -462,7 +461,6 @@ - diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 8546e9b72f..45d74aa2c1 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -244,9 +244,6 @@ Gui - - rpcs3 - Emu\Cell @@ -822,9 +819,6 @@ Emu\SysCalls - - rpcs3 - Emu\ARMv7 diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index b8492794c4..1622c29110 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -279,7 +279,6 @@ enum Status #include "Utilities/IdManager.h" #include "Utilities/StrFmt.h" -#include "AppConnector.h" #include "Emu/SysCalls/Callback.h" #include "Ini.h"