[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.41,1.42
Nicolas Bacca
arisme at users.sourceforge.net
Mon Apr 21 03:10:05 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15096
Modified Files:
dialogs.cpp
Log Message:
Fix option dialogs for WinCE
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dialogs.cpp 12 Apr 2003 17:22:20 -0000 1.41
+++ dialogs.cpp 21 Apr 2003 10:09:41 -0000 1.42
@@ -464,17 +464,28 @@
kAboutCmd = 'ABOU'
};
+#ifndef _WIN32_WCE
OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
: ScummDialog(gui, scumm, 40, 30, 240, 124) {
+#else
+OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
+ : ScummDialog(gui, scumm, 40, 30, 240, 124 + kButtonHeight + 4) {
+#endif
//
// Add the buttons
//
+#ifdef _WIN32_WCE
+ addButton(_w-kButtonWidth-8, _h-24 - kButtonHeight - 4, "OK", kOKCmd, 'O');
+ addButton(_w-2*kButtonWidth-12, _h-24 - kButtonHeight - 4, "Cancel", kCancelCmd, 'C');
+
+ addButton(8, _h-24 - kButtonHeight - 4, "About", kAboutCmd, 'A');
+
+ addButton(kButtonWidth+12, _h-24, "Keys", kKeysCmd, 'K');
+#else
addButton(_w-kButtonWidth-8, _h-24, "OK", kOKCmd, 'O');
addButton(_w-2*kButtonWidth-12, _h-24, "Cancel", kCancelCmd, 'C');
addButton(8, _h-24, "About", kAboutCmd, 'A');
-#ifdef _WIN32_WCE
- addButton(kButtonWidth+12, _h-24, "Keys", kKeysCmd, 'K');
#endif
//
@@ -658,11 +669,11 @@
KeysDialog::KeysDialog(NewGui *gui, Scumm *scumm)
: ScummDialog(gui, scumm, 30, 20, 260, 160) {
- addButton(200, 20, queryCustomString(24), kMapCmd, 'M'); // Map
- addButton(200, 40, "OK", kOKCmd, 'O'); // OK
- addButton(200, 60, "Cancel", kCancelCmd, 'C'); // Cancel
+ addButton(160, 20, queryCustomString(24), kMapCmd, 'M'); // Map
+ addButton(160, 40, "OK", kOKCmd, 'O'); // OK
+ addButton(160, 60, "Cancel", kCancelCmd, 'C'); // Cancel
- _actionsList = new ListWidget(this, 10, 20, 180, 90);
+ _actionsList = new ListWidget(this, 10, 20, 140, 90);
_actionsList->setNumberingMode(kListNumberingZero);
_actionTitle = new StaticTextWidget(this, 10, 120, 240, 16, queryCustomString(25), kTextAlignCenter);
More information about the Scummvm-git-logs
mailing list