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

fixed build ide clean

Browse Source 
git-svn-id: trunk@4146 -
This commit is contained in:
mattias 2003-05-12 10:46:01 +00:00
parent 211ffa1bec
commit dfa8265f07
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/gtk/gtkglarea/gtkglarea.pp
View File

@ -34,7 +34,6 @@ type
FCurrentFrameTime: integer; // in msec FCurrentFrameTime: integer; // in msec
FLastFrameTime: integer; // in msec FLastFrameTime: integer; // in msec
FFrameDiffTime: integer; // in msec FFrameDiffTime: integer; // in msec
FPaintOnIdle: boolean;
protected protected
procedure WMPaint(var Message: TLMPaint); message LM_PAINT; procedure WMPaint(var Message: TLMPaint); message LM_PAINT;
function GetWidget: PGtkGLArea; function GetWidget: PGtkGLArea;
@ -138,7 +137,9 @@ end;
procedure TCustomGTKGLAreaControl.DoOnResize; procedure TCustomGTKGLAreaControl.DoOnResize;
begin begin
if HandleAllocated and (gint(True) = gtk_gl_area_make_current(Widget)) then if (not (csDesigning in ComponentState))
and Enabled and Visible and HandleAllocated
and (gint(True) = gtk_gl_area_make_current(Widget)) then
glViewport (0, 0, Width, Height); glViewport (0, 0, Width, Height);
inherited DoOnResize; inherited DoOnResize;
end; end;

7
ide/buildlazdialog.pas
View File

@ -281,6 +281,7 @@ begin
Result:=mrCancel; Result:=mrCancel;
Tool:=TExternalToolOptions.Create; Tool:=TExternalToolOptions.Create;
try try
// setup external tool
Tool.Filename:=Options.MakeFilename; Tool.Filename:=Options.MakeFilename;
Tool.EnvironmentOverrides.Values['LCL_PLATFORM']:= Tool.EnvironmentOverrides.Values['LCL_PLATFORM']:=
LCLPlatformNames[Options.LCLPlatform]; LCLPlatformNames[Options.LCLPlatform];
@ -290,6 +291,8 @@ begin
end; end;
Tool.ScanOutputForFPCMessages:=true; Tool.ScanOutputForFPCMessages:=true;
Tool.ScanOutputForMakeMessages:=true; Tool.ScanOutputForMakeMessages:=true;
// clean up
if Options.CleanAll if Options.CleanAll
and ([blfQuick,blfOnlyIDE]*Flags=[]) then begin and ([blfQuick,blfOnlyIDE]*Flags=[]) then begin
// clean lazarus source directories // clean lazarus source directories
@ -299,6 +302,8 @@ begin
Result:=ExternalTools.Run(Tool,Macros); Result:=ExternalTools.Run(Tool,Macros);
if Result<>mrOk then exit; if Result<>mrOk then exit;
end; end;
// build every item
for i:=0 to Options.Count-1 do begin for i:=0 to Options.Count-1 do begin
// build item // build item
CurItem:=Options.Items[i]; CurItem:=Options.Items[i];
@ -1052,7 +1057,7 @@ begin
// IDE // IDE
FItemIDE:=TBuildLazarusItem.Create('IDE',lisBuildIDE,'',mmBuild); FItemIDE:=TBuildLazarusItem.Create('IDE',lisBuildIDE,'',mmBuild);
FItemIDE.Commands[mmBuild]:='ide'; FItemIDE.Commands[mmBuild]:='ide';
FItemIDE.Commands[mmCleanBuild]:='cleanide'; FItemIDE.Commands[mmCleanBuild]:='cleanide ide';
fItems.Add(FItemIDE); fItems.Add(FItemIDE);
// Examples // Examples