--- hatari/src/gui-sdl/dlgScreen.c	2019/04/09 08:55:53	1.1.1.15
+++ hatari/src/gui-sdl/dlgScreen.c	2019/04/09 08:57:05	1.1.1.16
@@ -73,7 +73,7 @@ static SGOBJ monitordlg[] =
 	{ SGRADIOBUT, SG_EXIT, 0, 18,13, 11,1, "1_6 colors" },
 
 	{ SGBUTTON, SG_DEFAULT, 0, 7,16, 20,1, "Back to main menu" },
-	{ -1, 0, 0, 0,0, 0,0, NULL }
+	{ SGSTOP, 0, 0, 0,0, 0,0, NULL }
 };
 
 
@@ -136,10 +136,17 @@ static SGOBJ windowdlg[] =
 	{ SGRADIOBUT, 0, 0, 21,7,  3,1, "_2" },
 	{ SGRADIOBUT, 0, 0, 21,8,  3,1, "_4" },
 	{ SGRADIOBUT, 0, 0, 21,9,  6,1, "_Auto" },
+#if WITH_SDL2
+	{ SGTEXT,     0, 0, 35,4, 10,1, "resolution" },
+	{ SGTEXT,     0, 0, 35,5, 13,1, "in fullscreen" },
+	{ SGTEXT,     0, 0, 33,2,  1,1, "" },
+	{ SGCHECKBOX, 0, 0, 33,3, 14,1, "_Keep desktop" },
+#else
 	{ SGTEXT,     0, 0, 33,2, 14,1, "Keep desktop" },
 	{ SGTEXT,     0, 0, 33,3, 14,1, "resolution:" },
 	{ SGCHECKBOX, 0, 0, 35,4,  8,1, "ST/ST_e" },
 	{ SGCHECKBOX, 0, 0, 35,5, 11,1, "_TT/Falcon" },
+#endif
 	{ SGTEXT,     0, 0, 33,7, 15,1, "Max zoomed win:" },
 	{ SGBUTTON,   0, 0, 35,8,  1,1, "\x04", SG_SHORTCUT_LEFT },
 	{ SGTEXT,     0, 0, 37,8,  4,1, sMaxWidth },
@@ -164,7 +171,7 @@ static SGOBJ windowdlg[] =
 #else
 	{ SGBUTTON, SG_DEFAULT, 0, 17,18, 20,1, "Back to main menu" },
 #endif
-	{ -1, 0, 0, 0,0, 0,0, NULL }
+	{ SGSTOP, 0, 0, 0,0, 0,0, NULL }
 };
 
 /* for record button */
@@ -330,10 +337,12 @@ void Dialog_WindowDlg(void)
 		windowdlg[DLGSCRN_KEEP_RES].state |= SG_SELECTED;
 	else
 		windowdlg[DLGSCRN_KEEP_RES].state &= ~SG_SELECTED;
+#if !WITH_SDL2
 	if (ConfigureParams.Screen.bKeepResolutionST)
 		windowdlg[DLGSCRN_KEEP_RES_ST].state |= SG_SELECTED;
 	else
 		windowdlg[DLGSCRN_KEEP_RES_ST].state &= ~SG_SELECTED;
+#endif
 
 	windowdlg[DLGSCRN_STATUSBAR].state &= ~SG_SELECTED;
 	windowdlg[DLGSCRN_DRIVELED].state &= ~SG_SELECTED;
@@ -345,7 +354,7 @@ void Dialog_WindowDlg(void)
 	else
 		windowdlg[DLGSCRN_NONE].state |= SG_SELECTED;
 
-	for (i = 0; i < ARRAYSIZE(skip_frames); i++)
+	for (i = 0; i < ARRAY_SIZE(skip_frames); i++)
 	{
 		if (ConfigureParams.Screen.nFrameSkips >= skip_frames[i])
 			skip = i;
@@ -446,7 +455,9 @@ void Dialog_WindowDlg(void)
 
 	ConfigureParams.Screen.bFullScreen = (windowdlg[DLGSCRN_FULLSCRN].state & SG_SELECTED);
 	ConfigureParams.Screen.bKeepResolution = (windowdlg[DLGSCRN_KEEP_RES].state & SG_SELECTED);
+#if !WITH_SDL2
 	ConfigureParams.Screen.bKeepResolutionST = (windowdlg[DLGSCRN_KEEP_RES_ST].state & SG_SELECTED);
+#endif
 
 	ConfigureParams.Screen.nMaxWidth = maxw;
 	ConfigureParams.Screen.nMaxHeight = maxh;