Author: AlbrechtS
Date: 2011-07-20 06:50:15 -0700 (Wed, 20 Jul 2011)
New Revision: 8866
Log:
Fixed Fl_Menu issue with unusual menu flags (STR #2680).
Setting some flags in a terminating Fl_Menu_Item (one with
a NULL label/text/name) caused an endless loop.
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/src/Fl_Menu.cxx
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2011-07-19 13:26:52 UTC (rev 8865)
+++ branches/branch-1.3/CHANGES 2011-07-20 13:50:15 UTC (rev 8866)
@@ -1,6 +1,7 @@
CHANGES IN FLTK 1.3.1
+ - Fixed Fl_Menu issue with unusual menu flags (STR #2680)
- Fixed Windows DLL import of fl_xid() (STR #2670)
CHANGES IN FLTK 1.3.0
Modified: branches/branch-1.3/src/Fl_Menu.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Menu.cxx 2011-07-19 13:26:52 UTC (rev 8865)
+++ branches/branch-1.3/src/Fl_Menu.cxx 2011-07-20 13:50:15 UTC (rev 8866)
@@ -72,7 +72,7 @@
if (!m->visible()) n++;
while (n) {
m = next_visible_or_not(m);
- if (m->visible()) n--;
+ if (m->visible() || !m->text) n--;
}
return m;
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
