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

anchordocking: fixed opRemove for menus and menuitems

Browse Source 
git-svn-id: trunk@14402 -
This commit is contained in:
mattias 2008-03-04 09:42:26 +00:00
parent 64443a3455
commit 6ea2bc5ca1
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/main.pp
View File

@ -1252,11 +1252,11 @@ begin
DebugLn('[TMainIDE.Destroy] B -> inherited Destroy... ',ClassName);
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy B ');{$ENDIF}
FreeThenNil(MainBuildBoss);
FreeThenNil(FDockingManager);
inherited Destroy;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Destroy C ');{$ENDIF}
FreeThenNil(IDEProtocolOpts);
FreeThenNil(FDockingManager);
DebugLn('[TMainIDE.Destroy] END');
end;

2
lcl/include/application.inc
View File

@ -1802,6 +1802,7 @@ procedure TApplication.FreeComponent(Data: PtrInt);
var
OldComponents: TAvgLvlTree;
begin
//DebugLn(['TApplication.FreeComponent ',DbgSName(TComponent(Data))]);
TComponent(Data).Free;
if FComponentsToRelease<>nil then begin
OldComponents:=FComponentsToRelease;
@ -1816,6 +1817,7 @@ var
IsFirstItem: Boolean;
begin
if csDestroying in AComponent.ComponentState then exit;
//DebugLn(['TApplication.ReleaseComponent ',DbgSName(AComponent)]);
if AppDestroying in FFlags then begin
// free immediately
AComponent.Free;

38
lcl/ldockctrl.pas
View File

@ -632,6 +632,8 @@ var
CurDocker: TCustomLazControlDocker;
Anchor: TAnchorKind;
begin
if (Manager=nil) or (Control=nil) then
raise Exception.Create('TCustomLazControlDocker.ShowDockingEditor no docking available');
Dlg:=TLazDockControlEditorDlg.Create(nil);
try
// fill the list of controls this control can dock to
@ -728,6 +730,7 @@ end;
procedure TCustomLazControlDocker.ControlVisibleChanging(Sender: TObject);
begin
if Manager=nil then exit;
if Control<>Sender then begin
DebugLn('TCustomLazControlDocker.ControlVisibleChanging WARNING: ',
DbgSName(Control),'<>',DbgSName(Sender));
@ -757,6 +760,7 @@ end;
procedure TCustomLazControlDocker.ControlVisibleChanged(Sender: TObject);
begin
if Manager=nil then exit;
{$IFDEF VerboseAnchorDocking}
DebugLn(['TCustomLazControlDocker.ControlVisibleChanged Sender=',DbgSName(Sender),' Control.Visible=',Control.Visible]);
//DumpStack;
@ -1660,18 +1664,16 @@ begin
FControl.RemoveAllHandlersOfObject(Self);
FControl:=nil;
end;
if (AComponent is TMenu) then begin
Item:=nil;
if (AComponent is TMenu) then
Item:=FindLCDMenuItem(TMenu(AComponent));
if (AComponent is TMenuItem) then
Item:=FindLCDMenuItem(TMenu(AComponent));
if Item<>nil then begin
FMenus.Remove(Item);
Item.Menu:=nil;
FreeAndNil(Item.Item);
Item.Free;
end;
if (AComponent is TMenuItem) then begin
Item:=FindLCDMenuItem(TMenu(AComponent));
FMenus.Remove(Item);
Item.Menu:=nil;
Item.Item:=nil;
if Item.Item<>AComponent then
FreeAndNil(Item.Item);
Item.Free;
end;
end;
@ -1723,7 +1725,6 @@ end;
procedure TCustomLazControlDocker.AddPopupMenu(Menu: TPopupMenu);
var
AMenuItem: TMenuItem;
LCDItem: TLCDMenuItem;
begin
if FindLCDMenuItem(Menu)<>nil then exit;
@ -2191,14 +2192,23 @@ end;
destructor TCustomLazControlDocker.Destroy;
var
i: integer;
Item: TLCDMenuItem;
OldMenus: TFPList;
begin
Control:=nil;
Manager:=nil;
inherited Destroy;
if FMenus <> nil then
for i := 0 to FMenus.Count - 1 do
TLCDMenuItem(FMenus[i]).Free;
FreeAndNil(FMenus);
if FMenus <> nil then begin
OldMenus:=FMenus;
FMenus:=nil;
for i := OldMenus.Count - 1 downto 0 do
begin
Item:=TLCDMenuItem(OldMenus[i]);
FreeAndNil(Item.Item);
Item.Free;
end;
OldMenus.Free;
end;
end;
procedure TCustomLazControlDocker.PopupMenuItemClick(Sender: TObject);