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

fixed freeing brush handle on SetColor and fixed freeing splashform

Browse Source 
git-svn-id: trunk@6586 -
This commit is contained in:
mattias 2005-01-14 14:46:35 +00:00
parent dbaae1e981
commit c352ee72fe
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/lazarusmanager.pas
View File

@ -209,6 +209,7 @@ end;
procedure TLazarusManager.LazarusProcessStart(Sender: TObject); procedure TLazarusManager.LazarusProcessStart(Sender: TObject);
begin begin
SplashForm.Hide; SplashForm.Hide;
FreeThenNil(SplashForm);
Application.ProcessMessages; Application.ProcessMessages;
end; end;
@ -314,6 +315,9 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.18 2005/01/14 14:46:35 mattias
fixed freeing brush handle on SetColor and fixed freeing splashform
Revision 1.17 2005/01/10 08:49:28 vincents Revision 1.17 2005/01/10 08:49:28 vincents
implemented passing command line parameters to lazarus implemented passing command line parameters to lazarus

8
ide/splash.pp
View File

@ -94,6 +94,7 @@ begin
if Application.OnIdle=@ApplicationOnIdle then if Application.OnIdle=@ApplicationOnIdle then
Application.OnIdle:=nil; Application.OnIdle:=nil;
inherited Destroy; inherited Destroy;
SplashForm:=nil;
end; end;
procedure TSplashForm.Click; procedure TSplashForm.Click;
@ -123,8 +124,8 @@ procedure TSplashForm.Paint;
begin begin
inherited Paint; inherited Paint;
if FPixmap <>nil if FPixmap <>nil
then Canvas.Copyrect(Bounds(0, 0, Width, Height) then Canvas.Copyrect(Bounds(0, 0, Width, Height),FPixmap.Canvas,
,FPixmap.Canvas, Rect(0,0, Width, Height)); Rect(0,0, Width, Height));
end; end;
procedure TSplashForm.StartTimer; procedure TSplashForm.StartTimer;
@ -141,6 +142,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.20 2005/01/14 14:46:35 mattias
fixed freeing brush handle on SetColor and fixed freeing splashform
Revision 1.19 2003/09/18 09:21:02 mattias Revision 1.19 2003/09/18 09:21:02 mattias
renamed LCLLinux to LCLIntf renamed LCLLinux to LCLIntf

6
lcl/include/brush.inc
View File

@ -44,10 +44,10 @@ Procedure TBrush.SetColor(Value : TColor);
begin begin
if FColor <> Value if FColor <> Value
then begin then begin
FreeHandle;
{$IFDEF UseFPCanvas} {$IFDEF UseFPCanvas}
SetColor(Value,TColorToFPColor(Value)); SetColor(Value,TColorToFPColor(Value));
{$ELSE} {$ELSE}
FreeHandle;
FColor := Value; FColor := Value;
Changed; Changed;
{$ENDIF} {$ENDIF}
@ -267,6 +267,7 @@ end;
procedure TBrush.SetColor(const NewColor: TColor; const NewFPColor: TFPColor); procedure TBrush.SetColor(const NewColor: TColor; const NewFPColor: TFPColor);
begin begin
if (NewColor=Color) and (NewFPColor=FPColor) then exit; if (NewColor=Color) and (NewFPColor=FPColor) then exit;
FreeHandle;
FColor:=NewColor; FColor:=NewColor;
inherited SetFPColor(NewFPColor); inherited SetFPColor(NewFPColor);
Changed; Changed;
@ -282,6 +283,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.17 2005/01/14 14:46:35 mattias
fixed freeing brush handle on SetColor and fixed freeing splashform
Revision 1.16 2005/01/10 18:44:44 mattias Revision 1.16 2005/01/10 18:44:44 mattias
implemented the fpCanvas support for the LCL - Compile with -dUseFPCanvas implemented the fpCanvas support for the LCL - Compile with -dUseFPCanvas