merge the general and core configmain pages into "main" page, now it doesn't open onto a totally useless page ;)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1769 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-01-04 21:29:23 +00:00
parent 34cad180e8
commit 1ed27a4fc1
2 changed files with 26 additions and 45 deletions

View File

@ -44,20 +44,18 @@ class CConfigMain
private:
DECLARE_EVENT_TABLE();
DECLARE_EVENT_TABLE();
wxBoxSizer* sGeneralPage; // General Settings
wxCheckBox* ConfirmStop;
wxBoxSizer* sCore; // Core settings
wxStaticBoxSizer* sbBasic, *sbAdvanced, *sbInterface;
wxCheckBox* AllwaysHLEBIOS;
wxCheckBox* UseDynaRec;
wxCheckBox* UseDualCore;
wxCheckBox* LockThreads;
wxCheckBox* OptimizeQuantizers;
wxCheckBox* SkipIdle;
wxCheckBox* EnableCheats;
wxCheckBox* ConfirmStop;
wxCheckBox* AllwaysHLEBIOS;
wxCheckBox* UseDynaRec;
wxCheckBox* LockThreads;
wxCheckBox* OptimizeQuantizers;
wxBoxSizer* sGamecube; // GC settings
wxStaticBoxSizer* sbGamecubeIPLSettings;
@ -83,7 +81,7 @@ class CConfigMain
wxNotebook *Notebook;
wxPanel *GeneralPage;
wxPanel *CorePage;
wxPanel *MainPage;
wxPanel *GamecubePage;
wxPanel *WiiPage;
wxPanel *PathsPage;