Change grass6 -> grass7

Remove PyOpenGL references


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33474 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/mapdisp.py

@@ -2677,11 +2677,6 @@ class MapFrame(wx.Frame):
                         "included with this build "
                         "of wxPython! Switching back to "
                         "2D display mode.\n\nDetails: %s" % nviz.errorMsg)
-            if not nviz.haveOpenGL:
-                msg = _("Unable to start Nviz. The OpenGL package "
-                        "was not found. You can get it "
-                        "at http://PyOpenGL.sourceforge.net. "
-                        "Switching back to 2D display mode.\n\nDetails: %s" % nviz.errorMsg)
             if not nviz.haveNviz:
                 msg = _("Unable to start Nviz. Python extension "
                         "for Nviz was not found or loaded properly. "

gui/wxpython/gui_modules/nviz.py

@@ -29,18 +29,11 @@ try:
 except ImportError, e:
     haveGLCanvas = False
     errorMsg = e
-try:
-    from OpenGL.GL import *
-    from OpenGL.GLUT import *
-    haveOpenGL = True
-except ImportError, e:
-    haveOpenGL = False
-    errorMsg = e
 
 import globalvar
 try:
     sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-    import grass6_wxnviz as wxnviz
+    import grass7_wxnviz as wxnviz
     haveNviz = True
 except ImportError, e:
     haveNviz = False

gui/wxpython/gui_modules/nviz_mapdisp.py

@@ -37,7 +37,7 @@ from mapdisp import MapWindow as MapWindow
 from goutput import wxCmdOutput as wxCmdOutput
 
 sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass6_wxnviz as wxnviz
+import grass7_wxnviz as wxnviz
 
 wxUpdateProperties, EVT_UPDATE_PROP = NewEvent()
 wxUpdateView,       EVT_UPDATE_VIEW = NewEvent()

gui/wxpython/gui_modules/nviz_tools.py

@@ -30,7 +30,7 @@ from nviz_mapdisp import wxUpdateView as wxUpdateView
 from nviz_mapdisp import wxUpdateProperties as wxUpdateProperties
 
 sys.path.append(os.path.join(globalvar.ETCWXDIR, "nviz"))
-import grass6_wxnviz as wxnviz
+import grass7_wxnviz as wxnviz
 
 class NvizToolWindow(wx.Frame):
     """Experimental window for Nviz tools

gui/wxpython/gui_modules/vdigit.py

@@ -1303,7 +1303,7 @@ class AbstractDisplayDriver:
 
 class CDisplayDriver(AbstractDisplayDriver):
     """
-    Display driver using grass6_wxdriver module
+    Display driver using grass7_wxdriver module
     """
     def __init__(self, parent, mapwindow):
         """Initialization