[GRASS-SVN] r32044 - in grass/trunk: include lib/nviz

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-08 05:40:43 -0400 (Tue, 08 Jul 2008)
New Revision: 32044

Modified:
   grass/trunk/include/nviz.h
   grass/trunk/lib/nviz/render.c
Log:
nvizlib: OPENGL_WGL renamed to OPENGL_WINDOWS


Modified: grass/trunk/include/nviz.h
===================================================================
--- grass/trunk/include/nviz.h	2008-07-08 09:32:12 UTC (rev 32043)
+++ grass/trunk/include/nviz.h	2008-07-08 09:40:43 UTC (rev 32044)
@@ -119,7 +119,7 @@
     AGLContext contextId;
     AGLPixmap windowId;
     GWorldPtr pixmap;
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     /* TODO */
 #endif
 };

Modified: grass/trunk/lib/nviz/render.c
===================================================================
--- grass/trunk/lib/nviz/render.c	2008-07-08 09:32:12 UTC (rev 32043)
+++ grass/trunk/lib/nviz/render.c	2008-07-08 09:40:43 UTC (rev 32044)
@@ -65,7 +65,7 @@
     aglDestroyContext(rwin->contextId);
     aglDestroyAGLPixmap(rwin->windowId); 
     /* TODO FreePixMap */
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     /* TODO: wglDeleteContext( HRC hrc ) */
 #endif
 
@@ -91,7 +91,7 @@
     XVisualInfo  *v;
 #elif defined(OPENGL_AQUA)
     AGLPixelFmtID v;
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     int v;
 #endif
 
@@ -104,7 +104,7 @@
     rwin->displayId = XOpenDisplay((char *) display);
 #elif defined(OPENGL_AQUA)
     /* TODO */
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     /* TODO */
 #endif
 
@@ -125,7 +125,7 @@
     rwin->displayId = aglChoosePixelFmt(GDHandle *dev, int ndev, attributeList);
     
     rwin->contextId = aglCreateContext(rwin->display, NULL); 
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     /* TODO int ChoosePixelFormat( HDC hdc, PIXELFORMATDESCRIPTOR *pfd ) */
 #endif
 
@@ -151,7 +151,7 @@
     /* create an off-screen AGL rendering area */
     rwin->windowId = aglCreateAGLPixmap(rwin->displayId,
 					rwin->pixmap); 
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     /* TODO */
 #endif
 
@@ -186,7 +186,7 @@
 	return 1;
 
     aglMakeCurrent(rwin->windowId, rwin->contextId);
-#elif defined(OPENGL_WGL)
+#elif defined(OPENGL_WINDOWS)
     /* TODO wglMakeCurrent( HDC hdc, HGLRC hrc ) */
 #endif