paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-25 23:51:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* two more "getmodule" fixes.

Browse Source 
git-svn-id: trunk@24293 -
This commit is contained in:
marco 2013-04-21 20:20:21 +00:00
parent 1df71e5d99
commit f007dc9711
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils/fpdoc/dw_html.pp
View File

@ -263,6 +263,7 @@ type
// For producing complete package documentation // For producing complete package documentation
procedure WriteHTMLPages; virtual; procedure WriteHTMLPages; virtual;
procedure WriteXHTMLPages; procedure WriteXHTMLPages;
function ModuleForElement(AnElement:TPasElement):TPasModule;
Function InterPretOption(Const Cmd,Arg : String) : boolean; override; Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
Procedure WriteDoc; override; Procedure WriteDoc; override;
@ -829,6 +830,16 @@ begin
end; end;
end; end;
function THTMLWriter.ModuleForElement(AnElement:TPasElement):TPasModule;
begin
result:=TPasModule(AnElement);
while assigned(result) and not (result is TPasModule) do
result:=TPasModule(result.parent);
if not (result is TPasModule) then
result:=nil;
end;
procedure THTMLWriter.CreateCSSFile; procedure THTMLWriter.CreateCSSFile;
Var Var
@ -2170,7 +2181,7 @@ begin
else else
AppendText(NewEl,El['id']); AppendText(NewEl,El['id']);
l:=El['id']; l:=El['id'];
DescrEl := Engine.FindShortDescr(AElement.GetModule,L); DescrEl := Engine.FindShortDescr(ModuleForElement(AElement),L);
if Assigned(DescrEl) then if Assigned(DescrEl) then
begin begin
AppendNbSp(CreatePara(CreateTD(TREl)), 2); AppendNbSp(CreatePara(CreateTD(TREl)), 2);
@ -2362,7 +2373,7 @@ procedure THTMLWriter.CreateClassHierarchyPage(AList : TStringList; AddUnit : Bo
if (P<>Nil) then if (P<>Nil) then
begin begin
AppendHyperLink(CurOutputNode,P); AppendHyperLink(CurOutputNode,P);
PM:=P.Getmodule; PM:=ModuleForElement(P);
if (PM<>Nil) then if (PM<>Nil) then
begin begin
AppendText(CurOutputNode,' ('); AppendText(CurOutputNode,' (');