diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -1,7 +1,10 @@ CHANGES IN FLTK 1.1.7 - - Fl_Double_Window would cause a full redraw, even if only - small parts of the UI were changed on Mac OS X. + - Fl_Menu::popup() and ::pulldown() would crash an + application if a callback created widgets before they + returned (STR #685) + - Fl_Double_Window would cause a full redraw, even if + only small parts of the UI were changed on Mac OS X. - Fl_JPEG_Image did not correctly handle errors reported by the JPEG library (STR #652) - Fl_Menu now draws sub-menu arrows like other toolkits diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index b3a2ee71a..23c09c0f4 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.36 2004/12/14 13:49:55 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.37 2005/01/04 15:02:57 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -774,10 +774,10 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown( } } const Fl_Menu_Item* m = pp.current_item; + Fl::release(); delete fakemenu; while (pp.nummenus>1) delete pp.p[--pp.nummenus]; mw.hide(); - Fl::release(); return m; } @@ -832,5 +832,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.36 2004/12/14 13:49:55 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.37 2005/01/04 15:02:57 easysw Exp $". // |