diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-06-29 22:05:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-06-29 22:05:21 +0300 |
| commit | b6bdc6a3406e4171b3e46c3735b7801edd27dd67 (patch) | |
| tree | 8e3d6b0513342022f4d0132524fa6925c2fbfaa4 /src | |
| parent | 37f849a6ae4d96a22d7b972d3021c235aa294ad8 (diff) | |
| download | manaplus-b6bdc6a3406e4171b3e46c3735b7801edd27dd67.tar.gz manaplus-b6bdc6a3406e4171b3e46c3735b7801edd27dd67.tar.bz2 manaplus-b6bdc6a3406e4171b3e46c3735b7801edd27dd67.tar.xz manaplus-b6bdc6a3406e4171b3e46c3735b7801edd27dd67.zip | |
fix initialisation order in setup/video.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/setup_video.cpp | 30 | ||||
| -rw-r--r-- | src/gui/setup_video.h | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 4e62d5445..14de7cb1a 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -211,20 +211,6 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : // TRANSLATORS: video settings checkbox mFsCheckBox(new CheckBox(this, _("Full screen"), mFullScreenEnabled)), mOpenGLDropDown(new DropDown(widget, mOpenGLListModel)), - mCustomCursorCheckBox(new CheckBox(this, -#ifdef ANDROID - // TRANSLATORS: video settings checkbox - _("Show cursor"), -#else - // TRANSLATORS: video settings checkbox - _("Custom cursor"), -#endif - mCustomCursorEnabled)), - // TRANSLATORS: video settings checkbox - mEnableResizeCheckBox(new CheckBox(this, _("Enable resize"), - mEnableResize)), - // TRANSLATORS: video settings checkbox - mNoFrameCheckBox(new CheckBox(this, _("No frame"), mNoFrame)), // TRANSLATORS: video settings checkbox mFpsCheckBox(new CheckBox(this, _("FPS limit:"))), mFpsSlider(new Slider(2, 160)), @@ -239,7 +225,21 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : mDialog(nullptr), mCustomCursorEnabled(config.getBoolValue("customcursor")), mEnableResize(config.getBoolValue("enableresize")), - mNoFrame(config.getBoolValue("noframe")) + mNoFrame(config.getBoolValue("noframe")), + mCustomCursorCheckBox(new CheckBox(this, +#ifdef ANDROID + // TRANSLATORS: video settings checkbox + _("Show cursor"), +#else + // TRANSLATORS: video settings checkbox + _("Custom cursor"), +#endif + mCustomCursorEnabled)), + // TRANSLATORS: video settings checkbox + mEnableResizeCheckBox(new CheckBox(this, _("Enable resize"), + mEnableResize)), + // TRANSLATORS: video settings checkbox + mNoFrameCheckBox(new CheckBox(this, _("No frame"), mNoFrame)) { // TRANSLATORS: video settings tab name setName(_("Video")); diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index bd77e32b5..2c0224f06 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -64,9 +64,6 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener ListBox *mModeList; CheckBox *mFsCheckBox; DropDown *mOpenGLDropDown; - CheckBox *mCustomCursorCheckBox; - CheckBox *mEnableResizeCheckBox; - CheckBox *mNoFrameCheckBox; CheckBox *mFpsCheckBox; Slider *mFpsSlider; Label *mFpsLabel; @@ -79,6 +76,9 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener bool mCustomCursorEnabled; bool mEnableResize; bool mNoFrame; + CheckBox *mCustomCursorCheckBox; + CheckBox *mEnableResizeCheckBox; + CheckBox *mNoFrameCheckBox; }; #endif // GUI_SETUP_VIDEO_H |