paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 05:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

synedit: fix TColor -> TColorRef assignments and vice versa

Browse Source 
git-svn-id: trunk@29714 -
This commit is contained in:
paul 2011-03-03 08:35:33 +00:00
parent 3aace13834
commit e91ed950f3
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/synedit/synedit.pp
View File

@ -3045,11 +3045,11 @@ begin
else else
types.UnionRect(FInvalidateRect, FInvalidateRect, rcClip); types.UnionRect(FInvalidateRect, FInvalidateRect, rcClip);
// Just paint the background // Just paint the background
SetBkColor(Canvas.Handle, ColorToRGB(Color)); SetBkColor(Canvas.Handle, TColorRef(ColorToRGB(Color)));
InternalFillRect(Canvas.Handle, rcClip); InternalFillRect(Canvas.Handle, rcClip);
if rcClip.Left <= TextLeftPixelOffset(False) then begin if rcClip.Left <= TextLeftPixelOffset(False) then begin
rcClip.Right := TextLeftPixelOffset(False)+1; rcClip.Right := TextLeftPixelOffset(False)+1;
SetBkColor(Canvas.Handle, ColorToRGB(FLeftGutter.Color)); SetBkColor(Canvas.Handle, TColorRef(ColorToRGB(FLeftGutter.Color)));
InternalFillRect(Canvas.Handle, rcClip); InternalFillRect(Canvas.Handle, rcClip);
end; end;
exit; exit;
@ -3817,7 +3817,7 @@ var
CurLogIndex := 0; CurLogIndex := 0;
// Delete the whole Line // Delete the whole Line
fTextDrawer.BackColor := colEditorBG; fTextDrawer.BackColor := colEditorBG;
SetBkColor(dc, ColorToRGB(colEditorBG)); SetBkColor(dc, TColorRef(ColorToRGB(colEditorBG)));
rcLine.Left := EraseLeft; rcLine.Left := EraseLeft;
InternalFillRect(dc, rcLine); InternalFillRect(dc, rcLine);
rcLine.Left := DrawLeft; rcLine.Left := DrawLeft;
@ -3922,7 +3922,7 @@ begin
AClip.Top := (LastLine+1) * fTextHeight; AClip.Top := (LastLine+1) * fTextHeight;
if (AClip.Top < AClip.Bottom) then begin if (AClip.Top < AClip.Bottom) then begin
// Delete the remaining area // Delete the remaining area
SetBkColor(dc, ColorToRGB(colEditorBG)); SetBkColor(dc, TColorRef(ColorToRGB(colEditorBG)));
AClip.Left := EraseLeft; AClip.Left := EraseLeft;
InternalFillRect(dc, AClip); InternalFillRect(dc, AClip);
AClip.Left := DrawLeft; AClip.Left := DrawLeft;

2
components/synedit/syngutter.pp
View File

@ -185,7 +185,7 @@ begin
Canvas.Brush.Color := Color; Canvas.Brush.Color := Color;
dc := Canvas.Handle; dc := Canvas.Handle;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
LCLIntf.SetBkColor(dc,Canvas.Brush.Color); LCLIntf.SetBkColor(dc, TColorRef(Canvas.Brush.Color));
{$ENDIF} {$ENDIF}
// Clear all // Clear all

4
components/synedit/synguttercodefolding.pp
View File

@ -28,7 +28,7 @@ interface
uses uses
SysUtils, Classes, Controls, Graphics, Menus, LCLIntf, SynGutterBase, SynEditMiscProcs, SysUtils, Classes, Controls, Graphics, Menus, LCLIntf, SynGutterBase, SynEditMiscProcs,
SynEditFoldedView, SynEditMouseCmds, SynEditHighlighterFoldBase, LCLProc, ImgList; SynEditFoldedView, SynEditMouseCmds, SynEditHighlighterFoldBase, LCLProc, LCLType, ImgList;
type type
@ -610,7 +610,7 @@ begin
if MarkupInfo.Background <> clNone then if MarkupInfo.Background <> clNone then
begin begin
Canvas.Brush.Color := MarkupInfo.Background; Canvas.Brush.Color := MarkupInfo.Background;
LCLIntf.SetBkColor(Canvas.Handle, Canvas.Brush.Color); LCLIntf.SetBkColor(Canvas.Handle, TColorRef(Canvas.Brush.Color));
Canvas.FillRect(AClip); Canvas.FillRect(AClip);
end; end;

2
components/synedit/syngutterlinenumber.pp
View File

@ -235,7 +235,7 @@ begin
else else
Canvas.Brush.Color := Gutter.Color; Canvas.Brush.Color := Gutter.Color;
dc := Canvas.Handle; dc := Canvas.Handle;
LCLIntf.SetBkColor(dc, Canvas.Brush.Color); LCLIntf.SetBkColor(dc, TColorRef(Canvas.Brush.Color));
FTextDrawer.BeginDrawing(dc); FTextDrawer.BeginDrawing(dc);
try try
if MarkupInfo.Background <> clNone then if MarkupInfo.Background <> clNone then

2
components/synedit/synguttermarks.pp
View File

@ -180,7 +180,7 @@ begin
Canvas.Brush.Color := MarkupInfo.Background Canvas.Brush.Color := MarkupInfo.Background
else else
Canvas.Brush.Color := Gutter.Color; Canvas.Brush.Color := Gutter.Color;
LCLIntf.SetBkColor(Canvas.Handle, Canvas.Brush.Color); LCLIntf.SetBkColor(Canvas.Handle, TColorRef(Canvas.Brush.Color));
if assigned(FBookMarkOpt) and assigned(FBookMarkOpt.BookmarkImages) then if assigned(FBookMarkOpt) and assigned(FBookMarkOpt.BookmarkImages) then
FColumnWidth := FBookMarkOpt.BookmarkImages.Width FColumnWidth := FBookMarkOpt.BookmarkImages.Width

8
components/synedit/syntextdrawer.pp
View File

@ -1051,8 +1051,8 @@ begin
DoSetCharExtra(FCharExtra); DoSetCharExtra(FCharExtra);
{$ELSE} {$ELSE}
FSavedFont := SelectObject(DC, FCrntFont); FSavedFont := SelectObject(DC, FCrntFont);
LCLIntf.SetTextColor(DC, FColor); LCLIntf.SetTextColor(DC, TColorRef(FColor));
LCLIntf.SetBkColor(DC, FBkColor); LCLIntf.SetBkColor(DC, TColorRef(FBkColor));
{$ENDIF} {$ENDIF}
end; end;
Inc(FDrawingCount); Inc(FDrawingCount);
@ -1161,7 +1161,7 @@ begin
FColor := Value; FColor := Value;
if FDC <> 0 then if FDC <> 0 then
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
SetTextColor(FDC, Value); SetTextColor(FDC, TColorRef(Value));
{$ELSE} {$ELSE}
SetTextColor(FDC, ColorToRGB(Value)); SetTextColor(FDC, ColorToRGB(Value));
{$ENDIF} {$ENDIF}
@ -1175,7 +1175,7 @@ begin
FBkColor := Value; FBkColor := Value;
if FDC <> 0 then if FDC <> 0 then
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
LCLIntf.SetBkColor(FDC, Value); LCLIntf.SetBkColor(FDC, TColorRef(Value));
{$ELSE} {$ELSE}
Windows.SetBkColor(FDC, ColorToRGB(Value)); Windows.SetBkColor(FDC, ColorToRGB(Value));
{$ENDIF} {$ENDIF}