diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.vcproj b/samples/CSharp/OCCTProxy/OCCTProxy.vcproj index 49075d5a95..f7ff0bed81 100644 --- a/samples/CSharp/OCCTProxy/OCCTProxy.vcproj +++ b/samples/CSharp/OCCTProxy/OCCTProxy.vcproj @@ -47,7 +47,6 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc" - PreprocessorDefinitions="WNT" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -129,7 +128,6 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc" - PreprocessorDefinitions="WNT" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -209,7 +207,6 @@ Disabled ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - WNT;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) false Default MultiThreadedDebugDLL @@ -113,7 +113,7 @@ Disabled ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - WNT;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) false Default MultiThreadedDebugDLL @@ -139,7 +139,7 @@ ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - WNT;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL @@ -166,7 +166,7 @@ ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - WNT;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj index e639973f75..9c11a90f7b 100644 --- a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj +++ b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj @@ -47,7 +47,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;"$(DXSDK_DIR)Include"" - PreprocessorDefinitions="WNT;_DEBUG" + PreprocessorDefinitions="_DEBUG" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -129,7 +129,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;"$(DXSDK_DIR)Include"" - PreprocessorDefinitions="WNT;_DEBUG" + PreprocessorDefinitions="_DEBUG" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -209,7 +209,6 @@ Disabled ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) - WNT;_DEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL @@ -115,7 +115,7 @@ Disabled ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) - WNT;_DEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) false Default MultiThreadedDebugDLL @@ -141,7 +141,7 @@ ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) - WNT;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL @@ -168,7 +168,7 @@ ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) - WNT;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj index 185fefed3c..dff201bc84 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -136,7 +136,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -178,7 +178,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj index 21ce01d814..e0bb4f8c2e 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -140,7 +140,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -182,7 +182,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -226,7 +226,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj index 57d22bbd37..996256ad2d 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -140,7 +140,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -182,7 +182,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -226,7 +226,7 @@ Disabled ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj index bddf957f69..10d426b0a5 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -251,7 +251,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -348,7 +348,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj index 360a0de7d9..b09ea68756 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -152,7 +152,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -248,7 +248,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -346,7 +346,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp index ae941c8575..715a76636a 100755 --- a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp +++ b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp @@ -15,11 +15,7 @@ static char THIS_FILE[] = __FILE__; #endif #include "GeomSources.h" -#ifdef WNT - #define EOL "\r\n" -#else - #define EOL "\n" -#endif +#define EOL "\r\n" #define WAIT_A_LITTLE WaitForInput(500) diff --git a/samples/mfc/standard/01_Geometry/src/StdAfx.h b/samples/mfc/standard/01_Geometry/src/StdAfx.h index 6cc9ea2eca..605e1331a1 100755 --- a/samples/mfc/standard/01_Geometry/src/StdAfx.h +++ b/samples/mfc/standard/01_Geometry/src/StdAfx.h @@ -16,10 +16,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj index f9d198fb61..e102cdccb5 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj @@ -92,7 +92,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -134,7 +134,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -177,7 +177,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -219,7 +219,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj index 1979d06381..7c6c81e665 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj index 19a9ada9bf..ca9816ca0a 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj index 424e1ab1fe..6feed04b4b 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -247,7 +247,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -345,7 +345,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj index 91ad9d20a7..9bdf8fddd4 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj @@ -54,7 +54,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -247,7 +247,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -343,7 +343,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/mfc/standard/02_Modeling/src/StdAfx.h b/samples/mfc/standard/02_Modeling/src/StdAfx.h index f8b0a8f0ab..38efb0faed 100755 --- a/samples/mfc/standard/02_Modeling/src/StdAfx.h +++ b/samples/mfc/standard/02_Modeling/src/StdAfx.h @@ -16,10 +16,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj index 85321a5af7..0cd7041cee 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj index 7520e748e0..6848982bc7 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj index 989b2bbf43..8dae73f12c 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj index a73270a5f2..e4b0706e45 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj index 44cafd2abc..0e44d762ad 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/03_Viewer2d/src/StdAfx.h b/samples/mfc/standard/03_Viewer2d/src/StdAfx.h index 65799e0025..100ccc9b77 100755 --- a/samples/mfc/standard/03_Viewer2d/src/StdAfx.h +++ b/samples/mfc/standard/03_Viewer2d/src/StdAfx.h @@ -16,9 +16,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj index 921cf4aa8d..924ff744cd 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -219,7 +219,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj index 62c4b223dc..67ad3aa235 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -223,7 +223,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj index 014cc64924..be79f86e73 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -223,7 +223,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj index f424f458dd..122042b6fd 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -249,7 +249,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -345,7 +345,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj index 4022996806..8fb95c655a 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -343,7 +343,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/04_Viewer3d/src/StdAfx.h b/samples/mfc/standard/04_Viewer3d/src/StdAfx.h index b15dda5622..2d5561443b 100755 --- a/samples/mfc/standard/04_Viewer3d/src/StdAfx.h +++ b/samples/mfc/standard/04_Viewer3d/src/StdAfx.h @@ -16,10 +16,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp index 24c1d4f860..a04536a347 100755 --- a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp @@ -34,11 +34,7 @@ const TexturesExt_Presentation::PSampleFuncType TexturesExt_Presentation::Sample &TexturesExt_Presentation::sampleKitchen }; -#ifdef WNT - #define EOL "\r\n" -#else - #define EOL "\n" -#endif +#define EOL "\r\n" #define ZVIEW_SIZE 100 diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj index 47a2203a82..e52969292f 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj index d90bc55328..8582ad4df6 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj index bc1f7af3e9..15d403ea14 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj index b35e2c791b..cb50ffd9ac 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj index 5dfc6c2aab..c4226cabe3 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx b/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx index 16b919da0b..dbc328fe12 100755 --- a/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx +++ b/samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx @@ -33,21 +33,14 @@ FSD_Archive::FSD_Archive(const FSD_CArchive& anArchive) myExternFlag = Standard_True; myCFile = NULL; myFormat = Standard_False; -#ifdef WNT if (myStream->IsLoading()) SetOpenMode(Storage_VSRead); else SetOpenMode(Storage_VSWrite); -#endif } -Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString& -#ifdef WNT - aName -#endif - ) +Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString& aName) { FSD_Archive f; Storage_Error s; -#ifdef WNT s = f.Open(aName,Storage_VSRead); if (s == Storage_VSOk) { @@ -62,23 +55,15 @@ Storage_Error FSD_Archive::IsGoodFileType(const TCollection_AsciiString& s = Storage_VSFormatError; } } -#else - s = Storage_VSFormatError; -#endif return s; } Storage_Error FSD_Archive::Open(const TCollection_AsciiString& theName, - const Storage_OpenMode -#ifdef WNT - aMode -#endif - ) + const Storage_OpenMode aMode) { Storage_Error result = Storage_VSOk; CString aName = theName.ToCString(); SetName (theName); -#ifdef WNT if (OpenMode() == Storage_VSNone) { if (aMode == Storage_VSRead) { if (!((FSD_CFile*)myCFile)->Open(aName, CFile::modeRead)) @@ -109,9 +94,6 @@ Storage_Error FSD_Archive::Open(const TCollection_AsciiString& theName, else { result = Storage_VSAlreadyOpen; } -#else - result = Storage_VSOpenError; -#endif return result; } @@ -127,7 +109,6 @@ Storage_Error FSD_Archive::Close() myEof = Standard_False; if (OpenMode() != Storage_VSNone) { -#ifdef WNT if (!myExternFlag) { (*myStream).Close(); ((FSD_CFile*)myCFile)->Close(); @@ -136,7 +117,6 @@ Storage_Error FSD_Archive::Close() myExternFlag = Standard_False; myStream = NULL; SetOpenMode(Storage_VSNone); -#endif } else { result = Storage_VSNotOpen; @@ -153,13 +133,8 @@ const Standard_CString FSD_Archive::MagicNumber() } -void FSD_Archive::ReadLine(TCollection_AsciiString& -#ifdef WNT - buffer -#endif - ) +void FSD_Archive::ReadLine(TCollection_AsciiString& buffer) { -#ifdef WNT TRY { char c; Standard_Boolean IsEnd = Standard_False; @@ -182,31 +157,19 @@ void FSD_Archive::ReadLine(TCollection_AsciiString& if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True; } END_CATCH -#endif } -void FSD_Archive::WriteLine(const TCollection_AsciiString& -#ifdef WNT - buffer -#endif - ) +void FSD_Archive::WriteLine(const TCollection_AsciiString& buffer) { -#ifdef WNT Standard_Integer i; for (i = 1; i <= buffer.Length(); i++) { (*myStream) << buffer.Value(i); } (*myStream) << (Standard_Character)0; -#endif } -void FSD_Archive::WriteExtendedLine(const TCollection_ExtendedString& -#ifdef WNT - buffer -#endif - ) +void FSD_Archive::WriteExtendedLine(const TCollection_ExtendedString& buffer) { -#ifdef WNT Standard_ExtString extBuffer; Standard_Integer i; @@ -217,16 +180,10 @@ void FSD_Archive::WriteExtendedLine(const TCollection_ExtendedString& } (*myStream) << (Standard_ExtCharacter)0; -#endif } -void FSD_Archive::ReadExtendedLine(TCollection_ExtendedString& -#ifdef WNT - buffer -#endif - ) +void FSD_Archive::ReadExtendedLine(TCollection_ExtendedString& buffer) { -#ifdef WNT TRY { Standard_ExtCharacter i = 0; Standard_Boolean fin = Standard_False; @@ -243,20 +200,10 @@ void FSD_Archive::ReadExtendedLine(TCollection_ExtendedString& if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True; } END_CATCH -#endif } -void FSD_Archive::ReadChar(TCollection_AsciiString& -#ifdef WNT - buffer -#endif - ,const Standard_Integer -#ifdef WNT - rsize -#endif - ) +void FSD_Archive::ReadChar(TCollection_AsciiString& buffer, const Standard_Integer rsize) { -#ifdef WNT TRY { char c; Standard_Integer ccount = 0; @@ -273,17 +220,11 @@ void FSD_Archive::ReadChar(TCollection_AsciiString& if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True; } END_CATCH -#endif } -Storage_Error FSD_Archive::FindTag(const Standard_CString -#ifdef WNT - aTag -#endif - ) +Storage_Error FSD_Archive::FindTag(const Standard_CString aTag) { -#ifdef WNT TCollection_AsciiString l; Standard_CString str; @@ -307,14 +248,10 @@ Storage_Error FSD_Archive::FindTag(const Standard_CString else { return Storage_VSOk; } -#else - return Storage_VSSectionNotFound; -#endif } void FSD_Archive::SkipObject() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char c; @@ -369,18 +306,12 @@ void FSD_Archive::SkipObject() else if (e->m_cause == CArchiveException::endOfFile) myEof = Standard_True; } END_CATCH -#endif } // ---------------------- PUBLIC : PUT -Storage_BaseDriver& FSD_Archive::PutReference(const Standard_Integer -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutReference(const Standard_Integer aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { @@ -392,17 +323,11 @@ Storage_BaseDriver& FSD_Archive::PutReference(const Standard_Integer END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::PutCharacter(const Standard_Character -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutCharacter(const Standard_Character aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { @@ -416,17 +341,11 @@ Storage_BaseDriver& FSD_Archive::PutCharacter(const Standard_Character END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::PutExtCharacter(const Standard_ExtCharacter -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutExtCharacter(const Standard_ExtCharacter aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << FSD_EXT << aValue; @@ -437,17 +356,11 @@ Storage_BaseDriver& FSD_Archive::PutExtCharacter(const Standard_ExtCharacter END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::PutInteger(const Standard_Integer -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutInteger(const Standard_Integer aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << FSD_INT << aValue; @@ -458,17 +371,11 @@ Storage_BaseDriver& FSD_Archive::PutInteger(const Standard_Integer END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::PutBoolean(const Standard_Boolean -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutBoolean(const Standard_Boolean aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << FSD_BOO << ((Standard_Integer)aValue); @@ -479,17 +386,11 @@ Storage_BaseDriver& FSD_Archive::PutBoolean(const Standard_Boolean END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::PutReal(const Standard_Real -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutReal(const Standard_Real aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << FSD_REA << ((Standard_Real)aValue); @@ -500,17 +401,11 @@ Storage_BaseDriver& FSD_Archive::PutReal(const Standard_Real END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::PutShortReal(const Standard_ShortReal -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::PutShortReal(const Standard_ShortReal aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << FSD_SHO << aValue; @@ -521,19 +416,13 @@ Storage_BaseDriver& FSD_Archive::PutShortReal(const Standard_ShortReal END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#endif return *this; } // ----------------- PUBLIC : GET -Storage_BaseDriver& FSD_Archive::GetReference(Standard_Integer& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetReference(Standard_Integer& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char ptype; @@ -549,17 +438,11 @@ Storage_BaseDriver& FSD_Archive::GetReference(Standard_Integer& END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::GetCharacter(Standard_Character& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetCharacter(Standard_Character& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //unsigned short i; @@ -579,17 +462,11 @@ Storage_BaseDriver& FSD_Archive::GetCharacter(Standard_Character& END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::GetExtCharacter(Standard_ExtCharacter& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetExtCharacter(Standard_ExtCharacter& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char ptype; @@ -605,17 +482,11 @@ Storage_BaseDriver& FSD_Archive::GetExtCharacter(Standard_ExtCharacter& END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::GetInteger(Standard_Integer& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetInteger(Standard_Integer& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char ptype; @@ -631,17 +502,11 @@ Storage_BaseDriver& FSD_Archive::GetInteger(Standard_Integer& END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::GetBoolean(Standard_Boolean& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetBoolean(Standard_Boolean& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char ptype; @@ -657,17 +522,11 @@ Storage_BaseDriver& FSD_Archive::GetBoolean(Standard_Boolean& END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::GetReal(Standard_Real& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetReal(Standard_Real& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char ptype; @@ -683,17 +542,11 @@ Storage_BaseDriver& FSD_Archive::GetReal(Standard_Real& END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } -Storage_BaseDriver& FSD_Archive::GetShortReal(Standard_ShortReal& -#ifdef WNT - aValue -#endif - ) +Storage_BaseDriver& FSD_Archive::GetShortReal(Standard_ShortReal& aValue) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { char ptype; @@ -709,7 +562,6 @@ char ptype; END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#endif return *this; } @@ -731,7 +583,6 @@ void FSD_Archive::Destroy() Storage_Error FSD_Archive::BeginWriteInfoSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << FSD_Archive::MagicNumber(); @@ -745,51 +596,19 @@ Storage_Error FSD_Archive::BeginWriteInfoSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } -void FSD_Archive::WriteInfo(const Standard_Integer -#ifdef WNT - nbObj -#endif - ,const TCollection_AsciiString& -#ifdef WNT - dbVersion -#endif - ,const TCollection_AsciiString& -#ifdef WNT - date -#endif - ,const TCollection_AsciiString& -#ifdef WNT - schemaName -#endif - ,const TCollection_AsciiString& -#ifdef WNT - schemaVersion -#endif - ,const TCollection_ExtendedString& -#ifdef WNT - appName -#endif - ,const TCollection_AsciiString& -#ifdef WNT - appVersion -#endif - ,const TCollection_ExtendedString& -#ifdef WNT - dataType -#endif - ,const TColStd_SequenceOfAsciiString& -#ifdef WNT - userInfo -#endif - ) +void FSD_Archive::WriteInfo(const Standard_Integer nbObj, + const TCollection_AsciiString& dbVersion, + const TCollection_AsciiString& date, + const TCollection_AsciiString& schemaName, + const TCollection_AsciiString& schemaVersion, + const TCollection_ExtendedString& appName, + const TCollection_AsciiString& appVersion, + const TCollection_ExtendedString& dataType, + const TColStd_SequenceOfAsciiString& userInfo) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { Standard_Integer i; @@ -820,15 +639,12 @@ void FSD_Archive::WriteInfo(const Standard_Integer END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif } Storage_Error FSD_Archive::EndWriteInfoSection() { -#ifdef WNT + Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "END_INFO_SECTION" << '\0'; @@ -840,16 +656,13 @@ Storage_Error FSD_Archive::EndWriteInfoSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } Storage_Error FSD_Archive::BeginReadInfoSection() { Storage_Error s; -#ifdef WNT + TCollection_AsciiString l; Standard_Integer len = (int)strlen(FSD_Archive::MagicNumber()); @@ -872,53 +685,21 @@ Storage_Error FSD_Archive::BeginReadInfoSection() else { s = FindTag("BEGIN_INFO_SECTION"); } -#else - s = Storage_VSFormatError; -#endif return s; } // ------------------- INFO : READ -void FSD_Archive::ReadInfo(Standard_Integer& -#ifdef WNT - nbObj -#endif - ,TCollection_AsciiString& -#ifdef WNT - dbVersion -#endif - ,TCollection_AsciiString& -#ifdef WNT - date -#endif - ,TCollection_AsciiString& -#ifdef WNT - schemaName -#endif - ,TCollection_AsciiString& -#ifdef WNT - schemaVersion -#endif - ,TCollection_ExtendedString& -#ifdef WNT - appName -#endif - ,TCollection_AsciiString& -#ifdef WNT - appVersion -#endif - ,TCollection_ExtendedString& -#ifdef WNT - dataType -#endif - ,TColStd_SequenceOfAsciiString& -#ifdef WNT - userInfo -#endif - ) +void FSD_Archive::ReadInfo(Standard_Integer& nbObj, + TCollection_AsciiString& dbVersion, + TCollection_AsciiString& date, + TCollection_AsciiString& schemaName, + TCollection_AsciiString& schemaVersion, + TCollection_ExtendedString& appName, + TCollection_AsciiString& appVersion, + TCollection_ExtendedString& dataType, + TColStd_SequenceOfAsciiString& userInfo) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> nbObj; @@ -950,7 +731,6 @@ void FSD_Archive::ReadInfo(Standard_Integer& END_CATCH if (errorStatus) -#endif Storage_StreamTypeMismatchError::Raise(); } @@ -963,7 +743,6 @@ Storage_Error FSD_Archive::EndReadInfoSection() Storage_Error FSD_Archive::BeginWriteCommentSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "BEGIN_COMMENT_SECTION" << '\0'; @@ -975,19 +754,11 @@ Storage_Error FSD_Archive::BeginWriteCommentSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } -void FSD_Archive::WriteComment(const TColStd_SequenceOfExtendedString& -#ifdef WNT - aCom -#endif - ) +void FSD_Archive::WriteComment(const TColStd_SequenceOfExtendedString& aCom) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { Standard_Integer i,aSize; @@ -1004,13 +775,11 @@ void FSD_Archive::WriteComment(const TColStd_SequenceOfExtendedString& END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } Storage_Error FSD_Archive::EndWriteCommentSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "END_COMMENT_SECTION" << '\0'; @@ -1022,9 +791,6 @@ Storage_Error FSD_Archive::EndWriteCommentSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } @@ -1035,13 +801,8 @@ Storage_Error FSD_Archive::BeginReadCommentSection() return FindTag("BEGIN_COMMENT_SECTION"); } -void FSD_Archive::ReadComment(TColStd_SequenceOfExtendedString& -#ifdef WNT - aCom -#endif - ) +void FSD_Archive::ReadComment(TColStd_SequenceOfExtendedString& aCom) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { TCollection_ExtendedString line; @@ -1062,7 +823,6 @@ void FSD_Archive::ReadComment(TColStd_SequenceOfExtendedString& END_CATCH if (errorStatus) -#endif Storage_StreamTypeMismatchError::Raise(); } @@ -1075,7 +835,6 @@ Storage_Error FSD_Archive::EndReadCommentSection() Storage_Error FSD_Archive::BeginWriteTypeSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "BEGIN_TYPE_SECTION" << '\0'; @@ -1087,19 +846,11 @@ Storage_Error FSD_Archive::BeginWriteTypeSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } -void FSD_Archive::SetTypeSectionSize(const Standard_Integer -#ifdef WNT - aSize -#endif - ) +void FSD_Archive::SetTypeSectionSize(const Standard_Integer aSize) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << aSize; @@ -1110,21 +861,12 @@ void FSD_Archive::SetTypeSectionSize(const Standard_Integer END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } -void FSD_Archive::WriteTypeInformations(const Standard_Integer -#ifdef WNT - typeNum -#endif - ,const TCollection_AsciiString& -#ifdef WNT - typeName -#endif - ) +void FSD_Archive::WriteTypeInformations (const Standard_Integer typeNum, + const TCollection_AsciiString& typeName) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << typeNum << typeName.ToCString() << '\0'; @@ -1137,13 +879,11 @@ void FSD_Archive::WriteTypeInformations(const Standard_Integer END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } Storage_Error FSD_Archive::EndWriteTypeSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "END_TYPE_SECTION" << '\0'; @@ -1155,9 +895,6 @@ Storage_Error FSD_Archive::EndWriteTypeSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } @@ -1171,7 +908,6 @@ Storage_Error FSD_Archive::BeginReadTypeSection() Standard_Integer FSD_Archive::TypeSectionSize() { Standard_Integer i = 0; -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> i; @@ -1183,23 +919,11 @@ Standard_Integer FSD_Archive::TypeSectionSize() END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#else - Storage_StreamTypeMismatchError::Raise(); -#endif return i; } -void FSD_Archive::ReadTypeInformations(Standard_Integer& -#ifdef WNT - typeNum -#endif - ,TCollection_AsciiString& -#ifdef WNT - typeName -#endif - ) +void FSD_Archive::ReadTypeInformations(Standard_Integer& typeNum, TCollection_AsciiString& typeName) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { unsigned char c; @@ -1221,7 +945,6 @@ void FSD_Archive::ReadTypeInformations(Standard_Integer& END_CATCH if (errorStatus) -#endif Storage_StreamTypeMismatchError::Raise(); } @@ -1234,7 +957,6 @@ Storage_Error FSD_Archive::EndReadTypeSection() Storage_Error FSD_Archive::BeginWriteRootSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "BEGIN_ROOT_SECTION" << '\0'; @@ -1246,19 +968,11 @@ Storage_Error FSD_Archive::BeginWriteRootSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } -void FSD_Archive::SetRootSectionSize(const Standard_Integer -#ifdef WNT - aSize -#endif - ) +void FSD_Archive::SetRootSectionSize(const Standard_Integer aSize) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << aSize; @@ -1269,25 +983,13 @@ void FSD_Archive::SetRootSectionSize(const Standard_Integer END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } -void FSD_Archive::WriteRoot(const TCollection_AsciiString& -#ifdef WNT - rootName -#endif - ,const Standard_Integer -#ifdef WNT - aRef -#endif - ,const TCollection_AsciiString& -#ifdef WNT - rootType -#endif - ) +void FSD_Archive::WriteRoot (const TCollection_AsciiString& rootName, + const Standard_Integer aRef, + const TCollection_AsciiString& rootType) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << aRef << rootName.ToCString() << '\0' << rootType.ToCString() << '\0'; @@ -1302,13 +1004,11 @@ void FSD_Archive::WriteRoot(const TCollection_AsciiString& END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } Storage_Error FSD_Archive::EndWriteRootSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "END_ROOT_SECTION" << '\0'; @@ -1320,9 +1020,6 @@ Storage_Error FSD_Archive::EndWriteRootSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } @@ -1336,7 +1033,6 @@ Storage_Error FSD_Archive::BeginReadRootSection() Standard_Integer FSD_Archive::RootSectionSize() { Standard_Integer i = 0; -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> i; @@ -1348,27 +1044,13 @@ Standard_Integer FSD_Archive::RootSectionSize() END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#else - Storage_StreamTypeMismatchError::Raise(); -#endif return i; } -void FSD_Archive::ReadRoot(TCollection_AsciiString& -#ifdef WNT - rootName -#endif - ,Standard_Integer& -#ifdef WNT - aRef -#endif - ,TCollection_AsciiString& -#ifdef WNT - rootType -#endif - ) +void FSD_Archive::ReadRoot(TCollection_AsciiString& rootName, + Standard_Integer& aRef, + TCollection_AsciiString& rootType) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> aRef; @@ -1382,7 +1064,6 @@ void FSD_Archive::ReadRoot(TCollection_AsciiString& END_CATCH if (errorStatus) -#endif Storage_StreamTypeMismatchError::Raise(); } @@ -1395,7 +1076,6 @@ Storage_Error FSD_Archive::EndReadRootSection() Storage_Error FSD_Archive::BeginWriteRefSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "BEGIN_REF_SECTION" << '\0'; @@ -1407,19 +1087,11 @@ Storage_Error FSD_Archive::BeginWriteRefSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } -void FSD_Archive::SetRefSectionSize(const Standard_Integer -#ifdef WNT - aSize -#endif - ) +void FSD_Archive::SetRefSectionSize(const Standard_Integer aSize) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << aSize; @@ -1430,21 +1102,12 @@ void FSD_Archive::SetRefSectionSize(const Standard_Integer END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } -void FSD_Archive::WriteReferenceType(const Standard_Integer -#ifdef WNT - reference -#endif - ,const Standard_Integer -#ifdef WNT - typeNum -#endif - ) +void FSD_Archive::WriteReferenceType(const Standard_Integer reference, + const Standard_Integer typeNum) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << reference << typeNum; @@ -1455,13 +1118,11 @@ void FSD_Archive::WriteReferenceType(const Standard_Integer END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } Storage_Error FSD_Archive::EndWriteRefSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "END_REF_SECTION" << '\0'; @@ -1473,9 +1134,6 @@ Storage_Error FSD_Archive::EndWriteRefSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } @@ -1489,7 +1147,6 @@ Storage_Error FSD_Archive::BeginReadRefSection() Standard_Integer FSD_Archive::RefSectionSize() { Standard_Integer i = 0; -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> i; @@ -1501,23 +1158,12 @@ Standard_Integer FSD_Archive::RefSectionSize() END_CATCH if (errorStatus) Storage_StreamTypeMismatchError::Raise(); -#else - Storage_StreamTypeMismatchError::Raise(); -#endif return i; } -void FSD_Archive::ReadReferenceType(Standard_Integer& -#ifdef WNT - reference -#endif - ,Standard_Integer& -#ifdef WNT - typeNum -#endif - ) +void FSD_Archive::ReadReferenceType(Standard_Integer& reference, + Standard_Integer& typeNum) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> reference; @@ -1530,7 +1176,6 @@ void FSD_Archive::ReadReferenceType(Standard_Integer& END_CATCH if (errorStatus) -#endif Storage_StreamTypeMismatchError::Raise(); } @@ -1543,7 +1188,6 @@ Storage_Error FSD_Archive::EndReadRefSection() Storage_Error FSD_Archive::BeginWriteDataSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "BEGIN_DATA_SECTION" << '\0'; @@ -1555,23 +1199,12 @@ Storage_Error FSD_Archive::BeginWriteDataSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } -void FSD_Archive::WritePersistentObjectHeader(const Standard_Integer -#ifdef WNT - aRef -#endif - ,const Standard_Integer -#ifdef WNT - aType -#endif - ) +void FSD_Archive::WritePersistentObjectHeader(const Standard_Integer aRef, + const Standard_Integer aType) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) << aRef << aType; @@ -1582,7 +1215,6 @@ void FSD_Archive::WritePersistentObjectHeader(const Standard_Integer END_CATCH if (errorStatus) -#endif Storage_StreamWriteError::Raise(); } @@ -1600,14 +1232,11 @@ void FSD_Archive::EndWriteObjectData() void FSD_Archive::EndWritePersistentObjectData() { -#ifdef WNT (*myStream) << 'E'; -#endif } Storage_Error FSD_Archive::EndWriteDataSection() { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { //(*myStream) << "END_DATA_SECTION" << '\0'; @@ -1619,9 +1248,6 @@ Storage_Error FSD_Archive::EndWriteDataSection() END_CATCH if (errorStatus) Storage_StreamWriteError::Raise(); -#else - Storage_StreamWriteError::Raise(); -#endif return Storage_VSOk; } @@ -1632,17 +1258,8 @@ Storage_Error FSD_Archive::BeginReadDataSection() return FindTag("BEGIN_DATA_SECTION"); } -void FSD_Archive::ReadPersistentObjectHeader(Standard_Integer& -#ifdef WNT - aRef -#endif - ,Standard_Integer& -#ifdef WNT - aType -#endif - ) +void FSD_Archive::ReadPersistentObjectHeader(Standard_Integer& aRef, Standard_Integer& aType) { -#ifdef WNT Standard_Boolean errorStatus = Standard_False; TRY { (*myStream) >> aRef; @@ -1655,7 +1272,6 @@ void FSD_Archive::ReadPersistentObjectHeader(Standard_Integer& END_CATCH if (errorStatus) -#endif Storage_StreamTypeMismatchError::Raise(); } @@ -1673,7 +1289,6 @@ void FSD_Archive::EndReadObjectData() void FSD_Archive::EndReadPersistentObjectData() { -#ifdef WNT char theEnd; (*myStream) >> theEnd; @@ -1681,7 +1296,6 @@ void FSD_Archive::EndReadPersistentObjectData() if (theEnd != 'E') { Storage_StreamFormatError::Raise(); } -#endif } Storage_Error FSD_Archive::EndReadDataSection() diff --git a/samples/mfc/standard/05_ImportExport/src/FSD_CArchive.hxx b/samples/mfc/standard/05_ImportExport/src/FSD_CArchive.hxx index 5650a54b42..e5803264b0 100755 --- a/samples/mfc/standard/05_ImportExport/src/FSD_CArchive.hxx +++ b/samples/mfc/standard/05_ImportExport/src/FSD_CArchive.hxx @@ -1,15 +1,9 @@ #ifndef _FSD_CArchive_HeaderFile #define _FSD_CArchive_HeaderFile -#ifdef WNT - //#define _MBCS - #include typedef CArchive* FSD_CArchive; -#else -typedef void* FSD_CArchive; -#endif #endif diff --git a/samples/mfc/standard/05_ImportExport/src/FSD_CFile.hxx b/samples/mfc/standard/05_ImportExport/src/FSD_CFile.hxx index 06e794144f..64d9c75a55 100755 --- a/samples/mfc/standard/05_ImportExport/src/FSD_CFile.hxx +++ b/samples/mfc/standard/05_ImportExport/src/FSD_CFile.hxx @@ -1,15 +1,9 @@ #ifndef _FSD_CFile_HeaderFile #define _FSD_CFile_HeaderFile -#ifdef WNT - //#define _MBCS - #include typedef CFile FSD_CFile; -#else -typedef void* FSD_CFile; -#endif #endif diff --git a/samples/mfc/standard/05_ImportExport/src/StdAfx.h b/samples/mfc/standard/05_ImportExport/src/StdAfx.h index f4643a6efd..c9db7cc6b5 100755 --- a/samples/mfc/standard/05_ImportExport/src/StdAfx.h +++ b/samples/mfc/standard/05_ImportExport/src/StdAfx.h @@ -19,11 +19,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT - -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #define DEFAULT_DEVIATIONCOEFFICIENT 0.001 #define DEFAULT_DCBIG 0.005 #define DEFAULT_DCVBIG 0.01 diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj index 951a35b59b..ed467b5b1f 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj index 595aa2f0dc..d590d83559 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj index b9c5a8a617..78b8895d73 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj index 61becb6c38..b89eda0d8d 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj index e3f776f1eb..6bfa3417b2 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/06_Ocaf/src/StdAfx.h b/samples/mfc/standard/06_Ocaf/src/StdAfx.h index 011efaf618..15d36044c6 100755 --- a/samples/mfc/standard/06_Ocaf/src/StdAfx.h +++ b/samples/mfc/standard/06_Ocaf/src/StdAfx.h @@ -23,10 +23,6 @@ // CasCade : -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #ifdef MAINWIN # define false FALSE # define true TRUE diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj index e51c8329d7..4474bd76d0 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj index 4919fc9aa6..573065f2bb 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj index 8979dd2d36..358260e04f 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj index 5cf258c372..bc0ab91cb4 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj index fa7a4ce2c4..8f6b485af1 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/07_Triangulation/src/StdAfx.h b/samples/mfc/standard/07_Triangulation/src/StdAfx.h index 2386e70a4b..a6a14f517f 100755 --- a/samples/mfc/standard/07_Triangulation/src/StdAfx.h +++ b/samples/mfc/standard/07_Triangulation/src/StdAfx.h @@ -16,10 +16,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp b/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp index dce1453f2f..0e5b8f6dfa 100755 --- a/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp +++ b/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp @@ -33,12 +33,7 @@ #include - -#ifdef WNT - #define EOL "\r\n" -#else - #define EOL "\n" -#endif +#define EOL "\r\n" // Initialization of global variable with an instance of this class OCCDemo_Presentation* OCCDemo_Presentation::Current = new Tesselate_Presentation; diff --git a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj index 0780b3925b..8699aff7e5 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -218,7 +218,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj index 52fcda4358..240b7d4ca8 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj index a8b740587c..71347b3d47 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -180,7 +180,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -222,7 +222,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj index 493184ebae..b23cc58990 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -248,7 +248,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -344,7 +344,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj index 16ea6aab7f..611e92d79f 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -246,7 +246,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -342,7 +342,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/samples/mfc/standard/08_HLR/src/StdAfx.h b/samples/mfc/standard/08_HLR/src/StdAfx.h index 998f02db20..d9704f5664 100755 --- a/samples/mfc/standard/08_HLR/src/StdAfx.h +++ b/samples/mfc/standard/08_HLR/src/StdAfx.h @@ -23,10 +23,6 @@ // CasCade : -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #define DEFAULT_DEVIATIONCOEFFICIENT 0.001 #define DEFAULT_DCBIG 0.005 #define DEFAULT_DCVBIG 0.01 diff --git a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj index 4d65db8200..ed0e7b1bb4 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj @@ -92,7 +92,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -134,7 +134,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -177,7 +177,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -219,7 +219,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj index 894b03e736..ff89f798f1 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj index 8f8c4176b6..997842ed67 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -96,7 +96,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -138,7 +138,7 @@ Disabled ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -181,7 +181,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;WNT;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ MaxSpeed OnlyExplicitInline ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;WNT;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj index 3076a21e68..e82f0efba5 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -151,7 +151,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT" + PreprocessorDefinitions="NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -247,7 +247,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -345,7 +345,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT" + PreprocessorDefinitions="NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj index 1a4f05f5bf..c0c7ac6b3d 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj @@ -54,7 +54,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -150,7 +150,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -247,7 +247,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT" + PreprocessorDefinitions="NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -343,7 +343,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT" + PreprocessorDefinitions="NDEBUG;_WINDOWS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/mfc/standard/09_Animation/src/StdAfx.h b/samples/mfc/standard/09_Animation/src/StdAfx.h index 4a45eea167..762f520ddd 100755 --- a/samples/mfc/standard/09_Animation/src/StdAfx.h +++ b/samples/mfc/standard/09_Animation/src/StdAfx.h @@ -23,10 +23,6 @@ // CasCade : -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - enum CurrentAction3d { CurAction3d_Nothing, CurAction3d_DynamicZooming, diff --git a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj index 0c594cd067..ba1a9463d1 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj @@ -93,7 +93,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -182,7 +182,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -226,7 +226,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj index 2f4bde2b81..201a8a82f4 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -142,7 +142,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -186,7 +186,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -230,7 +230,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj index b9f5f50b7d..54760da764 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -97,7 +97,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -142,7 +142,7 @@ MaxSpeed OnlyExplicitInline ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -186,7 +186,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -230,7 +230,7 @@ Disabled ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj index 8f2cfcc4a3..c528f3a366 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -54,7 +54,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -152,7 +152,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" @@ -251,7 +251,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -349,7 +349,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" diff --git a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj index 8d7411c747..74455c50f9 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj @@ -55,7 +55,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -153,7 +153,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -250,7 +250,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" @@ -347,7 +347,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" diff --git a/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp b/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp index b893ec3ce3..e91b20612f 100755 --- a/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp +++ b/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp @@ -54,11 +54,7 @@ static const Quantity_Color SurfaceColor (1,1,0, Quantity_TOC_RGB); // static const Quantity_Color BSplineColor (1,0.647,0, Quantity_TOC_RGB); // orange static const Quantity_Color BSplineSurfaceColor (0,0,1, Quantity_TOC_RGB); // blue -#ifdef WNT - #define EOL "\r\n" -#else - #define EOL "\n" -#endif +#define EOL "\r\n" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/samples/mfc/standard/10_Convert/src/WNT/StdAfx.h b/samples/mfc/standard/10_Convert/src/WNT/StdAfx.h index 07ccc1809b..43eaa4062d 100755 --- a/samples/mfc/standard/10_Convert/src/WNT/StdAfx.h +++ b/samples/mfc/standard/10_Convert/src/WNT/StdAfx.h @@ -19,10 +19,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/Common/StdAfx.h b/samples/mfc/standard/Common/StdAfx.h index 0f0303b3cd..41f11867a6 100755 --- a/samples/mfc/standard/Common/StdAfx.h +++ b/samples/mfc/standard/Common/StdAfx.h @@ -16,10 +16,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT -#if !defined(WNT) - #error WNT precompiler directive is mandatory for CasCade -#endif - #pragma warning( disable : 4244 ) // Issue warning 4244 #include "Standard_ShortReal.hxx" #pragma warning( default : 4244 ) // Issue warning 4244 diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj index 9613da3fdb..91c9e07b18 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj @@ -92,7 +92,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -135,7 +135,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -179,7 +179,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 0eb3c5ca27..612269f89e 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -96,7 +96,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -139,7 +139,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -183,7 +183,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -226,7 +226,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index 2c6e02c613..bb56cb124f 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -96,7 +96,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -139,7 +139,7 @@ Disabled $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) + _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -183,7 +183,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -226,7 +226,7 @@ MaxSpeed OnlyExplicitInline $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0501;%(PreprocessorDefinitions) + NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 9bff5fa97b..38d91c43cb 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -152,7 +152,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -249,7 +249,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -348,7 +348,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj index d195df8feb..f56fb5c1dd 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj @@ -54,7 +54,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -151,7 +151,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;WINVER=0x0500" + PreprocessorDefinitions="_DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -249,7 +249,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -346,7 +346,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(CASROOT)/inc,..\..\..\..\Common" - PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;WINVER=0x0500" + PreprocessorDefinitions="NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" diff --git a/samples/qt/Common/src/CommonSample.h b/samples/qt/Common/src/CommonSample.h index 4900d135c0..4806bf2b11 100755 --- a/samples/qt/Common/src/CommonSample.h +++ b/samples/qt/Common/src/CommonSample.h @@ -3,13 +3,13 @@ #ifndef NO_COMMONSAMPLE_EXPORTS #ifdef COMMONSAMPLE_EXPORTS -#ifdef WIN32 +#ifdef _WIN32 #define COMMONSAMPLE_EXPORT __declspec( dllexport ) #else #define COMMONSAMPLE_EXPORT #endif #else -#ifdef WIN32 +#ifdef _WIN32 #define COMMONSAMPLE_EXPORT __declspec( dllimport ) #else #define COMMONSAMPLE_EXPORT diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx index 4eca6970c4..7014ad8d84 100755 --- a/samples/qt/Common/src/View.cxx +++ b/samples/qt/Common/src/View.cxx @@ -1,4 +1,4 @@ -#if !defined WNT +#if !defined _WIN32 #define QT_CLEAN_NAMESPACE /* avoid definition of INT32 and INT8 */ #endif @@ -187,7 +187,7 @@ void View::init() Window aWindowHandle = (Window )winId(); Handle(Aspect_DisplayConnection) aDispConnection = myContext->CurrentViewer()->Driver()->GetDisplayConnection(); Handle(Xw_Window) hWnd = new Xw_Window (aDispConnection, aWindowHandle); -#endif // WNT +#endif // _WIN32 myView->SetWindow (hWnd); if ( !hWnd->IsMapped() ) diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro index 433524fab5..3bd3a3e329 100755 --- a/samples/qt/IESample/IESample.pro +++ b/samples/qt/IESample/IESample.pro @@ -47,7 +47,6 @@ unix { MACOSX_USE_GLX = $$(MACOSX_USE_GLX) !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD - !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD @@ -70,7 +69,7 @@ win32 { MOC_DIR = ./win$(ARCH)/$(VCVER)/moc LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib } - DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS + DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS } LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \ diff --git a/samples/qt/Interface/src/IESample.h b/samples/qt/Interface/src/IESample.h index d7b2062915..6eb8465707 100755 --- a/samples/qt/Interface/src/IESample.h +++ b/samples/qt/Interface/src/IESample.h @@ -3,13 +3,13 @@ #ifndef NO_IESAMPLE_EXPORTS #ifdef IESAMPLE_EXPORTS -#ifdef WIN32 +#ifdef _WIN32 #define IESAMPLE_EXPORT __declspec( dllexport ) #else #define IESAMPLE_EXPORT #endif #else -#ifdef WIN32 +#ifdef _WIN32 #define IESAMPLE_EXPORT __declspec( dllimport ) #else #define IESAMPLE_EXPORT diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro index dd66bb4881..f07d77e7fb 100755 --- a/samples/qt/Tutorial/Tutorial.pro +++ b/samples/qt/Tutorial/Tutorial.pro @@ -50,7 +50,6 @@ unix { MACOSX_USE_GLX = $$(MACOSX_USE_GLX) !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD - !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD @@ -73,7 +72,7 @@ win32 { MOC_DIR = ./win$(ARCH)/$(VCVER)/moc LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib } - DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS + DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS } LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \