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

win32: select correct output method when cancelling dialog

This commit is contained in:
OV2 2018-04-01 13:32:56 +02:00
parent bdade06dff
commit 60fc2fb0ae
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
win32/wsnes9x.cpp
View File

@ -7263,6 +7263,17 @@ LRESULT CALLBACK GroupBoxCheckBoxTitle(HWND hWnd, UINT message, WPARAM wParam, L
return CallWindowProc(lpfnOldWndProc, hWnd, message, wParam, lParam); return CallWindowProc(lpfnOldWndProc, hWnd, message, wParam, lParam);
} }
void SelectOutputMethodInVideoDropdown(HWND hDlg, OutputMethod method)
{
// select item with corresponding itemdata
int item_count = SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_GETCOUNT, 0, 0);
for (int index = 0; index < item_count; index++) {
int item_data = SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_GETITEMDATA, index, 0);
if (item_data == method)
SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_SETCURSEL, index, 0);
}
}
INT_PTR CALLBACK DlgFunky(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK DlgFunky(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
int index; int index;
@ -7406,13 +7417,7 @@ INT_PTR CALLBACK DlgFunky(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
inserted_index = SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("OpenGL")); inserted_index = SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_ADDSTRING, 0, (LPARAM)TEXT("OpenGL"));
SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_SETITEMDATA, inserted_index, OPENGL); SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_SETITEMDATA, inserted_index, OPENGL);
// select item with corresponding itemdata SelectOutputMethodInVideoDropdown(hDlg, GUI.outputMethod);
int item_count = SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_GETCOUNT, 0, 0);
for (int index = 0; index < item_count; index++) {
int item_data = SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_GETITEMDATA, index, 0);
if (item_data == GUI.outputMethod)
SendDlgItemMessage(hDlg, IDC_OUTPUTMETHOD, CB_SETCURSEL, index, 0);
}
// add all the GUI.Scale filters to the combo box // add all the GUI.Scale filters to the combo box
for (int filter = 0; filter < (int)NUM_FILTERS; filter++) for (int filter = 0; filter < (int)NUM_FILTERS; filter++)
@ -7784,7 +7789,7 @@ updateFilterBox2:
case IDCANCEL: case IDCANCEL:
ComboBox_SetCurSel(GetDlgItem(hDlg,IDC_OUTPUTMETHOD),prevOutputMethod); SelectOutputMethodInVideoDropdown(hDlg, prevOutputMethod);
SendMessage(hDlg,WM_COMMAND,MAKEWPARAM(IDC_OUTPUTMETHOD,CBN_SELCHANGE),0); SendMessage(hDlg,WM_COMMAND,MAKEWPARAM(IDC_OUTPUTMETHOD,CBN_SELCHANGE),0);
{ {