Add Fl::visible_focus() method.

Add optional "draw_symbols" argument to fl_draw and fl_measure functions.

Fl_Repeat_Button didn't handle keyboard focus properly.


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

3 files changed, 15 insertions, 11 deletions

diff --git a/FL/Fl.H b/FL/Fl.H
index 72e61c353..7abf3ae9e 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.H,v 1.8.2.11.2.2 2001/08/06 03:17:43 easysw Exp $"
+// "$Id: Fl.H,v 1.8.2.11.2.3 2001/11/03 05:11:33 easysw Exp $"
 //
 // Main header file for the Fast Light Tool Kit (FLTK).
 //
@@ -61,7 +61,7 @@ public: // should be private!
   static FL_EXPORT Fl_Window* modal_;
   static FL_EXPORT Fl_Window* grab_;
   static FL_EXPORT int compose_state;
-
+  static FL_EXPORT int visible_focus_;
   static void damage(int x) {damage_ = x;}
 
   static FL_EXPORT void (*idle)();
@@ -212,10 +212,13 @@ public:
   static FL_EXPORT void grab(Fl_Window&w) {grab(&w);}
   static FL_EXPORT void release() {grab(0);}
 
+  // Visible focus methods...
+  static void visible_focus(int v) { visible_focus_ = v; }
+  static int  visible_focus() { return visible_focus_; }
 };
 
 #endif
 
 //
-// End of "$Id: Fl.H,v 1.8.2.11.2.2 2001/08/06 03:17:43 easysw Exp $".
+// End of "$Id: Fl.H,v 1.8.2.11.2.3 2001/11/03 05:11:33 easysw Exp $".
 //
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index 6281d133c..795b72bde 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget.H,v 1.6.2.4.2.9 2001/10/29 03:44:31 easysw Exp $"
+// "$Id: Fl_Widget.H,v 1.6.2.4.2.10 2001/11/03 05:11:34 easysw Exp $"
 //
 // Widget header file for the Fast Light Tool Kit (FLTK).
 //
@@ -90,7 +90,7 @@ protected:
   FL_EXPORT void draw_box() const;
   FL_EXPORT void draw_box(Fl_Boxtype, Fl_Color) const;
   FL_EXPORT void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const;
-  FL_EXPORT void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
+  void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
   FL_EXPORT void draw_focus(Fl_Boxtype, int,int,int,int) const;
   FL_EXPORT void draw_label() const;
   FL_EXPORT void draw_label(int, int, int, int) const;
@@ -207,5 +207,5 @@ public:
 #endif
 
 //
-// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.9 2001/10/29 03:44:31 easysw Exp $".
+// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.10 2001/11/03 05:11:34 easysw Exp $".
 //
diff --git a/FL/fl_draw.H b/FL/fl_draw.H
index e33ed8a39..3f21d9d9f 100644
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.H,v 1.9.2.6.2.2 2001/08/05 23:58:54 easysw Exp $"
+// "$Id: fl_draw.H,v 1.9.2.6.2.3 2001/11/03 05:11:34 easysw Exp $"
 //
 // Portable drawing function header file for the Fast Light Tool Kit (FLTK).
 //
@@ -151,11 +151,12 @@ FL_EXPORT double fl_width(uchar);
 // draw using current font:
 FL_EXPORT void fl_draw(const char*, int x, int y);
 FL_EXPORT void fl_draw(const char*, int n, int x, int y);
-FL_EXPORT void fl_measure(const char*, int& x, int& y);
-FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align, Fl_Image* img=0);
+FL_EXPORT void fl_measure(const char*, int& x, int& y, int draw_symbols = 1);
+FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align, Fl_Image* img=0,
+                       int draw_symbols = 1);
 FL_EXPORT void fl_draw(const char*, int,int,int,int, Fl_Align,
 	               void (*callthis)(const char *, int n, int x, int y),
-		       Fl_Image* img=0);
+		       Fl_Image* img=0, int draw_symbols = 1);
 
 // boxtypes:
 FL_EXPORT void fl_frame(const char* s, int x, int y, int w, int h);
@@ -191,5 +192,5 @@ FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scal
 #endif
 
 //
-// End of "$Id: fl_draw.H,v 1.9.2.6.2.2 2001/08/05 23:58:54 easysw Exp $".
+// End of "$Id: fl_draw.H,v 1.9.2.6.2.3 2001/11/03 05:11:34 easysw Exp $".
 //