hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed children/parent check in X11.moo

Browse Source
This commit is contained in:
hyunghwan.chung 2019-10-13 13:20:49 +00:00
parent 5d1d42f608
commit bf53ba8d7e
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
moo/kernel/X11.moo
View File

@ -466,17 +466,18 @@ class X11.Composite(X11.Widget)
method remove: widget method remove: widget
{ {
| link | | link |
if (widget parent notNil) // TODO: DEBUG. check if this widget is being disposed multiple times. I see this method called with 'widget parent' of nil. // see the dispose: function about the following condition checks
{ // commented out
if (widget parent ~~ self) //if (widget parent notNil)
{ //{
selfns.Exception signal: "Cannot remove an unknown widget" // if (widget parent ~~ self)
}. // {
// selfns.Exception signal: "Cannot remove an unknown widget"
// }.
link := self.children findIdenticalLink: widget. link := self.children findIdenticalLink: widget.
self.children removeLink: link. self.children removeLink: link.
widget parent: nil. widget parent: nil.
}. //}.
} }
method childrenCount method childrenCount
@ -497,15 +498,18 @@ class X11.Composite(X11.Widget)
method dispose method dispose
{ {
'Composite dispose XXXXXXXXXXXXXX' dump.
self.children do: [:child | self.children do: [:child |
child dispose. child dispose.
self remove: child.
// some children(e.g. Shell) may remove itself from the parent.
// after disposal, the parent is reset to nil. so make a check
// before calling the removal method.
// if the check is made here, the remove: method doesn't need
// to check if the child is valid. see the lines commented out
// in the method.
if (child parent == self) { self remove: child }.
]. ].
'Composite dispose DONE XXXXXXXXXXXXXX' dump.
'SUPER SUPER SUPER dispose' dump.
super dispose. super dispose.
'SUPER SUPER SUPER dispose DONE' dump.
} }
method onPaintEvent: event method onPaintEvent: event
@ -724,7 +728,7 @@ extend X11
method requestToExit method requestToExit
{ {
self.event_loop_exit_req := true. self.event_loop_exit_req := true.
self.event_loop_sem signal. if (self.event_loop_sem notNil) { self.event_loop_sem signal }.
} }
///////////////////////////////////////// /////////////////////////////////////////