diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2009-01-08 17:12:34 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2009-01-08 17:12:34 +0000 |
| commit | eec7f80e949dd78874741a6c17fe66ec74cec3a5 (patch) | |
| tree | 74a1d08ed3432f34d73af19b751cec2705217e4e /src/Fl_Widget.cxx | |
| parent | 601a0f0d3efd46b0ef6c34a98cd738bceaae504c (diff) | |
Widgets now remove themselves from their parent group (if any), when destroyed
(STR #1894). Fl_Group::clear() removes widget by widget (one at a time) to
allow widgets to remove other related widgets from the same group, when they
are deleted.
Also fixed a bug in Fl_Value_Input (added a destructor), because it used
a non-Fl_Group widget as parent of another widget.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6623 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Widget.cxx')
| -rw-r--r-- | src/Fl_Widget.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index 8f76527ca..550f1eb1c 100644 --- a/src/Fl_Widget.cxx +++ b/src/Fl_Widget.cxx @@ -135,14 +135,19 @@ extern void fl_throw_focus(Fl_Widget*); // in Fl_x.cxx /** Destroys the widget, taking care of throwing focus before if any. - Destruction does not remove from any parent group! And groups when - destroyed destroy all their children. This is convenient and fast. - However, it is only legal to destroy a "root" such as an Fl_Window, - and automatic destructors may be called. + Destruction removes the widget from any parent group! And groups when + destroyed destroy all their children. This is convenient and fast. */ Fl_Widget::~Fl_Widget() { Fl::clear_widget_pointer(this); if (flags() & COPIED_LABEL) free((void *)(label_.value)); + // remove from parent group + if (parent_) parent_->remove(this); +#ifdef DEBUG_DELETE + if (parent_) { // this should never happen + printf("*** Fl_Widget: parent_->remove(this) failed [%p,%p]\n",parent_,this); + } +#endif // DEBUG_DELETE parent_ = 0; // Don't throw focus to a parent widget. fl_throw_focus(this); } |
