[Scummvm-cvs-logs] CVS: scummvm/gui ListWidget.cpp,1.56,1.57 options.cpp,1.95,1.96

Chris Apers chrilith at users.sourceforge.net
Sat Sep 3 09:27:06 CEST 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29695

Modified Files:
	ListWidget.cpp options.cpp 
Log Message:
Change PalmOS ident

Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ListWidget.cpp	30 Jul 2005 21:11:00 -0000	1.56
+++ ListWidget.cpp	3 Sep 2005 16:24:58 -0000	1.57
@@ -261,7 +261,7 @@
 		_scrollBar->draw();
 	}
 
-#if !defined(__PALM_OS__)
+#if !defined(PALMOS_MODE)
 	// not done on PalmOS because keyboard is emulated and keyup is not generated
 	_currentKeyDown = keycode;
 #endif

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- options.cpp	17 Aug 2005 20:29:21 -0000	1.95
+++ options.cpp	3 Sep 2005 16:24:58 -0000	1.96
@@ -1,679 +1,679 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
[...1327 lines suppressed...]
+		BrowserDialog browser("Select SoundFont", false);
+		if (browser.runModal() > 0) {
+			// User made his choice...
+			FilesystemNode file(browser.getResult());
+			_soundFont->setLabel(file.path());
+			draw();
+		}
+		break;
+	}
+#ifdef SMALL_SCREEN_DEVICE
+	case kChooseKeyMappingCmd:
+		_keysDialog->runModal();
+		break;
+#endif
+	default:
+		OptionsDialog::handleCommand(sender, cmd, data);
+	}
+}
+
+} // End of namespace GUI





More information about the Scummvm-git-logs mailing list