summaryrefslogtreecommitdiff
path: root/src/gui/menuwindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-09 14:49:07 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-09 14:49:07 +0000
commitcd68076f45b1ae6332b5298f57240aa4b0ebf357 (patch)
tree1736ba4bf56cf5d9ac32a50a036b996954d651ee /src/gui/menuwindow.cpp
parentaca696b5c784bfbb426c50ac58e93e3d61944b39 (diff)
downloadMana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.tar.gz
Mana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.tar.bz2
Mana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.tar.xz
Mana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.zip
Re-enabled non-functional item shortcut window, planned to be fixed for 0.0.25
(reverted change 3811). Somehow seems it's not drawing anything, not sure why.
Diffstat (limited to 'src/gui/menuwindow.cpp')
-rw-r--r--src/gui/menuwindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index e4d101c8..2043b7d1 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -35,7 +35,7 @@ extern Window *inventoryWindow;
extern Window *equipmentWindow;
extern Window *skillDialog;
extern Window *statusWindow;
-//extern Window *itemShortcutWindow;
+extern Window *itemShortcutWindow;
namespace {
struct MenuWindowListener : public gcn::ActionListener
@@ -62,7 +62,7 @@ MenuWindow::MenuWindow():
"Equipment",
"Inventory",
"Skills",
-// "Shortcut",
+ "Shortcut",
"Setup",
0
};
@@ -107,10 +107,10 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
{
window = skillDialog;
}
- //else if (event.getId() == "Shortcut")
- //{
- // window = itemShortcutWindow;
- //}
+ else if (event.getId() == "Shortcut")
+ {
+ window = itemShortcutWindow;
+ }
else if (event.getId() == "Setup")
{
window = setupWindow;