summaryrefslogtreecommitdiff
path: root/src/gui/setup.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-23 21:59:21 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-23 22:00:09 +0100
commit99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch)
tree03c296d1f89859aae35336dfe2f58df09d256fd3 /src/gui/setup.h
parentfa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff)
parent347452b9b69ef3af29c577b7751082822e900c01 (diff)
downloadmana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz
mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2
mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz
mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip
Merge branch 'aethyra/master'
Conflicts: Many files.
Diffstat (limited to 'src/gui/setup.h')
-rw-r--r--src/gui/setup.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 919445b7..4c387d34 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -31,7 +31,6 @@
#include "../guichanfwd.h"
class SetupTab;
-class Button;
/**
* The setup dialog.
@@ -51,13 +50,16 @@ class Setup : public Window, public gcn::ActionListener
*/
~Setup();
- void setInGame(bool inGame);
-
/**
* Event handling method.
*/
void action(const gcn::ActionEvent &event);
+ /**
+ * Enables the reset button when in game.
+ */
+ void setInGame(bool inGame);
+
private:
std::list<SetupTab*> mTabs;
gcn::Button *mResetWindows;