Some internal code shuffling for Config dialogs. OSX seems to be picky about when StaticSizerBoxes are created, as described in Issue 2229.

Bit of cleanup/grouping, control creation is now a bit more separate from value setting and tooltip assignment which IMO cluttered the code as it was.
Removed something from main.cpp that looked like a hack to me.
Fixes Issue 2229

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5021 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st
2010-02-06 16:20:54 +00:00
parent 811cfb059e
commit f3868dd491
9 changed files with 441 additions and 341 deletions

View File

@ -68,8 +68,6 @@ class GFXConfigDialogOGL : public wxDialog
void AddWindowReso(const char *reso);
void CreateGUIControls();
void GameIniLoad();
// Combo box lists, this one needs to be public
wxArrayString arrayStringFor_FullscreenCB;
private:
DECLARE_EVENT_TABLE();
@ -109,13 +107,9 @@ class GFXConfigDialogOGL : public wxDialog
#ifndef _WIN32
wxCheckBox *m_HideCursor;
#endif
wxArrayString arrayStringFor_WindowResolutionCB;
wxComboBox *m_WindowResolutionCB;
wxComboBox *m_WindowFSResolutionCB;
wxArrayString arrayStringFor_MaxAnisotropyCB;
wxChoice *m_MaxAnisotropyCB;
wxArrayString arrayStringFor_MSAAModeCB, arrayStringFor_PhackvalueCB;
wxArrayString arrayStringFor_PostShaderCB;
wxChoice *m_MSAAModeCB, *m_PhackvalueCB, *m_PostShaderCB, *m_KeepAR;
wxCheckBox *m_ShowFPS;
@ -146,6 +140,14 @@ class GFXConfigDialogOGL : public wxDialog
wxSlider *m_SliderWidth, *m_SliderHeight, *m_SliderLeft, *m_SliderTop;
wxCheckBox *m_ScreenSize;
wxArrayString arrayStringFor_WindowResolutionCB;
wxArrayString arrayStringFor_FullscreenCB;
wxArrayString arrayStringFor_AspectRatio;
wxArrayString arrayStringFor_MaxAnisotropyCB;
wxArrayString arrayStringFor_MSAAModeCB;
wxArrayString arrayStringFor_PhackvalueCB;
wxArrayString arrayStringFor_PostShaderCB;
enum
{
ID_CLOSE = 1000,
@ -217,6 +219,11 @@ class GFXConfigDialogOGL : public wxDialog
ID_EDITSHADER,
};
void LoadShaders();
void InitializeGUILists();
void InitializeGUIValues();
void InitializeGUITooltips();
void OnClose(wxCloseEvent& event);
void UpdateGUI();
void UpdateHack();