Control: when disposing/releasing a control, check whether the set fo…

…nt is still alive
syntevo · Mar 21, 2024 · 837c55e · 837c55e
1 parent 9d59c4e
commit 837c55e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -2941,6 +2941,14 @@ void release (boolean destroy) {
 	}
 }
 
+@Override
+void releaseChildren (boolean destroy) {
+	if (font != null && font.isDisposed()) {
+		SWT.error(SWT.ERROR_GRAPHIC_DISPOSED, font.disposeStackTrace);
+	}
+	super.releaseChildren(destroy);
+}
+
 @Override
 void releaseHandle () {
 	super.releaseHandle ();

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -4756,6 +4756,14 @@ void release (boolean destroy) {
 	}
 }
 
+@Override
+void releaseChildren (boolean destroy) {
+	if (font != null && font.isDisposed()) {
+		SWT.error(SWT.ERROR_GRAPHIC_DISPOSED, font.disposeStackTrace);
+	}
+	super.releaseChildren(destroy);
+}
+
 @Override
 void releaseHandle () {
 	super.releaseHandle ();

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -2468,6 +2468,14 @@ void register () {
 	display.addControl (handle, this);
 }
 
+@Override
+void releaseChildren (boolean destroy) {
+	if (font != null && font.isDisposed()) {
+		SWT.error(SWT.ERROR_GRAPHIC_DISPOSED, font.disposeStackTrace);
+	}
+	super.releaseChildren(destroy);
+}
+
 @Override
 void releaseHandle () {
 	super.releaseHandle ();