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 #2117 from lioncash/id 

DolphinWX: Remove unnecessary control IDs
This commit is contained in:
skidau 2015-02-26 12:49:07 +11:00
parent 7408de7e79 30c91a3003
commit f71f376371
9 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
View File

@ -89,7 +89,7 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
mem_panel->SetSizer(mem_sizer); mem_panel->SetSizer(mem_sizer);
m_MainNotebook->AddPage(mem_panel, _("Memory")); m_MainNotebook->AddPage(mem_panel, _("Memory"));
m_Regs = new DSPRegisterView(this, ID_DSP_REGS); m_Regs = new DSPRegisterView(this);
// add the panes to the manager // add the panes to the manager
m_mgr.AddPane(m_Toolbar, wxAuiPaneInfo(). m_mgr.AddPane(m_Toolbar, wxAuiPaneInfo().

1
Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
View File

@ -36,7 +36,6 @@ private:
ID_RUNTOOL, ID_RUNTOOL,
ID_STEPTOOL, ID_STEPTOOL,
ID_SHOWPCTOOL, ID_SHOWPCTOOL,
ID_DSP_REGS
}; };
DSPDebugInterface debug_interface; DSPDebugInterface debug_interface;

2
Source/Core/DolphinWX/Debugger/DSPRegisterView.h
View File

@ -42,6 +42,6 @@ public:
class DSPRegisterView : public wxGrid class DSPRegisterView : public wxGrid
{ {
public: public:
DSPRegisterView(wxWindow* parent, wxWindowID id); DSPRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY);
void Update() override; void Update() override;
}; };

2
Source/Core/DolphinWX/Debugger/RegisterView.h
View File

@ -69,7 +69,7 @@ private:
class CRegisterView : public wxGrid class CRegisterView : public wxGrid
{ {
public: public:
CRegisterView(wxWindow* parent, wxWindowID id); CRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY);
void Update() override; void Update() override;
void OnMouseDownR(wxGridEvent& event); void OnMouseDownR(wxGridEvent& event);
void OnPopupMenu(wxCommandEvent& event); void OnPopupMenu(wxCommandEvent& event);

2
Source/Core/DolphinWX/Debugger/RegisterWindow.cpp
View File

@ -27,7 +27,7 @@ CRegisterWindow::CRegisterWindow(wxWindow* parent, wxWindowID id,
void CRegisterWindow::CreateGUIControls() void CRegisterWindow::CreateGUIControls()
{ {
wxBoxSizer *sGrid = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sGrid = new wxBoxSizer(wxVERTICAL);
m_GPRGridView = new CRegisterView(this, ID_GPR); m_GPRGridView = new CRegisterView(this);
sGrid->Add(m_GPRGridView, 1, wxGROW); sGrid->Add(m_GPRGridView, 1, wxGROW);
SetSizer(sGrid); SetSizer(sGrid);

5
Source/Core/DolphinWX/Debugger/RegisterWindow.h
View File

@ -28,11 +28,6 @@ public:
void NotifyUpdate(); void NotifyUpdate();
private: private:
enum
{
ID_GPR = 1002
};
CRegisterView* m_GPRGridView; CRegisterView* m_GPRGridView;
void CreateGUIControls(); void CreateGUIControls();
}; };

2
Source/Core/DolphinWX/Debugger/WatchView.h
View File

@ -44,7 +44,7 @@ private:
class CWatchView : public wxGrid class CWatchView : public wxGrid
{ {
public: public:
CWatchView(wxWindow* parent, wxWindowID id); CWatchView(wxWindow* parent, wxWindowID id = wxID_ANY);
void Update() override; void Update() override;
void OnMouseDownR(wxGridEvent& event); void OnMouseDownR(wxGridEvent& event);
void OnPopupMenu(wxCommandEvent& event); void OnPopupMenu(wxCommandEvent& event);

2
Source/Core/DolphinWX/Debugger/WatchWindow.cpp
View File

@ -71,7 +71,7 @@ CWatchWindow::CWatchWindow(wxWindow* parent, wxWindowID id,
m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); m_mgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
wxBoxSizer *sGrid = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sGrid = new wxBoxSizer(wxVERTICAL);
m_GPRGridView = new CWatchView(this, ID_GPR); m_GPRGridView = new CWatchView(this);
sGrid->Add(m_GPRGridView, 1, wxGROW); sGrid->Add(m_GPRGridView, 1, wxGROW);
SetSizer(sGrid); SetSizer(sGrid);

5
Source/Core/DolphinWX/Debugger/WatchWindow.h
View File

@ -36,11 +36,6 @@ public:
private: private:
wxAuiManager m_mgr; wxAuiManager m_mgr;
enum
{
ID_GPR = 1002
};
CWatchView* m_GPRGridView; CWatchView* m_GPRGridView;
void CreateGUIControls(); void CreateGUIControls();
}; };