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
Second integration of PV3D viewer:
[modules/gui.git]
/
src
/
GLViewer
/
GLViewer_ViewPort.cxx
diff --git
a/src/GLViewer/GLViewer_ViewPort.cxx
b/src/GLViewer/GLViewer_ViewPort.cxx
index 733b1a392bde11c55bf7088ad24e50df4f144e8c..d84ef5abc3a74e98a1e28899854315a55abb74a3 100644
(file)
--- a/
src/GLViewer/GLViewer_ViewPort.cxx
+++ b/
src/GLViewer/GLViewer_ViewPort.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-42,7
+42,7
@@
#include <stdlib.h>
#include <stdlib.h>
-#if !defined WIN32
+#if !defined WIN32
&& !defined __APPLE__
#include <QX11Info>
#include <GL/glx.h>
#include <X11/Xlib.h>
#include <QX11Info>
#include <GL/glx.h>
#include <X11/Xlib.h>
@@
-121,16
+121,6
@@
static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
#ifdef DEBUG
cout << "Choosing cmap for vID = " << vi->visualid << endl;
#endif
#ifdef DEBUG
cout << "Choosing cmap for vID = " << vi->visualid << endl;
#endif
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if ( vi->visualid == XVisualIDFromVisual( (Visual*)QX11Info::appVisual() ) )
- {
-#ifdef DEBUG
- cout << "Using x11AppColormap" << endl;
-#endif
- return QX11Info::appColormap();
- }
-#else
if ( vi->visualid == XVisualIDFromVisual( XDefaultVisual( QX11Info::display(), -1 ) ) )
{
#ifdef DEBUG
if ( vi->visualid == XVisualIDFromVisual( XDefaultVisual( QX11Info::display(), -1 ) ) )
{
#ifdef DEBUG
@@
-138,7
+128,6
@@
static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
#endif
return XDefaultColormap( QX11Info::display(), -1 );
}
#endif
return XDefaultColormap( QX11Info::display(), -1 );
}
-#endif
if ( mesa_gl )
{
Atom hp_cmaps = XInternAtom( dpy, "_HP_RGB_SMOOTH_MAP_LIST", true );
if ( mesa_gl )
{
Atom hp_cmaps = XInternAtom( dpy, "_HP_RGB_SMOOTH_MAP_LIST", true );
@@
-353,7
+342,7
@@
void GLViewer_ViewPort::cleanup()
*/
void GLViewer_ViewPort::selectVisualId( ViewType type )
{
*/
void GLViewer_ViewPort::selectVisualId( ViewType type )
{
-#if !defined WIN32
+#if !defined WIN32
&& !defined __APPLE__
XVisualInfo* pVisualInfo;
if ( QX11Info::display() )
{
XVisualInfo* pVisualInfo;
if ( QX11Info::display() )
{