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

win32: Control dialog box OK/Cancel were backwards.

This commit is contained in:
Brandon Wright 2019-02-12 19:35:06 -06:00
parent 9774d7024e
commit 49e399c9cf
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
win32/rsrc/snes9x.rc
View File

@ -31,7 +31,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPU
CAPTION "Sound Settings" CAPTION "Sound Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
GROUPBOX "Sound Quality",IDC_STATIC,119,6,289,126,0,WS_EX_TRANSPARENT GROUPBOX "Sound Quality",IDC_STATIC,120,6,288,126,0,WS_EX_TRANSPARENT
DEFPUSHBUTTON "&OK",IDOK,318,138,42,14 DEFPUSHBUTTON "&OK",IDOK,318,138,42,14
COMBOBOX IDC_DRIVER,180,36,106,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DRIVER,180,36,106,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Sound Driver:",IDC_STATIC,126,36,51,12,SS_CENTERIMAGE LTEXT "Sound Driver:",IDC_STATIC,126,36,51,12,SS_CENTERIMAGE
@ -52,7 +52,7 @@ BEGIN
CONTROL "",IDC_SLIDER_VOLUME_REGULAR,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP | 0x400,18,30,24,78 CONTROL "",IDC_SLIDER_VOLUME_REGULAR,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP | 0x400,18,30,24,78
EDITTEXT IDC_EDIT_VOLUME_REGULAR,18,108,24,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_VOLUME_REGULAR,18,108,24,12,ES_AUTOHSCROLL
CTEXT "Regular",IDC_STATIC,12,18,36,8 CTEXT "Regular",IDC_STATIC,12,18,36,8
GROUPBOX "Volume",IDC_STATIC,7,6,107,126,0,WS_EX_TRANSPARENT GROUPBOX "Volume",IDC_STATIC,6,6,108,126,0,WS_EX_TRANSPARENT
CONTROL "",IDC_SLIDER_VOLUME_TURBO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP | 0x400,72,30,24,78 CONTROL "",IDC_SLIDER_VOLUME_TURBO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP | 0x400,72,30,24,78
EDITTEXT IDC_EDIT_VOLUME_TURBO,72,108,24,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_VOLUME_TURBO,72,108,24,12,ES_AUTOHSCROLL
CTEXT "Fast-Forward",IDC_STATIC,60,18,45,8 CTEXT "Fast-Forward",IDC_STATIC,60,18,45,8
@ -252,7 +252,7 @@ BEGIN
CONTROL "Progress1",IDC_NPPROGRESS,"msctls_progress32",WS_BORDER,5,30,160,25 CONTROL "Progress1",IDC_NPPROGRESS,"msctls_progress32",WS_BORDER,5,30,160,25
END END
IDD_INPUTCONFIG DIALOGEX 0, 0, 330, 150 IDD_INPUTCONFIG DIALOGEX 0, 0, 330, 152
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION
CAPTION " " CAPTION " "
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@ -275,8 +275,8 @@ BEGIN
CONTROL " ",IDC_UPRIGHT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,104,71,12,WS_EX_CLIENTEDGE CONTROL " ",IDC_UPRIGHT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,104,71,12,WS_EX_CLIENTEDGE
CONTROL " ",IDC_DWNRIGHT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,117,71,12,WS_EX_CLIENTEDGE CONTROL " ",IDC_DWNRIGHT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,117,71,12,WS_EX_CLIENTEDGE
CONTROL " ",IDC_DWNLEFT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,129,71,12,WS_EX_CLIENTEDGE CONTROL " ",IDC_DWNLEFT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,129,71,12,WS_EX_CLIENTEDGE
PUSHBUTTON "Cancel",IDCANCEL,246,132,36,14 PUSHBUTTON "Cancel",IDCANCEL,288,132,36,14
PUSHBUTTON "OK",IDOK,288,132,36,14 PUSHBUTTON "OK",IDOK,246,132,36,14
LTEXT "Blue means the button is already mapped.\nPink means it conflicts with a custom hotkey.\nRed means it's reserved by Windows.\nButtons can be disabled using Escape.",IDC_LABEL_BLUE,166,0,157,32 LTEXT "Blue means the button is already mapped.\nPink means it conflicts with a custom hotkey.\nRed means it's reserved by Windows.\nButtons can be disabled using Escape.",IDC_LABEL_BLUE,166,0,157,32
RTEXT "UP",IDC_LABEL_UP,8,42,38,8 RTEXT "UP",IDC_LABEL_UP,8,42,38,8
RTEXT "RIGHT",IDC_LABEL_RIGHT,6,81,41,8 RTEXT "RIGHT",IDC_LABEL_RIGHT,6,81,41,8
@ -297,7 +297,7 @@ BEGIN
CONTROL IDB_PAD,IDC_STATIC,"Static",SS_BITMAP,243,39,80,74 CONTROL IDB_PAD,IDC_STATIC,"Static",SS_BITMAP,243,39,80,74
CONTROL "Allow Left+Rt/Up+Dn",IDC_ALLOWLEFTRIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,115,87,11 CONTROL "Allow Left+Rt/Up+Dn",IDC_ALLOWLEFTRIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,115,87,11
GROUPBOX "Controller",IDC_STATIC,5,1,142,28,0,WS_EX_TRANSPARENT GROUPBOX "Controller",IDC_STATIC,5,1,142,28,0,WS_EX_TRANSPARENT
GROUPBOX "Buttons",IDC_STATIC,5,30,234,117,0,WS_EX_TRANSPARENT GROUPBOX "Buttons",IDC_STATIC,5,30,234,116,0,WS_EX_TRANSPARENT
END END
IDD_CHEAT_SEARCH DIALOGEX 0, 0, 272, 275 IDD_CHEAT_SEARCH DIALOGEX 0, 0, 272, 275
@ -643,7 +643,7 @@ BEGIN
RIGHTMARGIN, 326 RIGHTMARGIN, 326
VERTGUIDE, 77 VERTGUIDE, 77
VERTGUIDE, 92 VERTGUIDE, 92
BOTTOMMARGIN, 141 BOTTOMMARGIN, 143
HORZGUIDE, 122 HORZGUIDE, 122
END END
@ -1060,6 +1060,16 @@ BEGIN
0 0
END END
IDD_SOUND_OPTS AFX_DIALOG_LAYOUT
BEGIN
0
END
IDD_INPUTCONFIG AFX_DIALOG_LAYOUT
BEGIN
0
END
#endif // English (United States) resources #endif // English (United States) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////