Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but because

of quite a bit of GUI differences there were additional changes and probably
additional issues. You have been warned. ;)

Merged revisions 4045-4049,4051-4059 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines

  Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
  gcn::TabbedArea usage)
........
  r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines

  Fixed problem with row height in shop list box.
........

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 59cfefa4..dfa446ab 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -45,7 +45,7 @@ Setup_Joystick::Setup_Joystick():
     mCalibrateButton->setPosition(10, 30 + mCalibrateLabel->getHeight());
 
     mOriginalJoystickEnabled = (int)config.getValue("joystickEnabled", 0) != 0;
-    mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
+    mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 
     mJoystickEnabled->addActionListener(this);
 
@@ -62,7 +62,7 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
 
     if (event.getSource() == mJoystickEnabled)
     {
-        joystick->setEnabled(mJoystickEnabled->isMarked());
+        joystick->setEnabled(mJoystickEnabled->isSelected());
     }
     else
     {
@@ -85,7 +85,7 @@ void Setup_Joystick::cancel()
     {
         joystick->setEnabled(mOriginalJoystickEnabled);
     }
-    mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
+    mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
 }
 
 void Setup_Joystick::apply()