From a34e8e40f681c511ea07e2fa38b5675e3f63f9ad Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 12 May 2002 02:19:18 +0000 Subject: Fix FLUID menu drawing bug reported by Paul Sydney (didn't rebuild the menu after reading the last attribute in a menu item...) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2208 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ CREDITS | 1 + fluid/file.cxx | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 2ba39f8d2..c4b6b3925 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ CHANGES IN FLTK 1.1.0rc2 - Portability fixes. + - The last menu item in a menu didn't pick up on font + changes. - FLUID now properly handles default argument parameters properly. - Fixed WM_PAINT handling under WIN32 - didn't validate diff --git a/CREDITS b/CREDITS index 4fb3c2c0c..60eb5353e 100644 --- a/CREDITS +++ b/CREDITS @@ -31,6 +31,7 @@ OTHER CONTRIBUTORS for FLTK: Teun Burgers + Fabien Costantini Greg Ercolano Stuart Levy Mike Lindner diff --git a/fluid/file.cxx b/fluid/file.cxx index 3b47e2b5c..10c235084 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -1,5 +1,5 @@ // -// "$Id: file.cxx,v 1.7.2.6.2.2 2002/04/30 18:11:49 easysw Exp $" +// "$Id: file.cxx,v 1.7.2.6.2.3 2002/05/12 02:19:18 easysw Exp $" // // Fluid file routines for the Fast Light Tool Kit (FLTK). // @@ -491,6 +491,9 @@ int read_file(const char *filename, int merge) { if (merge) deselect(); else delete_all(); read_children(Fl_Type::current, merge); Fl_Type::current = 0; + // Force menu items to be rebuilt... + for (Fl_Type *o = Fl_Type::first; o; o = o->next) + if (o->is_menu_item()) o->add_child(0,0); for (Fl_Type *o = Fl_Type::first; o; o = o->next) if (o->selected) {Fl_Type::current = o; break;} return close_read(); @@ -628,5 +631,5 @@ void read_fdesign() { } // -// End of "$Id: file.cxx,v 1.7.2.6.2.2 2002/04/30 18:11:49 easysw Exp $". +// End of "$Id: file.cxx,v 1.7.2.6.2.3 2002/05/12 02:19:18 easysw Exp $". // -- cgit v1.2.3