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

CheatsWindow: Remove unnecessary wxPanel in the wxDialog 

We can simply size the controls within the dialog directly.
This commit is contained in:
Lioncash 2014-10-18 21:12:44 -04:00
parent f0769233e6
commit 90eaf9519c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
View File

@ -67,10 +67,8 @@ wxCheatsWindow::~wxCheatsWindow()
void wxCheatsWindow::Init_ChildControls() void wxCheatsWindow::Init_ChildControls()
{ {
wxPanel* const panel = new wxPanel(this);
// Main Notebook // Main Notebook
m_notebook_main = new wxNotebook(panel, wxID_ANY); m_notebook_main = new wxNotebook(this, wxID_ANY);
// --- Tabs --- // --- Tabs ---
// Cheats List Tab // Cheats List Tab
@ -130,9 +128,9 @@ void wxCheatsWindow::Init_ChildControls()
m_notebook_main->AddPage(m_tab_log, _("Logging")); m_notebook_main->AddPage(m_tab_log, _("Logging"));
// Button Strip // Button Strip
m_button_apply = new wxButton(panel, wxID_APPLY, _("Apply")); m_button_apply = new wxButton(this, wxID_APPLY, _("Apply"));
m_button_apply->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this); m_button_apply->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this);
wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel")); wxButton* const button_cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
button_cancel->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ButtonClose_Press, this); button_cancel->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ButtonClose_Press, this);
Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this); Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this);
@ -145,11 +143,7 @@ void wxCheatsWindow::Init_ChildControls()
wxBoxSizer* const sMain = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const sMain = new wxBoxSizer(wxVERTICAL);
sMain->Add(m_notebook_main, 1, wxEXPAND|wxALL, 5); sMain->Add(m_notebook_main, 1, wxEXPAND|wxALL, 5);
sMain->Add(sButtons, 0, wxRIGHT | wxBOTTOM | wxALIGN_RIGHT, 5); sMain->Add(sButtons, 0, wxRIGHT | wxBOTTOM | wxALIGN_RIGHT, 5);
panel->SetSizerAndFit(sMain); SetSizerAndFit(sMain);
wxBoxSizer* const frame_szr = new wxBoxSizer(wxVERTICAL);
frame_szr->Add(panel, 1, wxEXPAND);
SetSizerAndFit(frame_szr);
} }
void wxCheatsWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED (event)) void wxCheatsWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED (event))