[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.87,1.88
Max Horn
fingolfin at users.sourceforge.net
Mon Dec 1 20:16:52 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.344,1.345
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen command.h,1.7,1.8 cutaway.cpp,1.76,1.77 cutaway.h,1.26,1.27 debug.cpp,1.1,1.2 debug.h,1.1,1.2 display.cpp,1.30,1.31 display.h,1.23,1.24 graphics.cpp,1.51,1.52 graphics.h,1.42,1.43 input.cpp,1.13,1.14 input.h,1.10,1.11 journal.cpp,1.5,1.6 journal.h,1.1,1.2 logic.cpp,1.111,1.112 logic.h,1.73,1.74 queen.cpp,1.46,1.47 queen.h,1.14,1.15 resource.cpp,1.29,1.30 resource.h,1.19,1.20 sound.cpp,1.14,1.15 sound.h,1.6,1.7 talk.cpp,1.49,1.50 talk.h,1.22,1.23 walk.h,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv9209
Modified Files:
dialogs.cpp
Log Message:
don't do a global import of namespace GUI
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- dialogs.cpp 28 Nov 2003 21:56:14 -0000 1.87
+++ dialogs.cpp 1 Dec 2003 22:16:29 -0000 1.88
@@ -47,7 +47,13 @@
extern void load_key_mapping();
#endif
-using namespace GUI;
+using GUI::CommandSender;
+using GUI::StaticTextWidget;
+using GUI::kButtonWidth;
+using GUI::kCloseCmd;
+using GUI::kTextAlignCenter;
+using GUI::kTextAlignLeft;
+using GUI::WIDGET_ENABLED;
namespace Scumm {
@@ -191,7 +197,7 @@
kQuitCmd = 'QUIT'
};
-class SaveLoadChooser : public ChooserDialog {
+class SaveLoadChooser : public GUI::ChooserDialog {
typedef Common::String String;
typedef Common::StringList StringList;
protected:
@@ -208,7 +214,7 @@
: ChooserDialog(title, buttonLabel, 182), _saveMode(saveMode) {
_list->setEditable(saveMode);
- _list->setNumberingMode(saveMode ? kListNumberingOne : kListNumberingZero);
+ _list->setNumberingMode(saveMode ? GUI::kListNumberingOne : GUI::kListNumberingZero);
}
const Common::String &SaveLoadChooser::getResultString() const {
@@ -218,8 +224,8 @@
void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
int selItem = _list->getSelected();
switch (cmd) {
- case kListItemActivatedCmd:
- case kListItemDoubleClickedCmd:
+ case GUI::kListItemActivatedCmd:
+ case GUI::kListItemDoubleClickedCmd:
if (selItem >= 0) {
if (_saveMode || !getResultString().isEmpty()) {
setResult(selItem);
@@ -227,7 +233,7 @@
}
}
break;
- case kListSelectionChangedCmd:
+ case GUI::kListSelectionChangedCmd:
if (_saveMode) {
_list->startEditMode();
}
@@ -273,7 +279,7 @@
};
#define addBigButton(label, cmd, hotkey) \
- new ButtonWidget(this, x, y, kBigButtonWidth, 16, label, cmd, hotkey); y += kRowHeight
+ new GUI::ButtonWidget(this, x, y, kBigButtonWidth, 16, label, cmd, hotkey); y += kRowHeight
MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
: ScummDialog(scumm, (320 - kMainMenuWidth) / 2, (200 - kMainMenuHeight)/2, kMainMenuWidth, kMainMenuHeight) {
@@ -299,7 +305,7 @@
//
// Create the sub dialog(s)
//
- _aboutDialog = new AboutDialog();
+ _aboutDialog = new GUI::AboutDialog();
#ifndef DISABLE_HELP
_helpDialog = new HelpDialog(scumm);
#endif
@@ -431,7 +437,7 @@
//
// Some misc options
//
- subtitlesCheckbox = new CheckboxWidget(this, 15, 62, 200, 16, "Show subtitles", 0, 'S');
+ subtitlesCheckbox = new GUI::CheckboxWidget(this, 15, 62, 200, 16, "Show subtitles", 0, 'S');
//
// Create the sub dialog(s)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.344,1.345
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen command.h,1.7,1.8 cutaway.cpp,1.76,1.77 cutaway.h,1.26,1.27 debug.cpp,1.1,1.2 debug.h,1.1,1.2 display.cpp,1.30,1.31 display.h,1.23,1.24 graphics.cpp,1.51,1.52 graphics.h,1.42,1.43 input.cpp,1.13,1.14 input.h,1.10,1.11 journal.cpp,1.5,1.6 journal.h,1.1,1.2 logic.cpp,1.111,1.112 logic.h,1.73,1.74 queen.cpp,1.46,1.47 queen.h,1.14,1.15 resource.cpp,1.29,1.30 resource.h,1.19,1.20 sound.cpp,1.14,1.15 sound.h,1.6,1.7 talk.cpp,1.49,1.50 talk.h,1.22,1.23 walk.h,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list