diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-07-26 19:52:28 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-07-26 19:52:28 +0000 |
| commit | 500d7616fd16005f6f8eea0a061160177160ec34 (patch) | |
| tree | 82b94a770435329debf353ada5176c16d185cbd5 /fluid/Fl_Menu_Type.cxx | |
| parent | 9ee02e0f013398536b61f08dd3ced4188cd559bb (diff) | |
Revamp variable tests so that we rarely need to provide "o" and
"w" variables. This eliminates most of the "variable is shadowed"
warnings from GCC we get after creating .cxx files from FLUID.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5266 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Fl_Menu_Type.cxx')
| -rw-r--r-- | fluid/Fl_Menu_Type.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 1e493cc19..17d98f48e 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -9,7 +9,7 @@ // This file also contains code to make Fl_Menu_Button, Fl_Menu_Bar, // etc widgets. // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2006 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -373,7 +373,7 @@ void Fl_Menu_Item_Type::write_code1() { init = 1; write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", indent(), mname, i); } - image->write_code(); + image->write_code("o"); } for (int n=0; n < NUM_EXTRA_CODE; n++) if (extra_code(n) && !isdeclare(extra_code(n))) { @@ -462,7 +462,7 @@ Fl_Type* Fl_Menu_Type::click_test(int, int) { void Fl_Menu_Type::write_code2() { if (next && next->is_menu_item()) - write_c("%so->menu(%s);\n", indent(), + write_c("%s%s->menu(%s);\n", indent(), name() ? name() : "o", unique_id(this, "menu", name(), label())); Fl_Widget_Type::write_code2(); } |