diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /gui/options.h | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'gui/options.h')
| -rw-r--r-- | gui/options.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gui/options.h b/gui/options.h index 1e65bfd134..294b41794b 100644 --- a/gui/options.h +++ b/gui/options.h @@ -29,7 +29,7 @@ #include "common/str.h" #include "audio/mididrv.h" -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG #include "gui/KeysDialog.h" #endif @@ -210,7 +210,7 @@ public: virtual void reflowLayout(); protected: -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG KeysDialog *_keysDialog; #endif #ifdef USE_FLUIDSYNTH @@ -236,6 +236,11 @@ protected: PopUpWidget *_autosavePeriodPopUp; StaticTextWidget *_guiLanguagePopUpDesc; PopUpWidget *_guiLanguagePopUp; + +#ifdef USE_UPDATES + StaticTextWidget *_updatesPopUpDesc; + PopUpWidget *_updatesPopUp; +#endif }; } // End of namespace GUI |