mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Widgets now remove stale entries from the default callback queue

Browse Source 
(see Fl::readqueue()) when they are deleted (STR #2302)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6977 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2009-12-23 12:53:45 +00:00
parent cccf37522b
commit 954fba25c8
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0
- Widgets now remove stale entries from the default callback
queue when they are deleted (STR #2302)
- Moved OS X code base to the more moder Cocoa toolkit thanks
to the awesome work of Manolo Gouy (STR #2221)
- Added template to generate new projects with Xcode.

29
src/Fl_Widget.cxx
View File

@ -73,7 +73,34 @@ Fl_Widget *Fl::readqueue() {
if (obj_tail >= QUEUE_SIZE) obj_tail = 0;
return o;
}
/*
This static internal function removes all pending callbacks for a
specific widget from the default callback queue (Fl::readqueue()).
It is only called from Fl_Widget's destructor if the widget
doesn't have an own callback.
Note: There's no need to have this in the Fl:: namespace.
*/
static void cleanup_readqueue(Fl_Widget *w) {
if (obj_tail==obj_head) return;
// Read the entire queue and copy over all valid entries.
// The new head will be determined after the last copied entry.
int old_head = obj_head; // save newest entry
int entry = obj_tail; // oldest entry
obj_head = obj_tail; // new queue start
for (;;) {
Fl_Widget *o = obj_queue[entry++];
if (entry >= QUEUE_SIZE) entry = 0;
if (o != w) { // valid entry
obj_queue[obj_head++] = o;
if (obj_head >= QUEUE_SIZE) obj_head = 0;
} // valid entry
if (entry == old_head) break;
}
return;
}
////////////////////////////////////////////////////////////////
int Fl_Widget::handle(int) {
@ -150,6 +177,8 @@ Fl_Widget::~Fl_Widget() {
#endif // DEBUG_DELETE
parent_ = 0; // Don't throw focus to a parent widget.
fl_throw_focus(this);
// remove stale entries from default callback queue (Fl::readqueue())
if (callback_ == default_callback) cleanup_readqueue(this);
}
/** Draws a focus box for the widget at the given position and size */