Remove enum and allow exit via keyboard

src/gui/guiJoystickChangeMenu.cpp

@@ -12,50 +12,6 @@
 
 #include "mainmenumanager.h"  // for g_gamecallback
 
-enum
-{
-	GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR,
-	// buttons
-	GUI_ID_KEY_FORWARD_BUTTON,
-	GUI_ID_KEY_BACKWARD_BUTTON,
-	GUI_ID_KEY_LEFT_BUTTON,
-	GUI_ID_KEY_RIGHT_BUTTON,
-	GUI_ID_KEY_AUX1_BUTTON,
-	GUI_ID_KEY_FLY_BUTTON,
-	GUI_ID_KEY_FAST_BUTTON,
-	GUI_ID_KEY_JUMP_BUTTON,
-	GUI_ID_KEY_NOCLIP_BUTTON,
-	GUI_ID_KEY_PITCH_MOVE,
-	GUI_ID_KEY_CHAT_BUTTON,
-	GUI_ID_KEY_CMD_BUTTON,
-	GUI_ID_KEY_CMD_LOCAL_BUTTON,
-	GUI_ID_KEY_CONSOLE_BUTTON,
-	GUI_ID_KEY_SNEAK_BUTTON,
-	GUI_ID_KEY_DROP_BUTTON,
-	GUI_ID_KEY_INVENTORY_BUTTON,
-	GUI_ID_KEY_HOTBAR_PREV_BUTTON,
-	GUI_ID_KEY_HOTBAR_NEXT_BUTTON,
-	GUI_ID_KEY_MUTE_BUTTON,
-	GUI_ID_KEY_DEC_VOLUME_BUTTON,
-	GUI_ID_KEY_INC_VOLUME_BUTTON,
-	GUI_ID_KEY_RANGE_BUTTON,
-	GUI_ID_KEY_ZOOM_BUTTON,
-	GUI_ID_KEY_CAMERA_BUTTON,
-	GUI_ID_KEY_MINIMAP_BUTTON,
-	GUI_ID_KEY_SCREENSHOT_BUTTON,
-	GUI_ID_KEY_CHATLOG_BUTTON,
-	GUI_ID_KEY_BLOCK_BOUNDS_BUTTON,
-	GUI_ID_KEY_HUD_BUTTON,
-	GUI_ID_KEY_FOG_BUTTON,
-	GUI_ID_KEY_DEC_RANGE_BUTTON,
-	GUI_ID_KEY_INC_RANGE_BUTTON,
-	GUI_ID_KEY_AUTOFWD_BUTTON,
-	// other
-	GUI_ID_CB_AUX1_DESCENDS,
-	GUI_ID_CB_DOUBLETAP_JUMP,
-	GUI_ID_CB_AUTOJUMP,
-};
-
 extern MainGameCallback *g_gamecallback;
 
 GUIJoystickChangeMenu::GUIJoystickChangeMenu(gui::IGUIEnvironment* env,
@@ -92,5 +48,12 @@ void GUIJoystickChangeMenu::drawMenu()
 
 bool GUIJoystickChangeMenu::OnEvent(const SEvent& event)
 {
+	if (event.EventType == EET_KEY_INPUT_EVENT
+			&& event.KeyInput.PressedDown
+			&& event.KeyInput.Key == irr::KEY_ESCAPE) {
+		quitMenu();
+		return true;
+	}
+
 	return Parent ? Parent->OnEvent(event) : false;
 }