[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.12,1.13 widget.cpp,1.4,1.5

[Matt Hargett]

Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv5874/scummvm/gui

Modified Files:
	newgui.cpp widget.cpp 
Log Message:
2002-09-21  Matt Hargett  <matt at use.net>

  * scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate
    PDBs on all builds.

  * gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp,
    dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp:
    Fix warnings where possible. One pragma added to eliminate
    warning of unknown pragmas.

  * string.cpp: If unknown escape sequence, print warning.



Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- newgui.cpp	19 Sep 2002 23:06:54 -0000	1.12
+++ newgui.cpp	22 Sep 2002 03:53:52 -0000	1.13
@@ -25,6 +25,10 @@
 #include "newgui.h"
 #include "dialog.h"
 #include "scumm/dialogs.h"
+
+#ifdef _MSC_VER
+#	pragma warning( disable : 4068 ) // unknown pragma
+#endif
 
 /*
  * TODO list
@@ -126,7 +130,7 @@
 		
 			switch(t.event_code) {
 				case OSystem::EVENT_KEYDOWN:
-					activeDialog->handleKeyDown(t.kbd.ascii, t.kbd.flags);
+					activeDialog->handleKeyDown((byte)t.kbd.ascii, t.kbd.flags);
 
 					// init continuous event stream
 					_currentKeyDown = t.kbd.ascii;
@@ -135,7 +139,7 @@
 					_keyRepeatLoopCount = 0;
 					break;
 				case OSystem::EVENT_KEYUP:
-					activeDialog->handleKeyUp(t.kbd.ascii, t.kbd.flags);
+					activeDialog->handleKeyUp((byte)t.kbd.ascii, t.kbd.flags);
 					if (t.kbd.ascii == _currentKeyDown)
 						// only stop firing events if it's the current key
 						_currentKeyDown = 0;

Index: widget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- widget.cpp	19 Sep 2002 16:06:51 -0000	1.4
+++ widget.cpp	22 Sep 2002 03:53:52 -0000	1.5
@@ -21,7 +21,11 @@
 #include "stdafx.h"
 #include "widget.h"
 #include "dialog.h"
-#include "newgui.h"
+#include "newgui.h"
+
+#ifdef _MSC_VER
+#	pragma warning( disable : 4068 ) // unknown pragma
+#endif
 
 
 Widget::Widget (Dialog *boss, int x, int y, int w, int h)
@@ -57,7 +61,7 @@
 	}
 	
 	// Now perform the actual widget draw
-	drawWidget(_flags & WIDGET_HILITED);
+	drawWidget((_flags & WIDGET_HILITED) ? true : false);
 
 	// Restore x/y
 	if (_flags & WIDGET_BORDER) {