[Scummvm-cvs-logs] SF.net SVN: scummvm:[48561] scummvm/trunk/engines

[fingolfin at users.sourceforge.net]

Revision: 48561
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48561&view=rev
Author:   fingolfin
Date:     2010-04-06 09:25:44 +0000 (Tue, 06 Apr 2010)

Log Message:
-----------
Remove old & undocumented MSVC 6 workaround

Modified Paths:
--------------
    scummvm/trunk/engines/dialogs.cpp
    scummvm/trunk/engines/scumm/dialogs.cpp

Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp	2010-04-06 09:18:21 UTC (rev 48560)
+++ scummvm/trunk/engines/dialogs.cpp	2010-04-06 09:25:44 UTC (rev 48561)
@@ -49,11 +49,7 @@
 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',
 	kLoadCmd = 'LOAD',
@@ -323,7 +319,7 @@
 #endif
 		break;
 	default:
-		GUI_OptionsDialog::handleCommand (sender, cmd, data);
+		GUI::OptionsDialog::handleCommand (sender, cmd, data);
 	}
 }
 

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2010-04-06 09:18:21 UTC (rev 48560)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2010-04-06 09:25:44 UTC (rev 48561)
@@ -64,9 +64,6 @@
 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 @@
 #endif
 		break;
 	default:
-		GUI_OptionsDialog::handleCommand (sender, cmd, data);
+		GUI::OptionsDialog::handleCommand (sender, cmd, data);
 	}
 }
 
@@ -710,7 +707,7 @@
 }
 
 void ValueDisplayDialog::open() {
-	GUI_Dialog::open();
+	GUI::Dialog::open();
 	setResult(_value);
 	_timer = g_system->getMillis() + kDisplayDelay;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.