paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 13:39:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: formatting, cleanup

Browse Source 
git-svn-id: trunk@24706 -
This commit is contained in:
paul 2010-04-19 01:37:51 +00:00
parent c30d8825cf
commit 3def3ea76c
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/graphics.pp
View File

@ -990,9 +990,9 @@ type
function GetHandle: HDC;
procedure SetAntialiasingMode(const AValue: TAntialiasingMode);
procedure SetAutoRedraw(Value: Boolean); virtual;
procedure SetLazFont(value: TFont);
procedure SetLazPen(value: TPen);
procedure SetLazBrush(value: TBrush);
procedure SetLazFont(Value: TFont);
procedure SetLazPen(Value: TPen);
procedure SetLazBrush(Value: TBrush);
procedure SetRegion(Value: TRegion);
protected
function DoCreateDefaultFont: TFPCustomFont; override;
@ -1042,9 +1042,9 @@ type
procedure CreateRegion; virtual;
procedure DeselectHandles; virtual;
procedure PenChanging(APen: TObject); virtual;
procedure FontChanging(APen: TObject); virtual;
procedure BrushChanging(APen: TObject); virtual;
procedure RegionChanging(APen: TObject); virtual;
procedure FontChanging(AFont: TObject); virtual;
procedure BrushChanging(ABrush: TObject); virtual;
procedure RegionChanging(ARegion: TObject); virtual;
procedure RealizeAutoRedraw; virtual;
procedure RealizeAntialiasing; virtual;
procedure RequiredState(ReqState: TCanvasState); virtual;

44
lcl/include/canvas.inc
View File

@ -1252,9 +1252,8 @@ end;
------------------------------------------------------------------------------}
procedure TCanvas.BrushChanged(ABrush: TObject);
begin
if csBrushValid in FState then begin
if csBrushValid in FState then
Exclude(FState, csBrushValid);
end;
end;
{------------------------------------------------------------------------------
@ -1266,9 +1265,8 @@ end;
------------------------------------------------------------------------------}
procedure TCanvas.FontChanged(AFont: TObject);
begin
if csFontValid in FState then begin
if csFontValid in FState then
Exclude(FState, csFontValid);
end;
end;
{------------------------------------------------------------------------------
@ -1288,7 +1286,7 @@ begin
end;
end;
procedure TCanvas.FontChanging(APen: TObject);
procedure TCanvas.FontChanging(AFont: TObject);
begin
if [csFontValid, csHandleValid] * FState = [csFontValid, csHandleValid] then
begin
@ -1298,7 +1296,7 @@ begin
end;
end;
procedure TCanvas.BrushChanging(APen: TObject);
procedure TCanvas.BrushChanging(ABrush: TObject);
begin
if [csBrushValid, csHandleValid] * FState = [csBrushValid, csHandleValid] then
begin
@ -1308,7 +1306,7 @@ begin
end;
end;
procedure TCanvas.RegionChanging(APen: TObject);
procedure TCanvas.RegionChanging(ARegion: TObject);
begin
if [csRegionValid, csHandleValid] * FState = [csRegionValid, csHandleValid] then
begin
@ -1327,10 +1325,8 @@ end;
------------------------------------------------------------------------------}
procedure TCanvas.PenChanged(APen: TObject);
begin
if csPenValid in FState
then begin
if csPenValid in FState then
Exclude(FState, csPenValid);
end;
end;
{------------------------------------------------------------------------------
@ -1342,10 +1338,8 @@ end;
------------------------------------------------------------------------------}
procedure TCanvas.RegionChanged(ARegion: TObject);
begin
if csRegionValid in FState
then begin
if csRegionValid in FState then
Exclude(FState, csRegionValid);
end;
end;
{------------------------------------------------------------------------------
@ -1511,14 +1505,15 @@ end;
procedure TCanvas.DeselectHandles;
begin
//debugln('TCanvas.DeselectHandles ',ClassName,' Self=',DbgS(Self),' Handle=',DbgS(FHandle),' FSavedBrushHandle=',DbgS(Cardinal(FSavedBrushHandle)));
if (FHandle<>0) then begin
if (FHandle <> 0) then
begin
// select default sub handles in the device context without deleting owns
if FSavedBrushHandle<>0 then
SelectObject(FHandle,FSavedBrushHandle);
if FSavedPenHandle<>0 then
SelectObject(FHandle,FSavedPenHandle);
if FSavedFontHandle<>0 then
SelectObject(FHandle,FSavedFontHandle);
if FSavedBrushHandle <> 0 then
SelectObject(FHandle, FSavedBrushHandle);
if FSavedPenHandle <> 0 then
SelectObject(FHandle, FSavedPenHandle);
if FSavedFontHandle <> 0 then
SelectObject(FHandle, FSavedFontHandle);
FState := FState - [csPenValid, csBrushValid, csFontValid];
end;
FSavedBrushHandle:=0;
@ -1587,10 +1582,11 @@ procedure TCanvas.SaveHandleState;
var
DCIndex: LongInt;
begin
if FSavedHandleStates=nil then FSavedHandleStates:=TFPList.Create;
if FSavedHandleStates = nil then
FSavedHandleStates := TFPList.Create;
DeselectHandles;
RequiredState([csHandleValid]);
DCIndex:=SaveDC(Handle);
DCIndex := SaveDC(Handle);
FSavedHandleStates.Add(Pointer(PtrInt(DCIndex)));
end;
@ -1598,10 +1594,10 @@ procedure TCanvas.RestoreHandleState;
var
DCIndex: LongInt;
begin
DCIndex:=integer(PtrUInt(FSavedHandleStates[FSavedHandleStates.Count-1]));
DCIndex := LongInt(PtrUInt(FSavedHandleStates[FSavedHandleStates.Count-1]));
FSavedHandleStates.Delete(FSavedHandleStates.Count-1);
DeselectHandles;
RestoreDC(Handle,DCIndex);
RestoreDC(Handle, DCIndex);
end;
procedure TCanvas.Changing;