Fix tooltips on some of the valuators...

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2209 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

6 files changed, 41 insertions, 30 deletions

diff --git a/CHANGES b/CHANGES
index c4b6b3925..552f15672 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 CHANGES IN FLTK 1.1.0rc2
 
 	- Portability fixes.
+	- Several of the valuators did not support tooltips.
 	- The last menu item in a menu didn't pick up on font
 	  changes.
 	- FLUID now properly handles default argument parameters
diff --git a/src/Fl_Adjuster.cxx b/src/Fl_Adjuster.cxx
index 421635739..cdccaf11a 100644
--- a/src/Fl_Adjuster.cxx
+++ b/src/Fl_Adjuster.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.5 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.6 2002/05/12 11:12:56 easysw Exp $"
 //
 // Adjuster widget for the Fast Light Tool Kit (FLTK).
 //
@@ -146,6 +146,10 @@ int Fl_Adjuster::handle(int event) {
         redraw();
         return 1;
       } else return 0;
+
+    case FL_ENTER :
+    case FL_LEAVE :
+      return 1;
   }
   return 0;
 }
@@ -160,5 +164,5 @@ Fl_Adjuster::Fl_Adjuster(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.5 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: Fl_Adjuster.cxx,v 1.5.2.3.2.6 2002/05/12 11:12:56 easysw Exp $".
 //
diff --git a/src/Fl_Dial.cxx b/src/Fl_Dial.cxx
index 3a09af7a6..1a6363a5d 100644
--- a/src/Fl_Dial.cxx
+++ b/src/Fl_Dial.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Dial.cxx,v 1.12.2.3.2.2 2002/04/11 10:46:19 easysw Exp $"
+// "$Id: Fl_Dial.cxx,v 1.12.2.3.2.3 2002/05/12 11:12:56 easysw Exp $"
 //
 // Circular dial widget for the Fast Light Tool Kit (FLTK).
 //
@@ -113,6 +113,9 @@ int Fl_Dial::handle(int event, int x, int y, int w, int h) {
   case FL_RELEASE:
     handle_release();
     return 1;
+  case FL_ENTER :
+  case FL_LEAVE :
+    return 1;
   default:
     return 0;
   }
@@ -131,5 +134,5 @@ Fl_Dial::Fl_Dial(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Dial.cxx,v 1.12.2.3.2.2 2002/04/11 10:46:19 easysw Exp $".
+// End of "$Id: Fl_Dial.cxx,v 1.12.2.3.2.3 2002/05/12 11:12:56 easysw Exp $".
 //
diff --git a/src/Fl_Roller.cxx b/src/Fl_Roller.cxx
index f949f8a1e..63f516bfe 100644
--- a/src/Fl_Roller.cxx
+++ b/src/Fl_Roller.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Roller.cxx,v 1.6.2.4.2.4 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Roller.cxx,v 1.6.2.4.2.5 2002/05/12 11:12:56 easysw Exp $"
 //
 // Roller widget for the Fast Light Tool Kit (FLTK).
 //
@@ -73,6 +73,9 @@ int Fl_Roller::handle(int event) {
       redraw();
       return 1;
     } else return 0;
+  case FL_ENTER :
+  case FL_LEAVE :
+    return 1;
   default:
     return 0;
   }
@@ -168,5 +171,5 @@ Fl_Roller::Fl_Roller(int X,int Y,int W,int H,const char* L)
 }
 
 //
-// End of "$Id: Fl_Roller.cxx,v 1.6.2.4.2.4 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Roller.cxx,v 1.6.2.4.2.5 2002/05/12 11:12:56 easysw Exp $".
 //
diff --git a/src/Fl_Value_Output.cxx b/src/Fl_Value_Output.cxx
index fd799caee..f3fe7c74a 100644
--- a/src/Fl_Value_Output.cxx
+++ b/src/Fl_Value_Output.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Value_Output.cxx,v 1.6.2.3.2.2 2002/01/01 15:11:31 easysw Exp $"
+// "$Id: Fl_Value_Output.cxx,v 1.6.2.3.2.3 2002/05/12 11:12:56 easysw Exp $"
 //
 // Value output widget for the Fast Light Tool Kit (FLTK).
 //
@@ -78,6 +78,9 @@ int Fl_Value_Output::handle(int event) {
   case FL_RELEASE:
     handle_release();
     return 1;
+  case FL_ENTER :
+  case FL_LEAVE :
+    return 1;
   default:
     return 0;
   }
@@ -94,5 +97,5 @@ Fl_Value_Output::Fl_Value_Output(int x,int y,int w,int h,const char *l)
 }
 
 //
-// End of "$Id: Fl_Value_Output.cxx,v 1.6.2.3.2.2 2002/01/01 15:11:31 easysw Exp $".
+// End of "$Id: Fl_Value_Output.cxx,v 1.6.2.3.2.3 2002/05/12 11:12:56 easysw Exp $".
 //
diff --git a/test/valuators.fl b/test/valuators.fl
index 15eef56b9..5254d05b7 100644
--- a/test/valuators.fl
+++ b/test/valuators.fl
@@ -1,10 +1,7 @@
 # data file for the Fltk User Interface Designer (fluid)
 version 1.0100 
 header_name {.h} 
