diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-10-09 03:34:45 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-10-09 03:34:45 +0000 |
commit | 8bde9095c5840b8d62ebafe11beaed98877d6ac2 (patch) | |
tree | 537f717a339d1247cae222eb7a354ea5dbe8babf /src/gui/help.cpp | |
parent | a246c08cef5e4d598fc07a681eb971bfbcf01519 (diff) | |
download | mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.tar.gz mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.tar.bz2 mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.tar.xz mana-8bde9095c5840b8d62ebafe11beaed98877d6ac2.zip |
* Made Sprite into an interface implemented by both FloorItem and Being, which
hook themselves into the map on construction. The improved fringe layer is
working as expected now.
* Made sure TMW compiles without warnings even when using "-Wconversion
-Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups.
* Added two new small tilesets that contain the desert tiles that are twice and
three times the height of a normal tile. One well in new_3-1 has been
converted to use the new double tiles for testing purposes.
Diffstat (limited to 'src/gui/help.cpp')
-rw-r--r-- | src/gui/help.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/help.cpp b/src/gui/help.cpp index 80ddbc9a..71e94340 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -51,7 +51,7 @@ HelpWindow::HelpWindow(): okButton->setEventId("close"); okButton->addActionListener(this); - + browserBox->setLinkHandler(this); add(scrollArea); @@ -69,7 +69,10 @@ HelpWindow::~HelpWindow() void HelpWindow::action(const std::string& eventId) { - setVisible(false); + if (eventId == "close") + { + setVisible(false); + } } void HelpWindow::handleLink(const std::string& link) @@ -81,7 +84,7 @@ void HelpWindow::handleLink(const std::string& link) void HelpWindow::loadHelp(const std::string &helpFile) { browserBox->clearRows(); - + loadFile("header"); loadFile(helpFile); |