From 5a7522a23dd83a48fd3ef216e0923ce351f3d810 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 17 Oct 2013 14:36:48 +0000 Subject: [PATCH] Replace deprecated WNT macro definition by WIN32. --- src/CASCatch/CASCatch_CatchSignals.cxx | 4 ++-- src/LightApp/LightApp.h | 2 +- src/LightApp/LightApp_Application.cxx | 2 +- src/LightApp/LightApp_SelectionMgr.cxx | 2 +- src/OCCViewer/OCCViewer_VService.cxx | 6 +++--- src/OCCViewer/OCCViewer_ViewPort.cxx | 6 +++--- src/OCCViewer/OCCViewer_ViewPort3d.cxx | 6 +++--- src/OCCViewer/OCCViewer_ViewSketcher.h | 4 ++-- src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx | 4 ++-- src/QxScene/QxScene.h | 4 ++-- src/SALOME_PY/SalomePy.cxx | 2 +- .../SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h | 10 +++++----- src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx | 2 +- src/SUITApp/SUITApp_Application.h | 2 +- src/SUITApp/SUITApp_init_python.hxx | 2 +- src/SalomeApp/SalomeApp_Application.cxx | 2 +- src/SalomeApp/SalomeApp_ExceptionHandler.cxx | 2 +- src/Session/Session_Session_i.cxx | 4 ++-- src/VTKViewer/VTKViewer_PolyDataMapper.cxx | 4 ++-- src/VTKViewer/VTKViewer_PolyDataMapper.h | 2 +- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/CASCatch/CASCatch_CatchSignals.cxx b/src/CASCatch/CASCatch_CatchSignals.cxx index 2a50209ce..ce25080a9 100644 --- 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 #include diff --git a/src/LightApp/LightApp.h b/src/LightApp/LightApp.h index f413e249b..844c03005 100644 --- 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 4c0c1fe19..17d4c5720 100644 --- 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 4e8eb3e86..5a520456a 100644 --- a/src/LightApp/LightApp_SelectionMgr.cxx +++ b/src/LightApp/LightApp_SelectionMgr.cxx @@ -395,7 +395,7 @@ void LightApp_SelectionMgr::selectedSubOwners( MapEntryOfMapOfInteger& theMap ) dynamic_cast( (*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 32d4b3216..fe2a8a6fd 100755 --- a/src/OCCViewer/OCCViewer_VService.cxx +++ b/src/OCCViewer/OCCViewer_VService.cxx @@ -28,7 +28,7 @@ #include #include #include -#ifdef WNT +#ifdef WIN32 #include #else #include @@ -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 18503c000..626ebea88 100755 --- 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 -#if !defined WNT +#if !defined WIN32 #include #include #include @@ -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 34cce7126..de0302be4 100755 --- 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 #else #include @@ -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 a44350df9..261f8d54f 100755 --- 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 27cd24072..9ae794927 100755 --- a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx +++ b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx @@ -26,7 +26,7 @@ #include -#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 3e3bcdd3c..ecc7be5c6 100644 --- 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 c7ec622c7..42d1ad883 100755 --- 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 505a0fb7e..903685de9 100644 --- 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 eac5e7515..6866f472a 100644 --- 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 562673a06..de7b49ed3 100644 --- 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 c2e13e84e..dcd23d285 100644 --- a/src/SUITApp/SUITApp_init_python.hxx +++ b/src/SUITApp/SUITApp_init_python.hxx @@ -36,7 +36,7 @@ #include -#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 b5f216a41..c7b16a8ae 100644 --- 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 a56afd07a..acb5263d6 100644 --- 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 5d6ddd53c..79df9c1d6 100755 --- a/src/Session/Session_Session_i.cxx +++ b/src/Session/Session_Session_i.cxx @@ -43,7 +43,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 # include #else #include @@ -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 6a6332163..58fbc4d16 100644 --- a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx +++ b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx @@ -39,7 +39,7 @@ #include #include -#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 6702b7d8d..9202a24bd 100644 --- 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 #endif -- 2.39.2