[Scummvm-cvs-logs] SF.net SVN: scummvm:[36283] scummvm/branches/branch-0-13-0/engines
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Thu Feb 12 22:54:02 CET 2009
Revision: 36283
http://scummvm.svn.sourceforge.net/scummvm/?rev=36283&view=rev
Author: anotherguest
Date: 2009-02-12 21:54:02 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
Fixed startup of the _keysDialog, common and in Scumm folder.
Modified Paths:
--------------
scummvm/branches/branch-0-13-0/engines/dialogs.cpp
scummvm/branches/branch-0-13-0/engines/scumm/dialogs.cpp
Modified: scummvm/branches/branch-0-13-0/engines/dialogs.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/dialogs.cpp 2009-02-12 21:52:29 UTC (rev 36282)
+++ scummvm/branches/branch-0-13-0/engines/dialogs.cpp 2009-02-12 21:54:02 UTC (rev 36283)
@@ -295,13 +295,7 @@
new GUI::ButtonWidget(this, "ScummConfig.Cancel", "Cancel", kCloseCmd, 'C');
#ifdef SMALL_SCREEN_DEVICE
- new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
-
- //
- // Create the sub dialog(s)
- //
-
- _keysDialog = new GUI::KeysDialog();
+ //new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
#endif
}
@@ -316,7 +310,13 @@
case kKeysCmd:
#ifdef SMALL_SCREEN_DEVICE
- _keysDialog->runModal();
+ //
+ // Create the sub dialog(s)
+ //
+ _keysDialog = new GUI::KeysDialog();
+ _keysDialog->runModal();
+ delete _keysDialog;
+ _keysDialog = NULL;
#endif
break;
default:
Modified: scummvm/branches/branch-0-13-0/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/scumm/dialogs.cpp 2009-02-12 21:52:29 UTC (rev 36282)
+++ scummvm/branches/branch-0-13-0/engines/scumm/dialogs.cpp 2009-02-12 21:54:02 UTC (rev 36283)
@@ -591,14 +591,6 @@
#ifdef SMALL_SCREEN_DEVICE
new GUI::ButtonWidget(this, "ScummConfig.Keys", "Keys", kKeysCmd, 'K');
#endif
-
-#ifdef SMALL_SCREEN_DEVICE
- //
- // Create the sub dialog(s)
- //
-
- _keysDialog = new GUI::KeysDialog();
-#endif
}
ConfigDialog::~ConfigDialog() {
@@ -611,7 +603,13 @@
switch (cmd) {
case kKeysCmd:
#ifdef SMALL_SCREEN_DEVICE
+ //
+ // Create the sub dialog(s)
+ //
+ _keysDialog = new GUI::KeysDialog();
_keysDialog->runModal();
+ delete _keysDialog;
+ _keysDialog = NULL;
#endif
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list