Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 07:26:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix menu crash bug (STR #685)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3959 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2005-01-04 15:02:57 +00:00
parent 1bc50aa780
commit fa7293b3cf
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+5 -2
View File
@@ -1,7 +1,10 @@
CHANGES IN FLTK 1.1.7 CHANGES IN FLTK 1.1.7
- Fl_Double_Window would cause a full redraw, even if only - Fl_Menu::popup() and ::pulldown() would crash an
small parts of the UI were changed on Mac OS X. 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 - Fl_JPEG_Image did not correctly handle errors reported
by the JPEG library (STR #652) by the JPEG library (STR #652)
- Fl_Menu now draws sub-menu arrows like other toolkits - Fl_Menu now draws sub-menu arrows like other toolkits
src/Fl_Menu.cxx
+3 -3
View File
@@ -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). // 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; const Fl_Menu_Item* m = pp.current_item;
Fl::release();
delete fakemenu; delete fakemenu;
while (pp.nummenus>1) delete pp.p[--pp.nummenus]; while (pp.nummenus>1) delete pp.p[--pp.nummenus];
mw.hide(); mw.hide();
Fl::release();
return m; 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 $".
// //