claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win_d2d: moved to dev branch and made optional + fixes

Browse Source
This commit is contained in:
David Hrdlička
2018-07-28 23:41:16 +02:00
parent d9357d2f8b
commit 65aedbbcee
5 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/win/win_ui.c
View File

@@ -8,7 +8,7 @@
*
* user Interface module for WinAPI on Windows.
*
* Version: @(#)win_ui.c 1.0.29 2018/07/19
* Version: @(#)win_ui.c 1.0.30 2018/07/28
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -113,6 +113,12 @@ ResetAllMenus(void)
EnableMenuItem(menuMain, IDM_CONFIG_SAVE, MF_DISABLED);
#endif
#ifdef USE_D2D
/* Disable Direct2D menu option on NT5 */
if(LOBYTE(LOWORD(GetVersion())) < 6)
EnableMenuItem(menuMain, IDM_VID_D2D, MF_GRAYED);
#endif
CheckMenuItem(menuMain, IDM_ACTION_RCTRL_IS_LALT, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_UPDATE_ICONS, MF_UNCHECKED);
@@ -147,10 +153,13 @@ ResetAllMenus(void)
CheckMenuItem(menuMain, IDM_VID_RESIZE, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_DDRAW+0, MF_UNCHECKED);
#ifdef USE_D2D
CheckMenuItem(menuMain, IDM_VID_DDRAW+1, MF_UNCHECKED);
#endif
CheckMenuItem(menuMain, IDM_VID_DDRAW+2, MF_UNCHECKED);
#ifdef USE_VNC
CheckMenuItem(menuMain, IDM_VID_DDRAW+3, MF_UNCHECKED);
#ifdef USE_VNC
CheckMenuItem(menuMain, IDM_VID_DDRAW+4, MF_UNCHECKED);
#endif
CheckMenuItem(menuMain, IDM_VID_FS_FULL+0, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FS_FULL+1, MF_UNCHECKED);
@@ -378,7 +387,9 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
break;
case IDM_VID_DDRAW:
#ifdef USE_D2D
case IDM_VID_D2D:
#endif
case IDM_VID_D3D:
case IDM_VID_SDL:
#ifdef USE_VNC