Replace deprecated WNT macro definition by WIN32.

diff --git a/src/CASCatch/CASCatch_CatchSignals.cxx b/src/CASCatch/CASCatch_CatchSignals.cxx
index 2a50209cec6f6a6fccf4d82d003efa9420c368c6..ce25080a9da86c059eaeb6cfd948e15c160f0f46 100644 (file)
--- a/src/CASCatch/CASCatch_CatchSignals.cxx
+++ b/src/CASCatch/CASCatch_CatchSignals.cxx
@@ -46,7 +46,7 @@ CASCatch_CatchSignals::CASCatch_CatchSignals()
     mySigStates[i] = NULL;
 }
 
-#ifndef WNT
+#ifndef WIN32
 
 //================================ UNIX part ==================================================
 
@@ -218,7 +218,7 @@ void CASCatch_CatchSignals::Deactivate()
 
 
 #else
-//====================================== WNT part ====================================================
+//====================================== WIN32 part ====================================================
 #include <OSD_WNT_1.hxx>
 
 #include <process.h>

diff --git a/src/LightApp/LightApp.h b/src/LightApp/LightApp.h
index f413e249b8323d8f1d44fe9c634d50f132e0d0a8..844c03005c9e04e8ae2a599cbaa8a1794f1dc491 100644 (file)
--- a/src/LightApp/LightApp.h
+++ b/src/LightApp/LightApp.h
@@ -36,7 +36,7 @@
 #  define LIGHTAPP_EXPORT
 #endif // WIN32
 
-#if defined WNT
+#if defined WIN32
 #pragma warning ( disable:4251 )
 #pragma warning ( disable:4786 )
 #pragma warning ( disable:4503 )

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 4c0c1fe199078939297cdf8dbac873f4ed8cb7dd..17d4c572014d3dafa8f5af3a6f04f6fc8f5817ab 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -24,7 +24,7 @@
 // Created:   6/20/2005 18:39:45 PM
 // Author:    Natalia Donis
 
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...

