[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.168,1.169 scummvm.cpp,2.464,2.465

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27556/scumm

Modified Files:
	resource.cpp scummvm.cpp 
Log Message:
modified MessageDialog to allow for custom button texts

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- resource.cpp	17 Oct 2003 16:28:29 -0000	1.168
+++ resource.cpp	1 Nov 2003 21:15:32 -0000	1.169
@@ -23,7 +23,6 @@
 #include "stdafx.h"
 #include "common/map.h"
 #include "common/str.h"
-#include "gui/message.h"
 #include "scumm/bundle.h"
 #include "scumm/dialogs.h"
 #include "scumm/imuse.h"

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.464
retrieving revision 2.465
diff -u -d -r2.464 -r2.465
--- scummvm.cpp	1 Nov 2003 20:52:40 -0000	2.464
+++ scummvm.cpp	1 Nov 2003 21:15:33 -0000	2.465
@@ -2496,7 +2496,7 @@
 	vsprintf(buf, message, va);
 	va_end(va);
 
-	MessageDialog dialog(_newgui, buf, true, showCancel);
+	MessageDialog dialog(_newgui, buf, "OK", "Cancel");
 	return runDialog(dialog);
 }