summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-03 02:29:24 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-03 02:29:24 +0300
commit51ff8587d3a008e9c4867b18034640f58063d4a8 (patch)
tree978011f13f74e99270669dae5c600218af6209d6 /src
parent5e4a1bf239d76a5525a4409dc7a2094fbffe0eb3 (diff)
downloadplus-51ff8587d3a008e9c4867b18034640f58063d4a8.tar.gz
plus-51ff8587d3a008e9c4867b18034640f58063d4a8.tar.bz2
plus-51ff8587d3a008e9c4867b18034640f58063d4a8.tar.xz
plus-51ff8587d3a008e9c4867b18034640f58063d4a8.zip
Fix npc menu item selection with keyboard.
Diffstat (limited to 'src')
-rw-r--r--src/gui/npcdialog.cpp3
-rw-r--r--src/keyboarddata.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 39af0c71d..5e0e9d56f 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -94,6 +94,9 @@ NpcDialog::NpcDialog(int npcId) :
// Setup listbox
mItemList = new ListBox(this);
mItemList->setWrappingEnabled(true);
+ mItemList->setActionEventId("ok");
+ mItemList->addActionListener(this);
+
setContentSize(260, 175);
mListScrollArea = new ScrollArea(mItemList);
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index 2fd4b7087..825da9e57 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -207,7 +207,6 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
{"keyQuit", SDLK_ESCAPE,
N_("Quit"),
KeyboardConfig::GRP_DEFAULT,
-// nullptr,
&ActionManager::quit,
KeyboardConfig::KEY_NO_VALUE, 50,
COND_DEFAULT},