[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.91,1.92

Nicolas Bacca arisme at users.sourceforge.net
Sun Dec 14 02:47:01 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1716

Modified Files:
	dialogs.cpp 
Log Message:
WinCE GUI fixes

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- dialogs.cpp	13 Dec 2003 17:10:46 -0000	1.91
+++ dialogs.cpp	14 Dec 2003 10:46:08 -0000	1.92
@@ -415,16 +415,15 @@
 	: GUI::OptionsDialog("", 40, 30, 240, 124), _scumm(scumm) {
 #else
 ConfigDialog::ConfigDialog(ScummEngine *scumm)
-	: GUI::OptionsDialog("", 40, 30, 240, 124 + kButtonHeight + 4), _scumm(scumm) {
+	: GUI::OptionsDialog("", 40, 30, 240, 124 + 4), _scumm(scumm) {
 #endif
 	//
 	// Add the buttons
 	//
 #ifdef _WIN32_WCE
-	addButton(_w - kButtonWidth - 8, _h - 24 - kButtonHeight - 4, "OK", GUI::OptionsDialog::kOKCmd, 'O');
-	addButton(_w - 2 * kButtonWidth - 12, _h - 24 - kButtonHeight - 4, "Cancel", kCloseCmd, 'C');
-
-	addButton(kButtonWidth+12, _h - 24, "Keys", kKeysCmd, 'K');
+	addButton(_w - kButtonWidth - 8, _h - 24 - 4, "OK", GUI::OptionsDialog::kOKCmd, 'O');
+	addButton(_w - 2 * kButtonWidth - 12, _h - 24 - 4, "Cancel", kCloseCmd, 'C');
+	addButton(_w - 3 * kButtonWidth - 16, _h - 24 - 4, "Keys", kKeysCmd, 'K');
 #else
 	addButton(_w - kButtonWidth-8, _h - 24, "OK", GUI::OptionsDialog::kOKCmd, 'O');
 	addButton(_w - 2 * kButtonWidth-12, _h - 24, "Cancel", kCloseCmd, 'C');
@@ -625,6 +624,11 @@
 #ifdef _WIN32_WCE
 
 #pragma mark -
+
+using GUI::ListWidget;
+using GUI::kListNumberingZero;
+using GUI::WIDGET_CLEARBG;
+using GUI::kListSelectionChangedCmd;
 
 enum {
 	kMapCmd					= 'map '





More information about the Scummvm-git-logs mailing list