updated copyright message

[modules/gui.git] / src / GLViewer / GLViewer_ViewPort.cxx

diff --git a/src/GLViewer/GLViewer_ViewPort.cxx b/src/GLViewer/GLViewer_ViewPort.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 99a68b7..544917c
--- a/src/GLViewer/GLViewer_ViewPort.cxx
+++ b/src/GLViewer/GLViewer_ViewPort.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  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
@@ -42,7 +42,7 @@
 
 #include <stdlib.h>
 
-#if !defined WIN32
+#if !defined WIN32 && !defined __APPLE__
 #include <QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
@@ -121,15 +121,13 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
 #ifdef DEBUG
     cout << "Choosing cmap for vID = " << vi->visualid << endl;
 #endif
-
-    if ( vi->visualid == XVisualIDFromVisual( (Visual*)QX11Info::appVisual() ) )
+    if ( vi->visualid == XVisualIDFromVisual( XDefaultVisual( QX11Info::display(), -1 ) ) )
     {
 #ifdef DEBUG
-        cout << "Using x11AppColormap" << endl;
+        cout << "Using XDefaultColormap" << endl;
 #endif
-        return QX11Info::appColormap();
+        return XDefaultColormap( QX11Info::display(), -1 );
     }
-
     if ( mesa_gl )
     {
         Atom hp_cmaps = XInternAtom( dpy, "_HP_RGB_SMOOTH_MAP_LIST", true );
@@ -344,7 +342,7 @@ void GLViewer_ViewPort::cleanup()
 */
 void GLViewer_ViewPort::selectVisualId( ViewType type )
 {
-#if !defined WIN32
+#if !defined WIN32 && !defined __APPLE__
     XVisualInfo* pVisualInfo;
     if ( QX11Info::display() )
     {