[GTK] Fix MenuItem/ToolItem setImage(null)

akurtakov · akurtakov · commit 4c6681063565 · 2025-09-01T10:53:56.000+03:00
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=568771 had the wrong assumption that _setImage should be called only when non null image. Fixes #2457
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -986,8 +986,9 @@ private void _setEnabledOrDisabledImage() {
 			defaultDisableImage = new Image(getDisplay(), image, SWT.IMAGE_DISABLE);
 		}
 		_setImage(defaultDisableImage);
+	} else {
+		_setImage(image);
 	}
-	if (enabled && image != null) _setImage(image);
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
@@ -1228,8 +1228,9 @@ private void _setEnabledOrDisabledImage() {
 		} else {
 			_setImage(disabledImage);
 		}
+	} else {
+		_setImage(image);
 	}
-	if (enabled && image != null) _setImage(image);
 }
 
 boolean setFocus () {

Original file line number	Diff line number	Diff line change
`@@ -986,8 +986,9 @@ private void _setEnabledOrDisabledImage() {`
`986`	`986`	`defaultDisableImage = new Image(getDisplay(), image, SWT.IMAGE_DISABLE);`
`987`	`987`	`}`
`988`	`988`	`_setImage(defaultDisableImage);`
	`989`	`+ } else {`
	`990`	`+ _setImage(image);`
`989`	`991`	`}`
`990`		`- if (enabled && image != null) _setImage(image);`
`991`	`992`	`}`
`992`	`993`
`993`	`994`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1228,8 +1228,9 @@ private void _setEnabledOrDisabledImage() {`
`1228`	`1228`	`} else {`
`1229`	`1229`	`_setImage(disabledImage);`
`1230`	`1230`	`}`
	`1231`	`+ } else {`
	`1232`	`+ _setImage(image);`
`1231`	`1233`	`}`
`1232`		`- if (enabled && image != null) _setImage(image);`
`1233`	`1234`	`}`
`1234`	`1235`
`1235`	`1236`	`boolean setFocus () {`