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
This commit is contained in:
Michael R Sweet
2002-05-12 02:19:18 +00:00
parent a04c2e28e7
commit a34e8e40f6
3 changed files with 8 additions and 2 deletions
+2
View File
@@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.0rc2 CHANGES IN FLTK 1.1.0rc2
- Portability fixes. - Portability fixes.
- The last menu item in a menu didn't pick up on font
changes.
- FLUID now properly handles default argument parameters - FLUID now properly handles default argument parameters
properly. properly.
- Fixed WM_PAINT handling under WIN32 - didn't validate - Fixed WM_PAINT handling under WIN32 - didn't validate
+1
View File
@@ -31,6 +31,7 @@ OTHER CONTRIBUTORS
for FLTK: for FLTK:
Teun Burgers Teun Burgers
Fabien Costantini
Greg Ercolano Greg Ercolano
Stuart Levy Stuart Levy
Mike Lindner Mike Lindner
+5 -2
View File
@@ -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). // 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(); if (merge) deselect(); else delete_all();
read_children(Fl_Type::current, merge); read_children(Fl_Type::current, merge);
Fl_Type::current = 0; 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) for (Fl_Type *o = Fl_Type::first; o; o = o->next)
if (o->selected) {Fl_Type::current = o; break;} if (o->selected) {Fl_Type::current = o; break;}
return close_read(); 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 $".
// //