-code_name {.cxx} 
-gridx 5 
-gridy 5 
-snap 3
+code_name {.cxx}
 Function {callback(Fl_Widget* o, void*)} {open private return_type void
 } {
   code {printf("%g     \\r", ((Fl_Valuator*)o)->value());
@@ -15,7 +12,7 @@ Function {} {open
 } {
   Fl_Window {} {
     label {Valuator classes, showing values for type()} open
-    xywh {382 441 567 506} color 43 selection_color 43
+    xywh {635 288 565 505} color 43 selection_color 43
     code0 {\#include <stdio.h>} visible
   } {
     Fl_Box {} {
@@ -25,7 +22,7 @@ Function {} {open
     Fl_Slider {} {
       label 0
       callback callback
-      xywh {30 45 20 145} selection_color 1 labelsize 8 align 1
+      tooltip {Vertical Slider} xywh {30 45 20 145} selection_color 1 labelsize 8 align 1
     }
     Fl_Slider {} {
       label FL_VERT_FILL_SLIDER
@@ -44,7 +41,7 @@ Function {} {open
     Fl_Value_Slider {} {
       label 0
       callback callback
-      xywh {30 260 30 145} selection_color 1 labelsize 8 align 1
+      tooltip {Value Slider} xywh {30 260 30 145} selection_color 1 labelsize 8 align 1
     }
     Fl_Value_Slider {} {
       label FL_VERT_FILL_SLIDER
@@ -87,18 +84,18 @@ Function {} {open
     }
     Fl_Value_Slider {} {
       label FL_HOR_NICE_SLIDER
-      callback callback selected
+      callback callback
       xywh {140 370 130 20} type {Horz Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8
     }
     Fl_Adjuster {} {
       label {w()>h()}
       callback callback
-      xywh {440 60 75 25} labelsize 8
+      tooltip {Horizontal Adjuster} xywh {440 60 75 25} labelsize 8
     }
     Fl_Adjuster {} {
       label {w()<h()}
       callback callback
-      xywh {520 35 25 75} labelsize 8
+      tooltip {Vertical Adjuster} xywh {520 35 25 75} labelsize 8
     }
     Fl_Box {} {
       label Fl_Counter
@@ -107,12 +104,12 @@ Function {} {open
     Fl_Counter {} {
       label 0
       callback callback
-      xywh {360 160 180 30} labelsize 8
+      tooltip {Standard Counter} xywh {360 160 180 30} labelsize 8
     }
     Fl_Counter {} {
       label FL_SIMPLE_COUNTER
       callback callback
-      xywh {360 205 180 30} type Simple labelsize 8
+      tooltip {Simple Counter} xywh {360 205 180 30} type Simple labelsize 8
     }
     Fl_Box {} {
       label Fl_Dial
@@ -121,18 +118,18 @@ Function {} {open
     Fl_Dial {} {
       label 0
       callback callback
-      xywh {315 280 65 65} color 10 selection_color 1 labelsize 8 value 0.5
+      tooltip {Standard Dial} xywh {315 280 65 65} color 10 selection_color 1 labelsize 8 value 0.5
       code0 {o->angles(0,315);}
     }
     Fl_Dial {} {
       label FL_LINE_DIAL
       callback callback
-      xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8 value 0.5
+      tooltip {Line Dial} xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8 value 0.5
     }
     Fl_Dial {} {
       label FL_FILL_DIAL
       callback callback
-      xywh {475 280 65 65} type Fill color 10 selection_color 1 labelsize 8 value 1
+      tooltip {Fill Dial} xywh {475 280 65 65} type Fill color 10 selection_color 1 labelsize 8 value 1
       code0 {o->angles(0,360);}
     }
     Fl_Box {} {
@@ -142,12 +139,12 @@ Function {} {open
     Fl_Roller {} {
       label 0
       callback callback
-      xywh {315 390 20 95} labelsize 8
+      tooltip {Vertical Roller} xywh {315 390 20 95} labelsize 8
     }
     Fl_Roller {} {
       label FL_HORIZONTAL
       callback callback
-      xywh {340 430 90 20} type Horizontal labelsize 8
+      tooltip {Horizontal Roller} xywh {340 430 90 20} type Horizontal labelsize 8
     }
     Fl_Box {} {
       label Fl_Value_Input
@@ -164,12 +161,12 @@ Function {} {open
     Fl_Value_Input {} {
       label 0
       callback callback
-      xywh {30 460 110 30} labelsize 8 maximum 100 step 0.1
+      tooltip {Value Input} xywh {30 460 110 30} labelsize 8 maximum 100 step 0.1
     }
     Fl_Value_Output {} {
       label 0
-      callback callback
-      xywh {170 460 110 30} labelsize 8 maximum 100 step 0.1
+      callback callback selected
+      tooltip {Value Output} xywh {170 460 110 30} labelsize 8 maximum 100 step 0.1
     }
     Fl_Box {} {
       label {   Fl_Scrollbar}
@@ -178,12 +175,12 @@ Function {} {open
     Fl_Scrollbar {} {
       label 0
       callback callback
-      xywh {395 20 20 105} labelsize 8 align 1 maximum 100 slider_size 0.3
+      tooltip {Vertical Scrollbar} xywh {395 20 20 105} labelsize 8 align 1 maximum 100 slider_size 0.3
     }
     Fl_Scrollbar {} {
       label FL_HORIZONTAL
       callback callback
-      xywh {300 65 95 20} type Horizontal labelsize 8 maximum 100 slider_size 0.3
+      tooltip {Horizontal Scrollbar} xywh {300 65 95 20} type Horizontal labelsize 8 maximum 100 slider_size 0.3
     }
   }
 }