summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2004-04-06 02:47:26 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2004-04-06 02:47:26 +0000
commit4e0450ea36afc824a57502de155165c357d72900 (patch)
tree77a4e1a8076250851976a39c0f1e49b22211b052 /src
parent70ca1d156ba8bb0aa1b3a925b89f935fe4dccfbe (diff)
FLUID crashed if you did layout with a window widget (STR #317)
Fl_Scroll::clear() didn't remove the child widget from the Fl_Scroll widget (STR #327) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3297 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Scroll.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Fl_Scroll.cxx b/src/Fl_Scroll.cxx
index 6e2f6a7a7..7508a980a 100644
--- a/src/Fl_Scroll.cxx
+++ b/src/Fl_Scroll.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.6 2004/03/11 05:17:12 easysw Exp $"
+// "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.7 2004/04/06 02:47:26 easysw Exp $"
//
// Scroll widget for the Fast Light Tool Kit (FLTK).
//
@@ -31,7 +31,10 @@
void Fl_Scroll::clear() {
for (int i=children() - 1; i >= 0; i --) {
Fl_Widget* o = child(i);
- if (o != &hscrollbar && o != &scrollbar) delete o;
+ if (o != &hscrollbar && o != &scrollbar) {
+ remove(o);
+ delete o;
+ }
}
}
@@ -268,5 +271,5 @@ int Fl_Scroll::handle(int event) {
}
//
-// End of "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.6 2004/03/11 05:17:12 easysw Exp $".
+// End of "$Id: Fl_Scroll.cxx,v 1.7.2.6.2.7 2004/04/06 02:47:26 easysw Exp $".
//