diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-06 14:04:53 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-06 14:04:53 +0000 |
| commit | a4cd699340c05a2c9525c1c5deadeee4d786ef24 (patch) | |
| tree | b6f8ade11e5a46e4b15b017d6f8539c888b577bb /src/Fl_Menu_add.cxx | |
| parent | 9c4a8a4ed24667a0d12bc06cc89a777a449d763f (diff) | |
Fl_Text_Display::draw_vline() needed to check nVisLine >= num lines.
Fl_Menu_::remove() added 1 to the size() value, but it didn't need to.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2282 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Menu_add.cxx')
| -rw-r--r-- | src/Fl_Menu_add.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index 4e4770463..19c2ce349 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.2 2002/04/11 11:52:41 easysw Exp $" +// "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.3 2002/06/06 14:04:53 easysw Exp $" // // Menu utilities for the Fast Light Tool Kit (FLTK). // @@ -257,9 +257,10 @@ void Fl_Menu_::remove(int i) { for (Fl_Menu_Item* m = item; m < next_item; m++) if (m->text) free((void*)(m->text)); } - memmove(item, next_item, ((menu_+n+1)-next_item)*sizeof(Fl_Menu_Item)); + // MRS: "n" is the menu size(), which includes the trailing NULL entry... + memmove(item, next_item, (menu_+n-next_item)*sizeof(Fl_Menu_Item)); } // -// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.2 2002/04/11 11:52:41 easysw Exp $". +// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.13.2.3 2002/06/06 14:04:53 easysw Exp $". // |