[Scummvm-cvs-logs] CVS: scummvm/gui widget.cpp,1.14,1.15 PopUpWidget.cpp,1.10,1.11 newgui.cpp,1.50,1.51

Max Horn fingolfin at users.sourceforge.net
Wed Jul 30 11:55:11 CEST 2003


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv3634/gui

Modified Files:
	widget.cpp PopUpWidget.cpp newgui.cpp 
Log Message:
the VC warning for unknown pragmas is now gloabally disabled, no need to work around it locally

Index: widget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- widget.cpp	21 May 2003 16:18:41 -0000	1.14
+++ widget.cpp	30 Jul 2003 18:40:28 -0000	1.15
@@ -24,11 +24,6 @@
 #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)
 	: _type(0), _boss(boss), _x(x), _y(y), _w(w), _h(h),
 	  _id(0), _flags(0), _hasFocus(false) {

Index: PopUpWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PopUpWidget.cpp	27 Mar 2003 07:13:29 -0000	1.10
+++ PopUpWidget.cpp	30 Jul 2003 18:40:28 -0000	1.11
@@ -24,10 +24,6 @@
 #include "newgui.h"
 #include "common/engine.h"
 
-#ifdef _MSC_VER
-#	pragma warning( disable : 4068 ) // unknown pragmas
-#endif
-
 #define UP_DOWN_BOX_HEIGHT	10
 
 // Little up/down arrow

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- newgui.cpp	22 Jul 2003 16:29:23 -0000	1.50
+++ newgui.cpp	30 Jul 2003 18:40:28 -0000	1.51
@@ -27,10 +27,6 @@
 #	include "palm.h"
 #endif
 
-#ifdef _MSC_VER
-#	pragma warning( disable : 4068 ) // unknown pragma
-#endif
-
 
 /*
  * TODO list





More information about the Scummvm-git-logs mailing list