diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2001-03-14 17:20:02 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2001-03-14 17:20:02 +0000 |
| commit | 97234fb3e28e7c8eaf844ae0fd841122de2c47dc (patch) | |
| tree | bd60a8df587b31d829e6c253ae79dc093364668e /FL/glut.H | |
| parent | 8470c05b5802bddbc6f02769e0d013332bbdf9a4 (diff) | |
Replaced remaining _WIN32 symbols with WIN32
Stuff from work:
Removed reference to unused GL/glu.h header file, which is missing on
some Linux systems.
Fl_Gl_Window has a new method to allow you to get and set the context:
void Fl_Gl_Window::context(void*, int destroy = 0)
void* Fl_Gl_Window::context() const;
Return or set a pointer to the GLContext that this window is
using. This is a system-dependent structure, but it is portable to
copy the context from one window to another. You can also set it to
NULL, which will force FLTK to recreate the context the next time
make_current() is called, this is useful for getting around bugs in
OpenGL implementations.
If destroy_flag is true the context will be destroyed by fltk when
the window is destroyed, or when the mode() is changed, or the next
time context(x) is called.
Some cleanup of Fl_Gl_Choice to move most of the system dependent
#ifdefs into Fl_Gl_Choice.cxx.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1413 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/glut.H')
| -rw-r--r-- | FL/glut.H | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,5 +1,5 @@ // -// "$Id: glut.H,v 1.6.2.9 2001/01/22 15:13:38 easysw Exp $" +// "$Id: glut.H,v 1.6.2.10 2001/03/14 17:20:01 spitzak Exp $" // // GLUT emulation header file for the Fast Light Tool Kit (FLTK). // @@ -45,7 +45,7 @@ #define __glut_h__ #include <FL/gl.h> -#include <GL/glu.h> +//#include <GL/glu.h> //////////////////////////////////////////////////////////////// // Glut is emulated using this window class and these static variables @@ -431,7 +431,7 @@ extern "C" { extern int APIENTRY glutExtensionSupported(char *name); /* Stroke font constants (use these in GLUT program). */ -#if defined(_WIN32) || defined(WIN32) +#ifdef WIN32 # define GLUT_STROKE_ROMAN ((void*)0) # define GLUT_STROKE_MONO_ROMAN ((void*)1) #else @@ -470,5 +470,5 @@ extern void APIENTRY glutSolidIcosahedron(); #endif /* __glut_h__ */ // -// End of "$Id: glut.H,v 1.6.2.9 2001/01/22 15:13:38 easysw Exp $". +// End of "$Id: glut.H,v 1.6.2.10 2001/03/14 17:20:01 spitzak Exp $". // |