--- previous/src/gui-sdl/dlgKeyboard.c	2018/04/24 19:30:45	1.1.1.2
+++ previous/src/gui-sdl/dlgKeyboard.c	2018/04/24 19:34:38	1.1.1.4
@@ -14,29 +14,20 @@ const char DlgKeyboard_fileid[] = "Previ
 #include "sdlgui.h"
 #include "file.h"
 #include "screen.h"
-#include "dimension.h"
-
+#include "dimension.hpp"
 
 #define ENABLE_LOADED_OPTION 0
 
 #define DLGKEY_SCANCODE  4
 #define DLGKEY_SYMBOLIC  5
-#define DLGKEY_FROMFILE  5
-#define DLGKEY_MAPNAME   7
-#define DLGKEY_MAPBROWSE 8
-#define DLGKEY_DISREPEAT 8
-#define DLGKEY_SWAP      9
-#define DLGKEY_EXIT      21
+#define DLGKEY_SWAP      8
+#define DLGKEY_EXIT      20
 
 
 /* The keyboard dialog: */
 static SGOBJ keyboarddlg[] =
 {
-#if ENABLE_DIMENSION
 	{ SGBOX, 0, 0, 0,0, 47,28, NULL },
-#else
-    { SGBOX, 0, 0, 0,0, 47,27, NULL },
-#endif
 	{ SGTEXT, 0, 0, 15,1, 16,1, "Keyboard options" },
     
     { SGBOX, 0, 0, 2,3, 21,7, NULL },
@@ -46,35 +37,21 @@ static SGOBJ keyboarddlg[] =
     
     { SGBOX, 0, 0, 24,3, 21,7, NULL },
     { SGTEXT, 0, 0, 26,4, 12,1, "Key options:" },
-	{ SGCHECKBOX, 0, 0, 26,6, 16,1, "Disable repeat" },
-    { SGCHECKBOX, 0, 0, 26,8, 18,1, "Swap cmd and alt" },
+    { SGCHECKBOX, 0, 0, 26,6, 18,1, "Swap cmd and alt" },
     
-#if ENABLE_DIMENSION
     { SGBOX, 0, 0, 2,11, 43,12, NULL },
-#else
-    { SGBOX, 0, 0, 2,11, 43,11, NULL },
-#endif
     { SGTEXT, 0, 0, 4,12, 10,1, "Shortcuts:" },
     { SGTEXT, 0, 0, 17,12, 10,1, "ctrl-alt-X (Fn)" },
     { SGTEXT, 0, 0, 6,14, 17,1, "Show main menu     -O (F12)" },
     { SGTEXT, 0, 0, 6,15, 17,1, "Pause              -P" },
     { SGTEXT, 0, 0, 6,16, 17,1, "Cold reset         -C" },
     { SGTEXT, 0, 0, 6,17, 17,1, "Lock/unlock mouse  -M" },
-#if ENABLE_DIMENSION
     { SGTEXT, 0, 0, 6,18, 17,1, "Screen toggle      -N" },
     { SGTEXT, 0, 0, 6,19, 17,1, "Fullscreen on/off  -F" },
     { SGTEXT, 0, 0, 6,20, 17,1, "Sound on/off       -S" },
     { SGTEXT, 0, 0, 6,21, 17,1, "Quit               -Q" },
     
     { SGBUTTON, SG_DEFAULT, 0, 13,25, 21,1, "Back to main menu" },
-#else
-    { SGTEXT, 0, 0, 6,1, 17,1, "" },
-    { SGTEXT, 0, 0, 6,18, 17,1, "Fullscreen on/off  -F" },
-    { SGTEXT, 0, 0, 6,19, 17,1, "Sound on/off       -S" },
-    { SGTEXT, 0, 0, 6,20, 17,1, "Quit               -Q" },
-
-	{ SGBUTTON, SG_DEFAULT, 0, 13,24, 21,1, "Back to main menu" },
-#endif
 	{ -1, 0, 0, 0,0, 0,0, NULL }
 };
 
@@ -110,15 +87,13 @@ void Dialog_KeyboardDlg(void)
 	File_ShrinkName(dlgmapfile, ConfigureParams.Keyboard.szMappingFileName, keyboarddlg[DLGKEY_MAPNAME].w);
 	keyboarddlg[DLGKEY_MAPNAME].txt = dlgmapfile;
 #endif
-	if (ConfigureParams.Keyboard.bDisableKeyRepeat)
-		keyboarddlg[DLGKEY_DISREPEAT].state |= SG_SELECTED;
-	else
-		keyboarddlg[DLGKEY_DISREPEAT].state &= ~SG_SELECTED;
     
-    if (ConfigureParams.Keyboard.bSwapCmdAlt)
-        keyboarddlg[DLGKEY_SWAP].state |= SG_SELECTED;
-    else
-        keyboarddlg[DLGKEY_SWAP].state &= ~SG_SELECTED;
+    if (ConfigureParams.Keyboard.bSwapCmdAlt) {
+        keyboarddlg[DLGKEY_SWAP].state |= SG_SELECTED;		
+	}
+    else {
+        keyboarddlg[DLGKEY_SWAP].state &= ~SG_SELECTED;		
+	}
 
 	/* Show the dialog: */
 	do
@@ -145,6 +120,5 @@ void Dialog_KeyboardDlg(void)
 	else
 		ConfigureParams.Keyboard.nKeymapType = KEYMAP_LOADED;
 #endif
-	ConfigureParams.Keyboard.bDisableKeyRepeat = (keyboarddlg[DLGKEY_DISREPEAT].state & SG_SELECTED);
     ConfigureParams.Keyboard.bSwapCmdAlt = (keyboarddlg[DLGKEY_SWAP].state & SG_SELECTED);
 }