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

IDE: Fix one access violation and some wrongly enabled menu items in menuitem OnClick handlers

Browse Source 
git-svn-id: trunk@30577 -
This commit is contained in:
juha 2011-05-06 10:45:36 +00:00
parent dcb11c1573
commit c96a1114c1
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ide/main.pp
View File

@ -3856,10 +3856,12 @@ var
begin
AvailUnits:=nil;
try
Editable:=False;
SelAvail:=False;
if BeginCodeTool(ASrcEdit,AnUnitInfo,[]) then begin
// GetCurrentUnit(ASrcEdit,AnUnitInfo);
Editable:=(ASrcEdit<>nil) and (not ASrcEdit.ReadOnly);
SelAvail:=(ASrcEdit<>nil) and (ASrcEdit.SelectionAvailable);
Assert(Assigned(ASrcEdit));
Editable:=not ASrcEdit.ReadOnly;
SelAvail:=ASrcEdit.SelectionAvailable;
// Get Available Units count to enable UseProjUnit feature.
AvailUnits:=GetAvailableUnits(ASrcEdit, CurrentUnitName);
@ -3920,32 +3922,32 @@ end;
procedure TMainIDE.mnuProjectClicked(Sender: TObject);
var
ASrcEdit: TSourceEditor;
AnUnitInfo: TUnitInfo;
PartOfProj: Boolean;
AUnitInfo: TUnitInfo;
NotPartOfProj: Boolean;
begin
PartOfProj:=False;
GetCurrentUnit(ASrcEdit,AnUnitInfo);
if Assigned(ASrcEdit) then
PartOfProj:=AnUnitInfo.IsPartOfProject;
MainIDEBar.itmProjectAddTo.Enabled:=not PartOfProj;
GetCurrentUnit(ASrcEdit,AUnitInfo);
NotPartOfProj:=Assigned(AUnitInfo) and not AUnitInfo.IsPartOfProject;
MainIDEBar.itmProjectAddTo.Enabled:=NotPartOfProj;
end;
procedure TMainIDE.mnuPackageClicked(Sender: TObject);
var
ASrcEdit: TSourceEditor;
AnUnitInfo: TUnitInfo;
AUnitInfo: TUnitInfo;
PkgFile: TPkgFile;
OpenPkgCurU, AddCurU: Boolean;
begin
PkgFile:=nil;
GetCurrentUnit(ASrcEdit,AnUnitInfo);
if Assigned(ASrcEdit) then
PkgFile:=PackageGraph.FindFileInAllPackages(AnUnitInfo.Filename,true,
not AnUnitInfo.IsPartOfProject);
with MainIDEBar do begin
itmPkgOpenPackageOfCurUnit.Enabled:=Assigned(PkgFile);
itmPkgAddCurUnitToPkg.Enabled:=
(not AnUnitInfo.IsVirtual) and FileExistsUTF8(AnUnitInfo.Filename);
OpenPkgCurU:=False;
AddCurU:=False;
GetCurrentUnit(ASrcEdit,AUnitInfo);
if Assigned(ASrcEdit) then begin
PkgFile:=PackageGraph.FindFileInAllPackages(AUnitInfo.Filename,true,
not AUnitInfo.IsPartOfProject);
OpenPkgCurU:=Assigned(PkgFile);
AddCurU:=(not AUnitInfo.IsVirtual) and FileExistsUTF8(AUnitInfo.Filename);
end;
MainIDEBar.itmPkgOpenPackageOfCurUnit.Enabled:=OpenPkgCurU;
MainIDEBar.itmPkgAddCurUnitToPkg.Enabled:=AddCurU;
end;
{------------------------------------------------------------------------------}