From 2b85bf81680e2243ef5a5daf85d9eb04321c7278 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 27 Nov 2001 17:44:08 +0000 Subject: Preliminary commit of my MacOS X work. **** THIS CODE COMPILES BUT DOES NOT WORK. **** TODO: fix event handling - getting blank windows, etc. TODO: re-port OpenGL code. TODO: add support for images with alpha. TODO: add support for more then just beeps in fl_beep(). TODO: other stuff I'm sure... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Gl_Choice.H | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/Fl_Gl_Choice.H') diff --git a/src/Fl_Gl_Choice.H b/src/Fl_Gl_Choice.H index 2fd10c967..82dad8f20 100644 --- a/src/Fl_Gl_Choice.H +++ b/src/Fl_Gl_Choice.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Choice.H,v 1.4.2.6 2001/03/14 17:20:01 spitzak Exp $" +// "$Id: Fl_Gl_Choice.H,v 1.4.2.6.2.1 2001/11/27 17:44:06 easysw Exp $" // // OpenGL definitions for the Fast Light Tool Kit (FLTK). // @@ -55,11 +55,14 @@ // Warning: whatever GLContext is defined to must take exactly the same // space in a structure as a void*!!! #ifdef WIN32 -# include -# define GLContext HGLRC +# include +# define GLContext HGLRC +#elif defined(__APPLE__) +# include +# define GLContext CGLContextObj #else -# include -# define GLContext GLXContext +# include +# define GLContext GLXContext #endif // Describes crap needed to create a GLContext. @@ -71,6 +74,8 @@ public: #ifdef WIN32 int pixelformat; // the visual to use PIXELFORMATDESCRIPTOR pfd; // some wgl calls need this thing +#elif defined(__APPLE__) + //++ #else XVisualInfo *vis; // the visual to use Colormap colormap; // a colormap for that visual @@ -87,6 +92,10 @@ class Fl_Window; GLContext fl_create_gl_context(Fl_Window*, const Fl_Gl_Choice*, int layer=0); +#elif defined(__APPLE__) + +//++ + #else GLContext fl_create_gl_context(XVisualInfo* vis); @@ -105,5 +114,5 @@ void fl_delete_gl_context(GLContext); #endif // -// End of "$Id: Fl_Gl_Choice.H,v 1.4.2.6 2001/03/14 17:20:01 spitzak Exp $". +// End of "$Id: Fl_Gl_Choice.H,v 1.4.2.6.2.1 2001/11/27 17:44:06 easysw Exp $". // -- cgit v1.2.3