plib-cvs

[<ud...@us...>]

Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv22832/src/pui

Modified Files:
	pu.cxx 
Log Message:
Moved "glIsValidContext" over to UL

Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- pu.cxx	19 Apr 2002 20:35:40 -0000	1.47
+++ pu.cxx	19 Apr 2002 21:02:16 -0000	1.48
@@ -23,14 +23,6 @@
 
 #include "puLocal.h"
 
-#ifndef WIN32
-#  ifndef macintosh
-#    include <GL/glx.h>
-#  else
-#    include <agl.h>
-#  endif
-#endif
-
 int puRefresh = TRUE ;
 
 static int puWindowWidth  = 400 ;
@@ -110,19 +102,6 @@
 } ;
 
 
-static int glIsValidContext ( void )
-{
-#if defined(CONSOLE)
-  return true ;
-#elif defined(WIN32)
-  return ( wglGetCurrentContext () != NULL ) ;
-#elif defined(macintosh)
-  return ( aglGetCurrentContext() != NULL ) ;
-#else
-  return ( glXGetCurrentContext() != NULL ) ;
-#endif
-}
-
 static int _puCursor_enable = FALSE ;
 static int _puCursor_x      = 0 ;
 static int _puCursor_y      = 0 ;
@@ -234,7 +213,7 @@
 
   if ( firsttime )
   {
-    if ( glIsValidContext () == 0 )
+    if ( ! ulIsValidContext () )
     {
       ulSetError ( UL_FATAL,
         "puInit called without a valid OpenGL context.");