From 5ea7ebcdfa7f2415565bc06976b5bccbf8ef66fd Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Sun, 25 Nov 2018 12:13:38 +0000
Subject: [PATCH] Qt,Qt5: removed old workaround in DrawText(). Fixes issue
 #34587

git-svn-id: trunk@59652 -
---
 lcl/interfaces/qt/qtobjects.pas  | 22 +---------------------
 lcl/interfaces/qt5/qtobjects.pas | 22 +---------------------
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/lcl/interfaces/qt/qtobjects.pas b/lcl/interfaces/qt/qtobjects.pas
index d4891cf647..017c97dd00 100644
--- a/lcl/interfaces/qt/qtobjects.pas
+++ b/lcl/interfaces/qt/qtobjects.pas
@@ -2822,10 +2822,6 @@ end;
   To get a correct behavior we need to sum the text's height to the Y coordinate.
  ------------------------------------------------------------------------------}
 procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString);
-{$IFDEF DARWIN}
-var
-  OldBkMode: Integer;
-{$ENDIF}
 begin
   {$ifdef VerboseQt}
   Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y);
@@ -2846,17 +2842,11 @@ begin
 
   // The ascent is only applied here, because it also needs
   // to be rotated
-  {$IFDEF DARWIN}
-  OldBkMode := SetBkMode(TRANSPARENT);
-  {$ENDIF}
   if Font.Angle <> 0 then
     QPainter_drawText(Widget, 0, Metrics.ascent, s)
   else
     QPainter_drawText(Widget, x, y, s);
-  {$IFDEF DARWIN}
-  SetBkMode(OldBkMode);
-  {$ENDIF}
-  
+
   RestorePenColor;
   
   // Restore previous angle
@@ -2879,10 +2869,6 @@ end;
   Returns: Nothing
  ------------------------------------------------------------------------------}
 procedure TQtDeviceContext.drawText(x, y, w, h, flags: Integer; s: PWideString);
-{$IFDEF DARWIN}
-var
-  OldBkMode: Integer;
-{$ENDIF}
 begin
   {$ifdef VerboseQt}
   Write('TQtDeviceContext.drawText x: ', X, ' Y: ', Y,' w: ',w,' h: ',h);
@@ -2897,16 +2883,10 @@ begin
   end;
 
   RestoreTextColor;
-  {$IFDEF DARWIN}
-  OldBkMode := SetBkMode(TRANSPARENT);
-  {$ENDIF}
   if Font.Angle <> 0 then
     QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
   else
     QPainter_DrawText(Widget, x, y, w, h, Flags, s);
-  {$IFDEF DARWIN}
-  SetBkMode(OldBkMode);
-  {$ENDIF}
   RestorePenColor;
 
   // Restore previous angle
diff --git a/lcl/interfaces/qt5/qtobjects.pas b/lcl/interfaces/qt5/qtobjects.pas
index cf6403f2e1..3e22fd5cb4 100644
--- a/lcl/interfaces/qt5/qtobjects.pas
+++ b/lcl/interfaces/qt5/qtobjects.pas
@@ -2820,10 +2820,6 @@ end;
   To get a correct behavior we need to sum the text's height to the Y coordinate.
  ------------------------------------------------------------------------------}
 procedure TQtDeviceContext.drawText(x: Integer; y: Integer; s: PWideString);
-{$IFDEF DARWIN}
-var
-  OldBkMode: Integer;
-{$ENDIF}
 begin
   {$ifdef VerboseQt}
   Write('TQtDeviceContext.drawText TargetX: ', X, ' TargetY: ', Y);
@@ -2844,17 +2840,11 @@ begin
 
   // The ascent is only applied here, because it also needs
   // to be rotated
-  {$IFDEF DARWIN}
-  OldBkMode := SetBkMode(TRANSPARENT);
-  {$ENDIF}
   if Font.Angle <> 0 then
     QPainter_drawText(Widget, 0, Metrics.ascent, s)
   else
     QPainter_drawText(Widget, x, y, s);
-  {$IFDEF DARWIN}
-  SetBkMode(OldBkMode);
-  {$ENDIF}
-  
+
   RestorePenColor;
   
   // Restore previous angle
@@ -2877,10 +2867,6 @@ end;
   Returns: Nothing
  ------------------------------------------------------------------------------}
 procedure TQtDeviceContext.drawText(x, y, w, h, flags: Integer; s: PWideString);
-{$IFDEF DARWIN}
-var
-  OldBkMode: Integer;
-{$ENDIF}
 begin
   {$ifdef VerboseQt}
   Write('TQtDeviceContext.drawText x: ', X, ' Y: ', Y,' w: ',w,' h: ',h);
@@ -2895,16 +2881,10 @@ begin
   end;
 
   RestoreTextColor;
-  {$IFDEF DARWIN}
-  OldBkMode := SetBkMode(TRANSPARENT);
-  {$ENDIF}
   if Font.Angle <> 0 then
     QPainter_DrawText(Widget, 0, 0, w, h, Flags, s)
   else
     QPainter_DrawText(Widget, x, y, w, h, Flags, s);
-  {$IFDEF DARWIN}
-  SetBkMode(OldBkMode);
-  {$ENDIF}
   RestorePenColor;
 
   // Restore previous angle