Rework new Image constructors accepting a ImageGcDrawer

When implementing the ImageGCDrawer as lambda, the resulting code is
better to read if the ImageGCDrawer is passed as last argument:

'''
new Image(device, 16, 16, (gc, w, h) -> {
	gc.draw ...
})
'''

Furthermore this way the argument order also better reflects the order
in which the arguments are applied:
1. an image with the given size is created.
2. the GC draws on that image

Follow-up on
- #1734

Author: HannesWell

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java

@@ -734,16 +734,15 @@ Image createButtonImage(Display display, int button) {
 	final Rectangle trim = renderer.computeTrim(button, SWT.NONE, 0, 0, 0, 0);
 	final Point imageSize = new Point(size.x - trim.width, size.y - trim.height);
 	Color transColor = renderer.parent.getBackground();
-	final ImageGcDrawer imageGcDrawer = new TransparencyColorImageGcDrawer(transColor) {
+	return new Image(display, imageSize.x, imageSize.y, new TransparencyColorImageGcDrawer(transColor) {
 		@Override
 		public void drawOn(GC gc, int imageWidth, int imageHeight) {
 			Rectangle imageBounds = new Rectangle(0, 0, imageWidth, imageHeight);
 			gc.setBackground(transColor);
 			gc.fillRectangle(imageBounds);
 			renderer.draw(button, SWT.NONE, imageBounds, gc);
 		}
-	};
-	return new Image(display, imageGcDrawer, imageSize.x, imageSize.y);
+	});
 }
 
 private void notifyItemCountChange() {
@@ -4007,7 +4006,8 @@ void updateBkImages(boolean colorChanged) {
 						if (colorChanged || !bounds.equals(bkImageBounds[i])) {
 							bkImageBounds[i] = bounds;
 							if (controlBkImages[i] != null) controlBkImages[i].dispose();
-							controlBkImages[i] = new Image(control.getDisplay(), (gc, imageWidth, imageHeight) -> renderer.draw(CTabFolderRenderer.PART_BACKGROUND, 0, bounds, gc), bounds.width, bounds.height);
+							controlBkImages[i] = new Image(control.getDisplay(), bounds.width, bounds.height,
+									(gc, w, h) -> renderer.draw(CTabFolderRenderer.PART_BACKGROUND, 0, bounds, gc));
 							control.setBackground(null);
 							control.setBackgroundImage(controlBkImages[i]);
 						}

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java

@@ -1593,32 +1593,31 @@ void createCaretBitmaps() {
 		leftCaretBitmap.dispose();
 	}
 	int lineHeight = renderer.getLineHeight();
-	final ImageGcDrawer leftCaretDrawer = (gc, width, height) -> {
+	leftCaretBitmap = new Image(display, caretWidth, lineHeight, (gc, width, height) -> {
 		gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
 		gc.fillRectangle(0, 0, width, height);
 		gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
 		gc.drawLine(0,0,0,height);
 		gc.drawLine(0,0,width-1,0);
 		gc.drawLine(0,1,1,1);
-	};
-	leftCaretBitmap = new Image(display, leftCaretDrawer, caretWidth, lineHeight);
+	});
 
 	if (rightCaretBitmap != null) {
 		if (defaultCaret != null && rightCaretBitmap.equals(defaultCaret.getImage())) {
 			defaultCaret.setImage(null);
 		}
 		rightCaretBitmap.dispose();
 	}
-	final ImageGcDrawer rightCaretDrawer = (gc, width, height) -> {
+	rightCaretBitmap = new Image(display, caretWidth, lineHeight, (gc, width, height) -> {
 		gc.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
 		gc.fillRectangle(0, 0, width, height);
 		gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));
 		gc.drawLine(width-1,0,width-1,height);
 		gc.drawLine(0,0,width-1,0);
 		gc.drawLine(width-1,1,1,1);
-	};
-	rightCaretBitmap = new Image(display, rightCaretDrawer, caretWidth, lineHeight);
+	});
 }
+
 /**
  * Moves the selected text to the clipboard.  The text will be put in the
  * clipboard in plain text, HTML, and RTF formats.

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java

@@ -878,9 +878,9 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
  *    <li>ERROR_NULL_ARGUMENT - if the ImageGcDrawer is null</li>
  * </ul>
- * @since 3.129
+ * @since 3.130
  */
-public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height) {
+public Image(Device device, int width, int height, ImageGcDrawer imageGcDrawer) {
 	super(device);
 	if (imageGcDrawer == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	this.imageGcDrawer = imageGcDrawer;
@@ -905,6 +905,15 @@ public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height)
 	}
 }
 
+/**
+ * @since 3.129
+ * @deprecated Instead use {@link #Image(Device, int, int, ImageGcDrawer)}
+ */
+@Deprecated(forRemoval = true, since = "2025-06 (removal in 2027-06 or later)")
+public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height) {
+	this(device, width, height, imageGcDrawer);
+}
+
 private ImageData drawWithImageGcDrawer(ImageGcDrawer imageGcDrawer, int width, int height, int zoom) {
 	Image image = new Image(device, width, height);
 	GC gc = new GC(image);

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java

@@ -670,9 +670,9 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
  *    <li>ERROR_NULL_ARGUMENT - if the ImageGcDrawer is null</li>
  * </ul>
- * @since 3.129
+ * @since 3.130
  */
-public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height) {
+public Image(Device device, int width, int height, ImageGcDrawer imageGcDrawer) {
 	super(device);
 	if (imageGcDrawer == null) {
 		SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -684,6 +684,15 @@ public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height)
 	init ();
 }
 
+/**
+ * @since 3.129
+ * @deprecated Instead use {@link #Image(Device, int, int, ImageGcDrawer)}
+ */
+@Deprecated(forRemoval = true, since = "2025-06 (removal in 2027-06 or later)")
+public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height) {
+	this(device, width, height, imageGcDrawer);
+}
+
 /**
  * Refreshes the image for the current device scale factor.
  * <p>

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java

@@ -629,15 +629,24 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
  *    <li>ERROR_NULL_ARGUMENT - if the ImageGcDrawer is null</li>
  * </ul>
- * @since 3.129
+ * @since 3.130
  */
-public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height) {
+public Image(Device device, int width, int height, ImageGcDrawer imageGcDrawer) {
 	super(device);
 	this.imageProvider = new ImageGcDrawerWrapper(imageGcDrawer, width, height);
 	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
 	init();
 }
 
+/**
+ * @since 3.129
+ * @deprecated Instead use {@link #Image(Device, int, int, ImageGcDrawer)}
+ */
+@Deprecated(forRemoval = true, since = "2025-06 (removal in 2027-06 or later)")
+public Image(Device device, ImageGcDrawer imageGcDrawer, int width, int height) {
+	this(device, width, height, imageGcDrawer);
+}
+
 private ImageData adaptImageDataIfDisabledOrGray(ImageData data) {
 	ImageData returnImageData = null;
 	switch (this.styleFlag) {