paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-04 18:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

editortoolbar: disconnect references when source window is destroyed

Browse Source 
git-svn-id: trunk@46023 -
This commit is contained in:
mattias 2014-08-06 17:17:31 +00:00
parent 822e9eaeee
commit 47d83c7efd
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/editortoolbar/editortoolbar.lpk
View File

@ -19,7 +19,7 @@
"/>
<License Value="GPL
"/>
<Version Minor="6" Release="1"/>
<Version Minor="6" Release="2"/>
<Files Count="4">
<Item1>
<Filename Value="jumpto_impl.pas"/>

28
components/editortoolbar/editortoolbar_impl.pas
View File

@ -25,7 +25,6 @@ interface
uses
Classes
,CodeToolManager
,CodeTree
,jumpto_impl
,Forms
,ComCtrls
@ -68,6 +67,7 @@ type
procedure AddDivider;
procedure AddStaticItems;
procedure ClearToolbar;
property OwnerWindow: TSourceEditorWindowInterface read FWindow;
end;
@ -78,6 +78,7 @@ type
FToolBarList: TFPList;
protected
procedure SourceWindowCreated(Sender: TObject);
procedure SourceWindowDestroyed(Sender: TObject);
procedure AddBar(ABar: TEditorToolbar);
procedure DelBar(ABar: TEditorToolbar);
procedure ReloadAll;
@ -116,9 +117,8 @@ type
TEditToolBarToolButton = class(TToolButton)
private
FMenuItem: TIDEMenuItem;
protected
procedure Click; override;
public
procedure Click; override;
property MenuItem: TIDEMenuItem read FMenuItem write FMenuItem;
end;
@ -156,6 +156,21 @@ begin
TEditorToolbar.Create(Sender as TSourceEditorWindowInterface);
end;
procedure TEditorToolbarList.SourceWindowDestroyed(Sender: TObject);
var
i: integer;
aBar: TEditorToolbar;
begin
// Let's remove from our list the destroyed window
for i:= 0 to FToolBarList.Count -1 do begin
aBar := TEditorToolbar(FToolBarList[i]);
if aBar.OwnerWindow = TSourceEditorWindowInterface(Sender) then begin
FToolBarList.Remove(aBar);
exit;
end;
end;
end;
procedure TEditorToolbarList.AddBar(ABar: TEditorToolbar);
begin
FToolBarList.Add(ABar);
@ -171,7 +186,7 @@ var
i: Integer;
begin
for i := 0 to FToolBarList.Count - 1 do
TEditorToolbar(FToolBarList[i]).Reload;
TEditorToolbar(FToolBarList[i]).Reload
end;
constructor TEditorToolbarList.Create;
@ -180,8 +195,10 @@ begin
uEditorToolbarList := self;
FToolBarList := TFPList.Create;
if SourceEditorManagerIntf <> nil then
if SourceEditorManagerIntf <> nil then begin
SourceEditorManagerIntf.RegisterChangeEvent(semWindowCreate, @SourceWindowCreated);
SourceEditorManagerIntf.RegisterChangeEvent(semWindowDestroy,@SourceWindowDestroyed);
end;
end;
@ -228,7 +245,6 @@ var
T: TJumpType;
c: integer;
cfg: TConfigStorage;
value: string;
begin
uEditorToolbarList.AddBar(Self);
if assigned(TB) then exit;