summaryrefslogtreecommitdiff
path: root/src/gui/setup_joystick.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-13 10:20:19 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-13 10:20:19 +0000
commitd3385829ca6f7d52e21706b25b14fe1083cfe984 (patch)
treeaea368b2434a49864b33183f95b6aae36abef3b7 /src/gui/setup_joystick.h
parent7d287027babe615e01ddcf20edc1057f7d778c58 (diff)
downloadMana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.gz
Mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.bz2
Mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.xz
Mana-d3385829ca6f7d52e21706b25b14fe1083cfe984.zip
Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates
from the 0.1.0 branch.
Diffstat (limited to 'src/gui/setup_joystick.h')
-rw-r--r--src/gui/setup_joystick.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 2abe9678..da773c8f 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -38,7 +38,7 @@ class Setup_Joystick : public SetupTab, public gcn::ActionListener
void apply() {}
void cancel() {}
- void action(const std::string&);
+ void action(const std::string& eventId, gcn::Widget* widget);
private:
gcn::Label *mCalibrateLabel;