diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-13 20:54:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-13 20:54:49 +0000 |
| commit | 7a455a05c64d74ebf5509c79f40715dbdcdc8a29 (patch) | |
| tree | 9fff78dceed118ae1bb0b0c58139c4c48286b966 /fluid | |
| parent | fe1d700e5c5f764fee921d2607d5c102c4fdd1b1 (diff) | |
WIN32 compile fixes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2218 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/file.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fluid/file.cxx b/fluid/file.cxx index b002c2651..1cb7b8c3a 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -1,5 +1,5 @@ // -// "$Id: file.cxx,v 1.7.2.6.2.4 2002/05/13 15:51:47 easysw Exp $" +// "$Id: file.cxx,v 1.7.2.6.2.5 2002/05/13 20:54:49 easysw Exp $" // // Fluid file routines for the Fast Light Tool Kit (FLTK). // @@ -486,15 +486,16 @@ static void read_children(Fl_Type *p, int paste) { extern void deselect(); int read_file(const char *filename, int merge) { + Fl_Type *o; read_version = 0.0; if (!open_read(filename)) return 0; 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) + for (o = Fl_Type::first; o; o = o->next) if (o->is_menu_button()) o->add_child(0,0); - for (Fl_Type *o = Fl_Type::first; o; o = o->next) + for (o = Fl_Type::first; o; o = o->next) if (o->selected) {Fl_Type::current = o; break;} return close_read(); } @@ -631,5 +632,5 @@ void read_fdesign() { } // -// End of "$Id: file.cxx,v 1.7.2.6.2.4 2002/05/13 15:51:47 easysw Exp $". +// End of "$Id: file.cxx,v 1.7.2.6.2.5 2002/05/13 20:54:49 easysw Exp $". // |