From 17abd7136d8fb7f6b6a52f8158f899be9e41be5a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 15 Jun 2003 04:47:28 +0000 Subject: [PATCH] Several widgets defined their own size() method but didn't provide an inline method that mapped to the Fl_Widget::size() method (STR #62) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3033 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 3 +++ FL/Fl_Browser.H | 7 ++++--- FL/Fl_Chart.H | 5 +++-- FL/Fl_Help_View.H | 5 +++-- FL/Fl_Input_.H | 5 +++-- FL/Fl_Menu_.H | 5 +++-- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index a86da0aee..c8cb9aa63 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ CHANGES IN FLTK 1.1.4 + - Several widgets defined their own size() method but + didn't provide an inline method that mapped to the + Fl_Widget::size() method (STR #62) - Fl_Scroll didn't provide its own clear() method, so calling clear() on a Fl_Scroll widget would also destroy the scrollbars (STR #75) diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H index c18ce2220..f910173c8 100644 --- a/FL/Fl_Browser.H +++ b/FL/Fl_Browser.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser.H,v 1.8.2.7.2.4 2003/01/30 21:38:41 easysw Exp $" +// "$Id: Fl_Browser.H,v 1.8.2.7.2.5 2003/06/15 04:47:27 easysw Exp $" // // Browser header file for the Fast Light Tool Kit (FLTK). // @@ -75,7 +75,8 @@ public: void clear(); int size() const {return lines;} - + void size(int W, int H) { Fl_Widget::size(W, H); } + int topline() const ; enum Fl_Line_Position { TOP, BOTTOM, MIDDLE }; void lineposition(int, Fl_Line_Position); @@ -123,5 +124,5 @@ public: #endif // -// End of "$Id: Fl_Browser.H,v 1.8.2.7.2.4 2003/01/30 21:38:41 easysw Exp $". +// End of "$Id: Fl_Browser.H,v 1.8.2.7.2.5 2003/06/15 04:47:27 easysw Exp $". // diff --git a/FL/Fl_Chart.H b/FL/Fl_Chart.H index 27ae8a17a..90241554e 100644 --- a/FL/Fl_Chart.H +++ b/FL/Fl_Chart.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Chart.H,v 1.6.2.3.2.5 2003/01/30 21:38:47 easysw Exp $" +// "$Id: Fl_Chart.H,v 1.6.2.3.2.6 2003/06/15 04:47:27 easysw Exp $" // // Forms chart header file for the Fast Light Tool Kit (FLTK). // @@ -71,6 +71,7 @@ public: void bounds(double *a,double *b) const {*a = min; *b = max;} void bounds(double a,double b); int size() const {return numb;} + void size(int W, int H) { Fl_Widget::size(W, H); } int maxsize() const {return maxnumb;} void maxsize(int); Fl_Font textfont() const {return (Fl_Font)textfont_;} @@ -86,5 +87,5 @@ public: #endif // -// End of "$Id: Fl_Chart.H,v 1.6.2.3.2.5 2003/01/30 21:38:47 easysw Exp $". +// End of "$Id: Fl_Chart.H,v 1.6.2.3.2.6 2003/06/15 04:47:27 easysw Exp $". // diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index b12055e2d..56aaa46aa 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.H,v 1.1.2.12 2003/05/21 16:12:14 easysw Exp $" +// "$Id: Fl_Help_View.H,v 1.1.2.13 2003/06/15 04:47:27 easysw Exp $" // // Help Viewer widget definitions. // @@ -169,6 +169,7 @@ class FL_EXPORT Fl_Help_View : public Fl_Group //// Help viewer widget int load(const char *f); void resize(int,int,int,int); int size() const { return (size_); } + void size(int W, int H) { Fl_Widget::size(W, H); } void textcolor(Fl_Color c) { if (textcolor_ == defcolor_) textcolor_ = c; defcolor_ = c; } Fl_Color textcolor() const { return (defcolor_); } void textfont(uchar f) { textfont_ = f; format(); } @@ -188,5 +189,5 @@ class FL_EXPORT Fl_Help_View : public Fl_Group //// Help viewer widget #endif // !Fl_Help_View_H // -// End of "$Id: Fl_Help_View.H,v 1.1.2.12 2003/05/21 16:12:14 easysw Exp $". +// End of "$Id: Fl_Help_View.H,v 1.1.2.13 2003/06/15 04:47:27 easysw Exp $". // diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H index 9936d1186..caf56fcab 100644 --- a/FL/Fl_Input_.H +++ b/FL/Fl_Input_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_.H,v 1.6.2.4.2.8 2003/01/30 21:39:23 easysw Exp $" +// "$Id: Fl_Input_.H,v 1.6.2.4.2.9 2003/06/15 04:47:28 easysw Exp $" // // Input base class header file for the Fast Light Tool Kit (FLTK). // @@ -99,6 +99,7 @@ public: const char* value() const {return value_;} char index(int i) const {return value_[i];} int size() const {return size_;} + void size(int W, int H) { Fl_Widget::size(W, H); } int maximum_size() const {return maximum_size_;} void maximum_size(int m) {maximum_size_ = m;} @@ -138,5 +139,5 @@ public: #endif // -// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.8 2003/01/30 21:39:23 easysw Exp $". +// End of "$Id: Fl_Input_.H,v 1.6.2.4.2.9 2003/06/15 04:47:28 easysw Exp $". // diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index a52e2c016..7e52f028f 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.H,v 1.7.2.4.2.6 2003/01/30 21:39:32 easysw Exp $" +// "$Id: Fl_Menu_.H,v 1.7.2.4.2.7 2003/06/15 04:47:28 easysw Exp $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // @@ -60,6 +60,7 @@ public: int add(const char* a, const char* b, Fl_Callback* c, void* d = 0, int e = 0) {return add(a,fl_old_shortcut(b),c,d,e);} int size() const ; + void size(int W, int H) { Fl_Widget::size(W, H); } void clear(); int add(const char *); void replace(int,const char *); @@ -93,5 +94,5 @@ public: #endif // -// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.6 2003/01/30 21:39:32 easysw Exp $". +// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.7 2003/06/15 04:47:28 easysw Exp $". //