From: adam Date: Sat, 10 Apr 2004 07:19:14 +0000 (+0000) Subject: removed PosChange, childadded, childremoved, added ChildChange X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=c9c75398e998bd9d1dce22509c2b3dea9de63ec4 removed PosChange, childadded, childremoved, added ChildChange darcs-hash:20040410071914-5007d-f5ace98bc69e5a16943954394df7ec5669a195e0.gz --- diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java index eb3123b..bbfad25 100644 --- a/src/org/ibex/Box.java +++ b/src/org/ibex/Box.java @@ -58,7 +58,7 @@ public final class Box extends JSScope implements Scheduler.Task { protected Box() { super(null); } - static Hash boxToCursor = new Hash(500, 3); + static Hash boxToCursor = new Hash(500, 3); // FIXME memory leak public static final int MAX_LENGTH = Integer.MAX_VALUE; static final Font DEFAULT_FONT; @@ -85,11 +85,9 @@ public final class Box extends JSScope implements Scheduler.Task { "Release1", "Release2", "Release3", "Click1", "Click2", "Click3", "DoubleClick1", "DoubleClick2", "DoubleClick3", - "Enter", "Leave", "Move", - "KeyPressed", "KeyReleased", "PosChange", "SizeChange", - "childadded", "childremoved", - "Focused", "Maximized", "Minimized", "Close", - "icon", "titlebar", "toback", "tofront" + "Enter", "Leave", "Move", "ChildChange", + "KeyPressed", "KeyReleased", "SizeChange", + "Focused", "Maximized", "Minimized", "Close" }; // Flags ////////////////////////////////////////////////////////////////////// @@ -702,10 +700,8 @@ public final class Box extends JSScope implements Scheduler.Task { case "_HScroll": propagateDownward(name, value, false); case "_VScroll": propagateDownward(name, value, false); - case "PosChange": return; case "SizeChange": return; - case "childadded": return; - case "childremoved": return; + case "ChildChange": return; case "Enter": return; case "Leave": return; @@ -944,7 +940,7 @@ public final class Box extends JSScope implements Scheduler.Task { deleteNode(i); b.parent = null; MARK_REFLOW; - putAndTriggerTrapsAndCatchExceptions("childremoved", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } public void put(int i, Object value) throws JSExn { @@ -956,22 +952,22 @@ public final class Box extends JSScope implements Scheduler.Task { } if (redirect == null) { - if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i)); + if (value == null) putAndTriggerTrapsAndCatchExceptions("ChildChange", getChild(i)); else JS.warn("attempt to add/remove children to/from a node with a null redirect"); } else if (redirect != this) { - if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value); + if (value != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", value); redirect.put(i, value); if (value == null) { Box b = (Box)redirect.get(new Integer(i)); - if (b != null) putAndTriggerTrapsAndCatchExceptions("childremoved", b); + if (b != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } } else if (value == null) { if (i < 0 || i > treeSize()) return; Box b = getChild(i); removeChild(i); - putAndTriggerTrapsAndCatchExceptions("childremoved", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } else { Box b = (Box)value; @@ -1000,7 +996,7 @@ public final class Box extends JSScope implements Scheduler.Task { MARK_REFLOW; b.dirty(); - putAndTriggerTrapsAndCatchExceptions("childadded", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } }