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

SrcEdit: Fix order of events for editor created/destoyed

Browse Source 
git-svn-id: trunk@36353 -
This commit is contained in:
martin 2012-03-26 19:42:40 +00:00
parent 30aa47c2c1
commit 67e76e1b92
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/sourceeditor.pp
View File

@ -6125,7 +6125,7 @@ begin
{$ENDIF} {$ENDIF}
Result := TSourceEditor.Create(Self, NotebookPage[PageNum], ASharedEditor); Result := TSourceEditor.Create(Self, NotebookPage[PageNum], ASharedEditor);
Result.FPageName := NoteBookPages[Pagenum]; Result.FPageName := NoteBookPages[Pagenum];
AcceptEditor(Result, True); AcceptEditor(Result);
PageIndex := Pagenum; PageIndex := Pagenum;
{$IFDEF IDE_DEBUG} {$IFDEF IDE_DEBUG}
debugln('TSourceNotebook.NewSE end '); debugln('TSourceNotebook.NewSE end ');
@ -6147,14 +6147,14 @@ begin
AnEditor.EditorComponent.EndUpdate; AnEditor.EditorComponent.EndUpdate;
if SendEvent then if SendEvent then
Manager.SendEditorCreated(AnEditor) Manager.SendEditorCreated(AnEditor);
end; end;
procedure TSourceNotebook.ReleaseEditor(AnEditor: TSourceEditor; SendEvent: Boolean); procedure TSourceNotebook.ReleaseEditor(AnEditor: TSourceEditor; SendEvent: Boolean);
begin begin
FSourceEditorList.Remove(AnEditor); FSourceEditorList.Remove(AnEditor);
if SendEvent then if SendEvent then
Manager.SendEditorDestroyed(AnEditor) Manager.SendEditorDestroyed(AnEditor);
end; end;
function TSourceNotebook.FindSourceEditorWithPageIndex(APageIndex: integer): TSourceEditor; function TSourceNotebook.FindSourceEditorWithPageIndex(APageIndex: integer): TSourceEditor;
@ -6886,6 +6886,7 @@ Begin
UpdatePageNames; UpdatePageNames;
UpdateProjectFiles(Result); UpdateProjectFiles(Result);
UpdateStatusBar; UpdateStatusBar;
Manager.SendEditorCreated(Result);
finally finally
EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TSourceNotebook.NewFile'){$ENDIF}; EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TSourceNotebook.NewFile'){$ENDIF};
end; end;
@ -6914,11 +6915,11 @@ begin
//debugln(['TSourceNotebook.CloseFile ',TempEditor.FileName,' ',TempEditor.APageIndex]); //debugln(['TSourceNotebook.CloseFile ',TempEditor.FileName,' ',TempEditor.APageIndex]);
EndIncrementalFind; EndIncrementalFind;
TempEditor.Close; TempEditor.Close;
NoteBookDeletePage(APageIndex); // delete page before sending notification senEditorDestroyed
TempEditor.Free; TempEditor.Free;
TempEditor:=nil; TempEditor:=nil;
// delete the page // delete the page
//debugln('TSourceNotebook.CloseFile B APageIndex=',APageIndex,' PageCount=',PageCount,' NoteBook.APageIndex=',Notebook.APageIndex); //debugln('TSourceNotebook.CloseFile B APageIndex=',APageIndex,' PageCount=',PageCount,' NoteBook.APageIndex=',Notebook.APageIndex);
NoteBookDeletePage(APageIndex);
//debugln('TSourceNotebook.CloseFile C APageIndex=',APageIndex,' PageCount=',PageCount,' NoteBook.APageIndex=',Notebook.APageIndex); //debugln('TSourceNotebook.CloseFile C APageIndex=',APageIndex,' PageCount=',PageCount,' NoteBook.APageIndex=',Notebook.APageIndex);
UpdateProjectFiles; UpdateProjectFiles;
UpdatePageNames; UpdatePageNames;