diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-11-21 21:37:08 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-11-21 21:37:08 +0000 |
| commit | 3988dbf8bd76949b65042c39d86b72c7c77c7d66 (patch) | |
| tree | 1607a77881dc7f1572d15a2fad7383c7f030c5f7 /fluid/Fl_Menu_Type.cxx | |
| parent | 7d432ff92cccabb48e8c6be3e1e29bd8289aa509 (diff) | |
Fixes for hidden class members...
(Bill, please look at the Fl_Menu_Type.cxx code around line 171; the
previous code didn't initialize level before it was used; I hope I
captured the original intent...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1338 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Fl_Menu_Type.cxx')
| -rw-r--r-- | fluid/Fl_Menu_Type.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 93c02ab08..cdd24540d 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Type.cxx,v 1.16.2.9 2000/06/05 21:20:37 mike Exp $" +// "$Id: Fl_Menu_Type.cxx,v 1.16.2.10 2000/11/21 21:37:07 easysw Exp $" // // Menu item code for the Fast Light Tool Kit (FLTK). // @@ -168,21 +168,21 @@ void Fl_Menu_Item_Type::write_static() { if (next && next->is_menu_item()) return; // okay, when we hit last item in the menu we have to write the // entire array out: - int level; + int mylevel; const char* k = class_name(1); if (k) { write_c("\nFl_Menu_Item %s::%s[] = {\n", k, menu_name(level)); } else write_c("\nFl_Menu_Item %s[] = {\n", menu_name(level)); Fl_Type* t = prev; while (t && t->is_menu_item()) t = t->prev; - level = t->level+1; + mylevel = t->level+1; for (Fl_Type* q = t->next; q && q->is_menu_item(); q = q->next) { ((Fl_Menu_Item_Type*)q)->write_item(); - if (q->is_parent()) level++; + if (q->is_parent()) mylevel++; int l1 = (q->next && q->next->is_menu_item()) ? q->next->level : t->next->level; - while (level > l1) {write_c(" {0},\n"); level--;} - level = l1; + while (mylevel > l1) {write_c(" {0},\n"); mylevel--;} + mylevel = l1; } write_c(" {0}\n};\n"); @@ -462,5 +462,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) { } // -// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.9 2000/06/05 21:20:37 mike Exp $". +// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.10 2000/11/21 21:37:07 easysw Exp $". // |