From ddeee54b5c37bf0991b6ece8bb516eef27b6d259 Mon Sep 17 00:00:00 2001 From: tombo Date: Fri, 19 Sep 2008 16:53:19 +0000 Subject: [PATCH] LCL Carbon: implemented GetTextColor, fixes bug #0012166: TSpeedButton in carbon git-svn-id: trunk@16655 - --- lcl/interfaces/carbon/carbonwinapi.inc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lcl/interfaces/carbon/carbonwinapi.inc b/lcl/interfaces/carbon/carbonwinapi.inc index 5b3ebde1de..b856127d6c 100644 --- a/lcl/interfaces/carbon/carbonwinapi.inc +++ b/lcl/interfaces/carbon/carbonwinapi.inc @@ -1774,7 +1774,19 @@ end; function TCarbonWidgetSet.GetTextColor(DC: HDC): TColorRef; begin - Result:=inherited GetTextColor(DC); + Result := clNone; + + {$IFDEF VerboseWinAPI} + DebugLn('TCarbonWidgetSet.GetTextColor DC: ' + DbgS(HDC)); + {$ENDIF} + + if not CheckDC(DC, 'GetTextColor') then Exit; + + Result := TCarbonDeviceContext(DC).TextColor; + + {$IFDEF VerboseWinAPI} + DebugLn('TCarbonWidgetSet.GetTextColor Result: ' + DbgS(Result)); + {$ENDIF} end; {------------------------------------------------------------------------------