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

* Fixed bug #7408

Browse Source 
git-svn-id: trunk@22271 -
This commit is contained in:
michael 2009-10-23 16:31:37 +00:00
parent 8533b5894c
commit b8c2996e0d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doceditor/eleditor.pp
View File

@ -622,7 +622,7 @@ end;
Function TElementEditor.Save : Boolean; Function TElementEditor.Save : Boolean;
Var Var
SS : TStringStream; SS : TStream;
S : String; S : String;
N,NN : TDomNode; N,NN : TDomNode;

14
doceditor/pkeditor.pp
View File

@ -394,9 +394,9 @@ end;
Procedure TPackageEditor.SelectElement(Sender : TDomElement); Procedure TPackageEditor.SelectElement(Sender : TDomElement);
begin begin
If IsElementNode(Sender) then If IsElementNode(Sender) or IsModuleNode(Sender) or IsPackageNode(Sender) then
CurrentElement:=Sender CurrentElement:=Sender
else // FModuleNode selected. else // No valid node
CurrentElement:=Nil; CurrentElement:=Nil;
If Assigned(FOnSelectElement) then If Assigned(FOnSelectElement) then
OnSelectElement(Sender); OnSelectElement(Sender);
@ -419,10 +419,10 @@ end;
Procedure TPackageEditor.SelectModule(Sender : TDomElement); Procedure TPackageEditor.SelectModule(Sender : TDomElement);
begin begin
Inherited CurrentElement:=Nil;
Inherited CurrentTopic:=Nil; Inherited CurrentTopic:=Nil;
Inherited CurrentModule:=Sender;
Inherited CurrentPackage:=FCurrentModule.ParentNode as TDomElement; Inherited CurrentPackage:=FCurrentModule.ParentNode as TDomElement;
Inherited CurrentModule:=Sender;
Inherited CurrentElement:=Sender;
ShowModuleElements(FCurrentModule); ShowModuleElements(FCurrentModule);
If Assigned(FOnSelectModule) then If Assigned(FOnSelectModule) then
FOnSelectModule(Sender); FOnSelectModule(Sender);
@ -782,6 +782,7 @@ begin
If Assigned(Module) then If Assigned(Module) then
begin begin
FModuleNode:=FElementTree.Items.Add(Nil,Module['name']); FModuleNode:=FElementTree.Items.Add(Nil,Module['name']);
FModuleNode.Data:=Module;
S:=TStringList.Create; S:=TStringList.Create;
Try Try
// get sorted list of elements // get sorted list of elements
@ -1116,7 +1117,10 @@ begin
If (E<>FCurrentElement) and (E <> nil) then If (E<>FCurrentElement) and (E <> nil) then
begin begin
Inherited; Inherited;
CurrentModule:=E.ParentNode as TDomElement; If E.NodeName='module' then
CurrentModule:=E
else
CurrentModule:=E.ParentNode as TDomElement;
SelNode:=FElementTree.Selected; SelNode:=FElementTree.Selected;
//avoid selecting an already selected node (occurs in OnChange event) //avoid selecting an already selected node (occurs in OnChange event)
if (SelNode = nil) or (SelNode.Data <> Pointer(E)) then if (SelNode = nil) or (SelNode.Data <> Pointer(E)) then