Index: lcl/interfaces/gtk2/gtk2winapi.inc
===================================================================
--- lcl/interfaces/gtk2/gtk2winapi.inc	(revision 62230)
+++ lcl/interfaces/gtk2/gtk2winapi.inc	(working copy)
@@ -2408,6 +2408,8 @@
   l: LongInt;
   Pt: TPoint;
   SavedRect: TRect; // if font orientation <> 0
+  LineHeight: Integer;
+  Size: TSize;
 
   function LeftOffset: Longint;
   begin
@@ -2453,7 +2455,7 @@
   var
     AP: TSize;
     J, MaxWidth,
-    LineWidth: Integer;
+    LineWidth, ActualHeight: Integer;
   begin
     theRect := Rect;
 
@@ -2497,6 +2499,7 @@
       if (Flags and DT_CALCRECT)<>0 then
       begin
         LineWidth := 0;
+        ActualHeight := 0;
         if (Lines <> nil) then
         begin
           for J := 0 to NumLines - 1 do
@@ -2503,14 +2506,18 @@
           begin
             TextExtentPoint(Lines[J], StrLen(Lines[J]), AP);
             LineWidth := Max(LineWidth, AP.cX);
+            Inc(ActualHeight, AP.cY);
           end;
         end;
         LineWidth := Min(MaxWidth, LineWidth);
       end else
+      begin
         LineWidth := MaxWidth;
+        ActualHeight := NumLines*TM.tmHeight;
+      end;
 
       theRect.Right := theRect.Left + LineWidth;
-      theRect.Bottom := theRect.Top + NumLines*TM.tmHeight;
+      theRect.Bottom := theRect.Top + ActualHeight;
       if NumLines>1 then
         Inc(theRect.Bottom, (NumLines-1)*TM.tmExternalLeading);// space between lines
 
@@ -2771,12 +2778,17 @@
       and (tm.tmHeight > (theRect.Bottom - theRect.Top))
       then Break;
 
-      if Lines[i] <> nil then begin
+      if Lines[i] <> nil then
+      begin
         l:=StrLen(Lines[i]);
         DrawLine(Lines[i], l, theRect.Top);
         dec(pIndex,l+length(LineEnding));
-      end;
-      Inc(theRect.Top, TM.tmExternalLeading + TM.tmHeight);// space between lines
+        GetTextExtentPoint(DC, Lines[i], l, Size);
+        LineHeight := Size.cY;
+      end
+      else
+        LineHeight := TM.tmHeight;
+      Inc(theRect.Top, LineHeight + TM.tmExternalLeading);// space between lines
     end;
 
   finally