From 4f5b33084cb5c1fc7053138088678dde9c20ddba Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 30 Apr 2006 14:58:42 +0000
Subject: [PATCH] Help for IDE windows: now supporting controls without name

git-svn-id: trunk@9211 -
---
 docs/IDEWindowHelpTree.xml | 3 ++-
 ide/idecontexthelpedit.pas | 1 +
 ide/idewindowhelp.pas      | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/IDEWindowHelpTree.xml b/docs/IDEWindowHelpTree.xml
index dcfb1ac1be..1f1017bf26 100644
--- a/docs/IDEWindowHelpTree.xml
+++ b/docs/IDEWindowHelpTree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<CONFIG Name="IDE windows and dialogs" Path="IDE_Window:_" ChildCount="1">
+<CONFIG Name="IDE windows and dialogs" Path="IDE_Window:_" ChildCount="2">
   <Node1 Name="TObjectInspector" Path="Object_Inspector" HasHelp="True" ChildCount="1">
     <Node1 Name="PairSplitter1" Path="PairSplitter1" ChildCount="1">
       <Node1 Name="PairSplitter1Side2" Path="PairSplitter1Side2" ChildCount="1">
@@ -13,4 +13,5 @@
       </Node1>
     </Node1>
   </Node1>
+  <Node2 Name="TfrmCompilerOptions" Path="Compiler_Options" HasHelp="True"/>
 </CONFIG>
diff --git a/ide/idecontexthelpedit.pas b/ide/idecontexthelpedit.pas
index 24090834f7..174915ceba 100644
--- a/ide/idecontexthelpedit.pas
+++ b/ide/idecontexthelpedit.pas
@@ -324,6 +324,7 @@ function TContextHelpEditorDlg.FindHelpTreeNode(HelpNode: TIWHelpNode
     ParentTreeNode: TTreeNode;
   begin
     if HNode=nil then exit(nil);
+    DebugLn('Find ',HNode.Name,' ',HNode.Path);
     if HNode.Parent=nil then begin
       Result:=HelpNodesTreeView.Items.FindTopLvlNode(HNode.Name);
     end else begin
diff --git a/ide/idewindowhelp.pas b/ide/idewindowhelp.pas
index f3b10298cb..3eb328dc8a 100644
--- a/ide/idewindowhelp.pas
+++ b/ide/idewindowhelp.pas
@@ -196,6 +196,7 @@ end;
 procedure TIWHelpNode.DoRemove(AChild: TIWHelpNode);
 begin
   FItems.Remove(AChild);
+  AChild.FParent:=nil;
 end;
 
 constructor TIWHelpNode.Create;
@@ -383,6 +384,7 @@ function TIWHelpTree.FindNodeForControl(AControl: TControl;
     ParentHelpNode: TIWHelpNode;
     CurName: String;
   begin
+    Result:=nil;
     //DebugLn('TIWHelpTree.FindNodeForControl.Find ',dbgsName(TheControl));
     NextParent:=TheControl.Parent;
     if NextParent=nil then begin
@@ -446,13 +448,13 @@ var
     ParentHelpNode: TIWHelpNode;
     CurName: String;
   begin
+    Result:=nil;
     NextParent:=TheControl.Parent;
     if NextParent=nil then begin
       CurName:=TheControl.ClassName;
       ParentHelpNode:=Root;
     end else begin
       CurName:=TheControl.Name;
-      if CurName='' then exit;
       ParentHelpNode:=Find(NextParent);
       if ParentHelpNode=nil then exit;
     end;