diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 23:56:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:42 +0300 |
| commit | d59cd9111c1e86b224ea62cc975c49b157e2b3cf (patch) | |
| tree | d7186479633c0269573e92b5a5213d04b84b3995 /src/gui/setup_joystick.cpp | |
| parent | 71d2b482d84246b8456ea863f94a9a766d33f197 (diff) | |
| download | manaplus-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.gz manaplus-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.bz2 manaplus-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.xz manaplus-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.zip | |
Add to some controls palette inheritance from other controls.
Diffstat (limited to 'src/gui/setup_joystick.cpp')
| -rw-r--r-- | src/gui/setup_joystick.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 851869d75..d556c20e3 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -41,13 +41,13 @@ extern Joystick *joystick; -Setup_Joystick::Setup_Joystick() : - SetupTab(), +Setup_Joystick::Setup_Joystick(const Widget2 *const widget) : + SetupTab(widget), mCalibrateLabel(new Label(_("Press the button to start calibration"))), mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)), mJoystickEnabled(new CheckBox(_("Enable joystick"))), mNamesModel(new NamesModel()), - mNamesDropDown(new DropDown(mNamesModel)), + mNamesDropDown(new DropDown(this, mNamesModel)), mUseInactiveCheckBox(new CheckBox(_("Use joystick if client " "window inactive"), config.getBoolValue("useInactiveJoystick"))) { |