From f842e0b40d8382011f0bc46b1446945d99ac0425 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 14 Jan 2007 14:54:39 +0000
Subject: Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).

---
 src/gui/setup_joystick.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 685d88cf..56f411d7 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -45,7 +45,6 @@ Setup_Joystick::Setup_Joystick():
     mOriginalJoystickEnabled = (int)config.getValue("joystickEnabled", 0) != 0;
     mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
 
-    mJoystickEnabled->setEventId("joystickEnabled");
     mJoystickEnabled->addActionListener(this);
 
     add(mCalibrateLabel);
@@ -53,13 +52,13 @@ Setup_Joystick::Setup_Joystick():
     add(mJoystickEnabled);
 }
 
-void Setup_Joystick::action(const std::string &event, gcn::Widget *widget)
+void Setup_Joystick::action(const gcn::ActionEvent &event)
 {
     if (!joystick) {
         return;
     }
 
-    if (event == "joystickEnabled")
+    if (event.getSource() == mJoystickEnabled)
     {
         joystick->setEnabled(mJoystickEnabled->isMarked());
     }
-- 
cgit v1.2.3-70-g09d2