Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 07:26:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change _WIN32 to WIN32 for 1.1.x tree.

Browse Source 
Cleanup recent tooltip changes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2215 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-05-13 15:43:10 +00:00
parent 80d05eb962
commit f953ffc27d
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -1,6 +1,7 @@
CHANGES IN FLTK 1.1.0rc2 CHANGES IN FLTK 1.1.0rc2
- Portability fixes. - Portability fixes.
- Backported 2.0 tooltip changes.
- Several of the valuators did not support tooltips. - Several of the valuators did not support tooltips.
- The last menu item in a menu didn't pick up on font - The last menu item in a menu didn't pick up on font
changes. changes.
FL/gl.h
+21 -21
View File
@@ -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). // 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". // Please report all bugs and problems to "fltk-bugs@fltk.org".
// //
#ifndef gl_draw_H #ifndef FL_gl_H
#define gl_draw_H # define FL_gl_H
#include "Enumerations.H" // for color names # include "Enumerations.H" // for color names
#ifdef _WIN32 # ifdef WIN32
# include <windows.h> # include <windows.h>
#endif # endif
#ifndef APIENTRY # ifndef APIENTRY
# if defined(__CYGWIN__) # if defined(__CYGWIN__)
# define APIENTRY __attribute__ ((__stdcall__)) # define APIENTRY __attribute__ ((__stdcall__))
# else # else
# define APIENTRY # define APIENTRY
# endif # endif
#endif # endif
#ifdef __APPLE__ # ifdef __APPLE__
# include <OpenGL/gl.h> # include <OpenGL/gl.h>
#else # else
# include <GL/gl.h> # include <GL/gl.h>
#endif # endif
FL_EXPORT void gl_start(); FL_EXPORT void gl_start();
FL_EXPORT void gl_finish(); 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); 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 $".
// //
src/Fl.cxx
+3 -3
View File
@@ -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). // 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! // 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); extern void fl_destroy_xft_draw(Window);
#endif #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 $".
// //
src/Fl_Tooltip.cxx
+4 -4
View File
@@ -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). // Tooltip source file for the Fast Light Tool Kit (FLTK).
// //
@@ -29,8 +29,8 @@
#include <stdio.h> #include <stdio.h>
float Fl_Tooltip::delay_ = 1.0f; float Fl_Tooltip::delay_ = 1.0f;
int Fl_Tooltip::enabled_ = 1; int Fl_Tooltip::enabled_ = 1;
unsigned Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1, unsigned Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1,
FL_NUM_GREEN - 1, FL_NUM_GREEN - 1,
FL_NUM_BLUE - 2); 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 $".
// //