From: akz <akz@opencascade.com>
Date: Fri, 25 Sep 2015 08:35:36 +0000 (+0300)
Subject: 0022972: Eliminate macro definitions that has compiler-provided analogs (WNT and... 
X-Git-Tag: V7_0_0_beta~231
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=bd6c46193d8d5948359a8f64e19ad9dd3b0bca32;p=occt-copy.git

0022972: Eliminate macro definitions that has compiler-provided analogs (WNT and so on)
Replace removed from occt WNT preprocessor flag with _WIN32
---

diff --git a/src/IVtkDraw/IVtkDraw.cxx b/src/IVtkDraw/IVtkDraw.cxx
index 7e9b53c774..d6fadddb8e 100644
--- a/src/IVtkDraw/IVtkDraw.cxx
+++ b/src/IVtkDraw/IVtkDraw.cxx
@@ -255,7 +255,7 @@ Standard_Integer GenerateId()
 const Handle(MMgt_TShared)& IVtkDraw::WClass()
 {
   static Handle(MMgt_TShared) aWindowClass;
-#ifdef WNT
+#ifdef _WIN32
   if (aWindowClass.IsNull())
   {
     aWindowClass = new WNT_WClass ("GWVTK_Class", DefWindowProc,
@@ -302,7 +302,7 @@ void IVtkDraw::ViewerInit (Standard_Integer thePxLeft,
   if (isFirst)
   {
     SetDisplayConnection (new Aspect_DisplayConnection ());
-#ifdef WNT
+#ifdef _WIN32
     if (GetWindow().IsNull())
     {
       GetWindow() = new WNT_Window ("IVtkTest",
@@ -332,7 +332,7 @@ void IVtkDraw::ViewerInit (Standard_Integer thePxLeft,
     GetRenderer()->GetActiveCamera()->ParallelProjectionOn();
     aRenWin->SetSize (aPxWidth, aPxHeight);
 
-#ifdef WNT
+#ifdef _WIN32
     aRenWin->SetWindowId((void*)GetWindow()->HWindow());
 #else
     Window aWindowId = GetWindow()->XWindow();