Bug 576120 - [GTK4] Replace GTK3/4 specific gtk_widget_size_allocate

This patch contains a new function in Widget called
gtk_widget_size_allocate which replaces the need to use GTK3 and GTK4
specific calls to the same function. There are other places that use
specific calls, but all if(GTK.GTK4) wrapped calls have been replaced.

Change-Id: Ia815181528c38a7663a104a4c99fe08079e76640
Signed-off-by: jmajano <[email protected]>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/185622
Tested-by: Platform Bot <[email protected]>
Reviewed-by: Alexander Kurtakov <[email protected]>

Author: joel-majano

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java

@@ -1005,7 +1005,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 		Point sizes = resizeCalculationsGTK3(boxHandle, boxWidth, boxHeight);
 		allocation.width = sizes.x;
 		allocation.height = sizes.y;
-		GTK3.gtk_widget_size_allocate (boxHandle, allocation);
+		gtk_widget_size_allocate(boxHandle, allocation, -1);
 	}
 	return result;
 }

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java

@@ -472,11 +472,7 @@ void adjustChildClipping (long widget) {
 			// Call gtk_widget_get_preferred_size() to prevent warnings
 			GTK.gtk_widget_get_preferred_size(widget, minimumSize, naturalSize);
 			// Allocate and queue a resize event
-			if (GTK.GTK4) {
-				GTK4.gtk_widget_size_allocate(widget, allocation, -1);
-			} else {
-				GTK3.gtk_widget_size_allocate(widget, allocation);
-			}
+			gtk_widget_size_allocate(widget, allocation, -1);
 			GTK.gtk_widget_queue_resize(widget);
 		}
 	}
@@ -1400,11 +1396,7 @@ void moveChildren(int oldWidth) {
 		gtk_widget_get_preferred_size (topHandle, requisition);
 		allocation.x = x;
 		allocation.y = y;
-		if (GTK.GTK4) {
-			GTK4.gtk_widget_size_allocate (topHandle, allocation, -1);
-		} else {
-			GTK3.gtk_widget_size_allocate (topHandle, allocation);
-		}
+		gtk_widget_size_allocate(topHandle, allocation, -1);
 		Control control = child.findBackgroundControl ();
 		if (control != null && control.backgroundImage != null) {
 			if (child.isVisible ()) child.redrawWidget (0, 0, 0, 0, true, true, true);

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java

@@ -882,11 +882,7 @@ void forceResize () {
 	gtk_widget_get_preferred_size (topHandle, requisition);
 	GtkAllocation allocation = new GtkAllocation ();
 	GTK.gtk_widget_get_allocation(topHandle, allocation);
-	if (GTK.GTK4) {
-		GTK4.gtk_widget_size_allocate (topHandle, allocation, -1);
-	} else {
-		GTK3.gtk_widget_size_allocate (topHandle, allocation);
-	}
+	gtk_widget_size_allocate(topHandle, allocation, -1);
 }
 
 /**
@@ -1153,11 +1149,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 			Control focusControl = display.getFocusControl();
 			GTK.gtk_widget_show(topHandle);
 			gtk_widget_get_preferred_size (topHandle, requisition);
-			if (GTK.GTK4) {
-				GTK4.gtk_widget_size_allocate (topHandle, allocation, -1);
-			} else {
-				GTK3.gtk_widget_size_allocate (topHandle, allocation);
-			}
+			gtk_widget_size_allocate(topHandle, allocation, -1);
 			GTK.gtk_widget_hide(topHandle);
 			/* Bug 540002: Showing and hiding widget causes original focused control to loose focus,
 			 * Reset focus to original focused control after dealing with allocation.
@@ -5875,11 +5867,7 @@ public boolean setParent (Composite parent) {
 	allocation.y = y;
 	allocation.width = width;
 	allocation.height = height;
-	if (GTK.GTK4) {
-		GTK4.gtk_widget_size_allocate (topHandle, allocation, -1);
-	} else {
-		GTK3.gtk_widget_size_allocate (topHandle, allocation);
-	}
+	gtk_widget_size_allocate(topHandle, allocation, -1);
 	this.parent = parent;
 	setZOrder (null, false, true);
 	reskin (SWT.ALL);

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java

@@ -585,7 +585,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 		GTK.gtk_widget_get_allocation(labelHandle, allocation);
 		allocation.width = labelWidth;
 		allocation.height = labelHeight;
-		GTK3.gtk_widget_size_allocate (labelHandle, allocation);
+		gtk_widget_size_allocate(labelHandle, allocation, -1);
 	}
 	return result;
 }

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java

@@ -1156,11 +1156,7 @@ void forceResize (int width, int height) {
 		}
 	}
 
-	if (GTK.GTK4) {
-		GTK4.gtk_widget_size_allocate(vboxHandle, allocation, -1);
-	} else {
-		GTK3.gtk_widget_size_allocate(vboxHandle, allocation);
-	}
+	gtk_widget_size_allocate(vboxHandle, allocation, -1);
 
 	if ((style & SWT.MIRRORED) != 0) moveChildren(clientWidth);
 }

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java

@@ -1038,7 +1038,7 @@ void resizeHandle(int width, int height) {
 	GTK.gtk_widget_get_allocation (handle, allocation);
 	allocation.width = width;
 	allocation.height = height;
-	GTK3.gtk_widget_size_allocate (handle, allocation);
+	gtk_widget_size_allocate(handle, allocation, -1);
 }
 
 void selectRadio () {

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java

@@ -2510,4 +2510,12 @@ void setToolTipText(long tipWidget, String string) {
 
 	GTK.gtk_widget_set_tooltip_text(tipWidget, buffer);
 }
+
+void gtk_widget_size_allocate (long widget, GtkAllocation allocation, int baseline) {
+	if (GTK.GTK4) {
+		GTK4.gtk_widget_size_allocate(widget, allocation, baseline);
+	} else {
+		GTK3.gtk_widget_size_allocate(widget, allocation);
+	}
+}
 }