diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-11-08 16:47:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-11-08 16:47:44 +0000 |
| commit | e278c332b3ea4f99f74dccc3a125cc92acef70e7 (patch) | |
| tree | fb79d34257bdf39318d9a01162470bc4b5f6aeb6 | |
| parent | dfa8c056201785fa0db5524348f03a5880808206 (diff) | |
Fixed WIN32 bug - FL_GL_WINDOW needs to be defined in Fl_Window.H...
git-svn-id: file:///fltk/svn/fltk/trunk@75 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Gl_Window.H | 7 | ||||
| -rw-r--r-- | FL/Fl_Window.H | 5 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index 6eac03e47..41eed6656 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Window.H,v 1.4 1998/11/08 16:37:18 mike Exp $" +// "$Id: Fl_Gl_Window.H,v 1.5 1998/11/08 16:47:42 mike Exp $" // // OpenGL header file for the Fast Light Tool Kit (FLTK). // @@ -27,9 +27,6 @@ #include "Fl_Window.H" -// type() value for OpenGL window... -#define FL_GL_WINDOW (FL_WINDOW + 1) - class Fl_Gl_Choice; // structure to hold result of glXChooseVisual class Fl_Gl_Window : public Fl_Window { @@ -87,5 +84,5 @@ public: #endif // -// End of "$Id: Fl_Gl_Window.H,v 1.4 1998/11/08 16:37:18 mike Exp $". +// End of "$Id: Fl_Gl_Window.H,v 1.5 1998/11/08 16:47:42 mike Exp $". // diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 30e09730c..a1808118c 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window.H,v 1.6 1998/10/21 14:19:42 mike Exp $" +// "$Id: Fl_Window.H,v 1.7 1998/11/08 16:47:43 mike Exp $" // // Window header file for the Fast Light Tool Kit (FLTK). // @@ -29,6 +29,7 @@ #include "Fl_Group.H" #define FL_WINDOW 0xF0 // all subclasses have type() >= this +#define FL_GL_WINDOW (FL_WINDOW + 1) class Fl_Window : public Fl_Group { @@ -110,5 +111,5 @@ public: #endif // -// End of "$Id: Fl_Window.H,v 1.6 1998/10/21 14:19:42 mike Exp $". +// End of "$Id: Fl_Window.H,v 1.7 1998/11/08 16:47:43 mike Exp $". // diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 243401c65..1945ac886 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.15 1998/11/08 16:37:20 mike Exp $" +// "$Id: Fl_win32.cxx,v 1.16 1998/11/08 16:47:44 mike Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -755,7 +755,7 @@ void Fl_Window::make_current() { // for all drawing calls, so we must select it here before any // code does any drawing... - fl_select_palette(); + fl_select_palette(type() == FL_GL_WINDOW); #endif // USE_COLORMAP current_ = this; @@ -816,5 +816,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl_win32.cxx,v 1.15 1998/11/08 16:37:20 mike Exp $". +// End of "$Id: Fl_win32.cxx,v 1.16 1998/11/08 16:47:44 mike Exp $". // |