OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0022972: Eliminate macro definitions that has compiler-provided analogs (WNT and so on)

Browse Source 
Replace removed from occt WNT preprocessor flag with _WIN32
This commit is contained in:
akz 2015-09-25 11:35:36 +03:00 committed by bugmaster
parent ed5ca017c7
commit bd6c46193d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/IVtkDraw/IVtkDraw.cxx
View File

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