aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-11-12 12:50:21 +0000
committerMax Horn2008-11-12 12:50:21 +0000
commit201c26fcd0ad71568a3581a5520c094d93ec6d06 (patch)
tree5aa8b1829cdb1685d94f9c21b8d3b16fda2123cb
parent8b91e9c8be67792b4e97b5e1c6895c31a01bc83f (diff)
downloadscummvm-rg350-201c26fcd0ad71568a3581a5520c094d93ec6d06.tar.gz
scummvm-rg350-201c26fcd0ad71568a3581a5520c094d93ec6d06.tar.bz2
scummvm-rg350-201c26fcd0ad71568a3581a5520c094d93ec6d06.zip
cleanup
svn-id: r35017
-rw-r--r--engines/dialogs.cpp10
-rw-r--r--engines/dialogs.h8
-rw-r--r--engines/scumm/dialogs.cpp4
3 files changed, 3 insertions, 19 deletions
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 1bb6182f7f..0032006ca7 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -48,10 +48,6 @@
using GUI::CommandSender;
using GUI::StaticTextWidget;
-using GUI::kButtonWidth;
-using GUI::kButtonHeight;
-using GUI::kBigButtonWidth;
-using GUI::kBigButtonHeight;
using GUI::kCloseCmd;
using GUI::kTextAlignCenter;
using GUI::kTextAlignLeft;
@@ -60,8 +56,6 @@ using GUI::WIDGET_ENABLED;
typedef GUI::OptionsDialog GUI_OptionsDialog;
typedef GUI::Dialog GUI_Dialog;
-GlobalDialog::GlobalDialog(Common::String name) : GUI::Dialog(name) {}
-
enum {
kSaveCmd = 'SAVE',
kLoadCmd = 'LOAD',
@@ -75,7 +69,7 @@ enum {
};
MainMenuDialog::MainMenuDialog(Engine *engine)
- : GlobalDialog("GlobalMenu"), _engine(engine) {
+ : GUI::Dialog("GlobalMenu"), _engine(engine) {
_backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial;
#ifndef DISABLE_FANCY_THEMES
@@ -202,7 +196,7 @@ void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
}
break;
default:
- GlobalDialog::handleCommand(sender, cmd, data);
+ GUI::Dialog::handleCommand(sender, cmd, data);
}
}
diff --git a/engines/dialogs.h b/engines/dialogs.h
index 0e715e6fb6..2f5cf55751 100644
--- a/engines/dialogs.h
+++ b/engines/dialogs.h
@@ -34,13 +34,7 @@
#include "engines/engine.h"
-class GlobalDialog : public GUI::Dialog {
-public:
- GlobalDialog(Common::String name);
-};
-
-
-class MainMenuDialog : public GlobalDialog {
+class MainMenuDialog : public GUI::Dialog {
public:
MainMenuDialog(Engine *engine);
~MainMenuDialog();
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6e126f0872..581c16ca06 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -61,10 +61,6 @@
using GUI::CommandSender;
using GUI::StaticTextWidget;
-using GUI::kButtonWidth;
-using GUI::kButtonHeight;
-using GUI::kBigButtonWidth;
-using GUI::kBigButtonHeight;
using GUI::kCloseCmd;
using GUI::kTextAlignCenter;
using GUI::kTextAlignLeft;