diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-28 20:43:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-28 20:43:44 +0000 |
| commit | c78dcd55ec0b09329c509668507922683f90aab4 (patch) | |
| tree | eb15853a514fce714728ba7150d010109eb2d083 /src | |
| parent | 6cb1b5c7bda9211da0dfc9abacbb403791b67cee (diff) | |
More doco updates.
Enable tooltips by default, and don't enable them when setting the
tooltip value, since that will negate any changes a program might
make when displaying the file chooser dialog, etc.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1777 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Tooltip.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_Widget.cxx | 9 | ||||
| -rw-r--r-- | src/gl_start.cxx | 6 |
4 files changed, 12 insertions, 17 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 39f1919c7..51bf7d61c 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.9 2001/11/28 18:00:17 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.10 2001/11/28 20:43:44 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -802,7 +802,7 @@ void Fl_Widget::damage(uchar flags, int X, int Y, int W, int H) { // if we already have damage we must merge with existing region: if (i->region) { #ifdef WIN32 - Region R = XRectangleRegion(X, Y, W, H); + Fl_Region R = XRectangleRegion(X, Y, W, H); CombineRgn(i->region, i->region, R, RGN_OR); XDestroyRegion(R); #elif defined(__APPLE__) @@ -834,5 +834,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.9 2001/11/28 18:00:17 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.10 2001/11/28 20:43:44 easysw Exp $". // diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 92c435e1e..b393fa310 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tooltip.cxx,v 1.38.2.7 2001/11/18 20:52:28 easysw Exp $" +// "$Id: Fl_Tooltip.cxx,v 1.38.2.8 2001/11/28 20:43:44 easysw Exp $" // // Tooltip source file for the Fast Light Tool Kit (FLTK). // @@ -35,8 +35,8 @@ // Fl_Tooltip global variables... // -void (*Fl_Tooltip::tooltip_callback_)(void *) = 0; -void (*Fl_Tooltip::tooltip_exit_)(void *) = 0; +void (*Fl_Tooltip::tooltip_callback_)(void *) = Fl_Tooltip::tooltip_timeout; +void (*Fl_Tooltip::tooltip_exit_)(void *) = Fl_Tooltip::tooltip_exit; float Fl_Tooltip::delay_ = 0.5; Fl_TooltipBox *Fl_Tooltip::box = 0; Fl_Menu_Window *Fl_Tooltip::window = 0; @@ -189,5 +189,5 @@ Fl_Tooltip::tooltip_timeout(void *v) { // -// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.7 2001/11/18 20:52:28 easysw Exp $". +// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.8 2001/11/28 20:43:44 easysw Exp $". // diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index 39036e08d..7a3b4a3ef 100644 --- a/src/Fl_Widget.cxx +++ b/src/Fl_Widget.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.7 2001/11/22 15:35:01 easysw Exp $" +// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.8 2001/11/28 20:43:44 easysw Exp $" // // Base widget class for the Fast Light Tool Kit (FLTK). // @@ -99,11 +99,6 @@ Fl_Widget::Fl_Widget(int X, int Y, int W, int H, const char* L) { if (Fl_Group::current()) Fl_Group::current()->add(this); } -void Fl_Widget::tooltip(const char *t) { - Fl_Tooltip::enable(); - tooltip_ = t; -} - void Fl_Widget::resize(int X, int Y, int W, int H) { x_ = X; y_ = Y; w_ = W; h_ = H; } @@ -249,5 +244,5 @@ int Fl_Widget::contains(const Fl_Widget *o) const { } // -// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.7 2001/11/22 15:35:01 easysw Exp $". +// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.8 2001/11/28 20:43:44 easysw Exp $". // diff --git a/src/gl_start.cxx b/src/gl_start.cxx index 1340eedce..ced7b0bac 100644 --- a/src/gl_start.cxx +++ b/src/gl_start.cxx @@ -1,5 +1,5 @@ // -// "$Id: gl_start.cxx,v 1.6.2.5.2.2 2001/11/27 17:44:08 easysw Exp $" +// "$Id: gl_start.cxx,v 1.6.2.5.2.3 2001/11/28 20:43:44 easysw Exp $" // // OpenGL context routines for the Fast Light Tool Kit (FLTK). // @@ -54,7 +54,7 @@ static int pw, ph; static Fl_Gl_Choice* gl_choice; #endif -Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx +Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx void gl_start() { if (!context) { @@ -117,5 +117,5 @@ int Fl::gl_visual(int mode, int *alist) { #endif // -// End of "$Id: gl_start.cxx,v 1.6.2.5.2.2 2001/11/27 17:44:08 easysw Exp $". +// End of "$Id: gl_start.cxx,v 1.6.2.5.2.3 2001/11/28 20:43:44 easysw Exp $". // |