diff --git a/src/LightApp/LightApp_SelectionMgr.cxx b/src/LightApp/LightApp_SelectionMgr.cxx
index 4e8eb3e8604e9a177079553b9d512b1941ba8b3f..5a520456a967217e531f3175f88e3456d0c1a3d1 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.cxx
+++ b/src/LightApp/LightApp_SelectionMgr.cxx
@@ -395,7 +395,7 @@ void LightApp_SelectionMgr::selectedSubOwners( MapEntryOfMapOfInteger& theMap )
       dynamic_cast<const LightApp_DataSubOwner*>( (*itr).operator->() );
     if ( subOwner )
     {
-//#ifndef WNT
+//#ifndef WIN32
       if ( !theMap.IsBound( TCollection_AsciiString(subOwner->entry().toLatin1().data()) ) )
 //#else
 //      if ( !theMap.IsBound( subOwner->entry().toLatin1().data() ) )

diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx
index 32d4b321626abfa65148c5e9b8332aae97f17ccb..fe2a8a6fd573095a38fa2135df44a16695f63921 100755 (executable)
--- a/src/OCCViewer/OCCViewer_VService.cxx
+++ b/src/OCCViewer/OCCViewer_VService.cxx
@@ -28,7 +28,7 @@
 #include <Aspect_DisplayConnection.hxx>
 #include <Graphic3d.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
-#ifdef WNT
+#ifdef WIN32
 #include <WNT_Window.hxx>
 #else
 #include <Xw_Window.hxx>
@@ -41,7 +41,7 @@ Handle(Aspect_Window) OCCViewer_VService::CreateWindow( const Handle(V3d_View)&
                                                        WId winId )
 {
   Aspect_Handle aWindowHandle = (Aspect_Handle)winId;
-#ifdef WNT
+#ifdef WIN32
   Handle(WNT_Window) viewWindow = new WNT_Window( aWindowHandle );
 #else
   Handle(Aspect_DisplayConnection) aDispConnection = view->Viewer()->Driver()->GetDisplayConnection();
@@ -65,7 +65,7 @@ Handle(V3d_Viewer) OCCViewer_VService::CreateViewer( const Standard_ExtString na
   if (aGraphicDriver.IsNull())
   {
     Handle(Aspect_DisplayConnection) aDisplayConnection;
-#ifndef WNT
+#ifndef WIN32
     aDisplayConnection = new Aspect_DisplayConnection( displayName );
 #else
     aDisplayConnection = new Aspect_DisplayConnection();

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 18503c000b79d5ebbd3e1cb4f352203a15406f8b..626ebea88b03ffc2d14a1d41a10f2022f3efedc2 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#if !defined WNT
+#if !defined WIN32
 #define QT_CLEAN_NAMESPACE         /* avoid definition of INT32 and INT8 */
 #endif
 
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-#if !defined WNT
+#if !defined WIN32
 #include <QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
@@ -225,7 +225,7 @@ void OCCViewer_ViewPort::cleanup()
 */
 void OCCViewer_ViewPort::selectVisualId()
 {
-#if !defined WNT
+#if !defined WIN32
   XVisualInfo* pVisualInfo;
   if ( QX11Info::display() )
   {

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 34cce7126241e89dbee36483c559c718bbca5394..de0302be4916201f5d5208dc2a427b5845008a72 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -46,7 +46,7 @@
 
 #include "utilities.h"
 
-#if defined WNT
+#if defined WIN32
 #include <WNT_Window.hxx>
 #else
 #include <Xw_Window.hxx>
@@ -623,7 +623,7 @@ void OCCViewer_ViewPort3d::endRotation()
 */
 void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e )
 {
-#ifndef WNT
+#ifndef WIN32
   /* X11 : map before show doesn't work */
   if ( !mapped( activeView() ) )
     mapView( activeView() );
@@ -643,7 +643,7 @@ void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e )
 */
 void OCCViewer_ViewPort3d::resizeEvent( QResizeEvent* e )
 {
-#ifdef WNT
+#ifdef WIN32
   /* Win32 : map before first show to avoid flicker */
   if ( !mapped( activeView() ) )
     mapView( activeView() );

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index a44350df90a0758a523e7785ed73e7e624171a08..261f8d54f86c3ca6fe48654b808d843564066fad 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.h
@@ -34,7 +34,7 @@ class QPolygon;
 class QtxRectRubberBand;
 class QtxPolyRubberBand;
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning ( disable:4251 )
 #endif
 
@@ -144,7 +144,7 @@ private:
   QtxPolyRubberBand*           mypPolyRB;
 };
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( default:4251 )
 #endif
 

diff --git a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx
index 27cd2407281ac3eafda85b93cd173b0dfcb5f659..9ae794927b73e6c9a96675c7e30ff253b01d1521 100755 (executable)
--- a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx
+++ b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx
@@ -26,7 +26,7 @@
 
 #include <cstring>
 
-#ifndef WNT
+#ifndef WIN32
 # ifndef GLX_GLXEXT_LEGACY
 #  define GLX_GLXEXT_LEGACY
 # endif
@@ -85,7 +85,7 @@ static PFNGLRENDERBUFFERSTORAGEEXTPROC vglRenderbufferStorageEXT = NULL;
 static PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC vglFramebufferRenderbufferEXT = NULL;
 static PFNGLDELETERENDERBUFFERSEXTPROC vglDeleteRenderbuffersEXT = NULL;
 
-#ifndef WNT
+#ifndef WIN32
 #define GL_GetProcAddress( x ) glXGetProcAddressARB( (const GLubyte*)x )
 #else
 #define GL_GetProcAddress( x ) wglGetProcAddress( (const LPCSTR)x )

diff --git a/src/QxScene/QxScene.h b/src/QxScene/QxScene.h
index 3e3bcdd3c395d4f19477a7063132e884ed2c5dc0..ecc7be5c62add5849c72b177f7d851f440eeae45 100644 (file)
--- a/src/QxScene/QxScene.h
+++ b/src/QxScene/QxScene.h
@@ -19,7 +19,7 @@
 
 //  SALOME QxScene : build Supervisor viewer into desktop
 //
-#ifdef WNT
+#ifdef WIN32
 #if defined QXSCENE_EXPORTS || defined QxScene_EXPORTS
 #define QXSCENE_EXPORT __declspec(dllexport)
 #else
@@ -29,6 +29,6 @@
 #define QXSCENE_EXPORT
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning ( disable:4251 )
 #endif

diff --git a/src/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx
index c7ec622c751a96e7ec25b54b8b3ca1955182e9d9..42d1ad88376825fb1b3bc2b2fe37ec8dae1b3644 100755 (executable)
--- a/src/SALOME_PY/SalomePy.cxx
+++ b/src/SALOME_PY/SalomePy.cxx
@@ -24,7 +24,7 @@
 //  File   : SalomePy.cxx
 //  Author : Paul RASCLE, EDF
 //
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
index 505a0fb7e3542f780dc72afef054d0868e3e47d8..903685de9953930a87a74726b1020e8d6095b127 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
@@ -25,7 +25,7 @@
 
 // ========================================================
 // set dllexport type for Win platform 
-#ifdef WNT
+#ifdef WIN32
 
 #if defined SALOME_PYQT_LIGHT_EXPORTS || defined SalomePyQtGUILight_EXPORTS
 #define SALOME_PYQT_LIGHT_EXPORT __declspec(dllexport)
@@ -33,15 +33,15 @@
 #define SALOME_PYQT_LIGHT_EXPORT __declspec(dllimport)
 #endif
 
-#else   // WNT
-
+#else   // 
+           WIN32
 #define SALOME_PYQT_LIGHT_EXPORT
 
-#endif  // WNT
+#endif  // WIN32
 
 // ========================================================
 // avoid warning messages
-#ifdef WNT
+#ifdef WIN32
 #pragma warning (disable : 4786)
 #pragma warning (disable : 4251)
 #endif

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index eac5e7515241880b932f94c833f1162df662b632..6866f472a49c7c3960e3f950d3ba3c81be62dd93 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@ -23,7 +23,7 @@
 // File   : SalomePyQt.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...

diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h
index 562673a06c67f3ef330770c970ddb37b81c7f567..de7b49ed347d57d96918eaf4239fc721623d7c6e 100644 (file)
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.h
@@ -31,7 +31,7 @@
 
 class SUIT_ExceptionHandler;
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined SUITAPP_EXPORTS || defined SUITApp_EXPORTS
 #    define SUITAPP_EXPORT __declspec(dllexport)
 #  else

diff --git a/src/SUITApp/SUITApp_init_python.hxx b/src/SUITApp/SUITApp_init_python.hxx
index c2e13e84e77fa12d502f262011591efe58262ef1..dcd23d28574cf849e4ba5e6833fb54c48169aaf8 100644 (file)
--- a/src/SUITApp/SUITApp_init_python.hxx
+++ b/src/SUITApp/SUITApp_init_python.hxx
@@ -36,7 +36,7 @@
 
 #include <Python.h>
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined SUITAPP_EXPORTS || defined SUITApp_EXPORTS
 #    define SUITAPP_EXPORT __declspec(dllexport)
 #  else

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index b5f216a4171af91bf0f29dd80c9294956e218c17..c7b16a8ae4bcaf0f84ccd7daf80a9588eb6e35fd 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -24,7 +24,7 @@
 // Created:   10/22/2004 3:23:45 PM
 // Author:    Sergey LITONIN
 
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index a56afd07a0804c61eae183b24a972413ec1726a3..acb5263d6f7d238f73c09d31ac45413220aff31d 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -115,7 +115,7 @@ extern "C" SALOMEAPP_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
   // We disable FPE signal as it was in earlier versions of SALOME. It is enabled
   // only in debug mode if the environment variable DISABLE_FPE is not set to 1.
   bool raiseFPE;
-#if defined(_DEBUG_) | defined(_DEBUG) //the Last for WNT default settings
+#if defined(_DEBUG_) | defined(_DEBUG) //the Last for WIN32 default settings
   raiseFPE = true;
   char* envDisableFPE = getenv("DISABLE_FPE");
   if (envDisableFPE && atoi(envDisableFPE))

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index 5d6ddd53c859ac31555f1375ecf00df3b7412a2b..79df9c1d6b6d645f7219c543fcfe43cb4a7165de 100755 (executable)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -43,7 +43,7 @@
 #include <OSD_SharedLibrary.hxx>
 #include <OSD_Function.hxx>
 
-#ifdef WNT
+#ifdef WIN32
 # include <process.h>
 #else
 #include <unistd.h>
@@ -248,7 +248,7 @@ CORBA::Long SALOME_Session_i::GetActiveStudyId()
 
 CORBA::Long SALOME_Session_i::getPID() {
   return (CORBA::Long)
-#ifndef WNT
+#ifndef WIN32
     getpid();
 #else
     _getpid();

diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
index 6a633216352e41d91c95e88f8663e33870d6ed33..58fbc4d162ed6a9aadd9e9fdaba6f4e65526afea 100644 (file)
--- a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
@@ -39,7 +39,7 @@
 #include <vtkCommand.h>
 #include <vtkCellData.h>
 
-#ifndef WNT
+#ifndef WIN32
 # ifndef GLX_GLXEXT_LEGACY
 #  define GLX_GLXEXT_LEGACY
 # endif
@@ -129,7 +129,7 @@ static PFNGLENABLEVERTEXATTRIBARRAYARBPROC  vglEnableVertexAttribArrayARB  = NUL
 static PFNGLDISABLEVERTEXATTRIBARRAYARBPROC vglDisableVertexAttribArrayARB = NULL;
 
 
-#ifndef WNT
+#ifndef WIN32
 #define GL_GetProcAddress( x )   glXGetProcAddressARB( (const GLubyte*)x )
 #else
 #define GL_GetProcAddress( x )   wglGetProcAddress( (const LPCSTR)x )

diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.h b/src/VTKViewer/VTKViewer_PolyDataMapper.h
index 6702b7d8d739a0ac1e18b938936aecd53418e0f0..9202a24bd32a3bfad8d54c84c22819abfdcc94a3 100644 (file)
--- a/src/VTKViewer/VTKViewer_PolyDataMapper.h
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.h
@@ -23,7 +23,7 @@
 #include "VTKViewer.h"
 #include "VTKViewer_MarkerDef.h"
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #endif