Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed WIN32 bug - FL_GL_WINDOW needs to be defined in Fl_Window.H...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/trunk@75 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1998-11-08 16:47:44 +00:00
parent dfa8c05620
commit e278c332b3
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Gl_Window.H
+2 -5
View File
@@ -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). // OpenGL header file for the Fast Light Tool Kit (FLTK).
// //
@@ -27,9 +27,6 @@
#include "Fl_Window.H" #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_Choice; // structure to hold result of glXChooseVisual
class Fl_Gl_Window : public Fl_Window { class Fl_Gl_Window : public Fl_Window {
@@ -87,5 +84,5 @@ public:
#endif #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 $".
// //
FL/Fl_Window.H
+3 -2
View File
@@ -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). // Window header file for the Fast Light Tool Kit (FLTK).
// //
@@ -29,6 +29,7 @@
#include "Fl_Group.H" #include "Fl_Group.H"
#define FL_WINDOW 0xF0 // all subclasses have type() >= this #define FL_WINDOW 0xF0 // all subclasses have type() >= this
#define FL_GL_WINDOW (FL_WINDOW + 1)
class Fl_Window : public Fl_Group { class Fl_Window : public Fl_Group {
@@ -110,5 +111,5 @@ public:
#endif #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 $".
// //
src/Fl_win32.cxx
+3 -3
View File
@@ -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). // 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 // for all drawing calls, so we must select it here before any
// code does any drawing... // code does any drawing...
fl_select_palette(); fl_select_palette(type() == FL_GL_WINDOW);
#endif // USE_COLORMAP #endif // USE_COLORMAP
current_ = this; 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 $".
// //