diff --git a/lcl/interfaces/gtk2/gtk2winapi.inc b/lcl/interfaces/gtk2/gtk2winapi.inc
index 6222c87248..593b87eacd 100644
--- a/lcl/interfaces/gtk2/gtk2winapi.inc
+++ b/lcl/interfaces/gtk2/gtk2winapi.inc
@@ -2784,7 +2784,7 @@ begin
         l:=StrLen(Lines[i]);
         DrawLine(Lines[i], l, theRect.Top);
         dec(pIndex,l+length(LineEnding));
-        GetTextExtentPoint(DC, Lines[i], l, Size);
+        GetTextExtentPoint(DC, Lines[i], l, Size{%H-});
         LineHeight := Size.cY;
       end
       else
diff --git a/lcl/widgetset/wsgrids.pp b/lcl/widgetset/wsgrids.pp
index d8866d81cc..55c08d0108 100644
--- a/lcl/widgetset/wsgrids.pp
+++ b/lcl/widgetset/wsgrids.pp
@@ -50,7 +50,7 @@ type
   published
     class procedure SendCharToEditor(AEditor:TWinControl; Ch: TUTF8Char); virtual;
     class function InvalidateStartY(const FixedHeight, RowOffset: Integer): integer; virtual;
-    class procedure Invalidate(sender: TCustomGrid); virtual;
+    class procedure Invalidate(sender: TCustomGrid); virtual; reintroduce;
     class function GetEditorBoundsFromCellRect(ACanvas: TCanvas;
       const ACellRect: TRect; const AColumnLayout: TTextLayout): TRect; virtual;
   end;