From 78b63e56ea174456667204d4fc3eab6b7a6267ce Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 13 Jun 2012 23:22:11 +0000
Subject: [PATCH] Fixes for better integration with the existing
 wxScrolledWindow and wxScrolledCanvas docs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 etg/scrolwin.py              | 14 +++++---------
 etgtools/sphinx_generator.py |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/etg/scrolwin.py b/etg/scrolwin.py
index 61c34883..46ca8e9d 100644
--- a/etg/scrolwin.py
+++ b/etg/scrolwin.py
@@ -86,20 +86,16 @@ def run():
         assert isinstance(item, etgtools.TypedefDef)
         item.docAsClass = True
         item.bases = ['wxPanel', 'wxScrolled']
-        item.briefDoc = docBase.format(name='ScrolledWindow', base='Panel')
-        item.briefDoc += """
-        Since this class derives from :ref:`Panel` it shares its behavior
-        with regard to TAB traversal and focus handling. If you do not want
-        this then use :ref:`ScrolledCanvas` instead."""
+        item.briefDoc = docBase.format(name='ScrolledWindow', base='Panel')        
         
         item = module.find('wxScrolledCanvas')
         item.docAsClass = True
         item.bases = ['wxWindow', 'wxScrolled']
         item.briefDoc = docBase.format(name='ScrolledCanvas', base='Window')
-        item.briefDoc += """
-        This scrolled window is not intended to have children so it doesn't
-        have special handling for TAB traversal or focus management."""            
-
+        item.detailedDoc[0] = "This scrolled window is not intended to have children "\
+                              "so it doesn't have special handling for TAB traversal "\
+                              "or focus management."
+        
         
     else:
         # NOTE: We do a tricky tweak here because wxScrolled requires using
diff --git a/etgtools/sphinx_generator.py b/etgtools/sphinx_generator.py
index 44515393..92cb2ee7 100644
--- a/etgtools/sphinx_generator.py
+++ b/etgtools/sphinx_generator.py
@@ -3226,7 +3226,6 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         typedef.subClasses = []
         typedef.method_list = typedef.property_list = []
         typedef.pyDocstring = typedef.briefDoc
-        typedef.detailedDoc = ''
 
         self.current_class = typedef