45708 & 4862 - recursive dispose

1 files changed, 9 insertions, 4 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TableColumn.java
index e3b735a757..605816f412 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TableColumn.java
@@ -183,6 +183,11 @@ protected void checkSubclass () {
 	if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
 }
 
+void destroyWidget () {
+	parent.destroyItem (this);
+	releaseHandle ();
+}
+
 /**
  * Returns a value which describes the position of the
  * text or image in the receiver. The value will be one of
@@ -316,9 +321,10 @@ public void pack () {
 	setWidth (width + Table.EXTRA_WIDTH);
 }
 
-void releaseChild () {
-	super.releaseChild ();
-	parent.destroyItem (this);
+void releaseHandle () {
+	super.releaseHandle ();
+	id = -1;
+	parent = null;
 }
 
 void releaseWidget () {
@@ -326,7 +332,6 @@ void releaseWidget () {
 	if (parent.sortColumn == this) {
 		parent.sortColumn = null;
 	}
-	parent = null;
 	if (iconRef != 0) OS.ReleaseIconRef (iconRef);
 	iconRef = 0;
 }