Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Porting to DEV version of OpenCASCADE: AIS_InteractiveContext : default value for...
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_Trihedron.cxx
diff --git
a/src/OCCViewer/OCCViewer_Trihedron.cxx
b/src/OCCViewer/OCCViewer_Trihedron.cxx
index 6f5c54ce95470c69a17ec05d1177750967d5cf79..d13af530ef417aa3f9362f5dc791fa6722dec3ab 100644
(file)
--- a/
src/OCCViewer/OCCViewer_Trihedron.cxx
+++ b/
src/OCCViewer/OCCViewer_Trihedron.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-21,7
+21,11
@@
#include <windows.h>
#endif
#include <windows.h>
#endif
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
#include <GL/gl.h>
#include <GL/gl.h>
+#endif
#include "OCCViewer_Trihedron.h"
#include "OCCViewer_Trihedron.h"
@@
-37,7
+41,7
@@
#include <PrsMgr_PresentationManager3d.hxx>
#include <PrsMgr_PresentationManager3d.hxx>
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
# include <GL/glx.h>
#endif
# include <GL/glx.h>
#endif
@@
-45,8
+49,7
@@
#define PI 3.14159265359
#define PI 3.14159265359
-IMPLEMENT_STANDARD_HANDLE( OCCViewer_Trihedron, AIS_InteractiveObject )
-IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject )
+OCCT_IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject )
/*!
* Constructor
/*!
* Constructor
@@
-123,7
+126,7
@@
GLuint generateTextList()
bool ok = false;
GLuint aList = glGenLists( 256 );
bool ok = false;
GLuint aList = glGenLists( 256 );
-#if
def WIN32
+#if
defined(WIN32)
HGLRC hglrc = wglGetCurrentContext();
if( hglrc )
{
HGLRC hglrc = wglGetCurrentContext();
if( hglrc )
{
@@
-143,7
+146,7
@@
GLuint generateTextList()
SelectObject( hdc, oldFont );
DeleteObject( font );
}
SelectObject( hdc, oldFont );
DeleteObject( font );
}
-#el
se
// X Window
+#el
if !defined(__APPLE__)
// X Window
Display* dpy = glXGetCurrentDisplay();
if( dpy )
{
Display* dpy = glXGetCurrentDisplay();
if( dpy )
{