mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-31 11:20:17 +02:00
gtk: Ensure text color, use LineInfo.GetLineInfo for TraceGdiCalls
git-svn-id: trunk@10169 -
This commit is contained in:
parent
f4f8d20afd
commit
0adbb16922
@ -43,7 +43,7 @@ uses
|
||||
{$ifdef TraceGdiCalls}
|
||||
const
|
||||
MaxTraces = 5;
|
||||
MaxCallBacks = 7;
|
||||
MaxCallBacks = 11;
|
||||
type
|
||||
TCallBacksArray = array[0..MaxCallBacks] of Pointer;
|
||||
PCallBacksArray = ^TCallBacksArray;
|
||||
|
@ -311,7 +311,7 @@ var
|
||||
i: integer;
|
||||
begin
|
||||
for i:=0 to MaxCallBacks do begin
|
||||
GetLineInfo(longWord(BackTrace[i]), Func, source, line);
|
||||
LineInfo.GetLineInfo(longWord(BackTrace[i]), Func, source, line);
|
||||
DebugLn('$', Hexstr(LongInt(BackTrace[i]),8),' ', Func, ', line ',
|
||||
dbgs(line),' of ',Source);
|
||||
end;
|
||||
|
@ -9070,6 +9070,8 @@ begin
|
||||
begin
|
||||
Result := CurrentTextColor.ColorRef;
|
||||
SetGDIColorRef(CurrentTextColor,Color);
|
||||
if Result<>Color then
|
||||
SelectedColors := dcscCustom; // force SelectGDKTextProps to ensure text color
|
||||
end;
|
||||
end;
|
||||
Assert(False, Format('trace:< [TGtkWidgetSet.SetTextColor] DC: 0x%x Color: %8x --> %8x', [Integer(DC), Color, Result]));
|
||||
|
Loading…
Reference in New Issue
Block a user