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

SourceEditor: Refactor creation/destruction of helpers

Browse Source 
git-svn-id: trunk@24172 -
This commit is contained in:
martin 2010-03-22 15:21:00 +00:00
parent 0a65211785
commit 9514e35650
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/codecontextform.pas
View File

@ -776,5 +776,8 @@ begin
inherited Destroy;
end;
finalization
FreeThenNil(CodeContextFrm);
end.

44
ide/sourceeditor.pp
View File

@ -291,7 +291,6 @@ type
procedure FindNextUTF8;
procedure FindPrevious;
procedure FindNextWordOccurrence(DirectionForward: boolean);
procedure InitGotoDialog;
procedure ShowGotoLineDialog;
// dialogs
@ -837,6 +836,7 @@ type
property ActiveSourceWindow: TSourceNotebook
read GetActiveSourceNotebook write SetActiveSourceNotebook; // reintroduce
function ActiveOrNewSourceWindow: TSourceNotebook;
function NewSourceWindow: TSourceNotebook;
// Editors
function SourceEditorCount: integer; override;
function GetActiveSE: TSourceEditor; { $note deprecate and use ActiveEditor}
@ -908,6 +908,7 @@ type
procedure HistoryJump(Sender: TObject; CloseAction: TJumpHistoryAction);
private
FCodeTemplateModul: TSynEditAutoComplete;
FGotoDialog: TfrmGoto;
procedure OnCodeTemplateTokenNotFound(Sender: TObject; AToken: string;
AnEditor: TCustomSynEdit; var Index:integer);
procedure OnCodeTemplateExecuteCompletion(
@ -922,6 +923,8 @@ type
procedure OnSourceMarksAction(AMark: TSourceMark; AAction: TListNotification);
property CodeTemplateModul: TSynEditAutoComplete
read FCodeTemplateModul write FCodeTemplateModul;
// goto dialog
function GotoDialog: TfrmGoto;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -1079,8 +1082,6 @@ var
SourceCompletionCaretXY: TPoint;
AWordCompletion: TWordCompletion = nil;
GotoDialog: TfrmGoto = nil;
function SourceNotebook: TSourceNotebook;
begin
if SourceEditorManager = nil then
@ -1911,13 +1912,14 @@ procedure TSourceEditor.ShowGotoLineDialog;
var
NewLeft: integer;
NewTop: integer;
dlg: TfrmGoto;
begin
InitGotoDialog;
GotoDialog.Edit1.Text:='';
GetDialogPosition(GotoDialog.Width,GotoDialog.Height,NewLeft,NewTop);
GotoDialog.SetBounds(NewLeft,NewTop,GotoDialog.Width,GotoDialog.Height);
if (GotoDialog.ShowModal = mrOK) then
GotoLine(StrToIntDef(GotoDialog.Edit1.Text,1));
dlg := Manager.GotoDialog;
dlg.Edit1.Text:='';
GetDialogPosition(dlg.Width, dlg.Height, NewLeft, NewTop);
dlg.SetBounds(NewLeft, NewTop, dlg.Width, dlg.Height);
if (dlg.ShowModal = mrOK) then
GotoLine(StrToIntDef(dlg.Edit1.Text,1));
Self.FocusEditor;
end;
@ -2112,12 +2114,6 @@ begin
'',Flags);
end;
procedure TSourceEditor.InitGotoDialog;
begin
if GotoDialog=nil then
GotoDialog := TfrmGoto.Create(SourceNotebook);
end;
function TSourceEditor.DoFindAndReplace: integer;
var
OldCaretXY: TPoint;
@ -4324,10 +4320,7 @@ begin
end;
FKeyStrokes.Free;
FSourceEditorList.Free;
FreeAndNil(Gotodialog);
FreeThenNil(CodeContextFrm);
FreeThenNil(SrcEditHintWindow);
FreeThenNil(FMouseHintTimer);
FreeThenNil(FHintWindow);
@ -7140,7 +7133,13 @@ begin
Result := ActiveSourceWindow;
if Result <> nil then exit;
Result := CreateNewWindow(True);
ActiveSourceWindow := nil;
ActiveSourceWindow := Result;
end;
function TSourceEditorManager.NewSourceWindow: TSourceNotebook;
begin
Result := CreateNewWindow(True);
ActiveSourceWindow := Result;
end;
function TSourceEditorManager.SourceEditorCount: integer;
@ -7828,6 +7827,13 @@ begin
Editor.UpdateExecutionSourceMark;
end;
function TSourceEditorManager.GotoDialog: TfrmGoto;
begin
if FGotoDialog=nil then
FGotoDialog := TfrmGoto.Create(self);
Result := FGotoDialog;
end;
constructor TSourceEditorManager.Create(AOwner: TComponent);
begin
inherited Create(AOwner);