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
Merge branch 'V8_4_BR'
[modules/gui.git]
/
src
/
GLViewer
/
GLViewer_Drawer.h
diff --git
a/src/GLViewer/GLViewer_Drawer.h
b/src/GLViewer/GLViewer_Drawer.h
index a8522cd59ea043d3a07ea899142a9398949caeea..f936da990d91b8e0f573060db9b0ab5d3f288767 100644
(file)
--- a/
src/GLViewer/GLViewer_Drawer.h
+++ b/
src/GLViewer/GLViewer_Drawer.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-36,7
+36,11
@@
class QFile;
class QFile;
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
#include <GL/gl.h>
#include <GL/gl.h>
+#endif
#include "GLViewer.h"
#include "GLViewer_Defs.h"
#include "GLViewer.h"
#include "GLViewer_Defs.h"
@@
-79,8
+83,8
@@
struct GLVIEWER_API GLViewer_TexFindId
bool myIsUndl;
//! Font Size
int myPointSize;
bool myIsUndl;
//! Font Size
int myPointSize;
- //! View P
O
rt ID
-
int
myViewPortId;
+ //! View P
o
rt ID
+
long
myViewPortId;
//! Overloaded operator for using struct as MAP key
bool operator < (const GLViewer_TexFindId theStruct) const
{
//! Overloaded operator for using struct as MAP key
bool operator < (const GLViewer_TexFindId theStruct) const
{