From 063909962ae557203a799bcc6c30f51dec4cc592 Mon Sep 17 00:00:00 2001 From: yexo Date: Sun, 4 Jul 2010 11:28:16 +0000 Subject: (svn r20074) -Fix (r20065): highscore window should use the same hotkey for quit as the toolbar --- src/highscore_gui.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/highscore_gui.cpp') diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp index 94486a4f2..004648b56 100644 --- a/src/highscore_gui.cpp +++ b/src/highscore_gui.cpp @@ -22,6 +22,7 @@ #include "company_base.h" #include "strings_func.h" #include "openttd.h" +#include "hotkeys.h" enum HighscoreWidgets { HSW_BACKGROUND, @@ -66,6 +67,11 @@ struct EndGameHighScoreBaseWindow : Window { virtual EventState OnKeyPress(uint16 key, uint16 keycode) { + /* All keys are 'handled' by this window but we want to make + * sure that 'quit' still works correctly. Not handling the + * quit key is enough so the main toolbar can handle it. */ + if (IsQuitKey(keycode)) return ES_NOT_HANDLED; + switch (keycode) { /* Keys for telling we want to go on */ case WKC_RETURN: @@ -74,11 +80,6 @@ struct EndGameHighScoreBaseWindow : Window { delete this; return ES_HANDLED; - /* Allow CTRL-Q to work like ALT-F4 in all cases */ - case 'Q' | WKC_CTRL: - case 'Q' | WKC_META: - return ES_NOT_HANDLED; - default: /* We want to handle all keys; we don't want windows in * the background to open. Especially the ones that do -- cgit v1.2.3-70-g09d2