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

MG: added patch from Andrew

Browse Source 
git-svn-id: trunk@2679 -
This commit is contained in:
lazarus 2002-08-18 04:56:42 +00:00
parent 0198ac77b8
commit c5a6db9d87
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lcl/include/canvas.inc
View File

@ -130,7 +130,7 @@ begin
if (OldHandle<>Brush.Handle) and (FSavedBrushHandle=0) then if (OldHandle<>Brush.Handle) and (FSavedBrushHandle=0) then
FSavedBrushHandle:=OldHandle; FSavedBrushHandle:=OldHandle;
Include(FState, csBrushValid); Include(FState, csBrushValid);
SetBkColor(FHandle, ColorToRGB(Brush.Color)); SetBkColor(FHandle, Brush.Color);
SetBkMode(FHandle, TRANSPARENT); SetBkMode(FHandle, TRANSPARENT);
end; end;
@ -165,7 +165,7 @@ begin
if (OldHandle<>Font.Handle) and (FSavedFontHandle=0) then if (OldHandle<>Font.Handle) and (FSavedFontHandle=0) then
FSavedFontHandle:=OldHandle; FSavedFontHandle:=OldHandle;
Include(FState, csFontValid); Include(FState, csFontValid);
SetTextColor(FHandle, ColorToRGB(Font.Color)); SetTextColor(FHandle, Font.Color);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -554,6 +554,29 @@ begin
Rectangle(Rect.Left, REct.Top, Rect.RIght, REct.Bottom); Rectangle(Rect.Left, REct.Top, Rect.RIght, REct.Bottom);
end; end;
{------------------------------------------------------------------------------
Method: TCanvas.RoundRect
Params: X1, Y1, X2, Y2, RX, RY
Returns: Nothing
------------------------------------------------------------------------------}
Procedure TCanvas.RoundRect(X1, Y1, X2, Y2: Integer; RX,RY : Integer);
begin
RequiredState([csHandleValid, csBrushValid, csPenValid]);
LCLLinux.RoundRect(FHandle, X1, Y1, X2, Y2, RX, RY);
end;
{------------------------------------------------------------------------------
Method: TCanvas.RoundRect
Params: Rect, RX, RY
Returns: Nothing
------------------------------------------------------------------------------}
Procedure TCanvas.RoundRect(const Rect : TRect; RX,RY : Integer);
begin
RoundRect(Rect.Left, Rect.Top, Rect.Right, Rect.Bottom, RX, RY);
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Method: TCanvas.TextRect Method: TCanvas.TextRect
Params: Rect, X, Y, Text Params: Rect, X, Y, Text
@ -625,6 +648,7 @@ begin
If Style.SystemFont then begin If Style.SystemFont then begin
RequiredState([csHandleValid]); RequiredState([csHandleValid]);
SelectObject(Self.Handle, GetStockObject(SYSTEM_FONT)); SelectObject(Self.Handle, GetStockObject(SYSTEM_FONT));
SetTextColor(Self.Handle, Font.Color);
end end
else else
RequiredState([csHandleValid, csFontValid]); RequiredState([csHandleValid, csFontValid]);
@ -1041,6 +1065,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.27 2002/09/18 17:07:24 lazarus
MG: added patch from Andrew
Revision 1.26 2002/09/12 15:35:57 lazarus Revision 1.26 2002/09/12 15:35:57 lazarus
MG: small bugfixes MG: small bugfixes