diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-13 15:43:10 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-13 15:43:10 +0000 |
| commit | f953ffc27d816d4969f825b8adfb5106e15cfd63 (patch) | |
| tree | fadef5cb3a1bfd4648118d5d2bf69cc5ec0f1780 | |
| parent | 80d05eb962ce78a43faf15c572158f603ce5a029 (diff) | |
Change _WIN32 to WIN32 for 1.1.x tree.
Cleanup recent tooltip changes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2215 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | FL/gl.h | 42 | ||||
| -rw-r--r-- | src/Fl.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Tooltip.cxx | 8 |
4 files changed, 29 insertions, 28 deletions
@@ -1,6 +1,7 @@ CHANGES IN FLTK 1.1.0rc2 - Portability fixes. + - Backported 2.0 tooltip changes. - Several of the valuators did not support tooltips. - The last menu item in a menu didn't pick up on font changes. @@ -1,5 +1,5 @@ // -// "$Id: gl.h,v 1.6.2.4.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: gl.h,v 1.6.2.4.2.3 2002/05/13 15:43:09 easysw Exp $" // // OpenGL header file for the Fast Light Tool Kit (FLTK). // @@ -30,26 +30,26 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // -#ifndef gl_draw_H -#define gl_draw_H +#ifndef FL_gl_H +# define FL_gl_H -#include "Enumerations.H" // for color names -#ifdef _WIN32 -# include <windows.h> -#endif -#ifndef APIENTRY -# if defined(__CYGWIN__) -# define APIENTRY __attribute__ ((__stdcall__)) -# else -# define APIENTRY -# endif -#endif +# include "Enumerations.H" // for color names +# ifdef WIN32 +# include <windows.h> +# endif +# ifndef APIENTRY +# if defined(__CYGWIN__) +# define APIENTRY __attribute__ ((__stdcall__)) +# else +# define APIENTRY +# endif +# endif -#ifdef __APPLE__ -# include <OpenGL/gl.h> -#else -# include <GL/gl.h> -#endif +# ifdef __APPLE__ +# include <OpenGL/gl.h> +# else +# include <GL/gl.h> +# endif FL_EXPORT void gl_start(); FL_EXPORT void gl_finish(); @@ -78,8 +78,8 @@ FL_EXPORT void gl_measure(const char*, int& x, int& y); FL_EXPORT void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, int ld=0); -#endif +#endif // !FL_gl_H // -// End of "$Id: gl.h,v 1.6.2.4.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: gl.h,v 1.6.2.4.2.3 2002/05/13 15:43:09 easysw Exp $". // diff --git a/src/Fl.cxx b/src/Fl.cxx index 45082bb0f..c7fd27136 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.27 2002/05/13 05:05:11 spitzak Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.28 2002/05/13 15:43:09 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -672,7 +672,7 @@ int Fl::handle(int event, Fl_Window* window) //////////////////////////////////////////////////////////////// // hide() destroys the X window, it does not do unmap! -#if !defined(_WIN32) && USE_XFT +#if !defined(WIN32) && USE_XFT extern void fl_destroy_xft_draw(Window); #endif @@ -892,5 +892,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.27 2002/05/13 05:05:11 spitzak Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.28 2002/05/13 15:43:09 easysw Exp $". // diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 11c9841f0..304ddddbf 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tooltip.cxx,v 1.38.2.18 2002/05/13 14:00:46 spitzak Exp $" +// "$Id: Fl_Tooltip.cxx,v 1.38.2.19 2002/05/13 15:43:10 easysw Exp $" // // Tooltip source file for the Fast Light Tool Kit (FLTK). // @@ -29,8 +29,8 @@ #include <stdio.h> -float Fl_Tooltip::delay_ = 1.0f; -int Fl_Tooltip::enabled_ = 1; +float Fl_Tooltip::delay_ = 1.0f; +int Fl_Tooltip::enabled_ = 1; unsigned Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1, FL_NUM_GREEN - 1, FL_NUM_BLUE - 2); @@ -172,5 +172,5 @@ void Fl_Widget::tooltip(const char *tt) { } // -// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.18 2002/05/13 14:00:46 spitzak Exp $". +// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.19 2002/05/13 15:43:10 easysw Exp $". // |