INTEGRATION: CWS sb59 (1.1.938); FILE MERGED

2006/09/20 11:09:19 sb 1.1.938.2: Manually resolved merge conflict against 1.2 (SRC680m185).
2006/08/22 12:50:36 sb 1.1.938.1: #i67487# Made code warning-free (wntmsci10).

desktop/win32/source/sowrapper.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sowrapper.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 09:51:03 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 14:30:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,7 +36,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 #include "main.h"
 
 int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )