diff --git a/lcl/interfaces/gtk3/gtk3lclbutton.inc b/lcl/interfaces/gtk3/gtk3lclbutton.inc
index 0978db4e37..4f126f3285 100644
--- a/lcl/interfaces/gtk3/gtk3lclbutton.inc
+++ b/lcl/interfaces/gtk3/gtk3lclbutton.inc
@@ -44,11 +44,11 @@ begin
   if AControl.LCLWidth = 0 then
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
+    nat_width^ := Max(min_width^, AControl.LCLObject.Width);
   end else
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
+    nat_width^ := Max(min_width^, AControl.LCLWidth);
   end;
 end;
 
@@ -94,11 +94,11 @@ begin
   if AControl.LCLHeight = 0 then
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
+    nat_height^ := Max(min_height^, AControl.LCLObject.Height);
   end else
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
+    nat_height^ := Max(min_height^, AControl.LCLHeight);
   end;
 end;
 
@@ -111,11 +111,11 @@ begin
   AWidgetClass^.get_preferred_height := @LCLGtkButtonGetPreferredHeight;
 end;
 
-procedure LCLGtkButtonInstanceInit(instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
-var
-  buttonWidget: PGtkButton;
+procedure LCLGtkButtonInstanceInit({%H-}instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
+//var
+//  buttonWidget: PGtkButton;
 begin
-  buttonWidget := PGtkButton(instance);
+  //buttonWidget := PGtkButton(instance);
   // Custom initialization logic (if needed)
 end;
 
diff --git a/lcl/interfaces/gtk3/gtk3lclcombobox.inc b/lcl/interfaces/gtk3/gtk3lclcombobox.inc
index a1280f215e..6d3b635285 100644
--- a/lcl/interfaces/gtk3/gtk3lclcombobox.inc
+++ b/lcl/interfaces/gtk3/gtk3lclcombobox.inc
@@ -46,11 +46,11 @@ begin
   if AControl.LCLWidth = 0 then
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
+    nat_width^ := Max(min_width^, AControl.LCLObject.Width);
   end else
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
+    nat_width^ := Max(min_width^, AControl.LCLWidth);
   end;
 end;
 
@@ -96,11 +96,11 @@ begin
   if AControl.LCLHeight = 0 then
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
+    nat_height^ := Max(min_height^, AControl.LCLObject.Height);
   end else
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
+    nat_height^ := Max(min_height^, AControl.LCLHeight);
   end;
 end;
 
diff --git a/lcl/interfaces/gtk3/gtk3lclentry.inc b/lcl/interfaces/gtk3/gtk3lclentry.inc
index 407d63adc1..68ca01c1d3 100644
--- a/lcl/interfaces/gtk3/gtk3lclentry.inc
+++ b/lcl/interfaces/gtk3/gtk3lclentry.inc
@@ -42,11 +42,11 @@ begin
   if AControl.LCLWidth = 0 then
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
+    nat_width^ := Max(min_width^, AControl.LCLObject.Width);
   end else
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
+    nat_width^ := Max(min_width^, AControl.LCLWidth);
   end;
 end;
 
@@ -91,11 +91,11 @@ begin
   if AControl.LCLHeight = 0 then
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
+    nat_height^ := Max(min_height^, AControl.LCLObject.Height);
   end else
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
+    nat_height^ := Max(min_height^, AControl.LCLHeight);
   end;
 end;
 
diff --git a/lcl/interfaces/gtk3/gtk3lclframe.inc b/lcl/interfaces/gtk3/gtk3lclframe.inc
index 531d0fb552..c74f99f4e9 100644
--- a/lcl/interfaces/gtk3/gtk3lclframe.inc
+++ b/lcl/interfaces/gtk3/gtk3lclframe.inc
@@ -51,11 +51,11 @@ begin
   if AControl.LCLWidth = 0 then
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
+    nat_width^ := Max(min_width^, AControl.LCLObject.Width);
   end else
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
+    nat_width^ := Max(min_width^, AControl.LCLWidth);
   end;
 end;
 
@@ -105,11 +105,11 @@ begin
   if AControl.LCLHeight = 0 then
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
+    nat_height^ := Max(min_height^, AControl.LCLObject.Height);
   end else
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
+    nat_height^ := Max(min_height^, AControl.LCLHeight);
   end;
 end;
 
diff --git a/lcl/interfaces/gtk3/gtk3lclspinbutton.inc b/lcl/interfaces/gtk3/gtk3lclspinbutton.inc
index e527d5722c..8e75cc09eb 100644
--- a/lcl/interfaces/gtk3/gtk3lclspinbutton.inc
+++ b/lcl/interfaces/gtk3/gtk3lclspinbutton.inc
@@ -44,11 +44,11 @@ begin
   if AControl.LCLWidth = 0 then
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
+    nat_width^ := Max(min_width^, AControl.LCLObject.Width);
   end else
   begin
     min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
-    nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
+    nat_width^ := Max(min_width^, AControl.LCLWidth);
   end;
 end;
 
@@ -93,11 +93,11 @@ begin
   if AControl.LCLHeight = 0 then
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
+    nat_height^ := Max(min_height^, AControl.LCLObject.Height);
   end else
   begin
     min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
-    nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
+    nat_height^ := Max(min_height^, AControl.LCLHeight);
   end;
 end;
 
@@ -110,7 +110,7 @@ begin
   AWidgetClass^.get_preferred_height := @LCLGtkSpinButtonGetPreferredHeight;
 end;
 
-procedure LCLGtkSpinButtonInstanceInit(instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
+procedure LCLGtkSpinButtonInstanceInit({%H-}instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
 // var
 //  buttonWidget: PGtkSpinButton;
 begin