From 42af47f31e9e107412a306b19db162026774a2cd Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 10 May 2011 16:46:42 +0000 Subject: [PATCH] Fix STR #2597. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8645 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/Fl_Menu_Type.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index 2bca9c59f..7f18f5c47 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -470,7 +470,10 @@ void Fl_Menu_Type::write_code2() { const char *mName = mi->menu_name(i); for (Fl_Type* q = next; q && q->is_menu_item(); q = q->next) { if (((Fl_Menu_Item_Type*)q)->label()) nLabel++; - nItem++; + int thislevel = q->level; if (q->is_parent()) thislevel++; + int nextlevel = + (q->next && q->next->is_menu_item()) ? q->next->level : next->level+1; + nItem += 1 + ((thislevel > nextlevel) ? (thislevel-nextlevel) : 0); } if (nLabel) { write_c("%sif (!%s_i18n_done) {\n", indent(), mName);