diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-12-03 02:48:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-12-03 02:48:22 +0000 |
| commit | 0184365c807d9ca2b414ff52d7d5c1b36e1e4d30 (patch) | |
| tree | 89f9854ef79c52fd7b26e62f01b4211c317d595d /src | |
| parent | a50a8b702aec0849d778f6e36e9b5f5703dff48c (diff) | |
Fl_Help_View::topline() incorrectly set the changed() flag (STR
#631)
Fl_Choice::value() now supports NULL or -1 to deselect the
current item (STR #637)
More VC++ 6 project file fixes (STR #638)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3928 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Choice.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx index 090e06943..7029d51c9 100644 --- a/src/Fl_Choice.cxx +++ b/src/Fl_Choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.17 2004/04/29 02:47:09 easysw Exp $" +// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.18 2004/12/03 02:48:21 easysw Exp $" // // Choice widget for the Fast Light Tool Kit (FLTK). // @@ -107,13 +107,13 @@ Fl_Choice::Fl_Choice(int X, int Y, int W, int H, const char *l) } int Fl_Choice::value(const Fl_Menu_Item *v) { - if (!v) return 0; if (!Fl_Menu_::value(v)) return 0; redraw(); return 1; } int Fl_Choice::value(int v) { + if (v == -1) return value((const Fl_Menu_Item *)0); if (v < 0 || v >= (size() - 1)) return 0; if (!Fl_Menu_::value(v)) return 0; redraw(); @@ -159,5 +159,5 @@ int Fl_Choice::handle(int e) { } // -// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.17 2004/04/29 02:47:09 easysw Exp $". +// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.18 2004/12/03 02:48:21 easysw Exp $". // diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 10f52ab3f..125677d31 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.54 2004/09/24 16:00:10 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.55 2004/12/03 02:48:21 easysw Exp $" // // Fl_Help_View widget routines. // @@ -2597,7 +2597,6 @@ Fl_Help_View::topline(int t) // I - Top line number scrollbar_.value(topline_, h() - 24, 0, size_); - set_changed(); do_callback(); redraw(); @@ -2801,5 +2800,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.54 2004/09/24 16:00:10 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.55 2004/12/03 02:48:21 easysw Exp $". // |