From 3a8366526b928992ed10bf4ae0d0d4ab8876bfe4 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 6 Apr 2010 09:25:44 +0000
Subject: Remove old & undocumented MSVC 6 workaround

svn-id: r48561
---
 engines/dialogs.cpp       | 6 +-----
 engines/scumm/dialogs.cpp | 7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index a923379c81..4a2f0f9f5b 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -49,10 +49,6 @@
 using GUI::CommandSender;
 using GUI::StaticTextWidget;
 using GUI::kCloseCmd;
-using GUI::WIDGET_ENABLED;
-
-typedef GUI::OptionsDialog GUI_OptionsDialog;
-typedef GUI::Dialog GUI_Dialog;
 
 enum {
 	kSaveCmd = 'SAVE',
@@ -323,7 +319,7 @@ void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
 #endif
 		break;
 	default:
-		GUI_OptionsDialog::handleCommand (sender, cmd, data);
+		GUI::OptionsDialog::handleCommand (sender, cmd, data);
 	}
 }
 
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 906d8754b3..981f17778c 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -64,9 +64,6 @@ using Graphics::kTextAlignCenter;
 using Graphics::kTextAlignLeft;
 using GUI::WIDGET_ENABLED;
 
-typedef GUI::OptionsDialog GUI_OptionsDialog;
-typedef GUI::Dialog GUI_Dialog;
-
 namespace Scumm {
 
 struct ResString {
@@ -429,7 +426,7 @@ void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
 #endif
 		break;
 	default:
-		GUI_OptionsDialog::handleCommand (sender, cmd, data);
+		GUI::OptionsDialog::handleCommand (sender, cmd, data);
 	}
 }
 
@@ -710,7 +707,7 @@ void ValueDisplayDialog::handleKeyDown(Common::KeyState state) {
 }
 
 void ValueDisplayDialog::open() {
-	GUI_Dialog::open();
+	GUI::Dialog::open();
 	setResult(_value);
 	_timer = g_system->getMillis() + kDisplayDelay;
 }
-- 
cgit v1.2.3