diff options
| author | Eugene Sandulenko | 2007-06-11 07:35:52 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2007-06-11 07:35:52 +0000 |
| commit | 7f7abe8706cc24e6bca0eb33c6199e6a218019fd (patch) | |
| tree | 179590ffd4e622d3d51eb65fe4fc1a404eaf75f1 /gui/options.h | |
| parent | 8dcbd6434748cbfd5d8241e83855b5705eb91fea (diff) | |
| download | scummvm-rg350-7f7abe8706cc24e6bca0eb33c6199e6a218019fd.tar.gz scummvm-rg350-7f7abe8706cc24e6bca0eb33c6199e6a218019fd.tar.bz2 scummvm-rg350-7f7abe8706cc24e6bca0eb33c6199e6a218019fd.zip | |
Revert commits:
r27175: Added partial workaround for bug #1677997
r27311: Extended the fix for bug #1677997 to also cover the global options dialog; also made the code a bit more flexible
r27312: Oops, fix crash when opening globals options dialog
svn-id: r27344
Diffstat (limited to 'gui/options.h')
| -rw-r--r-- | gui/options.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gui/options.h b/gui/options.h index 7b8b6abe46..8743528f12 100644 --- a/gui/options.h +++ b/gui/options.h @@ -81,10 +81,6 @@ protected: void setVolumeSettingsState(bool enabled); void setSubtitleSettingsState(bool enabled); - //virtual void setupWidgets(); - virtual void loadConfigToWidgets(); - virtual void saveConfigFromWidgets(); - private: // // Graphics controls @@ -151,10 +147,10 @@ public: GlobalOptionsDialog(); ~GlobalOptionsDialog(); + void open(); + void close(); void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); - virtual void reflowLayout(); - protected: #ifdef SMALL_SCREEN_DEVICE KeysDialog *_keysDialog; @@ -169,10 +165,6 @@ protected: StaticTextWidget *_curTheme; PopUpWidget *_autosavePeriodPopUp; - - void setupWidgets(); - virtual void loadConfigToWidgets(); - virtual void saveConfigFromWidgets(); }; } // End of namespace GUI |