Ticket #8305: options_dialog.diff

scummvm/gui/options.cpp

@@ -66 +66 @@
 
 }
 
-void OptionsDialog::open() {
+void OptionsDialog::internalOpen() {
         Dialog::open();
 
         // Reset result value
@@ -122 +122 @@
         }
 }
 
-void OptionsDialog::close() {
+void OptionsDialog::internalClose() {
         if (getResult()) {
                 if (_fullscreenCheckbox) {
                         if (_enableGraphicSettings) {
@@ -172 +172 @@
         Dialog::close();
 }
 
-void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void OptionsDialog::internalHandleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
         switch (cmd) {
         case kMasterVolumeChanged:
                 _masterVolumeLabel->setValue(_masterVolumeSlider->getValue());

scummvm/gui/options.h

@@ -37 +37 @@
 
 class OptionsDialog : public Dialog {
         typedef Common::String String;
+
+protected:
+        // HACK: Jamieson630
+        // The following are the actual implementation of
+        // open, close and handleCommand. Since these must be
+        // called directly from derived classes, and MSVC6 has
+        // been choking on the notation needed to do so,
+        // these functions are used instead to avoid a name
+        // ambiguity.
+        void internalOpen();
+        void internalClose();
+        void internalHandleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+
 public:
         OptionsDialog(const String &domain, int x, int y, int w, int h);
 
-        void open();
-        void close();
-        void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+        void open() { internalOpen(); }
+        void close() { internalClose(); }
+        void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { internalHandleCommand(sender, cmd, data); }
 
         enum {
                 kOKCmd                                  = 'ok  '

scummvm/scumm/dialogs.cpp

@@ -454 +454 @@
 }
 
 void OptionsDialog::open() {
-        GUI::OptionsDialog::open();
+        internalOpen(); // GUI::OptionsDialog::open
 
         // update checkboxes, too
         subtitlesCheckbox->setState(_scumm->_noSubtitles == false);
@@ -467 +467 @@
                 ConfMan.set("nosubtitles", !subtitlesCheckbox->getState(), _domain);
         }
 
-        GUI::OptionsDialog::close();
-
+        internalClose(); // GUI::OptionsDialog::close
 
         // Sync the engine with the config manager
         int soundVolumeMaster = ConfMan.getInt("master_volume");
@@ -498 +497 @@
 #endif
                 break;
         default:
-                GUI::OptionsDialog::handleCommand(sender, cmd, data);
+                internalHandleCommand(sender, cmd, data); // GUI::OptionsDialog::handleCommand
         }
 }