- Use vertical layout for Graphviz-generated class inheritance diagrams (to get the old behaviour back, change the rankdir arguments from "TB" to "LR" in the inheritance.py script;

- Do not generate module-level inheritance diagrams anymore;
- Correct a few ReST typos in `newevent.py`, `expando.py` and `buttons`;
- Include a toctree ReST reference to `classic_vs_phoenix.txt` in the `MigrationGuide.txt` document, to stop Sphinx complaining about it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/MigrationGuide.txt

@@ -381,3 +381,11 @@ your popup window for the wx.ComboCtrl.  This can not currently be
 done with Phoenix in the same way, but you can also use a widget class
 with a wx.ComboPopup in a has-a relationship rather than an is-a
 relationship.  See samples/combo/combo1.py for an example.
+
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   classic_vs_phoenix
+

sphinxtools/inheritance.py

@@ -106,7 +106,7 @@ class InheritanceDiagram(object):
 
     # These are the default attrs for graphviz
     default_graph_attrs = {
-        'rankdir': 'LR',
+        'rankdir': 'TB',
         'size': '"8.0, 12.0"',
     }
     default_node_attrs = {
@@ -138,7 +138,7 @@ class InheritanceDiagram(object):
         key/value pairs to pass on as graphviz properties.
         """
 
-        inheritance_graph_attrs = dict(fontsize=9, ratio='auto', size='""', rankdir="LR")
+        inheritance_graph_attrs = dict(fontsize=9, ratio='auto', size='""', rankdir="TB")
         inheritance_node_attrs = {"align": "center", 'shape': 'box',
                                   'fontsize': 10, 'height': 0.3,
                                   'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, '

sphinxtools/librarydescription.py

@@ -590,6 +590,11 @@ class Module(ParentBase):
         stream.write(newtext + '\n\n')
 
         spacer = '   '*self.name.count('.')
+
+        # IMPORTANT!!
+        # Remove this line to get back the inheritance diagram for a module
+        #
+        self.inheritance_diagram = None
         
         if self.kind != object_types.PACKAGE:
             print(('%s - %s (module)'%(spacer, self.name)))

wx/lib/buttons.py

@@ -785,7 +785,7 @@ class GenBitmapButton(GenButton):
         Set the bitmap to display normally.
         This is the only one that is required.
 
-        If `createOthers` is ``True`, then the other bitmaps will be generated
+        If `createOthers` is ``True``, then the other bitmaps will be generated
         on the fly.  Currently, only the disabled bitmap is generated.
 
         :param Bitmap `bitmap`: the bitmap for the normal button appearance.

wx/lib/expando.py

@@ -92,12 +92,12 @@ Sample usage::
 
             
         def OnWriteText(self, evt):
-            self.eom.WriteText("\nThis is a test...  Only a test.  If this had "
+            self.eom.WriteText("This is a test...  Only a test.  If this had "
                                "been a real emergency you would have seen the "
-                               "quick brown fox jump over the lazy dog.\n")
+                               "quick brown fox jump over the lazy dog.")
         
         def OnAppendText(self, evt):
-            self.eom.AppendText("\nAppended text.")
+            self.eom.AppendText("Appended text.")
 
     app = wx.App(0)
     frame = MyFrame()

wx/lib/newevent.py

@@ -112,7 +112,9 @@ import wx
 
 def NewEvent():
     """
-    Generates a new `(event, binder)` tuple::
+    Generates a new `(event, binder)` tuple.
+
+    ::
     
         MooEvent, EVT_MOO = NewEvent()
         
@@ -131,7 +133,9 @@ def NewEvent():
 
 def NewCommandEvent():
     """
-    Generates a new `(command_event, binder)` tuple::
+    Generates a new `(command_event, binder)` tuple.
+
+    ::
     
         MooCmdEvent, EVT_MOO = NewCommandEvent()