Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configuration dialog now shows 'Built-in video' for machines with build in video.

Browse source
This commit is contained in:
SarahW 2018-02-24 18:29:47 +00:00
commit 3a369bd3f6
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/wx-config.c
View file

@ -82,6 +82,16 @@ static void recalc_vid_list(void* hdlg, int model)
wx_sendmessage(h, WX_CB_RESETCONTENT, 0, 0); wx_sendmessage(h, WX_CB_RESETCONTENT, 0, 0);
wx_sendmessage(h, WX_CB_SETCURSEL, 0, 0); wx_sendmessage(h, WX_CB_SETCURSEL, 0, 0);
if (models[model].fixed_gfxcard)
{
wx_sendmessage(h, WX_CB_ADDSTRING, 0, (LONG_PARAM)"Built-in video");
wx_sendmessage(h, WX_CB_SETCURSEL, 0, 0);
wx_enablewindow(h, FALSE);
h = wx_getdlgitem(hdlg, WX_ID("IDC_CONFIGUREVID"));
wx_enablewindow(h, FALSE);
return;
}
while (1) while (1)
{ {
char *s = video_card_getname(c); char *s = video_card_getname(c);
@ -106,7 +116,13 @@ static void recalc_vid_list(void* hdlg, int model)
} }
if (!found_card) if (!found_card)
wx_sendmessage(h, WX_CB_SETCURSEL, 0, 0); wx_sendmessage(h, WX_CB_SETCURSEL, 0, 0);
wx_enablewindow(h, models[model].fixed_gfxcard ? FALSE : TRUE); wx_enablewindow(h, TRUE);
h = wx_getdlgitem(hdlg, WX_ID("IDC_CONFIGUREVID"));
if (video_card_has_config(video_old_to_new(gfxcard)))
wx_enablewindow(h, TRUE);
else
wx_enablewindow(h, FALSE);
h = wx_getdlgitem(hdlg, WX_ID("IDC_CHECKVOODOO")); h = wx_getdlgitem(hdlg, WX_ID("IDC_CHECKVOODOO"));
wx_enablewindow(h, (models[model].flags & MODEL_PCI) ? TRUE : FALSE); wx_enablewindow(h, (models[model].flags & MODEL_PCI) ? TRUE : FALSE);
@ -619,7 +635,7 @@ int config_dlgproc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam)
wx_enablewindow(h, FALSE); wx_enablewindow(h, FALSE);
h = wx_getdlgitem(hdlg, WX_ID("IDC_CONFIGUREVID")); h = wx_getdlgitem(hdlg, WX_ID("IDC_CONFIGUREVID"));
if (video_card_has_config(video_old_to_new(gfxcard))) if (video_card_has_config(video_old_to_new(gfxcard)) && !models[romstomodel[romset]].fixed_gfxcard)
wx_enablewindow(h, TRUE); wx_enablewindow(h, TRUE);
else else
wx_enablewindow(h, FALSE); wx_enablewindow(h, FALSE);
@ -1027,13 +1043,16 @@ int config_dlgproc(void* hdlg, int message, INT_PARAM wParam, LONG_PARAM lParam)
} }
else if (wParam == WX_ID("IDC_COMBOVID")) else if (wParam == WX_ID("IDC_COMBOVID"))
{ {
h = wx_getdlgitem(hdlg, WX_ID("IDC_COMBO1"));
temp_model = listtomodel[wx_sendmessage(h, WX_CB_GETCURSEL, 0, 0)];
h = wx_getdlgitem(hdlg, WX_ID("IDC_COMBOVID")); h = wx_getdlgitem(hdlg, WX_ID("IDC_COMBOVID"));
wx_sendmessage(h, WX_CB_GETLBTEXT, wx_sendmessage(h, WX_CB_GETCURSEL, 0, 0), wx_sendmessage(h, WX_CB_GETLBTEXT, wx_sendmessage(h, WX_CB_GETCURSEL, 0, 0),
(LONG_PARAM) temp_str); (LONG_PARAM) temp_str);
gfx = video_card_getid(temp_str); gfx = video_card_getid(temp_str);
h = wx_getdlgitem(hdlg, WX_ID("IDC_CONFIGUREVID")); h = wx_getdlgitem(hdlg, WX_ID("IDC_CONFIGUREVID"));
if (video_card_has_config(gfx)) if (video_card_has_config(gfx) && !models[temp_model].fixed_gfxcard)
wx_enablewindow(h, TRUE); wx_enablewindow(h, TRUE);
else else
wx_enablewindow(h, FALSE); wx_enablewindow(h, FALSE);