Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 13:55:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix case problems in include filenames...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2077 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-04-13 20:28:51 +00:00
parent 9e2f362016
commit 7f0c218c1c
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.0 CHANGES IN FLTK 1.1.0
- Fixed some case problems in includes for the MacOS X
code.
- Fl_Widget::handle() returned 1 for FL_ENTER and - Fl_Widget::handle() returned 1 for FL_ENTER and
FL_LEAVE events, which caused some compatibility FL_LEAVE events, which caused some compatibility
problems with 1.0 code. problems with 1.0 code.
src/Fl_Gl_Choice.cxx
+11 -11
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.9 2002/03/25 16:41:01 easysw Exp $" // "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.10 2002/04/13 20:28:51 easysw Exp $"
// //
// OpenGL visual selection code for the Fast Light Tool Kit (FLTK). // OpenGL visual selection code for the Fast Light Tool Kit (FLTK).
// //
@@ -32,7 +32,7 @@
#include "Fl_Gl_Choice.H" #include "Fl_Gl_Choice.H"
#ifdef __APPLE__ #ifdef __APPLE__
# include <Fl/Fl_Window.H> # include <FL/Fl_Window.H>
#endif #endif
static Fl_Gl_Choice *first; static Fl_Gl_Choice *first;
@@ -84,11 +84,11 @@ Fl_Gl_Choice *Fl_Gl_Choice::find(int mode, const int *alist) {
if (mode & FL_STENCIL) { if (mode & FL_STENCIL) {
list[n++] = AGL_STENCIL_SIZE; list[n++] = 1; list[n++] = AGL_STENCIL_SIZE; list[n++] = 1;
} }
#ifdef AGL_STEREO /* is there such a thing as AGL_STEREO? */ # ifdef AGL_STEREO /* is there such a thing as AGL_STEREO? */
if (mode & FL_STEREO) { if (mode & FL_STEREO) {
list[n++] = AGL_STEREO; list[n++] = AGL_STEREO;
} }
#endif # endif
list[n] = AGL_NONE; list[n] = AGL_NONE;
blist = list; blist = list;
} }
@@ -137,12 +137,12 @@ Fl_Gl_Choice *Fl_Gl_Choice::find(int mode, const int *alist) {
if (mode & FL_STEREO) { if (mode & FL_STEREO) {
list[n++] = GLX_STEREO; list[n++] = GLX_STEREO;
} }
#if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample) # if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
if (mode & FL_MULTISAMPLE) { if (mode & FL_MULTISAMPLE) {
list[n++] = GLX_SAMPLES_SGIS; list[n++] = GLX_SAMPLES_SGIS;
list[n++] = 4; // value Glut uses list[n++] = 4; // value Glut uses
} }
#endif # endif
list[n] = 0; list[n] = 0;
blist = list; blist = list;
} }
@@ -150,9 +150,9 @@ Fl_Gl_Choice *Fl_Gl_Choice::find(int mode, const int *alist) {
fl_open_display(); fl_open_display();
XVisualInfo *vis = glXChooseVisual(fl_display, fl_screen, (int *)blist); XVisualInfo *vis = glXChooseVisual(fl_display, fl_screen, (int *)blist);
if (!vis) { if (!vis) {
# if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample) # if defined(GLX_VERSION_1_1) && defined(GLX_SGIS_multisample)
if (mode&FL_MULTISAMPLE) return find(mode&~FL_MULTISAMPLE,0); if (mode&FL_MULTISAMPLE) return find(mode&~FL_MULTISAMPLE,0);
# endif # endif
return 0; return 0;
} }
@@ -227,9 +227,9 @@ GLContext fl_create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int lay
if (!hdc) { if (!hdc) {
hdc = i->private_dc = GetDCEx(i->xid, 0, DCX_CACHE); hdc = i->private_dc = GetDCEx(i->xid, 0, DCX_CACHE);
SetPixelFormat(hdc, g->pixelformat, (PIXELFORMATDESCRIPTOR*)(&g->pfd)); SetPixelFormat(hdc, g->pixelformat, (PIXELFORMATDESCRIPTOR*)(&g->pfd));
#if USE_COLORMAP # if USE_COLORMAP
if (fl_palette) SelectPalette(hdc, fl_palette, FALSE); if (fl_palette) SelectPalette(hdc, fl_palette, FALSE);
#endif # endif
} }
GLContext context = GLContext context =
layer ? wglCreateLayerContext(hdc, layer) : wglCreateContext(hdc); layer ? wglCreateLayerContext(hdc, layer) : wglCreateContext(hdc);
@@ -318,5 +318,5 @@ void fl_delete_gl_context(GLContext context) {
#endif #endif
// //
// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.9 2002/03/25 16:41:01 easysw Exp $". // End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.10 2002/04/13 20:28:51 easysw Exp $".
// //
src/Fl_mac.cxx
+3 -3
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_mac.cxx,v 1.1.2.19 2002/04/11 11:52:42 easysw Exp $" // "$Id: Fl_mac.cxx,v 1.1.2.20 2002/04/13 20:28:51 easysw Exp $"
// //
// MacOS specific code for the Fast Light Tool Kit (FLTK). // MacOS specific code for the Fast Light Tool Kit (FLTK).
// //
@@ -839,7 +839,7 @@ static int FSSpec2UnixPath( FSSpec *fs, char *dst )
} }
Fl_Window *fl_dnd_target_window = 0; Fl_Window *fl_dnd_target_window = 0;
#include <Fl/fl_draw.h> #include <FL/fl_draw.H>
/** /**
* Drag'n'drop tracking handler * Drag'n'drop tracking handler
*/ */
@@ -1359,6 +1359,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
// //
// End of "$Id: Fl_mac.cxx,v 1.1.2.19 2002/04/11 11:52:42 easysw Exp $". // End of "$Id: Fl_mac.cxx,v 1.1.2.20 2002/04/13 20:28:51 easysw Exp $".
// //