From f953ffc27d816d4969f825b8adfb5106e15cfd63 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 13 May 2002 15:43:10 +0000 Subject: 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 --- src/Fl.cxx | 6 +++--- src/Fl_Tooltip.cxx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') 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 -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 $". // -- cgit v1.2.3