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

Merge pull request #4442 from lioncash/param 

CodeWindow: Remove unused constructor parameter
This commit is contained in:
Mat M 2016-11-11 13:58:33 -05:00 committed by GitHub
parent e8af48adfc cd9520f458
commit fbfce2a043
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -51,11 +51,9 @@
#include "DolphinWX/Globals.h" #include "DolphinWX/Globals.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
CCodeWindow::CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame* parent, wxWindowID id, CCodeWindow::CCodeWindow(CFrame* parent, wxWindowID id, const wxPoint& position, const wxSize& size,
const wxPoint& position, const wxSize& size, long style, long style, const wxString& name)
const wxString& name) : wxPanel(parent, id, position, size, style, name), Parent(parent)
: wxPanel(parent, id, position, size, style, name), m_sibling_panels(), Parent(parent),
codeview(nullptr)
{ {
DebugInterface* di = &PowerPC::debug_interface; DebugInterface* di = &PowerPC::debug_interface;

9
Source/Core/DolphinWX/Debugger/CodeWindow.h
View File

@ -75,9 +75,10 @@ struct DebugPanelToID<GFXDebuggerPanel>
class CCodeWindow : public wxPanel class CCodeWindow : public wxPanel
{ {
public: public:
CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame* parent, wxWindowID id = wxID_ANY, explicit CCodeWindow(CFrame* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxBORDER_NONE, const wxString& name = _("Code")); long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
const wxString& name = _("Code"));
~CCodeWindow(); ~CCodeWindow();
void Load(); void Load();
@ -156,7 +157,7 @@ private:
// Sibling debugger panels // Sibling debugger panels
// FIXME: This obviously belongs in some manager class above this one. // FIXME: This obviously belongs in some manager class above this one.
std::array<wxPanel*, IDM_DEBUG_WINDOW_LIST_END - IDM_DEBUG_WINDOW_LIST_START> m_sibling_panels; std::array<wxPanel*, IDM_DEBUG_WINDOW_LIST_END - IDM_DEBUG_WINDOW_LIST_START> m_sibling_panels{};
CFrame* Parent; CFrame* Parent;
CCodeView* codeview; CCodeView* codeview;

2
Source/Core/DolphinWX/Frame.cpp
View File

@ -324,7 +324,7 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo
// Debugger class // Debugger class
if (UseDebugger) if (UseDebugger)
{ {
g_pCodeWindow = new CCodeWindow(SConfig::GetInstance(), this, IDM_CODE_WINDOW); g_pCodeWindow = new CCodeWindow(this, IDM_CODE_WINDOW);
LoadIniPerspectives(); LoadIniPerspectives();
g_pCodeWindow->Load(); g_pCodeWindow->Load();
} }