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

- Mac build fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7439 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
gnick79 2011-04-06 15:51:55 +00:00
parent d5c4976532
commit 41915b2aff
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
View File

@ -923,11 +923,7 @@ void VideoConfigDiag::SetUIValuesFromConfig()
case sizeof(bool): if (cur_vconfig.UI_State.member) ((SettingCheckBox*)p)->Set3StateValue((wxCheckBoxState)*(bool*)m);\
else ((SettingCheckBox*)p)->Set3StateValue(wxCHK_UNDETERMINED); break;\
case sizeof(int): if (cur_vconfig.UI_State.member) ((IntSettingChoice*)p)->SetSelection(*(int*)m + inc);\
else ((IntSettingChoice*)p)->SetSelection(0); break;\
case sizeof(std::string): if (cur_vconfig.UI_State.member) {\
if ((*(std::string*)m).empty()) ((StringSettingChoice*)p)->SetSelection(inc);\
else ((StringSettingChoice*)p)->SetStringSelection(wxString::FromAscii((*(std::string*)m).c_str())); }\
else ((StringSettingChoice*)p)->SetSelection(0); break; } }
else ((IntSettingChoice*)p)->SetSelection(0); break; } }
if (choice_adapter) SET_CHOICE(choice_adapter, iAdapter);
SET_CHOICE(choice_aspect, iAspectRatio);
@ -990,5 +986,14 @@ void VideoConfigDiag::SetUIValuesFromConfig()
SET_CHOICE(dlcache, bDlistCachingEnable);
SET_CHOICE(ompdecoder, bOMPDecoder);
SET_CHOICE(hotkeys, bOSDHotKey);
if (choice_ppshader) SET_CHOICE(choice_ppshader, sPostProcessingShader);
if (choice_ppshader)
{
std::string m = cur_vconfig.sPostProcessingShader;
if (cur_vconfig.UI_State.sPostProcessingShader)
{
if (m.empty()) choice_ppshader->SetSelection(inc);
else choice_ppshader->SetStringSelection(wxString::FromAscii(m.c_str()));
}
else choice_ppshader->SetSelection(0);
}
}