[Scummvm-cvs-logs] SF.net SVN: scummvm: [27628] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Jun 22 23:38:35 CEST 2007


Revision: 27628
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27628&view=rev
Author:   fingolfin
Date:     2007-06-22 14:38:34 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
Converted some more code to make use of Common::KEYCODE_ / Common::ASCII_

Modified Paths:
--------------
    scummvm/trunk/engines/queen/journal.cpp
    scummvm/trunk/gui/massadd.cpp
    scummvm/trunk/gui/message.cpp

Modified: scummvm/trunk/engines/queen/journal.cpp
===================================================================
--- scummvm/trunk/engines/queen/journal.cpp	2007-06-22 21:34:03 UTC (rev 27627)
+++ scummvm/trunk/engines/queen/journal.cpp	2007-06-22 21:38:34 UTC (rev 27628)
@@ -522,8 +522,8 @@
 			dirty = true;
 		}
 		break;
-	case '\n':
-	case '\r':
+	case Common::KEYCODE_RETURN:
+	case Common::KEYCODE_KP_ENTER:
 		if (_textField.text[0]) {
 			closeTextField();
 			int currentSlot = _currentSavePage * 10 + _currentSaveSlot;

Modified: scummvm/trunk/gui/massadd.cpp
===================================================================
--- scummvm/trunk/gui/massadd.cpp	2007-06-22 21:34:03 UTC (rev 27627)
+++ scummvm/trunk/gui/massadd.cpp	2007-06-22 21:38:34 UTC (rev 27628)
@@ -85,10 +85,10 @@
 	_gameProgressText = new StaticTextWidget(this, "massadddialog_gameprogress",
 											 "... progress ...");
 
-	_okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, '\r');
+	_okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, Common::ASCII_RETURN);
 	_okButton->setEnabled(false);
 
-	new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, '\27');
+	new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE);
 
 }
 

Modified: scummvm/trunk/gui/message.cpp
===================================================================
--- scummvm/trunk/gui/message.cpp	2007-06-22 21:34:03 UTC (rev 27627)
+++ scummvm/trunk/gui/message.cpp	2007-06-22 21:38:34 UTC (rev 27628)
@@ -96,10 +96,10 @@
 	}
 
 	if (defaultButton)
-		addButton(this, okButtonPos, _h - buttonHeight - 8, defaultButton, kOkCmd, '\r');	// Confirm dialog
+		addButton(this, okButtonPos, _h - buttonHeight - 8, defaultButton, kOkCmd, Common::ASCII_RETURN);	// Confirm dialog
 
 	if (altButton)
-		addButton(this, cancelButtonPos, _h - buttonHeight - 8, altButton, kCancelCmd, '\27');	// Cancel dialog
+		addButton(this, cancelButtonPos, _h - buttonHeight - 8, altButton, kCancelCmd, Common::ASCII_ESCAPE);	// Cancel dialog
 }
 
 void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {


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