diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-09-04 20:33:18 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-09-04 20:33:18 +0000 |
| commit | 32b9640e1ca9ce14f802309ad7818c23910dc62c (patch) | |
| tree | c89669a586e5bb23416841d4924520d8ea9a5175 /src | |
| parent | 0196542a090c4f225061553fdfbf234cb9da89ab (diff) | |
Fixes from Matthew Morrise.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2618 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Chart.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_Scrollbar.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Tabs.cxx | 10 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/Fl_Chart.cxx b/src/Fl_Chart.cxx index ef1a34643..cd2564fc1 100644 --- a/src/Fl_Chart.cxx +++ b/src/Fl_Chart.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.9 2002/08/09 01:09:48 easysw Exp $" +// "$Id: Fl_Chart.cxx,v 1.5.2.6.2.10 2002/09/04 20:33:18 easysw Exp $" // // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK). // @@ -298,6 +298,10 @@ Fl_Widget(X,Y,W,H,l) { entries = (FL_CHART_ENTRY *)calloc(sizeof(FL_CHART_ENTRY), FL_CHART_MAX + 1); } +Fl_Chart::~Fl_Chart() { + free(entries); +} + void Fl_Chart::clear() { numb = 0; redraw(); @@ -380,5 +384,5 @@ void Fl_Chart::maxsize(int m) { } // -// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.9 2002/08/09 01:09:48 easysw Exp $". +// End of "$Id: Fl_Chart.cxx,v 1.5.2.6.2.10 2002/09/04 20:33:18 easysw Exp $". // diff --git a/src/Fl_Scrollbar.cxx b/src/Fl_Scrollbar.cxx index 1ef2a9a45..e5efbe445 100644 --- a/src/Fl_Scrollbar.cxx +++ b/src/Fl_Scrollbar.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.10 2002/08/13 15:42:44 easysw Exp $" +// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.11 2002/09/04 20:33:18 easysw Exp $" // // Scroll bar widget for the Fast Light Tool Kit (FLTK). // @@ -43,9 +43,11 @@ void Fl_Scrollbar::increment_cb() { break; case 5: i = -int((maximum()-minimum())*slider_size()/(1.0-slider_size())) + ls; + if (i > -ls) i = -ls; break; case 6: i = int((maximum()-minimum())*slider_size()/(1.0-slider_size())) - ls; + if (i < ls) i = ls; break; } handle_drag(clamp(value() + i)); @@ -246,5 +248,5 @@ Fl_Scrollbar::Fl_Scrollbar(int X, int Y, int W, int H, const char* L) } // -// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.10 2002/08/13 15:42:44 easysw Exp $". +// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.11 2002/09/04 20:33:18 easysw Exp $". // diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx index dd728b937..3d702b3d0 100644 --- a/src/Fl_Tabs.cxx +++ b/src/Fl_Tabs.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.11 2002/08/09 03:17:30 easysw Exp $" +// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.12 2002/09/04 20:33:18 easysw Exp $" // // Tab widget for the Fast Light Tool Kit (FLTK). // @@ -78,8 +78,10 @@ int Fl_Tabs::tab_positions(int* p, int* wp) { if (wp[i] > W) wp[i] = W; } // adjust edges according to visiblity: - for (i = children(); i > selected; i--) { - p[i] = p[i-1]+wp[i-1]; + if (selected >= 0) { + for (i = children(); i > selected; i--) { + p[i] = p[i-1]+wp[i-1]; + } } return selected; } @@ -300,5 +302,5 @@ Fl_Tabs::Fl_Tabs(int X,int Y,int W, int H, const char *l) : } // -// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.11 2002/08/09 03:17:30 easysw Exp $". +// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.12 2002/09/04 20:33:18 easysw Exp $". // |