summaryrefslogtreecommitdiff
path: root/src/gui/setup_joystick.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-07 15:23:07 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-07 15:23:07 +0000
commit92950d2f309550e21b33d851ef9bbf7906ce5e50 (patch)
tree18a6d2539c6e004e52cbebb1e61d8f8f0344f9a0 /src/gui/setup_joystick.cpp
parent3f3ba5f3e18b0a5093e7275aee574ecd6f293ec6 (diff)
downloadmana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.tar.gz
mana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.tar.bz2
mana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.tar.xz
mana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.zip
Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
gcn::TabbedArea usage)
Diffstat (limited to 'src/gui/setup_joystick.cpp')
-rw-r--r--src/gui/setup_joystick.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 56f411d7..a501298e 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -43,7 +43,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);
@@ -60,7 +60,7 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
if (event.getSource() == mJoystickEnabled)
{
- joystick->setEnabled(mJoystickEnabled->isMarked());
+ joystick->setEnabled(mJoystickEnabled->isSelected());
}
else
{
@@ -83,7 +83,7 @@ void Setup_Joystick::cancel()
{
joystick->setEnabled(mOriginalJoystickEnabled);
}
- mJoystickEnabled->setMarked(mOriginalJoystickEnabled);
+ mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
}
void Setup_Joystick::apply()