diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-09 10:44:41 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-09 10:44:41 -0700 |
commit | 52d7f2bdb1e27cb43754d46edf1c7a8942853ae7 (patch) | |
tree | cc5e7f3beda0121b8b89e8731991fc6ef59d3f78 /docs/doxygen | |
parent | d84b1dd44cdc1d0b798ab2a7a6a0a738d2d10cce (diff) | |
parent | 36dfc43ce9435faf61adae8dc955b8b3b411abdb (diff) |
Merge remote-tracking branch 'reynwar/next_minorbugs' into next
Diffstat (limited to 'docs/doxygen')
-rw-r--r-- | docs/doxygen/swig_doc.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/doxygen/swig_doc.py b/docs/doxygen/swig_doc.py index f24608b3ee..da104a2e00 100644 --- a/docs/doxygen/swig_doc.py +++ b/docs/doxygen/swig_doc.py @@ -218,14 +218,16 @@ def make_block2_entry(di, block): descriptions = [] # For new style blocks all the relevant documentation should be # associated with the 'make' method. + class_description = combine_descriptions(block) make_func = block.get_member('make', DoxyFunction) - description = combine_descriptions(make_func) + make_description = combine_descriptions(make_func) + description = class_description + "\n\nConstructor Specific Documentation:\n\n" + make_description # Associate the combined description with the class and # the make function. output = [] - #output.append(make_class_entry( - # block, description=description, - # ignored_methods=['make'], params=make_func.params)) + output.append(make_class_entry( + block, description=description, + ignored_methods=['make'], params=make_func.params)) makename = block.name() + '::make' output.append(make_func_entry( make_func, name=makename, description=description, |