From d3385829ca6f7d52e21706b25b14fe1083cfe984 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 13 Aug 2006 10:20:19 +0000
Subject: Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several
 updates from the 0.1.0 branch.

---
 src/gui/setup_joystick.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/setup_joystick.h')

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;
-- 
cgit v1.2.3-70-g09d2