improved the new way of doing aboutboxes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@789 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-10-07 19:17:15 +00:00
parent 5cacbf97b7
commit d11f42c329
5 changed files with 21 additions and 24 deletions

View File

@ -18,7 +18,6 @@
#include "ConfigDlg.h"
#include "../PadSimple.h"
#include <wx/aboutdlg.h>
#ifdef _WIN32
#include "../DirectInputBase.h"
@ -95,8 +94,7 @@ inline void AddControl(wxPanel *pan, wxButton **button, wxStaticBoxSizer *sizer,
}
void ConfigDialog::CreateGUIControls()
{
wxButton* AboutButton;
{
// Notebook
m_Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
@ -112,13 +110,13 @@ void ConfigDialog::CreateGUIControls()
// Standard buttons
m_Close = new wxButton(this, ID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
AboutButton = new wxButton(this, ID_PAD_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_About = new wxButton(this, ID_PAD_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Put notebook and standard buttons in sizers
wxBoxSizer* sSButtons;
sSButtons = new wxBoxSizer(wxHORIZONTAL);
sSButtons->Add(m_About,0,wxALL, 5);
sSButtons->Add(0, 0, 1, wxEXPAND, 5);
sSButtons->Add(AboutButton,0,wxALL, 5);
sSButtons->Add(m_Close, 0, wxALL, 5);
wxBoxSizer* sMain;
@ -210,7 +208,6 @@ void ConfigDialog::CreateGUIControls()
sPage[i]->Add(sStick[i], wxGBPosition(1, 2), wxGBSpan(2, 1), wxALL, 1);
sPage[i]->Add(sDPad[i], wxGBPosition(1, 3), wxGBSpan(2, 1), wxALL, 1);
sPage[i]->Add(sCStick[i], wxGBPosition(1, 4), wxGBSpan(2, 1), wxALL, 1);
sPage[i]->Add(AboutButton,wxGBPosition(5,1),wxGBSpan(1, 1),wxALL,5);
m_Controller[i]->SetSizer(sPage[i]);
sPage[i]->Layout();