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

ide: solve Invalid Type Cast in menu editor + TFrame. Issue #29955, patch from Denis Kozlov

Browse Source 
git-svn-id: trunk@52107 -
This commit is contained in:
ondrej 2016-04-05 21:14:41 +00:00
parent b4316ad202
commit eb754b6fff
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
designer/menueditorform.pas
View File

@ -86,7 +86,6 @@ type
procedure LoadFixedButtonGlyphs;
procedure OnDesignerSetSelection(const ASelection: TPersistentSelectionList);
procedure ProcessForPopup(aControl: TControl);
procedure ScanLookupRoot(aForm: TCustomForm);
procedure SetupPopupAssignmentsDisplay;
public
constructor Create(aDesigner: TMenuDesignerBase); reintroduce;
@ -438,16 +437,6 @@ begin
end;
end;
procedure TMenuDesignerForm.ScanLookupRoot(aForm: TCustomForm);
var
i: integer;
begin
if (aForm.PopupMenu = FEditedMenu) then
FPopupAssignments.Add(aForm.Name);
for i:=0 to aForm.ControlCount-1 do
ProcessForPopup(aForm.Controls[i]);
end;
function TMenuDesignerForm.GetPopupAssignmentCount: integer;
var
lookupRoot: TPersistent;
@ -458,7 +447,7 @@ begin
else begin
FreeAndNil(FPopupAssignments);
FPopupAssignments:=TStringList.Create;
ScanLookupRoot(lookupRoot as TCustomForm);
ProcessForPopup(lookupRoot as TControl);
Result:=FPopupAssignments.Count;
end
end;