diff options
| author | Aaron M. Ucko <ucko@debian.org> | 2005-04-05 20:28:45 +0000 |
|---|---|---|
| committer | Aaron M. Ucko <ucko@debian.org> | 2005-04-05 20:28:45 +0000 |
| commit | 398d9e39b4fb3782e0b041419f005637388e7f04 (patch) | |
| tree | 8fc51d4e7996565d4f24bde50589aaf38532e037 /src/Fl_Gl_Choice.H | |
| parent | 190e20c801ad73f1b6d6fe02ffa5de135ae0f8d5 (diff) | |
Load fltk-1.1.5rc3 into branches/upstream/current.
Diffstat (limited to 'src/Fl_Gl_Choice.H')
| -rw-r--r-- | src/Fl_Gl_Choice.H | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/Fl_Gl_Choice.H b/src/Fl_Gl_Choice.H index 5b96969..d06a7c2 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.2.3 2001/12/18 11:00:09 matthiaswm Exp $" +// "$Id: Fl_Gl_Choice.H,v 1.4.2.6.2.5 2004/09/09 21:34:46 matthiaswm Exp $" // // OpenGL definitions for the Fast Light Tool Kit (FLTK). // @@ -57,7 +57,12 @@ #ifdef WIN32 # include <FL/gl.h> # define GLContext HGLRC -#elif defined(__APPLE__) +#elif defined(__APPLE_QD__) +# include <OpenGL/gl.h> +# include <AGL/agl.h> +# define GLContext AGLContext +#elif defined(__APPLE_QUARTZ__) +// warning: the Quartz version should probably use Core GL (CGL) instead of AGL # include <OpenGL/gl.h> # include <AGL/agl.h> # define GLContext AGLContext @@ -75,7 +80,10 @@ public: #ifdef WIN32 int pixelformat; // the visual to use PIXELFORMATDESCRIPTOR pfd; // some wgl calls need this thing -#elif defined(__APPLE__) +#elif defined(__APPLE_QD__) + AGLPixelFormat pixelformat; +#elif defined(__APPLE_QUARTZ__) + // warning: the Quartz version should probably use Core GL (CGL) instead of AGL AGLPixelFormat pixelformat; #else XVisualInfo *vis; // the visual to use @@ -93,7 +101,12 @@ class Fl_Window; GLContext fl_create_gl_context(Fl_Window*, const Fl_Gl_Choice*, int layer=0); -#elif defined(__APPLE__) +#elif defined(__APPLE_QD__) + +GLContext fl_create_gl_context(Fl_Window*, const Fl_Gl_Choice*, int layer=0); + +#elif defined(__APPLE_QUARTZ__) +// warning: the Quartz version should probably use Core GL (CGL) instead of AGL GLContext fl_create_gl_context(Fl_Window*, const Fl_Gl_Choice*, int layer=0); @@ -115,5 +128,5 @@ void fl_delete_gl_context(GLContext); #endif // -// End of "$Id: Fl_Gl_Choice.H,v 1.4.2.6.2.3 2001/12/18 11:00:09 matthiaswm Exp $". +// End of "$Id: Fl_Gl_Choice.H,v 1.4.2.6.2.5 2004/09/09 21:34:46 matthiaswm Exp $". // |