diff --git a/TODO.rst b/TODO.rst
index 577c6bdd..ae196ad8 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -82,25 +82,33 @@ check if the the feature is available in wxWidgets or if the stubs should be
 compiled.)
 
 
-Reorganize Sphinx output
-------------------------
+Sphinx tweaks
+-------------
 
-To make it easier for 3rd party tools to find the docs for specific
-classes and methods it would be good to change how the file names for
-the class pages are generated.  Currently it looks like just the
-leading "wx." is missing from the file names.  So that means that
-classes in "core" do not have any package prefix in the filename at
-all.  For example, .../html/Bitmap.html instead of
-.../html/wx.Bitmap.html.  The same holds true for classes in the other
-extension modules in wx, and also wx.lib.
+The big changes are done, but here are some dangling strings that still need
+to be untangled:
 
-    .../html/adv.AnimationCtrl.html
-    .../html/lib.buttons.GenButton.html	
-    etc.
+  * The `chopDescription()` function is not very smart. See if it can be made a
+    little smarter and pull out the first sentence from the docstring instead
+    of ust the first line.
 
-The intra-document anchor links should also have the leading "wx."
-added to them for consistency.
+  * Convert the main.html page to a ReST file? It would probably make it a
+    little easier to maintain.
 
+  * Turn off full justification of text?
+
+  * Set max width of body sections?  I think it looks a little nicer that way,
+    but we'll need to fix the floating and alignment of the sidebar to do
+    it...
+
+  * Change the column widths of the ReST simple tables, to be about 30/70 instead
+    of 50/50.  This can be done by changing how many '=' are generated for the top
+    and bottom lines of the tables.
+
+  * Move the building of the docs to the Windows build slave so the Windows
+    specific modules will be present for the wxlib build command, so those
+    modules can be documented.
+    
 
 
 Other Dev Stuff
@@ -174,10 +182,10 @@ Other Dev Stuff
     bytes objects, they should probably be string objects. Or not, sip's
     default might be best... See ModuleDef.addGlobalStr if I change my mind.
 
-  * If a function or method has overloads but all but one all ignored then the doc
-    generator should not use the "*args, **kw" form of output and just use the
-    args string of the remaining function or method definition like for those
-    that do not have overloads.  For example, see Window.GetClientSize
+  * If a function or method has overloads but all but one all ignored then the
+    doc generator should not use the "\*args, \*\*kw" form of output and just use
+    the args string of the remaining function or method definition like for
+    those that do not have overloads.  For example, see Window.GetClientSize
 
   * Check gui_scripts entry points.
 
diff --git a/b b/b
index d7ef1fc7..fc10d4e4 100755
--- a/b
+++ b/b
@@ -5,11 +5,11 @@
 if [ "$OSTYPE" = "cygwin" ]; then
     PYTHON=`which python.exe`
     echo $PYTHON
-    $PYTHON -u build.py "$@"
+    $PYTHON -u build.py --dev "$@"
 else
     PYTHON=`which python`
     echo $PYTHON
-    $PYTHON -u build.py "$@"
+    $PYTHON -u build.py --dev "$@"
 fi
 
 exit $?
diff --git a/bin/build-sip-posix b/bin/build-sip-posix
index c2a3c028..f859eddf 100755
--- a/bin/build-sip-posix
+++ b/bin/build-sip-posix
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -o errexit
-#set -o xtrace 
+#set -o xtrace
 
 PYVER=2.7
 PYTHON=`which python$PYVER`
@@ -13,29 +13,34 @@ fi
 
 MYBINDIR=$(dirname $(readlink -f $0))
 
-cd $PROJECTS/sip/sip
-SIPVER=`$PYTHON configure.py --version | grep -v "This is SIP"`
 PLATFORM=`$PYTHON -c "import buildtools.config as bc; print(bc.getToolsPlatformName(True))"`
 echo $PLATFORM
+cd $PROJECTS/sip/sip
+SIPVER=`$PYTHON configure.py --version | grep -v "This is SIP"`
 
 if [ "$PLATFORM" = "darwin" ]; then
-    # try to ensure compatiblity back to 10.5 if we can
+    # try to ensure compatibility back to 10.6 if we can
     xcode=$(xcode-select -print-path)
-    if [ -d $xcode/SDKs/MacOSX10.5.sdk ]; then
-        SDK=$xcode/SDKs/MacOSX10.5.sdk
-    elif [ -d $xcode/SDKs/MacOSX10.6.sdk ]; then
-        SDK=$xcode/SDKs/MacOSX10.6.sdk
-    elif [ -d $xcode/SDKs/MacOSX10.7.sdk ]; then
-        SDK=$xcode/SDKs/MacOSX10.7.sdk
-    fi
+    for v in 6 7 8 9 10 11 12; do
+        if [ -d $xcode/SDKs/MacOSX10.$v.sdk ]; then
+            SDK=$xcode/SDKs/MacOSX10.$v.sdk
+            break
+        elif [ -d $xcode/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.$v.sdk ]; then
+            SDK=$xcode/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.$v.sdk
+            break
+        fi
+    done
+
     $PYTHON configure.py \
-	--deployment-target=10.5 \
+	--deployment-target=10.6 \
 	--sdk=$SDK \
 	--arch=i386 \
+	--universal \
 	--sip-module wx.siplib \
 	$*
 
     make -C sipgen clean all
+
 else
     $PYTHON configure.py \
 	--sip-module wx.siplib \
diff --git a/bin/make-new-etg-file.py b/bin/make-new-etg-file.py
index b6df7f32..5809fa6f 100755
--- a/bin/make-new-etg-file.py
+++ b/bin/make-new-etg-file.py
@@ -56,7 +56,9 @@ def run():
     #-----------------------------------------------------------------
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
-    
+
+    #module.addHeaderCode('#include <wx/some_header_file.h>')
+
     #c = module.find('')
     #assert isinstance(c, etgtools.ClassDef)
     
diff --git a/build.py b/build.py
index b6bf6222..df4278d6 100755
--- a/build.py
+++ b/build.py
@@ -72,12 +72,12 @@ wxICON = 'docs/sphinx/_static/images/sphinxdocs/mondrian.png'
 
 # Some tools will be downloaded for the builds. These are the versions and
 # MD5s of the tool binaries currently in use.
-sipCurrentVersion = '4.16.7'
+sipCurrentVersion = '4.18.1.dev1606100655'
 sipMD5 = {
-    'darwin'   : '29874bb82327e556554e3ca8ddf8fa16',
-    'win32'    : 'd19030b397034742694a6d229f056ad0', 
-    'linux32'  : '6f70956abd8f837b1d55dc5cfa9f6201', 
-    'linux64'  : '6ac7653c331462516abbc38c5b93e0ac', 
+    'darwin'   : '48f7370706c63036fac66da6439559e8',
+    'win32'    : '138b2daa19a357ac9d92edd9a8e149b9',
+    'linux32'  : '23f00942b1eb5d69a7bdac517c4e2995',
+    'linux64'  : 'fce6937c3e67c2d099a8610890d81f87',
 }
 
 wafCurrentVersion = '1.7.15-p1'
@@ -863,7 +863,7 @@ def cmd_etg(options, args):
 
     
 def cmd_sphinx(options, args):
-    from sphinxtools.postprocess import SphinxIndexes, MakeHeadings, PostProcess, GenGallery
+    from sphinxtools.postprocess import genIndexes, makeHeadings, postProcess, genGallery
 
     cmdTimer = CommandTimer('sphinx')
     pwd = pushDir(phoenixDir())
@@ -885,8 +885,8 @@ def cmd_sphinx(options, args):
         txt = os.path.join(sphinxDir, os.path.splitext(rstName)[0] + '.txt')
         copyIfNewer(rst, txt)
 
-    SphinxIndexes(sphinxDir)
-    GenGallery()
+    genIndexes(sphinxDir)
+    genGallery()
 
     # Copy the hand-edited top level doc files too
     rstFiles = [os.path.join(phoenixDir(), 'TODO.rst')] + \
@@ -895,7 +895,7 @@ def cmd_sphinx(options, args):
         txt = os.path.join(sphinxDir, os.path.splitext(os.path.basename(rst))[0] + '.txt')
         copyIfNewer(rst, txt)
     
-    MakeHeadings()
+    makeHeadings()
 
     pwd2 = pushDir(sphinxDir)
     buildDir = os.path.join(sphinxDir, 'build')
@@ -904,7 +904,7 @@ def cmd_sphinx(options, args):
     del pwd2
     
     msg('Postprocessing sphinx output...')
-    PostProcess(htmlDir)
+    postProcess(htmlDir)
 
 
 def cmd_wxlib(options, args):
@@ -913,52 +913,25 @@ def cmd_wxlib(options, args):
     cmdTimer = CommandTimer('wx.lib')
     pwd = pushDir(phoenixDir())
 
-    libDir = os.path.join(phoenixDir(), 'wx', 'lib')
+    for wx_pkg in ['lib', 'py', 'tools']:
+        libDir = os.path.join(phoenixDir(), 'wx', wx_pkg)
 
-    if not os.path.isdir(libDir):
-        raise Exception('Missing wx.lib folder in the distribution')
+        if not os.path.isdir(libDir):
+            raise Exception('Missing wx.{} folder in the distribution'.format(wx_pkg))
+
+        init_name = os.path.join(libDir, '__init__.py')
+        import_name = 'wx.{}'.format(wx_pkg)
+
+        ModuleHunter(init_name, import_name, version3)
 
-    init_name = os.path.join(libDir, '__init__.py')
-    import_name = 'lib'
-    version = version3
 
-    ModuleHunter(init_name, import_name, version)
-    
 
 def cmd_wxpy(options, args):
-    from sphinxtools.modulehunter import ModuleHunter
-
-    cmdTimer = CommandTimer('wx.py')
-    pwd = pushDir(phoenixDir())
-
-    libDir = os.path.join(phoenixDir(), 'wx', 'py')
-
-    if not os.path.isdir(libDir):
-        raise Exception('Missing wx.py folder in the distribution')
-
-    init_name = os.path.join(libDir, '__init__.py')
-    import_name = 'py'
-    version = version3
-
-    ModuleHunter(init_name, import_name, version)
+    msg('Command wxpy has been folded into command wxlib.')
 
 
 def cmd_wxtools(options, args):
-    from sphinxtools.modulehunter import ModuleHunter
-
-    cmdTimer = CommandTimer('wx.tools')
-    pwd = pushDir(phoenixDir())
-
-    libDir = os.path.join(phoenixDir(), 'wx', 'tools')
-
-    if not os.path.isdir(libDir):
-        raise Exception('Missing wx.tools folder in the distribution')
-
-    init_name = os.path.join(libDir, '__init__.py')
-    import_name = 'tools'
-    version = version3
-
-    ModuleHunter(init_name, import_name, version)
+    msg('Command wxtools has been folded into command wxlib.')
 
 
 def cmd_docs_bdist(options, args):
@@ -1484,7 +1457,7 @@ def cmd_clean_py(options, args):
     cfg = Config()
     deleteIfExists(getWafBuildBase())
     files = list()
-    for wc in ['*.py', '*.pyc', '*.so', '*.dylib', '*.pyd', '*.pdb', '*.pi']:
+    for wc in ['*.py', '*.pyc', '*.so', '*.dylib', '*.pyd', '*.pdb', '*.pi', '*.pyi']:
         files += glob.glob(opj(cfg.PKGDIR, wc))
     if isWindows:
         msw = getMSWSettings(options)
@@ -1499,7 +1472,6 @@ def cmd_clean_py(options, args):
         cmd_clean_py(options, args)
         options.both = True
 
-
     
 def cmd_clean_sphinx(options, args):
     cmdTimer = CommandTimer('clean_sphinx')
@@ -1508,6 +1480,7 @@ def cmd_clean_sphinx(options, args):
     sphinxDir = opj(phoenixDir(), 'docs', 'sphinx')
          
     globs = [ opj(sphinxDir, '*.txt'),
+              opj(sphinxDir, '*.rst'),
               opj(sphinxDir, '*.inc'),
               opj(sphinxDir, '*.pkl'),
               opj(sphinxDir, '*.lst'),
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 6ea0a313..c6bc8ce1 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -222,7 +222,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
                         mode=mode, method=method))
 
     if buildType == 'docs':
-        cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib wxtools wxpy ' \
+        cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib ' \
               'sphinx docs_bdist sdist --upload' % pyVer
     else:
         cmd = 'python -u build.py %s %s setrev dox touch etg --nodoc sip build' % (pyVer, clean)
diff --git a/buildtools/build_wxwidgets.py b/buildtools/build_wxwidgets.py
index 19d695fe..31af3e54 100644
--- a/buildtools/build_wxwidgets.py
+++ b/buildtools/build_wxwidgets.py
@@ -285,7 +285,8 @@ def main(wxDir, args):
                             ]
 
         if sys.platform.startswith("darwin"):
-            wxpy_configure_opts.append("--enable-monolithic")
+            #wxpy_configure_opts.append("--enable-monolithic")
+            pass
         else:
             wxpy_configure_opts.append("--with-sdl")
 
diff --git a/demo/ColourDB.py b/demo/ColourDB.py
index 15ff1875..14331bf2 100644
--- a/demo/ColourDB.py
+++ b/demo/ColourDB.py
@@ -110,12 +110,12 @@ class TestWindow(wx.ScrolledWindow):
             rect = rgn.GetBox()
             pixStart = vs[1]*self.lineHeight + rect.y
             pixStop  = pixStart + rect.height
-            start = pixStart / self.lineHeight - 1
-            stop = pixStop / self.lineHeight
+            start = pixStart // self.lineHeight - 1
+            stop = pixStop // self.lineHeight
         else:
             start = 0
             stop = numColours
-
+            
         for line in range(max(0,start), min(stop,numColours)):
             clr = colours[line][0]
             y = (line+1) * self.lineHeight + 2
diff --git a/demo/DrawXXXList.py b/demo/DrawXXXList.py
index ad5391ed..408f3b4d 100644
--- a/demo/DrawXXXList.py
+++ b/demo/DrawXXXList.py
@@ -106,7 +106,7 @@ def makeRandomPens(num, cache):
         c = random.choice(colours)
         t = random.randint(1, 4)
 
-        if not cache.has_key( (c, t) ):
+        if not (c, t) in cache.keys():
             cache[(c, t)] = wx.Pen(c, t)
 
         pens.append( cache[(c, t)] )
@@ -120,7 +120,7 @@ def makeRandomBrushes(num, cache):
     for i in range(num):
         c = random.choice(colours)
 
-        if not cache.has_key(c):
+        if not c in cache.keys():
             cache[c] = wx.Brush(c)
 
         brushes.append( cache[c] )
diff --git a/demo/GridBagSizer.py b/demo/GridBagSizer.py
index 73b22a29..dbfde8b6 100644
--- a/demo/GridBagSizer.py
+++ b/demo/GridBagSizer.py
@@ -95,18 +95,19 @@ class TestFrame(wx.Frame):
             self.gbs.SetItemPosition(btn, self.lastPos)
             btn.SetLabel("Move this to (3,6)")
         else:
-            if self.gbs.CheckForIntersectionPos( (3,6), (1,1) ):
+            if self.gbs.CheckForIntersection( (3,6), (1,1) ):
                 wx.MessageBox("""\
-wx.GridBagSizer will not allow items to be in the same cell as
-another item, so this operation will fail.  You will also get an
-assert when compiled in debug mode.""",
+wx.GridBagSizer will not allow items to be in the
+same cell as another item, so this operation will
+fail.  You will also get an assert when compiled
+in debug mode.""",
                               "Warning", wx.OK | wx.ICON_INFORMATION)
 
             try:
                 if self.gbs.SetItemPosition(btn, (3,6)):
                     self.lastPos = curPos
                     btn.SetLabel("Move it back")
-            except wx.PyAssertionError:
+            except wx.wxAssertionError:
                 pass
 
         self.gbs.Layout()
@@ -116,9 +117,9 @@ assert when compiled in debug mode.""",
         pt = evt.GetPosition()
         item = self.gbs.FindItemAtPoint(pt)
         if item is None:
-            print("no item at", `pt`)
+            print("no item at", repr(pt))
         else:
-            print("item found: ", `item.GetPos()`, "--", `item.GetSpan()`)
+            print("item found: ", repr(item.GetPos()), "--", repr(item.GetSpan()))
 
 
 #---------------------------------------------------------------------------
diff --git a/demo/MediaCtrl.py b/demo/MediaCtrl.py
index 48f37270..d481571b 100644
--- a/demo/MediaCtrl.py
+++ b/demo/MediaCtrl.py
@@ -26,13 +26,9 @@ class TestPanel(wx.Panel):
 
         # Create some controls
         try:
-            backend = ""
-            if 'wxMSW' in wx.PlatformInfo:
-                # the default backend doesn't always send the EVT_MEDIA_LOADED
-                # event which we depend upon, so use a different backend by
-                # default for this demo.
-                backend = wx.media.MEDIABACKEND_QUICKTIME
-                
+            backend = "" # let MediaCtrl choose default backend
+            #backend=wx.media.MEDIABACKEND_DIRECTSHOW
+            #backend=wx.media.MEDIABACKEND_WMP10
             self.mc = wx.media.MediaCtrl()
             ok = self.mc.Create(self, style=wx.SIMPLE_BORDER,
                                 szBackend=backend)
@@ -42,6 +38,9 @@ class TestPanel(wx.Panel):
             self.Destroy()
             raise
 
+        # the following event is not sent with the Windows default backend
+        # MEDIABACKEND_DIRECTSHOW
+        # choose above e.g. MEDIABACKEND_WMP10 if this is a problem for you
         self.Bind(wx.media.EVT_MEDIA_LOADED, self.OnMediaLoaded)
 
         btn1 = wx.Button(self, -1, "Load File")
@@ -100,15 +99,17 @@ class TestPanel(wx.Panel):
 
 
     def DoLoadFile(self, path):
-        self.playBtn.Disable()
+        
         if not self.mc.Load(path):
             wx.MessageBox("Unable to load %s: Unsupported format?" % path,
                           "ERROR",
                           wx.ICON_ERROR | wx.OK)
+            self.playBtn.Disable()
         else:
             self.mc.SetInitialSize()
             self.GetSizer().Layout()
             self.slider.SetRange(0, self.mc.Length())
+            self.playBtn.Enable()
 
     def OnMediaLoaded(self, evt):
         self.playBtn.Enable()
diff --git a/docs/sphinx/_static/css/basic.css b/docs/sphinx/_static/css/basic.css
index 842f8243..e435c178 100644
--- a/docs/sphinx/_static/css/basic.css
+++ b/docs/sphinx/_static/css/basic.css
@@ -123,7 +123,7 @@ table.contentstable p.biglink {
 }
 
 a.biglink {
-    font-size: 1.3em;
+    font-size: 1.2em;
 }
 
 span.linkdescr {
diff --git a/docs/sphinx/_static/css/phoenix.css b/docs/sphinx/_static/css/phoenix.css
index 1005a046..1ef60088 100644
--- a/docs/sphinx/_static/css/phoenix.css
+++ b/docs/sphinx/_static/css/phoenix.css
@@ -88,7 +88,8 @@ div.body h4 {
  */
 
 body { 
-  background-color: rgb(230,230,230);
+    background-color: rgb(230,230,230);
+    font-size: 0.95em;
 }
 
 div.headerimage {
@@ -104,7 +105,7 @@ div.document {
   position: relative;
   margin-left: 240px;
   z-index: 0;
-  top: 50px;
+  top: 30px;
 }
 
 div.sphinxsidebar {
@@ -118,15 +119,26 @@ div.sphinxsidebar {
     height: auto;
     z-index: 1;
     left: 0;
-    top: 50px;
-    bottom: 0;  
+    top: 30px;
+    bottom: 0;    
+}
+
+div#searchbox {
+    margin-top: 30px;
+}
+
+div#sourcelink {
+    position: absolute; 
+    bottom: 0;
+    font-style: italic;
+    font-size: small;
 }
 
 div.related {
     background-image: url('../images/sphinxdocs/navigation.png');
     border-top: 1px solid #ddd;
     border-bottom: 1px solid #ddd;
-    font-size: 1em;
+    font-size: 90%;
     position: fixed;
     line-height: normal;
     position: fixed;
@@ -160,19 +172,21 @@ div.related ul li.right {
     font-size: small;
     float: right;
     margin-right: 5px;
-    margin-top: 0;
 }
 
 div.related ul li#searchbox.right {
     float: right;
     margin-right: 5px;
     margin-top:  7px;
+    font-size: 90%;
 }
+
 div.related ul li a {
     margin: 0;
     padding: 0 5px 0 5px;
     line-height: normal;
     color: #EE9816;
+    font-size: 90%;
 }
 
 div.related ul li.reltitle {
@@ -203,6 +217,18 @@ div.sphinxsidebar a {
   color: #355f7c;
 }
 
+div.section a {
+    color:  #ca7900;
+    font-weight: bold;
+    font-style: normal;
+    font-size: 0.95em;
+    letter-spacing: 0.01em;
+}
+
+div.section a:hover {
+    color: #2491cf;
+}
+
 div.sphinxsidebar ul.want-points {
   list-style: disc;
 }
diff --git a/docs/sphinx/_static/images/sphinxdocs/phoenix_main.png b/docs/sphinx/_static/images/sphinxdocs/phoenix_main.png
index a16468ba..4cf96bb2 100644
Binary files a/docs/sphinx/_static/images/sphinxdocs/phoenix_main.png and b/docs/sphinx/_static/images/sphinxdocs/phoenix_main.png differ
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.animationctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.animationctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.animationctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.animationctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.bitmapcombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.bitmapcombobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.bitmapcombobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.bitmapcombobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.calendarctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.calendarctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.calendarctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.calendarctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.commandlinkbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.commandlinkbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.commandlinkbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.commandlinkbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.datepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.datepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.datepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.datepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.hyperlinkctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.hyperlinkctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.hyperlinkctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.hyperlinkctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.ownerdrawncombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.ownerdrawncombobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.ownerdrawncombobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.ownerdrawncombobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.richtooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.richtooltip.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.richtooltip.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.richtooltip.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.timepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.timepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.timepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.adv.timepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/bitmapbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.bitmapbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/bitmapbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.bitmapbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/button.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.button.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/button.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.button.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/checkbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.checkbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/checkbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.checkbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/checklistbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.checklistbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/checklistbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.checklistbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/choice.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.choice.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/choice.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.choice.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/choicebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.choicebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/choicebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.choicebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/collapsiblepane.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.collapsiblepane.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/collapsiblepane.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.collapsiblepane.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/colourpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.colourpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/colourpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.colourpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/combobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.combobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/combobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.combobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/comboctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.comboctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/comboctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.comboctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/dataview.dataviewctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.dataview.dataviewctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/dataview.dataviewctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.dataview.dataviewctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/dataview.dataviewtreectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.dataview.dataviewtreectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/dataview.dataviewtreectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.dataview.dataviewtreectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/dirpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.dirpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/dirpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.dirpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/filectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.filectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/filectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.filectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/filepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.filepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/filepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.filepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/fontpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.fontpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/fontpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.fontpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/gauge.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.gauge.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/gauge.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.gauge.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/genericdirctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.genericdirctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/genericdirctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.genericdirctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/listbook.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listbook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/listbook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listbook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/listbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/listbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/listctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/listctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/listview.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listview.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/listview.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.listview.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/notebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.notebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/notebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.notebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/radiobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.radiobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/radiobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.radiobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/radiobutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.radiobutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/radiobutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.radiobutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/scrollbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.scrollbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/scrollbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.scrollbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/searchctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.searchctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/searchctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.searchctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/slider.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.slider.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/slider.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.slider.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/spinbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.spinbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/spinbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.spinbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/spinctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.spinctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/spinctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.spinctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/spinctrldouble.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.spinctrldouble.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/spinctrldouble.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.spinctrldouble.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/staticbitmap.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.staticbitmap.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/staticbitmap.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.staticbitmap.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/staticbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.staticbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/staticbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.staticbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/statictext.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.statictext.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/statictext.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.statictext.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/textctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.textctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/textctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.textctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/togglebutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.togglebutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/togglebutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.togglebutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/treectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.treectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxgtk/treectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxgtk/wx.treectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.animationctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.animationctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.animationctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.animationctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.bitmapcombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.bitmapcombobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.bitmapcombobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.bitmapcombobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.calendarctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.calendarctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.calendarctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.calendarctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.datepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.datepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.datepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.datepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.hyperlinkctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.hyperlinkctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.hyperlinkctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.hyperlinkctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.ownerdrawncombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.ownerdrawncombobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.ownerdrawncombobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.ownerdrawncombobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.richtooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.richtooltip.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.richtooltip.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.richtooltip.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.timepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.timepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.timepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.adv.timepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/bitmapbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.bitmapbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/bitmapbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.bitmapbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/button.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.button.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/button.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.button.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/checkbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.checkbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/checkbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.checkbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/checklistbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.checklistbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/checklistbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.checklistbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/choice.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.choice.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/choice.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.choice.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/choicebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.choicebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/choicebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.choicebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/collapsiblepane.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.collapsiblepane.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/collapsiblepane.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.collapsiblepane.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/colourpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.colourpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/colourpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.colourpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/combobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.combobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/combobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.combobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/comboctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.comboctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/comboctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.comboctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/dataview.dataviewctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.dataview.dataviewctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/dataview.dataviewctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.dataview.dataviewctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/dataview.dataviewtreectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.dataview.dataviewtreectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/dataview.dataviewtreectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.dataview.dataviewtreectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/dirpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.dirpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/dirpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.dirpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/filepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.filepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/filepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.filepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/fontpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.fontpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/fontpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.fontpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/gauge.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.gauge.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/gauge.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.gauge.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/genericdirctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.genericdirctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/genericdirctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.genericdirctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/listbook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.listbook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/listbook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.listbook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/listbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.listbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/listbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.listbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/listctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.listctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/listctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.listctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/notebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.notebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/notebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.notebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/radiobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.radiobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/radiobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.radiobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/radiobutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.radiobutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/radiobutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.radiobutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/scrollbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.scrollbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/scrollbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.scrollbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/searchctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.searchctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/searchctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.searchctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/slider.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.slider.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/slider.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.slider.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/spinbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.spinbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/spinbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.spinbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/spinctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.spinctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/spinctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.spinctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/spinctrldouble.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.spinctrldouble.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/spinctrldouble.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.spinctrldouble.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/staticbitmap.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.staticbitmap.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/staticbitmap.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.staticbitmap.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/staticbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.staticbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/staticbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.staticbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/statictext.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.statictext.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/statictext.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.statictext.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/textctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.textctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/textctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.textctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/togglebutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.togglebutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/togglebutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.togglebutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/treectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.treectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmac/treectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmac/wx.treectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.animationctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.animationctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.animationctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.animationctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.bitmapcombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.bitmapcombobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.bitmapcombobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.bitmapcombobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.calendarctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.calendarctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.calendarctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.calendarctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.commandlinkbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.commandlinkbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.commandlinkbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.commandlinkbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.datepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.datepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.datepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.datepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.hyperlinkctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.hyperlinkctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.hyperlinkctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.hyperlinkctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.ownerdrawncombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.ownerdrawncombobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.ownerdrawncombobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.ownerdrawncombobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.richtooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.richtooltip.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.richtooltip.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.richtooltip.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.timepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.timepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.timepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.adv.timepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/aui.auimdiparentframe.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.aui.auimdiparentframe.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/aui.auimdiparentframe.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.aui.auimdiparentframe.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/aui.framemanager.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.aui.framemanager.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/aui.framemanager.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.aui.framemanager.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/bitmapbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.bitmapbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/bitmapbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.bitmapbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/button.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.button.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/button.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.button.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/checkbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.checkbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/checkbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.checkbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/checklistbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.checklistbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/checklistbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.checklistbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/choice.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.choice.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/choice.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.choice.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/choicebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.choicebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/choicebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.choicebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/collapsiblepane.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.collapsiblepane.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/collapsiblepane.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.collapsiblepane.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/colourpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.colourpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/colourpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.colourpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/combobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.combobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/combobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.combobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/comboctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.comboctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/comboctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.comboctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/dataview.dataviewctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dataview.dataviewctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/dataview.dataviewctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dataview.dataviewctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/dataview.dataviewtreectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dataview.dataviewtreectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/dataview.dataviewtreectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dataview.dataviewtreectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/dialog.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dialog.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/dialog.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dialog.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/dirpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dirpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/dirpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.dirpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/filepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.filepickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/filepickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.filepickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/fontpickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.fontpickerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/fontpickerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.fontpickerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/frame.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.frame.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/frame.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.frame.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/gauge.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.gauge.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/gauge.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.gauge.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/genericdirctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.genericdirctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/genericdirctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.genericdirctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.advancedsplash.advancedsplash.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.advancedsplash.advancedsplash.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.advancedsplash.advancedsplash.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.advancedsplash.advancedsplash.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aquabutton.aquabutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aquabutton.aquabutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aquabutton.aquabutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aquabutton.aquabutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aui.auibar.auitoolbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aui.auibar.auitoolbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aui.auibar.auitoolbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aui.auibar.auitoolbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aui.auibook.auinotebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aui.auibook.auinotebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aui.auibook.auinotebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aui.auibook.auinotebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aui.framemanager.auimanager.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aui.framemanager.auimanager.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.aui.framemanager.auimanager.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.aui.framemanager.auimanager.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.balloontip.balloontip.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.balloontip.balloontip.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.balloontip.balloontip.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.balloontip.balloontip.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.buttonpanel.buttonpanel.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.buttonpanel.buttonpanel.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.buttonpanel.buttonpanel.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.buttonpanel.buttonpanel.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.cubecolourdialog.cubecolourdialog.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.cubecolourdialog.cubecolourdialog.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.cubecolourdialog.cubecolourdialog.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.cubecolourdialog.cubecolourdialog.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.customtreectrl.customtreectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.customtreectrl.customtreectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.customtreectrl.customtreectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.customtreectrl.customtreectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.flatmenu.flatmenubar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.flatmenu.flatmenubar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.flatmenu.flatmenubar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.flatmenu.flatmenubar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.flatnotebook.flatnotebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.flatnotebook.flatnotebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.flatnotebook.flatnotebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.flatnotebook.flatnotebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.floatspin.floatspin.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.floatspin.floatspin.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.floatspin.floatspin.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.floatspin.floatspin.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.fmcustomizedlg.fmcustomizedlg.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.fmcustomizedlg.fmcustomizedlg.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.fmcustomizedlg.fmcustomizedlg.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.fmcustomizedlg.fmcustomizedlg.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.foldpanelbar.foldpanelbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.foldpanelbar.foldpanelbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.foldpanelbar.foldpanelbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.foldpanelbar.foldpanelbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.fourwaysplitter.fourwaysplitter.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.fourwaysplitter.fourwaysplitter.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.fourwaysplitter.fourwaysplitter.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.fourwaysplitter.fourwaysplitter.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.genericmessagedialog.genericmessagedialog.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.genericmessagedialog.genericmessagedialog.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.genericmessagedialog.genericmessagedialog.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.genericmessagedialog.genericmessagedialog.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.gradientbutton.gradientbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.gradientbutton.gradientbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.gradientbutton.gradientbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.gradientbutton.gradientbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.hyperlink.hyperlinkctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.hyperlink.hyperlinkctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.hyperlink.hyperlinkctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.hyperlink.hyperlinkctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.hypertreelist.hypertreelist.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.hypertreelist.hypertreelist.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.hypertreelist.hypertreelist.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.hypertreelist.hypertreelist.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.infobar.infobar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.infobar.infobar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.infobar.infobar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.infobar.infobar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.knobctrl.knobctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.knobctrl.knobctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.knobctrl.knobctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.knobctrl.knobctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.labelbook.flatimagebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.labelbook.flatimagebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.labelbook.flatimagebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.labelbook.flatimagebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.labelbook.labelbook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.labelbook.labelbook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.labelbook.labelbook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.labelbook.labelbook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.multidirdialog.multidirdialog.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.multidirdialog.multidirdialog.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.multidirdialog.multidirdialog.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.multidirdialog.multidirdialog.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.peakmeter.peakmeterctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.peakmeter.peakmeterctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.peakmeter.peakmeterctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.peakmeter.peakmeterctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.piectrl.piectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.piectrl.piectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.piectrl.piectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.piectrl.piectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.piectrl.progresspie.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.piectrl.progresspie.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.piectrl.progresspie.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.piectrl.progresspie.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pybusyinfo.pybusyinfo.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pybusyinfo.pybusyinfo.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pybusyinfo.pybusyinfo.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pybusyinfo.pybusyinfo.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pycollapsiblepane.pycollapsiblepane.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pycollapsiblepane.pycollapsiblepane.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pycollapsiblepane.pycollapsiblepane.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pycollapsiblepane.pycollapsiblepane.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pygauge.pygauge.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pygauge.pygauge.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pygauge.pygauge.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pygauge.pygauge.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pyprogress.pyprogress.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pyprogress.pyprogress.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.pyprogress.pyprogress.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.pyprogress.pyprogress.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.bar.ribbonbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.bar.ribbonbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.bar.ribbonbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.bar.ribbonbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.buttonbar.ribbonbuttonbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.buttonbar.ribbonbuttonbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.buttonbar.ribbonbuttonbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.buttonbar.ribbonbuttonbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.gallery.ribbongallery.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.gallery.ribbongallery.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.gallery.ribbongallery.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.gallery.ribbongallery.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.page.ribbonpage.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.page.ribbonpage.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.page.ribbonpage.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.page.ribbonpage.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.panel.ribbonpanel.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.panel.ribbonpanel.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.panel.ribbonpanel.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.panel.ribbonpanel.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.toolbar.ribbontoolbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.toolbar.ribbontoolbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ribbon.toolbar.ribbontoolbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ribbon.toolbar.ribbontoolbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.rulerctrl.rulerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.rulerctrl.rulerctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.rulerctrl.rulerctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.rulerctrl.rulerctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmapbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmapbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmapbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmapbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmaptextbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmaptextbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmaptextbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmaptextbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmaptexttogglebutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmaptexttogglebutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmaptexttogglebutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmaptexttogglebutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmaptogglebutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmaptogglebutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shapedbutton.sbitmaptogglebutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shapedbutton.sbitmaptogglebutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shortcuteditor.shortcuteditor.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shortcuteditor.shortcuteditor.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.shortcuteditor.shortcuteditor.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.shortcuteditor.shortcuteditor.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.speedmeter.speedmeter.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.speedmeter.speedmeter.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.speedmeter.speedmeter.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.speedmeter.speedmeter.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.supertooltip.supertooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.supertooltip.supertooltip.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.supertooltip.supertooltip.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.supertooltip.supertooltip.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.thumbnailctrl.thumbnailctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.thumbnailctrl.thumbnailctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.thumbnailctrl.thumbnailctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.thumbnailctrl.thumbnailctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.toasterbox.toasterbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.toasterbox.toasterbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.toasterbox.toasterbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.toasterbox.toasterbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ultimatelistctrl.ultimatelistctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ultimatelistctrl.ultimatelistctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.ultimatelistctrl.ultimatelistctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.ultimatelistctrl.ultimatelistctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.xlsgrid.xlsgrid.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.xlsgrid.xlsgrid.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.xlsgrid.xlsgrid.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.xlsgrid.xlsgrid.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.zoombar.zoombar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.zoombar.zoombar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/lib.agw.zoombar.zoombar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.lib.agw.zoombar.zoombar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/listbook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.listbook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/listbook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.listbook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/listbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.listbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/listbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.listbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/listctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.listctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/listctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.listctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/miniframe.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.miniframe.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/miniframe.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.miniframe.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/notebook.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.notebook.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/notebook.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.notebook.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/radiobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.radiobox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/radiobox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.radiobox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/radiobutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.radiobutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/radiobutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.radiobutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/scrollbar.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.scrollbar.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/scrollbar.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.scrollbar.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/searchctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.searchctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/searchctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.searchctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/slider.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.slider.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/slider.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.slider.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/spinbutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.spinbutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/spinbutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.spinbutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/spinctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.spinctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/spinctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.spinctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/spinctrldouble.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.spinctrldouble.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/spinctrldouble.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.spinctrldouble.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/staticbitmap.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.staticbitmap.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/staticbitmap.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.staticbitmap.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/staticbox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.staticbox.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/staticbox.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.staticbox.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/statictext.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.statictext.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/statictext.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.statictext.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/textctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.textctrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/textctrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.textctrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/togglebutton.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.togglebutton.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/togglebutton.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.togglebutton.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/treectrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.treectrl.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/treectrl.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.treectrl.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wizard.pywizardpage.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.wizard.pywizardpage.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/wizard.pywizardpage.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.wizard.pywizardpage.png
diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wizard.wizardpagesimple.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.wizard.wizardpagesimple.png
similarity index 100%
rename from docs/sphinx/_static/images/widgets/fullsize/wxmsw/wizard.wizardpagesimple.png
rename to docs/sphinx/_static/images/widgets/fullsize/wxmsw/wx.wizard.wizardpagesimple.png
diff --git a/docs/sphinx/_templates/layout.html b/docs/sphinx/_templates/layout.html
index 99f7aeb8..68f7af14 100644
--- a/docs/sphinx/_templates/layout.html
+++ b/docs/sphinx/_templates/layout.html
@@ -1,4 +1,4 @@
-{% extends "!layout.html" %}
+{% extends "basic/layout.html" %}
 
 {%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool)
     and (sidebars != []) and (pagename != 'index') %}
@@ -32,37 +32,22 @@
         <li><img src="_static/images/sphinxdocs/phoenix_small.png" alt=""/></li>
         <li><a href="index.html" style="color: rgb(238, 152, 22); hover: rgb(53, 95, 124);">Home</a> |&nbsp;</li>
         <li><a href="gallery.html" style="color: rgb(238, 152, 22); hover: rgb(53, 95, 124);;">Gallery</a> |&nbsp;</li>
-        <li><a href="main.html" style="color: rgb(238, 152, 22); hover: rgb(53, 95, 124);">Docs</a> &raquo; </li>
+        <li><a href="main.html" style="color: rgb(238, 152, 22); hover: rgb(53, 95, 124);">API Docs</a> &raquo; </li>
 
         {%- for parent in parents %}
-          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
+          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>
+              {{ parent.title }}</a>{{ reldelim1 }}</li>
         {%- endfor %}
         <li class="reltitle"> {{ title }}</li>
 
-        {%- if pagename != 'search' %}
-        <li id="searchbox" style="display: none;" class="right">
-          <form class="search" action="{{ pathto('search') }}" method="get">
-            <span>{{ _('Search:') }}</span>
-            <input type="text" name="q" size="18" />
-            <input type="submit" value="{{ _('Go') }}" />
-            <input type="hidden" name="check_keywords" value="yes" />
-            <input type="hidden" name="area" value="default" />
-          </form>
-        </li>
-        <script type="text/javascript">$('#searchbox').show(0);</script>
-        {%- endif %}
-
-        </ul>
-        <ul class="row2">
-
         {%- for rellink in rellinks %}
         <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
           <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
              {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
           {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
         {%- endfor %}
-        
-      </ul>
+
+        </ul>
     </div>
 {%- endmacro %}
 
diff --git a/docs/sphinx/_templates/main.html b/docs/sphinx/_templates/main.html
index 5a6bf309..6c6d8842 100644
--- a/docs/sphinx/_templates/main.html
+++ b/docs/sphinx/_templates/main.html
@@ -1,106 +1,77 @@
 {% extends "layout.html" %}
-{% set title = 'Documentation' %}
+{% set title = 'API Documentation' %}
 {% block body %}
-  <h1>wxPython-Phoenix Reference Documentation</h1>
+  <h1>wxPython Phoenix API Documentation</h1>
 
   <p>
-    Welcome! This is the documentation for wxPython {{ release }}, last updated |TODAY| from
-    revision |VCSREV|.
+    Welcome! This is the API documentation for wxPython Phoenix {{ release }},
+    last updated |TODAY| from git revision |VCSREV|.
   </p>
 
-  <p>
-  <b>Phoenix</b> is the code name for the new version of wxPython. <i>Robin Dunn</i> called
-  this <a href="http://wiki.wxpython.org/ProjectPhoenix">Project Phoenix</a> because in the
-  process of doing this project wxPython's implementation will be utterly destroyed and then
-  reborn in a new and marvelous way, much like the mythical Phoenix rising from the ashes
-  of its former self.  For wxPython many things about how the wrapper/bindings code is
-  produced will be changing, and we'll also be eliminating some other crud along the way.
-  </p>
-
-  <p>
-  Some interesting documents about the current status or the Phoenix project and its development:
-  </p>
-  <ul>
-    <li><b>Project Phoenix Wiki:</b> The <a href="http://wiki.wxpython.org/ProjectPhoenix">
-    Project Phoenix</a> section of the wxPython wiki has information about the background
-    of, and reasons for this project, as well as information for developers who want to help out.
-    </li>
-    <li><b>Migration Guide:</b> the <a href="MigrationGuide.html">Migration Guide</a> will give you
-      some hints on how to modify your existing wxPython applications to be compatible with Phoenix,
-      and the <a href="classic_vs_phoenix.html">Classic vs. Phoenix</a> document will give details
-      on the identifier names that have changed and what you should use instead in your applications.
-      These documents are updated as the project progresses, so be sure to check them often.
-    </li>
-  </ul>
-
-<br>
-
 <div class="admonition note">
  <p class="first admonition-title">Note</p>
 
     If you wish to help in the documentation effort, the main docstrings guidelines are outlined in
-    <a href="DocstringsGuidelines.html">this document</a>.
+    the <a href="DocstringsGuidelines.html">Docstring Guidelines</a> document.
 </div>
 
 <br>
 
 
-  <h2>Documentation</h2>
+  <h2>API Modules</h2>
 
   <table class="contentstable" align="center" style="margin-left: 25px">
     <tr>
     <td width="50%" valign="top">
-      <p class="biglink"><a class="biglink" href="{{ pathto("1classindex") }}">Core wx Classes</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.1moduleindex") }}">wx Core</a><br/>
          <span class="linkdescr">The classes which appear in the main wx namespace</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("functions") }}">Core Functions</a><br/>
-         <span class="linkdescr">Standalone functions in the main wx namespace</span></p>
-
-      <p class="biglink"><a class="biglink" href="{{ pathto("adv.1classindex") }}">wx.adv</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.adv.1moduleindex") }}">wx.adv</a><br/>
          <span class="linkdescr">Less commonly used or more advanced classes</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("dataview.1classindex") }}">wx.dataview</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.dataview.1moduleindex") }}">wx.dataview</a><br/>
          <span class="linkdescr">Classes for viewing tabular or hierarchical data</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("stc.1classindex") }}">wx.stc</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.stc.1moduleindex") }}">wx.stc</a><br/>
          <span class="linkdescr">Classes for Styled Text Control, a.k.a Scintilla</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("html.1classindex") }}">wx.html</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.html.1moduleindex") }}">wx.html</a><br/>
          <span class="linkdescr">Widget and supporting classes for a generic html renderer</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("html2.1classindex") }}">wx.html2</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.html2.1moduleindex") }}">wx.html2</a><br/>
          <span class="linkdescr">Widget and supporting classes for a native html renderer, with CSS and javascript support</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("grid.1classindex") }}">wx.grid</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.grid.1moduleindex") }}">wx.grid</a><br/>
          <span class="linkdescr">Widget and supporting classes for displaying and editing tabular data</span></p>
 
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.richtext.1moduleindex") }}">wx.richtext</a><br/>
+         <span class="linkdescr">A generic, ground-up implementation of a text control capable of showing multiple text styles and images.</span></p>
+
+
     </td>
     <td valign="top" width="50%" style="margin-left: 5px">
-      <p class="biglink"><a class="biglink" href="{{ pathto("lib") }}">wx.lib</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.lib") }}">wx.lib</a><br/>
          <span class="linkdescr">Our pure-Python library of widgets</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("glcanvas.1classindex") }}">wx.glcanvas</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.glcanvas.1moduleindex") }}">wx.glcanvas</a><br/>
          <span class="linkdescr">Classes for embedding OpenGL views in a window</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("richtext.1classindex") }}">wx.richtext</a><br/>
-         <span class="linkdescr">A generic, ground-up implementation of a text control capable of showing multiple text styles and images.</span></p>
-
-      <p class="biglink"><a class="biglink" href="{{ pathto("xrc.1classindex") }}">wx.xrc</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.xrc.1moduleindex") }}">wx.xrc</a><br/>
          <span class="linkdescr">Classes for loading widgets and layout from XML</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("media.1classindex") }}">wx.media</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.media.1moduleindex") }}">wx.media</a><br/>
          <span class="linkdescr">MediaCtrl and related classes</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("xml.1classindex") }}">wx.xml</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.xml.1moduleindex") }}">wx.xml</a><br/>
          <span class="linkdescr">Some simple XML classes for use with XRC</span></p>
 
-      <p class="biglink"><a class="biglink" href="msw.1classindex.html">wx.msw</a><br/>
-         <span class="linkdescr">A few classes available only Windows</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.msw.1moduleindex") }}">wx.msw</a><br/>
+         <span class="linkdescr">A few classes available only on Windows</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("py") }}">wx.py</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.py") }}">wx.py</a><br/>
          <span class="linkdescr">The py package, containing PyCrust and related modules</span></p>
 
-      <p class="biglink"><a class="biglink" href="{{ pathto("tools") }}">wx.tools</a><br/>
+      <p class="biglink"><a class="biglink" href="{{ pathto("wx.tools") }}">wx.tools</a><br/>
          <span class="linkdescr">Some useful tools and utilities for wxPython.</span></p>
 
     </td></tr>
diff --git a/docs/sphinx/_templates/searchbox.html b/docs/sphinx/_templates/searchbox.html
new file mode 100644
index 00000000..e9c86019
--- /dev/null
+++ b/docs/sphinx/_templates/searchbox.html
@@ -0,0 +1,21 @@
+{#
+    basic/searchbox.html
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: quick search box.
+
+    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if pagename != "search" and builder != "singlehtml" %}
+<div id="searchbox" style="display: none" role="search">
+  <h4>{{ _('Search') }}</h4>
+    <form class="search" action="{{ pathto('search') }}" method="get">
+      <input type="text" name="q" />
+      <input type="submit" value="{{ _('Go') }}" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+</div>
+<script type="text/javascript">$('#searchbox').show(0);</script>
+{%- endif %}
diff --git a/docs/sphinx/_templates/sourcelink.html b/docs/sphinx/_templates/sourcelink.html
new file mode 100644
index 00000000..2692973e
--- /dev/null
+++ b/docs/sphinx/_templates/sourcelink.html
@@ -0,0 +1,15 @@
+{#
+    basic/sourcelink.html
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: "show source" link.
+
+    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if show_source and has_source and sourcename %}
+    <div id="sourcelink" role="note" aria-label="source link">
+        <a href="{{ pathto('_sources/' + sourcename, true)|e }}"
+           rel="nofollow">{{ _('Show page source') }}</a>
+    </div>
+{%- endif %}
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index e4815a7c..931ce2c0 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -3,7 +3,8 @@
 # Phoenix documentation build configuration file, created by
 # sphinx-quickstart on Mon Jun 22 09:32:57 2009.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its
+# containing dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -12,26 +13,29 @@
 # serve to show the default.
 
 import sys, os
+from datetime import datetime
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.append(os.path.abspath('.'))
-sys.path.append('..')
+sys.path.append(os.path.abspath('..'))
 
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.todo', 'sphinx.ext.autodoc',
-              'sphinx.ext.autosummary', 'sphinx.ext.coverage',
+extensions = ['sphinx.ext.todo',
+              'sphinx.ext.autodoc',
+              'sphinx.ext.autosummary',
+              'sphinx.ext.coverage',
               'availability']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-# The suffix of source filenames.
-source_suffix = '.txt'
+# The suffix(es) of source filenames.
+source_suffix = ['.txt']
 
 todo_include_todos = True
 todo_all_todos = True
@@ -46,8 +50,8 @@ availability_all_availabilities = True
 master_doc = 'index'
 
 # General information about the project.
-project = u'wxPython (Phoenix)'
-copyright = u'2012-2014, The wxPython Team'
+project = u'wxPython Phoenix'
+copyright = u'2012-{}, The wxPython Team'.format(datetime.now().year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -99,6 +103,8 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
 
 # -- Options for HTML output ---------------------------------------------------
 
@@ -146,7 +152,15 @@ html_style = 'css/phoenix.css'
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'index': 'indexsidebar.html'}
+html_sidebars = {
+    'index': ['indexsidebar.html'], # TODO: index page doesn't have a sidebar??
+    'main':  ['searchbox.html'],
+    '**':    ['localtoc.html',
+             #'relations.html',  # Next/Prev in the sidebar, disabled for now
+              'searchbox.html',
+              'sourcelink.html',
+             ],
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
new file mode 100644
index 00000000..a620522c
--- /dev/null
+++ b/docs/sphinx/itemToModuleMap.json
@@ -0,0 +1,6119 @@
+{
+"ACCEL_ALT":"wx.",
+"ACCEL_CMD":"wx.",
+"ACCEL_CTRL":"wx.",
+"ACCEL_NORMAL":"wx.",
+"ACCEL_RAW_CTRL":"wx.",
+"ACCEL_SHIFT":"wx.",
+"AC_DEFAULT_STYLE":"wx.adv.",
+"AC_NO_AUTORESIZE":"wx.adv.",
+"ADJUST_MINSIZE":"wx.",
+"ALIGN_BOTTOM":"wx.",
+"ALIGN_CENTER":"wx.",
+"ALIGN_CENTER_HORIZONTAL":"wx.",
+"ALIGN_CENTER_VERTICAL":"wx.",
+"ALIGN_CENTRE":"wx.",
+"ALIGN_CENTRE_HORIZONTAL":"wx.",
+"ALIGN_CENTRE_VERTICAL":"wx.",
+"ALIGN_INVALID":"wx.",
+"ALIGN_LEFT":"wx.",
+"ALIGN_MASK":"wx.",
+"ALIGN_NOT":"wx.",
+"ALIGN_RIGHT":"wx.",
+"ALIGN_TOP":"wx.",
+"ALL":"wx.",
+"ALPHA_OPAQUE":"wx.",
+"ALPHA_TRANSPARENT":"wx.",
+"ALWAYS_SHOW_SB":"wx.",
+"AND":"wx.",
+"AND_INVERT":"wx.",
+"AND_REVERSE":"wx.",
+"ANIMATION_TYPE_ANI":"wx.adv.",
+"ANIMATION_TYPE_ANY":"wx.adv.",
+"ANIMATION_TYPE_GIF":"wx.adv.",
+"ANIMATION_TYPE_INVALID":"wx.adv.",
+"ANTIALIAS_DEFAULT":"wx.",
+"ANTIALIAS_NONE":"wx.",
+"APPLY":"wx.",
+"APP_ASSERT_DIALOG":"wx.",
+"APP_ASSERT_EXCEPTION":"wx.",
+"APP_ASSERT_LOG":"wx.",
+"APP_ASSERT_SUPPRESS":"wx.",
+"ARCH_32":"wx.",
+"ARCH_64":"wx.",
+"ARCH_INVALID":"wx.",
+"ARCH_MAX":"wx.",
+"ART_ADD_BOOKMARK":"wx.",
+"ART_BUTTON":"wx.",
+"ART_CDROM":"wx.",
+"ART_CLOSE":"wx.",
+"ART_CMN_DIALOG":"wx.",
+"ART_COPY":"wx.",
+"ART_CROSS_MARK":"wx.",
+"ART_CUT":"wx.",
+"ART_DELETE":"wx.",
+"ART_DEL_BOOKMARK":"wx.",
+"ART_ERROR":"wx.",
+"ART_EXECUTABLE_FILE":"wx.",
+"ART_FILE_OPEN":"wx.",
+"ART_FILE_SAVE":"wx.",
+"ART_FILE_SAVE_AS":"wx.",
+"ART_FIND":"wx.",
+"ART_FIND_AND_REPLACE":"wx.",
+"ART_FLOPPY":"wx.",
+"ART_FOLDER":"wx.",
+"ART_FOLDER_OPEN":"wx.",
+"ART_FRAME_ICON":"wx.",
+"ART_GOTO_FIRST":"wx.",
+"ART_GOTO_LAST":"wx.",
+"ART_GO_BACK":"wx.",
+"ART_GO_DIR_UP":"wx.",
+"ART_GO_DOWN":"wx.",
+"ART_GO_FORWARD":"wx.",
+"ART_GO_HOME":"wx.",
+"ART_GO_TO_PARENT":"wx.",
+"ART_GO_UP":"wx.",
+"ART_HARDDISK":"wx.",
+"ART_HELP":"wx.",
+"ART_HELP_BOOK":"wx.",
+"ART_HELP_BROWSER":"wx.",
+"ART_HELP_FOLDER":"wx.",
+"ART_HELP_PAGE":"wx.",
+"ART_HELP_SETTINGS":"wx.",
+"ART_HELP_SIDE_PANEL":"wx.",
+"ART_INFORMATION":"wx.",
+"ART_LIST":"wx.",
+"ART_LIST_VIEW":"wx.",
+"ART_MENU":"wx.",
+"ART_MESSAGE_BOX":"wx.",
+"ART_MINUS":"wx.",
+"ART_MISSING_IMAGE":"wx.",
+"ART_NEW":"wx.",
+"ART_NEW_DIR":"wx.",
+"ART_NORMAL_FILE":"wx.",
+"ART_OTHER":"wx.",
+"ART_PASTE":"wx.",
+"ART_PLUS":"wx.",
+"ART_PRINT":"wx.",
+"ART_QUESTION":"wx.",
+"ART_QUIT":"wx.",
+"ART_REDO":"wx.",
+"ART_REMOVABLE":"wx.",
+"ART_REPORT_VIEW":"wx.",
+"ART_TICK_MARK":"wx.",
+"ART_TIP":"wx.",
+"ART_TOOLBAR":"wx.",
+"ART_UNDO":"wx.",
+"ART_WARNING":"wx.",
+"Abort":"wx.",
+"AboutBox":"wx.adv.",
+"AboutDialogInfo":"wx.adv.",
+"Above":"wx.",
+"Absolute":"wx.",
+"AcceleratorEntry":"wx.",
+"AcceleratorEntryFlags":"wx.",
+"AcceleratorTable":"wx.",
+"ActivateEvent":"wx.",
+"AffineMatrix2D":"wx.",
+"AffineMatrix2DBase":"wx.",
+"Alignment":"wx.",
+"AlphaPixelData":"wx.",
+"AlphaPixelData_Accessor":"wx.",
+"Animation":"wx.adv.",
+"AnimationCtrl":"wx.adv.",
+"AnimationCtrlNameStr":"wx.adv.",
+"AnimationType":"wx.adv.",
+"AntialiasMode":"wx.",
+"AnyButton":"wx.",
+"App":"wx.",
+"AppAssertMode":"wx.",
+"AppConsole":"wx.",
+"AppTraits":"wx.",
+"Architecture":"wx.",
+"ArchiveFSHandler":"wx.",
+"ArtClient":"wx.",
+"ArtID":"wx.",
+"ArtProvider":"wx.",
+"AsIs":"wx.",
+"AssertHandler_t":"wx.",
+"AttrKind":"wx.grid.GridCellAttr.",
+"AutoBufferedPaintDC":"wx.",
+"AutoBufferedPaintDCFactory":"wx.",
+"BACKINGSTORE":"wx.",
+"BACKWARD":"wx.",
+"BATTERY_CRITICAL_STATE":"wx.",
+"BATTERY_LOW_STATE":"wx.",
+"BATTERY_NORMAL_STATE":"wx.",
+"BATTERY_SHUTDOWN_STATE":"wx.",
+"BATTERY_UNKNOWN_STATE":"wx.",
+"BG_STYLE_COLOUR":"wx.",
+"BG_STYLE_ERASE":"wx.",
+"BG_STYLE_PAINT":"wx.",
+"BG_STYLE_SYSTEM":"wx.",
+"BG_STYLE_TRANSPARENT":"wx.",
+"BITMAP_SCREEN_DEPTH":"wx.",
+"BITMAP_TYPE_ANI":"wx.",
+"BITMAP_TYPE_ANY":"wx.",
+"BITMAP_TYPE_BMP":"wx.",
+"BITMAP_TYPE_BMP_RESOURCE":"wx.",
+"BITMAP_TYPE_CUR":"wx.",
+"BITMAP_TYPE_CUR_RESOURCE":"wx.",
+"BITMAP_TYPE_GIF":"wx.",
+"BITMAP_TYPE_GIF_RESOURCE":"wx.",
+"BITMAP_TYPE_ICO":"wx.",
+"BITMAP_TYPE_ICON":"wx.",
+"BITMAP_TYPE_ICON_RESOURCE":"wx.",
+"BITMAP_TYPE_ICO_RESOURCE":"wx.",
+"BITMAP_TYPE_IFF":"wx.",
+"BITMAP_TYPE_INVALID":"wx.",
+"BITMAP_TYPE_JPEG":"wx.",
+"BITMAP_TYPE_JPEG_RESOURCE":"wx.",
+"BITMAP_TYPE_MACCURSOR":"wx.",
+"BITMAP_TYPE_MACCURSOR_RESOURCE":"wx.",
+"BITMAP_TYPE_PCX":"wx.",
+"BITMAP_TYPE_PCX_RESOURCE":"wx.",
+"BITMAP_TYPE_PICT":"wx.",
+"BITMAP_TYPE_PICT_RESOURCE":"wx.",
+"BITMAP_TYPE_PNG":"wx.",
+"BITMAP_TYPE_PNG_RESOURCE":"wx.",
+"BITMAP_TYPE_PNM":"wx.",
+"BITMAP_TYPE_PNM_RESOURCE":"wx.",
+"BITMAP_TYPE_RESOURCE":"wx.",
+"BITMAP_TYPE_TGA":"wx.",
+"BITMAP_TYPE_TIF":"wx.",
+"BITMAP_TYPE_TIFF":"wx.",
+"BITMAP_TYPE_TIFF_RESOURCE":"wx.",
+"BITMAP_TYPE_TIF_RESOURCE":"wx.",
+"BITMAP_TYPE_XBM":"wx.",
+"BITMAP_TYPE_XBM_DATA":"wx.",
+"BITMAP_TYPE_XPM":"wx.",
+"BITMAP_TYPE_XPM_DATA":"wx.",
+"BI_EXPAND":"wx.",
+"BK_ALIGN_MASK":"wx.",
+"BK_BOTTOM":"wx.",
+"BK_DEFAULT":"wx.",
+"BK_HITTEST_NOWHERE":"wx.",
+"BK_HITTEST_ONICON":"wx.",
+"BK_HITTEST_ONITEM":"wx.",
+"BK_HITTEST_ONLABEL":"wx.",
+"BK_HITTEST_ONPAGE":"wx.",
+"BK_LEFT":"wx.",
+"BK_RIGHT":"wx.",
+"BK_TOP":"wx.",
+"BLACK":"wx.",
+"BLACK_BRUSH":"wx.",
+"BLACK_DASHED_PEN":"wx.",
+"BLACK_PEN":"wx.",
+"BLUE":"wx.",
+"BLUE_BRUSH":"wx.",
+"BLUE_PEN":"wx.",
+"BMP_1BPP":"wx.",
+"BMP_1BPP_BW":"wx.",
+"BMP_24BPP":"wx.",
+"BMP_4BPP":"wx.",
+"BMP_8BPP":"wx.",
+"BMP_8BPP_GRAY":"wx.",
+"BMP_8BPP_GREY":"wx.",
+"BMP_8BPP_PALETTE":"wx.",
+"BMP_8BPP_RED":"wx.",
+"BORDER":"wx.",
+"BORDER_DEFAULT":"wx.",
+"BORDER_DOUBLE":"wx.",
+"BORDER_MASK":"wx.",
+"BORDER_NONE":"wx.",
+"BORDER_RAISED":"wx.",
+"BORDER_SIMPLE":"wx.",
+"BORDER_STATIC":"wx.",
+"BORDER_SUNKEN":"wx.",
+"BORDER_THEME":"wx.",
+"BOTH":"wx.",
+"BOTTOM":"wx.",
+"BRUSHSTYLE_BDIAGONAL_HATCH":"wx.",
+"BRUSHSTYLE_CROSSDIAG_HATCH":"wx.",
+"BRUSHSTYLE_CROSS_HATCH":"wx.",
+"BRUSHSTYLE_FDIAGONAL_HATCH":"wx.",
+"BRUSHSTYLE_FIRST_HATCH":"wx.",
+"BRUSHSTYLE_HORIZONTAL_HATCH":"wx.",
+"BRUSHSTYLE_INVALID":"wx.",
+"BRUSHSTYLE_LAST_HATCH":"wx.",
+"BRUSHSTYLE_SOLID":"wx.",
+"BRUSHSTYLE_STIPPLE":"wx.",
+"BRUSHSTYLE_STIPPLE_MASK":"wx.",
+"BRUSHSTYLE_STIPPLE_MASK_OPAQUE":"wx.",
+"BRUSHSTYLE_TRANSPARENT":"wx.",
+"BRUSHSTYLE_VERTICAL_HATCH":"wx.",
+"BUFFER_CLIENT_AREA":"wx.",
+"BUFFER_USES_SHARED_BUFFER":"wx.",
+"BUFFER_VIRTUAL_AREA":"wx.",
+"BU_ALIGN_MASK":"wx.",
+"BU_AUTODRAW":"wx.",
+"BU_BOTTOM":"wx.",
+"BU_EXACTFIT":"wx.",
+"BU_LEFT":"wx.",
+"BU_NOTEXT":"wx.",
+"BU_RIGHT":"wx.",
+"BU_TOP":"wx.",
+"BackgroundStyle":"wx.",
+"BannerWindow":"wx.adv.",
+"BannerWindowNameStr":"wx.adv.",
+"BatteryState":"wx.",
+"BeginBusyCursor":"wx.",
+"Bell":"wx.",
+"Below":"wx.",
+"Bitmap":"wx.",
+"BitmapBufferFormat":"wx.",
+"BitmapBufferFormat_ARGB32":"wx.",
+"BitmapBufferFormat_RGB":"wx.",
+"BitmapBufferFormat_RGB32":"wx.",
+"BitmapBufferFormat_RGBA":"wx.",
+"BitmapButton":"wx.",
+"BitmapComboBox":"wx.adv.",
+"BitmapComboBoxNameStr":"wx.adv.",
+"BitmapDataObject":"wx.",
+"BitmapFromBuffer":"wx.",
+"BitmapFromBufferRGBA":"wx.",
+"BitmapFromImage":"wx.",
+"BitmapHandler":"wx.",
+"BitmapToggleButton":"wx.",
+"BitmapType":"wx.",
+"BookCtrl":"wx.",
+"BookCtrlBase":"wx.",
+"BookCtrlEvent":"wx.",
+"Border":"wx.",
+"Bottom":"wx.",
+"BoxSizer":"wx.",
+"Brush":"wx.",
+"BrushList":"wx.",
+"BrushStyle":"wx.",
+"BufferedDC":"wx.",
+"BufferedPaintDC":"wx.",
+"BusyCursor":"wx.",
+"BusyInfo":"wx.",
+"Button":"wx.",
+"ButtonLabel":"wx.GenericMessageDialog.",
+"ButtonNameStr":"wx.",
+"Byte":"wx.",
+"C2S_CSS_SYNTAX":"wx.",
+"C2S_HTML_SYNTAX":"wx.",
+"C2S_NAME":"wx.",
+"CAL_BORDER_NONE":"wx.adv.",
+"CAL_BORDER_ROUND":"wx.adv.",
+"CAL_BORDER_SQUARE":"wx.adv.",
+"CAL_HITTEST_DAY":"wx.adv.",
+"CAL_HITTEST_DECMONTH":"wx.adv.",
+"CAL_HITTEST_HEADER":"wx.adv.",
+"CAL_HITTEST_INCMONTH":"wx.adv.",
+"CAL_HITTEST_NOWHERE":"wx.adv.",
+"CAL_HITTEST_SURROUNDING_WEEK":"wx.adv.",
+"CAL_HITTEST_WEEK":"wx.adv.",
+"CAL_MONDAY_FIRST":"wx.adv.",
+"CAL_NO_MONTH_CHANGE":"wx.adv.",
+"CAL_NO_YEAR_CHANGE":"wx.adv.",
+"CAL_SEQUENTIAL_MONTH_SELECTION":"wx.adv.",
+"CAL_SHOW_HOLIDAYS":"wx.adv.",
+"CAL_SHOW_SURROUNDING_WEEKS":"wx.adv.",
+"CAL_SHOW_WEEK_NUMBERS":"wx.adv.",
+"CAL_SUNDAY_FIRST":"wx.adv.",
+"CANCEL":"wx.",
+"CANCEL_DEFAULT":"wx.",
+"CAPTION":"wx.",
+"CAP_BUTT":"wx.",
+"CAP_INVALID":"wx.",
+"CAP_PROJECTING":"wx.",
+"CAP_ROUND":"wx.",
+"CB_DROPDOWN":"wx.",
+"CB_READONLY":"wx.",
+"CB_SIMPLE":"wx.",
+"CB_SORT":"wx.",
+"CC_SPECIAL_DCLICK":"wx.",
+"CC_STD_BUTTON":"wx.",
+"CENTER":"wx.",
+"CENTRE":"wx.",
+"CHB_ALIGN_MASK":"wx.",
+"CHB_BOTTOM":"wx.",
+"CHB_DEFAULT":"wx.",
+"CHB_LEFT":"wx.",
+"CHB_RIGHT":"wx.",
+"CHB_TOP":"wx.",
+"CHK_2STATE":"wx.",
+"CHK_3STATE":"wx.",
+"CHK_ALLOW_3RD_STATE_FOR_USER":"wx.",
+"CHK_CHECKED":"wx.",
+"CHK_UNCHECKED":"wx.",
+"CHK_UNDETERMINED":"wx.",
+"CHOICEDLG_STYLE":"wx.",
+"CHOICE_HEIGHT":"wx.",
+"CHOICE_WIDTH":"wx.",
+"CLEAR":"wx.",
+"CLIP_CHILDREN":"wx.",
+"CLIP_SIBLINGS":"wx.",
+"CLOSE":"wx.",
+"CLOSE_BOX":"wx.",
+"CLRP_DEFAULT_STYLE":"wx.",
+"CLRP_SHOW_LABEL":"wx.",
+"CLRP_USE_TEXTCTRL":"wx.",
+"COLOURED":"wx.",
+"COL_DEFAULT_FLAGS":"wx.",
+"COL_HIDDEN":"wx.",
+"COL_REORDERABLE":"wx.",
+"COL_RESIZABLE":"wx.",
+"COL_SORTABLE":"wx.",
+"COL_WIDTH_AUTOSIZE":"wx.",
+"COL_WIDTH_DEFAULT":"wx.",
+"COMPOSITION_ADD":"wx.",
+"COMPOSITION_ATOP":"wx.",
+"COMPOSITION_CLEAR":"wx.",
+"COMPOSITION_DEST":"wx.",
+"COMPOSITION_DEST_ATOP":"wx.",
+"COMPOSITION_DEST_IN":"wx.",
+"COMPOSITION_DEST_OUT":"wx.",
+"COMPOSITION_DEST_OVER":"wx.",
+"COMPOSITION_IN":"wx.",
+"COMPOSITION_INVALID":"wx.",
+"COMPOSITION_OUT":"wx.",
+"COMPOSITION_OVER":"wx.",
+"COMPOSITION_SOURCE":"wx.",
+"COMPOSITION_XOR":"wx.",
+"CONTROL_CHECKABLE":"wx.",
+"CONTROL_CHECKED":"wx.",
+"CONTROL_CURRENT":"wx.",
+"CONTROL_DISABLED":"wx.",
+"CONTROL_EXPANDED":"wx.",
+"CONTROL_FLAT":"wx.",
+"CONTROL_FOCUSED":"wx.",
+"CONTROL_ISDEFAULT":"wx.",
+"CONTROL_ISSUBMENU":"wx.",
+"CONTROL_PRESSED":"wx.",
+"CONTROL_SELECTED":"wx.",
+"CONTROL_SIZEGRIP":"wx.",
+"CONTROL_SPECIAL":"wx.",
+"CONTROL_UNDETERMINED":"wx.",
+"COPY":"wx.",
+"CP_DEFAULT_STYLE":"wx.",
+"CP_NO_TLW_RESIZE":"wx.",
+"CROSS_CURSOR":"wx.",
+"CURSOR_ARROW":"wx.",
+"CURSOR_ARROWWAIT":"wx.",
+"CURSOR_BASED_ARROW_DOWN":"wx.",
+"CURSOR_BASED_ARROW_UP":"wx.",
+"CURSOR_BLANK":"wx.",
+"CURSOR_BULLSEYE":"wx.",
+"CURSOR_CHAR":"wx.",
+"CURSOR_COPY_ARROW":"wx.",
+"CURSOR_CROSS":"wx.",
+"CURSOR_CROSS_REVERSE":"wx.",
+"CURSOR_DEFAULT":"wx.",
+"CURSOR_DOUBLE_ARROW":"wx.",
+"CURSOR_HAND":"wx.",
+"CURSOR_IBEAM":"wx.",
+"CURSOR_LEFT_BUTTON":"wx.",
+"CURSOR_MAGNIFIER":"wx.",
+"CURSOR_MAX":"wx.",
+"CURSOR_MIDDLE_BUTTON":"wx.",
+"CURSOR_NONE":"wx.",
+"CURSOR_NO_ENTRY":"wx.",
+"CURSOR_PAINT_BRUSH":"wx.",
+"CURSOR_PENCIL":"wx.",
+"CURSOR_POINT_LEFT":"wx.",
+"CURSOR_POINT_RIGHT":"wx.",
+"CURSOR_QUESTION_ARROW":"wx.",
+"CURSOR_RIGHT_ARROW":"wx.",
+"CURSOR_RIGHT_BUTTON":"wx.",
+"CURSOR_SIZENESW":"wx.",
+"CURSOR_SIZENS":"wx.",
+"CURSOR_SIZENWSE":"wx.",
+"CURSOR_SIZEWE":"wx.",
+"CURSOR_SIZING":"wx.",
+"CURSOR_SPRAYCAN":"wx.",
+"CURSOR_WAIT":"wx.",
+"CURSOR_WATCH":"wx.",
+"CYAN":"wx.",
+"CYAN_BRUSH":"wx.",
+"CYAN_PEN":"wx.",
+"CalculateLayoutEvent":"wx.adv.",
+"Calendar":"wx.DateTime.",
+"CalendarCtrl":"wx.adv.",
+"CalendarDateAttr":"wx.adv.",
+"CalendarDateBorder":"wx.adv.",
+"CalendarEvent":"wx.adv.",
+"CalendarHitTestResult":"wx.adv.",
+"CalendarNameStr":"wx.adv.",
+"CallAfter":"wx.",
+"CallLater":"wx.",
+"Caret":"wx.",
+"CellSpan":"wx.grid.Grid.",
+"Center":"wx.",
+"Centre":"wx.",
+"CentreX":"wx.",
+"CentreY":"wx.",
+"Char":"wx.",
+"Char16":"wx.",
+"Char32":"wx.",
+"CheckBox":"wx.",
+"CheckBoxNameStr":"wx.",
+"CheckBoxState":"wx.",
+"CheckListBox":"wx.",
+"ChildFocusEvent":"wx.",
+"ChildrenRepositioningGuard":"wx.Window.",
+"Choice":"wx.",
+"Choicebook":"wx.",
+"ClientDC":"wx.",
+"ClientDataContainer":"wx.",
+"ClientDisplayRect":"wx.",
+"Clipboard":"wx.",
+"ClipboardTextEvent":"wx.",
+"CloseEvent":"wx.",
+"CollapsiblePane":"wx.",
+"CollapsiblePaneEvent":"wx.",
+"CollapsiblePaneNameStr":"wx.",
+"Colour":"wx.",
+"ColourData":"wx.",
+"ColourDatabase":"wx.",
+"ColourDialog":"wx.",
+"ColourDisplay":"wx.",
+"ColourPickerCtrl":"wx.",
+"ColourPickerCtrlNameStr":"wx.",
+"ColourPickerEvent":"wx.",
+"ColourPickerWidgetNameStr":"wx.",
+"ComboBox":"wx.",
+"ComboBoxNameStr":"wx.",
+"ComboCtrl":"wx.",
+"ComboCtrlFeatures":"wx.",
+"ComboPopup":"wx.",
+"Command":"wx.",
+"CommandEvent":"wx.",
+"CommandLinkButton":"wx.adv.",
+"CommandProcessor":"wx.",
+"CompositionMode":"wx.",
+"ConfigBase":"wx.",
+"ConfigPathChanger":"wx.",
+"ContextHelp":"wx.",
+"ContextHelpButton":"wx.",
+"ContextMenuEvent":"wx.",
+"Control":"wx.",
+"ControlNameStr":"wx.",
+"ControlWithItems":"wx.",
+"Coord":"wx.",
+"Country":"wx.DateTime.",
+"CreateDynamicObject":"wx.",
+"CreateFileTipProvider":"wx.adv.",
+"Cursor":"wx.",
+"CustomDataObject":"wx.",
+"DATAVIEW_CELL_ACTIVATABLE":"wx.dataview.",
+"DATAVIEW_CELL_EDITABLE":"wx.dataview.",
+"DATAVIEW_CELL_FOCUSED":"wx.dataview.",
+"DATAVIEW_CELL_INERT":"wx.dataview.",
+"DATAVIEW_CELL_INSENSITIVE":"wx.dataview.",
+"DATAVIEW_CELL_PRELIT":"wx.dataview.",
+"DATAVIEW_CELL_SELECTED":"wx.dataview.",
+"DATAVIEW_COL_HIDDEN":"wx.dataview.",
+"DATAVIEW_COL_REORDERABLE":"wx.dataview.",
+"DATAVIEW_COL_RESIZABLE":"wx.dataview.",
+"DATAVIEW_COL_SORTABLE":"wx.dataview.",
+"DC":"wx.",
+"DCBrushChanger":"wx.",
+"DCClipper":"wx.",
+"DCFontChanger":"wx.",
+"DCOverlay":"wx.",
+"DCPenChanger":"wx.",
+"DCTextColourChanger":"wx.",
+"DD_CHANGE_DIR":"wx.",
+"DD_DEFAULT_STYLE":"wx.",
+"DD_DIR_MUST_EXIST":"wx.",
+"DD_NEW_DIR_BUTTON":"wx.",
+"DECLARE_EVENT":"wx.",
+"DECLARE_EXPORTED_EVENT":"wx.",
+"DEFAULT_DIALOG_STYLE":"wx.",
+"DEFAULT_FRAME_STYLE":"wx.",
+"DEFINE_EVENT":"wx.",
+"DELETE":"wx.",
+"DELETEA":"wx.",
+"DF_BITMAP":"wx.",
+"DF_DIB":"wx.",
+"DF_DIF":"wx.",
+"DF_ENHMETAFILE":"wx.",
+"DF_FILENAME":"wx.",
+"DF_HTML":"wx.",
+"DF_INVALID":"wx.",
+"DF_LOCALE":"wx.",
+"DF_MAX":"wx.",
+"DF_METAFILE":"wx.",
+"DF_OEMTEXT":"wx.",
+"DF_PALETTE":"wx.",
+"DF_PENDATA":"wx.",
+"DF_PRIVATE":"wx.",
+"DF_RIFF":"wx.",
+"DF_SYLK":"wx.",
+"DF_TEXT":"wx.",
+"DF_TIFF":"wx.",
+"DF_UNICODETEXT":"wx.",
+"DF_WAVE":"wx.",
+"DIALOG_ADAPTATION_ANY_SIZER":"wx.",
+"DIALOG_ADAPTATION_LOOSE_BUTTONS":"wx.",
+"DIALOG_ADAPTATION_MODE_DEFAULT":"wx.",
+"DIALOG_ADAPTATION_MODE_DISABLED":"wx.",
+"DIALOG_ADAPTATION_MODE_ENABLED":"wx.",
+"DIALOG_ADAPTATION_NONE":"wx.",
+"DIALOG_ADAPTATION_STANDARD_SIZER":"wx.",
+"DIALOG_EX_CONTEXTHELP":"wx.",
+"DIALOG_EX_METAL":"wx.",
+"DIALOG_NO_PARENT":"wx.",
+"DIRCTRL_3D_INTERNAL":"wx.",
+"DIRCTRL_DIR_ONLY":"wx.",
+"DIRCTRL_EDIT_LABELS":"wx.",
+"DIRCTRL_MULTIPLE":"wx.",
+"DIRCTRL_SELECT_FIRST":"wx.",
+"DIRCTRL_SHOW_FILTERS":"wx.",
+"DIRECTION_MASK":"wx.",
+"DIRP_CHANGE_DIR":"wx.",
+"DIRP_DEFAULT_STYLE":"wx.",
+"DIRP_DIR_MUST_EXIST":"wx.",
+"DIRP_SMALL":"wx.",
+"DIRP_USE_TEXTCTRL":"wx.",
+"DISABLE_ASSERTS_IN_RELEASE_BUILD":"wx.",
+"DISABLE_DEBUG_SUPPORT":"wx.",
+"DOUBLE_BORDER":"wx.",
+"DOWN":"wx.",
+"DP_ALLOWNONE":"wx.adv.",
+"DP_DEFAULT":"wx.adv.",
+"DP_DROPDOWN":"wx.adv.",
+"DP_SHOWCENTURY":"wx.adv.",
+"DP_SPIN":"wx.adv.",
+"DUPLEX_HORIZONTAL":"wx.",
+"DUPLEX_SIMPLEX":"wx.",
+"DUPLEX_VERTICAL":"wx.",
+"DVC_DEFAULT_MINWIDTH":"wx.dataview.",
+"DVC_DEFAULT_RENDERER_SIZE":"wx.dataview.",
+"DVC_DEFAULT_WIDTH":"wx.dataview.",
+"DVC_TOGGLE_DEFAULT_WIDTH":"wx.dataview.",
+"DVR_DEFAULT_ALIGNMENT":"wx.dataview.",
+"DV_HORIZ_RULES":"wx.dataview.",
+"DV_MULTIPLE":"wx.dataview.",
+"DV_NO_HEADER":"wx.dataview.",
+"DV_ROW_LINES":"wx.dataview.",
+"DV_SINGLE":"wx.dataview.",
+"DV_VARIABLE_LINE_HEIGHT":"wx.dataview.",
+"DV_VERT_RULES":"wx.dataview.",
+"DataFormat":"wx.",
+"DataFormatId":"wx.",
+"DataObject":"wx.",
+"DataObjectComposite":"wx.",
+"DataObjectSimple":"wx.",
+"DataViewBitmapRenderer":"wx.dataview.",
+"DataViewCellMode":"wx.dataview.",
+"DataViewCellRenderState":"wx.dataview.",
+"DataViewChoiceRenderer":"wx.dataview.",
+"DataViewColumn":"wx.dataview.",
+"DataViewColumnFlags":"wx.dataview.",
+"DataViewCtrl":"wx.dataview.",
+"DataViewCtrlNameStr":"wx.dataview.",
+"DataViewCustomRenderer":"wx.dataview.",
+"DataViewDateRenderer":"wx.dataview.",
+"DataViewEvent":"wx.dataview.",
+"DataViewIconText":"wx.dataview.",
+"DataViewIconTextRenderer":"wx.dataview.",
+"DataViewIndexListModel":"wx.dataview.",
+"DataViewItem":"wx.dataview.",
+"DataViewItemAttr":"wx.dataview.",
+"DataViewItemObjectMapper":"wx.dataview.",
+"DataViewListCtrl":"wx.dataview.",
+"DataViewListModel":"wx.dataview.",
+"DataViewListStore":"wx.dataview.",
+"DataViewModel":"wx.dataview.",
+"DataViewModelNotifier":"wx.dataview.",
+"DataViewProgressRenderer":"wx.dataview.",
+"DataViewRenderer":"wx.dataview.",
+"DataViewSpinRenderer":"wx.dataview.",
+"DataViewTextRenderer":"wx.dataview.",
+"DataViewToggleRenderer":"wx.dataview.",
+"DataViewTreeCtrl":"wx.dataview.",
+"DataViewTreeStore":"wx.dataview.",
+"DataViewVirtualListModel":"wx.dataview.",
+"DateEvent":"wx.adv.",
+"DatePickerCtrl":"wx.adv.",
+"DateSpan":"wx.",
+"DateTime":"wx.",
+"DateTimeFromDMY":"wx.",
+"DateTimeFromHMS":"wx.",
+"DateTimeFromJDN":"wx.",
+"DateTimeFromTimeT":"wx.",
+"DefaultCoord":"wx.",
+"DefaultDateTime":"wx.",
+"DefaultDateTimeFormat":"wx.",
+"DefaultPosition":"wx.",
+"DefaultSize":"wx.",
+"DefaultSpan":"wx.",
+"DefaultTimeSpanFormat":"wx.",
+"DefaultValidator":"wx.",
+"DefaultVideoMode":"wx.",
+"DelegateRendererNative":"wx.",
+"Dialog":"wx.",
+"DialogLayoutAdaptationMode":"wx.",
+"DialogLayoutAdapter":"wx.",
+"DialogNameStr":"wx.",
+"DirDialog":"wx.",
+"DirDialogDefaultFolderStr":"wx.",
+"DirDialogNameStr":"wx.",
+"DirFilterListCtrl":"wx.",
+"DirPickerCtrl":"wx.",
+"DirPickerCtrlNameStr":"wx.",
+"DirPickerWidgetLabel":"wx.",
+"DirPickerWidgetNameStr":"wx.",
+"DirSelector":"wx.",
+"DirSelectorPromptStr":"wx.",
+"Direction":"wx.DataObject.",
+"DisableAsserts":"wx.",
+"Display":"wx.",
+"DisplayChangedEvent":"wx.",
+"DisplayDepth":"wx.",
+"DisplaySize":"wx.",
+"DisplaySizeMM":"wx.",
+"Double":"wx.",
+"DragCancel":"wx.",
+"DragCopy":"wx.",
+"DragError":"wx.",
+"DragImage":"wx.",
+"DragLink":"wx.",
+"DragMove":"wx.",
+"DragNone":"wx.",
+"DragResult":"wx.",
+"Drag_AllowMove":"wx.",
+"Drag_CopyOnly":"wx.",
+"Drag_DefaultMove":"wx.",
+"DropFilesEvent":"wx.",
+"DropSource":"wx.",
+"DropTarget":"wx.",
+"DuplexMode":"wx.",
+"Dword":"wx.",
+"EAST":"wx.",
+"ELLIPSIZE_END":"wx.",
+"ELLIPSIZE_FLAGS_DEFAULT":"wx.",
+"ELLIPSIZE_FLAGS_EXPAND_TABS":"wx.",
+"ELLIPSIZE_FLAGS_NONE":"wx.",
+"ELLIPSIZE_FLAGS_PROCESS_MNEMONICS":"wx.",
+"ELLIPSIZE_MIDDLE":"wx.",
+"ELLIPSIZE_NONE":"wx.",
+"ELLIPSIZE_START":"wx.",
+"EL_ALLOW_DELETE":"wx.adv.",
+"EL_ALLOW_EDIT":"wx.adv.",
+"EL_ALLOW_NEW":"wx.adv.",
+"EL_DEFAULT_STYLE":"wx.adv.",
+"EL_NO_REORDER":"wx.adv.",
+"ENDIAN_BIG":"wx.",
+"ENDIAN_INVALID":"wx.",
+"ENDIAN_LITTLE":"wx.",
+"ENDIAN_MAX":"wx.",
+"ENDIAN_PDP":"wx.",
+"EQUIV":"wx.",
+"EVENT_HANDLER_CAST":"wx.",
+"EVENT_PROPAGATE_MAX":"wx.",
+"EVENT_PROPAGATE_NONE":"wx.",
+"EXEC_ASYNC":"wx.",
+"EXEC_BLOCK":"wx.",
+"EXEC_HIDE_CONSOLE":"wx.",
+"EXEC_MAKE_GROUP_LEADER":"wx.",
+"EXEC_NODISABLE":"wx.",
+"EXEC_NOEVENTS":"wx.",
+"EXEC_SHOW_CONSOLE":"wx.",
+"EXEC_SYNC":"wx.",
+"EXPAND":"wx.",
+"EXTEND_LAST_ON_EACH_LINE":"wx.",
+"Edge":"wx.",
+"EditableListBox":"wx.adv.",
+"EditableListBoxNameStr":"wx.adv.",
+"EllipsizeFlags":"wx.",
+"EllipsizeMode":"wx.",
+"EmptyBitmap":"wx.",
+"EmptyBitmapRGBA":"wx.",
+"EmptyIcon":"wx.",
+"EmptyImage":"wx.",
+"EmptyXmlResource":"wx.xrc.",
+"EnableTopLevelWindows":"wx.",
+"EndBusyCursor":"wx.",
+"Endianness":"wx.",
+"Entry":"wx.",
+"EntryType":"wx.ConfigBase.",
+"EnvVariableHashMap":"wx.",
+"EraseEvent":"wx.",
+"Event":"wx.",
+"EventBlocker":"wx.",
+"EventCategory":"wx.",
+"EventFilter":"wx.",
+"EventLoopActivator":"wx.",
+"EventLoopBase":"wx.",
+"EventPropagation":"wx.",
+"EventType":"wx.",
+"EvtHandler":"wx.",
+"Execute":"wx.",
+"Exit":"wx.",
+"ExtHelpController":"wx.adv.",
+"FC_DEFAULT_STYLE":"wx.",
+"FC_MULTIPLE":"wx.",
+"FC_NOSHOWHIDDEN":"wx.",
+"FC_OPEN":"wx.",
+"FC_SAVE":"wx.",
+"FD_CHANGE_DIR":"wx.",
+"FD_DEFAULT_STYLE":"wx.",
+"FD_FILE_MUST_EXIST":"wx.",
+"FD_MULTIPLE":"wx.",
+"FD_OPEN":"wx.",
+"FD_OVERWRITE_PROMPT":"wx.",
+"FD_PREVIEW":"wx.",
+"FD_SAVE":"wx.",
+"FFont":"wx.",
+"FIXED_LENGTH":"wx.",
+"FIXED_MINSIZE":"wx.",
+"FLEX_GROWMODE_ALL":"wx.",
+"FLEX_GROWMODE_NONE":"wx.",
+"FLEX_GROWMODE_SPECIFIED":"wx.",
+"FLOOD_BORDER":"wx.",
+"FLOOD_SURFACE":"wx.",
+"FLP_CHANGE_DIR":"wx.",
+"FLP_DEFAULT_STYLE":"wx.",
+"FLP_FILE_MUST_EXIST":"wx.",
+"FLP_OPEN":"wx.",
+"FLP_OVERWRITE_PROMPT":"wx.",
+"FLP_SAVE":"wx.",
+"FLP_SMALL":"wx.",
+"FLP_USE_TEXTCTRL":"wx.",
+"FNTP_DEFAULT_STYLE":"wx.",
+"FNTP_FONTDESC_AS_LABEL":"wx.",
+"FNTP_USEFONT_FOR_LABEL":"wx.",
+"FNTP_USE_TEXTCTRL":"wx.",
+"FONTBTN_DEFAULT_STYLE":"wx.",
+"FONTENCODING_ALTERNATIVE":"wx.",
+"FONTENCODING_BIG5":"wx.",
+"FONTENCODING_BULGARIAN":"wx.",
+"FONTENCODING_CP1250":"wx.",
+"FONTENCODING_CP1251":"wx.",
+"FONTENCODING_CP1252":"wx.",
+"FONTENCODING_CP1253":"wx.",
+"FONTENCODING_CP1254":"wx.",
+"FONTENCODING_CP1255":"wx.",
+"FONTENCODING_CP1256":"wx.",
+"FONTENCODING_CP1257":"wx.",
+"FONTENCODING_CP1258":"wx.",
+"FONTENCODING_CP12_MAX":"wx.",
+"FONTENCODING_CP1361":"wx.",
+"FONTENCODING_CP437":"wx.",
+"FONTENCODING_CP850":"wx.",
+"FONTENCODING_CP852":"wx.",
+"FONTENCODING_CP855":"wx.",
+"FONTENCODING_CP866":"wx.",
+"FONTENCODING_CP874":"wx.",
+"FONTENCODING_CP932":"wx.",
+"FONTENCODING_CP936":"wx.",
+"FONTENCODING_CP949":"wx.",
+"FONTENCODING_CP950":"wx.",
+"FONTENCODING_DEFAULT":"wx.",
+"FONTENCODING_EUC_JP":"wx.",
+"FONTENCODING_EUC_KR":"wx.",
+"FONTENCODING_GB2312":"wx.",
+"FONTENCODING_ISO2022_JP":"wx.",
+"FONTENCODING_ISO8859_1":"wx.",
+"FONTENCODING_ISO8859_10":"wx.",
+"FONTENCODING_ISO8859_11":"wx.",
+"FONTENCODING_ISO8859_12":"wx.",
+"FONTENCODING_ISO8859_13":"wx.",
+"FONTENCODING_ISO8859_14":"wx.",
+"FONTENCODING_ISO8859_15":"wx.",
+"FONTENCODING_ISO8859_2":"wx.",
+"FONTENCODING_ISO8859_3":"wx.",
+"FONTENCODING_ISO8859_4":"wx.",
+"FONTENCODING_ISO8859_5":"wx.",
+"FONTENCODING_ISO8859_6":"wx.",
+"FONTENCODING_ISO8859_7":"wx.",
+"FONTENCODING_ISO8859_8":"wx.",
+"FONTENCODING_ISO8859_9":"wx.",
+"FONTENCODING_ISO8859_MAX":"wx.",
+"FONTENCODING_JOHAB":"wx.",
+"FONTENCODING_KOI8":"wx.",
+"FONTENCODING_KOI8_U":"wx.",
+"FONTENCODING_MACARABIC":"wx.",
+"FONTENCODING_MACARABICEXT":"wx.",
+"FONTENCODING_MACARMENIAN":"wx.",
+"FONTENCODING_MACBENGALI":"wx.",
+"FONTENCODING_MACBURMESE":"wx.",
+"FONTENCODING_MACCELTIC":"wx.",
+"FONTENCODING_MACCENTRALEUR":"wx.",
+"FONTENCODING_MACCHINESESIMP":"wx.",
+"FONTENCODING_MACCHINESETRAD":"wx.",
+"FONTENCODING_MACCROATIAN":"wx.",
+"FONTENCODING_MACCYRILLIC":"wx.",
+"FONTENCODING_MACDEVANAGARI":"wx.",
+"FONTENCODING_MACDINGBATS":"wx.",
+"FONTENCODING_MACETHIOPIC":"wx.",
+"FONTENCODING_MACGAELIC":"wx.",
+"FONTENCODING_MACGEORGIAN":"wx.",
+"FONTENCODING_MACGREEK":"wx.",
+"FONTENCODING_MACGUJARATI":"wx.",
+"FONTENCODING_MACGURMUKHI":"wx.",
+"FONTENCODING_MACHEBREW":"wx.",
+"FONTENCODING_MACICELANDIC":"wx.",
+"FONTENCODING_MACJAPANESE":"wx.",
+"FONTENCODING_MACKANNADA":"wx.",
+"FONTENCODING_MACKEYBOARD":"wx.",
+"FONTENCODING_MACKHMER":"wx.",
+"FONTENCODING_MACKOREAN":"wx.",
+"FONTENCODING_MACLAOTIAN":"wx.",
+"FONTENCODING_MACMALAJALAM":"wx.",
+"FONTENCODING_MACMAX":"wx.",
+"FONTENCODING_MACMIN":"wx.",
+"FONTENCODING_MACMONGOLIAN":"wx.",
+"FONTENCODING_MACORIYA":"wx.",
+"FONTENCODING_MACROMAN":"wx.",
+"FONTENCODING_MACROMANIAN":"wx.",
+"FONTENCODING_MACSINHALESE":"wx.",
+"FONTENCODING_MACSYMBOL":"wx.",
+"FONTENCODING_MACTAMIL":"wx.",
+"FONTENCODING_MACTELUGU":"wx.",
+"FONTENCODING_MACTHAI":"wx.",
+"FONTENCODING_MACTIBETAN":"wx.",
+"FONTENCODING_MACTURKISH":"wx.",
+"FONTENCODING_MACVIATNAMESE":"wx.",
+"FONTENCODING_MAX":"wx.",
+"FONTENCODING_SHIFT_JIS":"wx.",
+"FONTENCODING_SYSTEM":"wx.",
+"FONTENCODING_UNICODE":"wx.",
+"FONTENCODING_UTF16":"wx.",
+"FONTENCODING_UTF16BE":"wx.",
+"FONTENCODING_UTF16LE":"wx.",
+"FONTENCODING_UTF32":"wx.",
+"FONTENCODING_UTF32BE":"wx.",
+"FONTENCODING_UTF32LE":"wx.",
+"FONTENCODING_UTF7":"wx.",
+"FONTENCODING_UTF8":"wx.",
+"FONTENCODING_VIETNAMESE":"wx.",
+"FONTFAMILY_DECORATIVE":"wx.",
+"FONTFAMILY_DEFAULT":"wx.",
+"FONTFAMILY_MAX":"wx.",
+"FONTFAMILY_MODERN":"wx.",
+"FONTFAMILY_ROMAN":"wx.",
+"FONTFAMILY_SCRIPT":"wx.",
+"FONTFAMILY_SWISS":"wx.",
+"FONTFAMILY_TELETYPE":"wx.",
+"FONTFAMILY_UNKNOWN":"wx.",
+"FONTFLAG_ANTIALIASED":"wx.",
+"FONTFLAG_BOLD":"wx.",
+"FONTFLAG_DEFAULT":"wx.",
+"FONTFLAG_ITALIC":"wx.",
+"FONTFLAG_LIGHT":"wx.",
+"FONTFLAG_MASK":"wx.",
+"FONTFLAG_NOT_ANTIALIASED":"wx.",
+"FONTFLAG_SLANT":"wx.",
+"FONTFLAG_STRIKETHROUGH":"wx.",
+"FONTFLAG_UNDERLINED":"wx.",
+"FONTSIZE_LARGE":"wx.",
+"FONTSIZE_MEDIUM":"wx.",
+"FONTSIZE_SMALL":"wx.",
+"FONTSIZE_XX_LARGE":"wx.",
+"FONTSIZE_XX_SMALL":"wx.",
+"FONTSIZE_X_LARGE":"wx.",
+"FONTSIZE_X_SMALL":"wx.",
+"FONTSTYLE_ITALIC":"wx.",
+"FONTSTYLE_MAX":"wx.",
+"FONTSTYLE_NORMAL":"wx.",
+"FONTSTYLE_SLANT":"wx.",
+"FONTWEIGHT_BOLD":"wx.",
+"FONTWEIGHT_LIGHT":"wx.",
+"FONTWEIGHT_MAX":"wx.",
+"FONTWEIGHT_NORMAL":"wx.",
+"FORWARD":"wx.",
+"FRAME_DRAWER":"wx.",
+"FRAME_EX_CONTEXTHELP":"wx.",
+"FRAME_EX_METAL":"wx.",
+"FRAME_FLOAT_ON_PARENT":"wx.",
+"FRAME_NO_TASKBAR":"wx.",
+"FRAME_NO_WINDOW_MENU":"wx.",
+"FRAME_SHAPED":"wx.",
+"FRAME_TOOL_WINDOW":"wx.",
+"FR_DOWN":"wx.",
+"FR_MATCHCASE":"wx.",
+"FR_NOMATCHCASE":"wx.",
+"FR_NOUPDOWN":"wx.",
+"FR_NOWHOLEWORD":"wx.",
+"FR_REPLACEDIALOG":"wx.",
+"FR_WHOLEWORD":"wx.",
+"FSFile":"wx.",
+"FSWFlags":"wx.",
+"FSWWarningType":"wx.",
+"FSW_EVENT_ACCESS":"wx.",
+"FSW_EVENT_ALL":"wx.",
+"FSW_EVENT_ATTRIB":"wx.",
+"FSW_EVENT_CREATE":"wx.",
+"FSW_EVENT_DELETE":"wx.",
+"FSW_EVENT_ERROR":"wx.",
+"FSW_EVENT_MODIFY":"wx.",
+"FSW_EVENT_RENAME":"wx.",
+"FSW_EVENT_UNMOUNT":"wx.",
+"FSW_EVENT_WARNING":"wx.",
+"FSW_WARNING_GENERAL":"wx.",
+"FSW_WARNING_NONE":"wx.",
+"FSW_WARNING_OVERFLOW":"wx.",
+"FS_READ":"wx.",
+"FS_SEEKABLE":"wx.",
+"FULLSCREEN_ALL":"wx.",
+"FULLSCREEN_NOBORDER":"wx.",
+"FULLSCREEN_NOCAPTION":"wx.",
+"FULLSCREEN_NOMENUBAR":"wx.",
+"FULLSCREEN_NOSTATUSBAR":"wx.",
+"FULLSCREEN_NOTOOLBAR":"wx.",
+"FULL_REPAINT_ON_RESIZE":"wx.",
+"FileConfig":"wx.",
+"FileCtrl":"wx.",
+"FileCtrlEvent":"wx.",
+"FileCtrlNameStr":"wx.",
+"FileDataObject":"wx.",
+"FileDialog":"wx.",
+"FileDialogNameStr":"wx.",
+"FileDirPickerEvent":"wx.",
+"FileDropTarget":"wx.",
+"FileHistory":"wx.",
+"FileOffset":"wx.",
+"FilePickerCtrl":"wx.",
+"FilePickerCtrlNameStr":"wx.",
+"FilePickerWidgetLabel":"wx.",
+"FilePickerWidgetNameStr":"wx.",
+"FileSelector":"wx.",
+"FileSelectorDefaultWildcardStr":"wx.",
+"FileSelectorEx":"wx.",
+"FileSelectorPromptStr":"wx.",
+"FileSystem":"wx.",
+"FileSystemHandler":"wx.",
+"FileSystemOpenFlags":"wx.",
+"FileSystemWatcher":"wx.",
+"FileSystemWatcherEvent":"wx.",
+"FileTranslationsLoader":"wx.",
+"FileType":"wx.",
+"FileTypeInfo":"wx.",
+"FilterFSHandler":"wx.",
+"FindDialogEvent":"wx.",
+"FindMenuItemId":"wx.",
+"FindReplaceData":"wx.",
+"FindReplaceDialog":"wx.",
+"FindReplaceDialogStyles":"wx.",
+"FindReplaceFlags":"wx.",
+"FindWindowAtPoint":"wx.",
+"FindWindowAtPointer":"wx.",
+"FindWindowById":"wx.",
+"FindWindowByLabel":"wx.",
+"FindWindowByName":"wx.",
+"FlexGridSizer":"wx.",
+"FlexSizerGrowMode":"wx.",
+"Float32":"wx.",
+"Float64":"wx.",
+"FloodFillStyle":"wx.",
+"FocusEvent":"wx.",
+"Font":"wx.",
+"FontData":"wx.",
+"FontDialog":"wx.",
+"FontEncoding":"wx.",
+"FontEnumerator":"wx.",
+"FontFamily":"wx.",
+"FontFlag":"wx.",
+"FontInfo":"wx.",
+"FontList":"wx.",
+"FontMapper":"wx.",
+"FontMetrics":"wx.",
+"FontPickerCtrl":"wx.",
+"FontPickerCtrlNameStr":"wx.",
+"FontPickerEvent":"wx.",
+"FontPickerWidgetNameStr":"wx.",
+"FontStyle":"wx.",
+"FontSymbolicSize":"wx.",
+"FontWeight":"wx.",
+"FormatInvalid":"wx.",
+"Frame":"wx.",
+"FrameNameStr":"wx.",
+"FromCurrent":"wx.",
+"FromEnd":"wx.",
+"FromStart":"wx.",
+"FromString":"wx.",
+"GA_HORIZONTAL":"wx.",
+"GA_SMOOTH":"wx.",
+"GA_VERTICAL":"wx.",
+"GBPosition":"wx.",
+"GBSizerItem":"wx.",
+"GBSpan":"wx.",
+"GCDC":"wx.",
+"GDIObject":"wx.",
+"GLCanvas":"wx.glcanvas.",
+"GLContext":"wx.glcanvas.",
+"GREEN":"wx.",
+"GREEN_BRUSH":"wx.",
+"GREEN_PEN":"wx.",
+"GREY_BRUSH":"wx.",
+"GREY_PEN":"wx.",
+"GRIDTABLE_NOTIFY_COLS_APPENDED":"wx.grid.",
+"GRIDTABLE_NOTIFY_COLS_DELETED":"wx.grid.",
+"GRIDTABLE_NOTIFY_COLS_INSERTED":"wx.grid.",
+"GRIDTABLE_NOTIFY_ROWS_APPENDED":"wx.grid.",
+"GRIDTABLE_NOTIFY_ROWS_DELETED":"wx.grid.",
+"GRIDTABLE_NOTIFY_ROWS_INSERTED":"wx.grid.",
+"GRIDTABLE_REQUEST_VIEW_GET_VALUES":"wx.grid.",
+"GRIDTABLE_REQUEST_VIEW_SEND_VALUES":"wx.grid.",
+"GRID_DRAW_BOX_RECT":"wx.grid.",
+"GRID_DRAW_CELL_LINES":"wx.grid.",
+"GRID_DRAW_COLS_HEADER":"wx.grid.",
+"GRID_DRAW_DEFAULT":"wx.grid.",
+"GRID_DRAW_ROWS_HEADER":"wx.grid.",
+"GRID_DRAW_SELECTION":"wx.grid.",
+"GRID_FLOAT_FORMAT_COMPACT":"wx.grid.",
+"GRID_FLOAT_FORMAT_DEFAULT":"wx.grid.",
+"GRID_FLOAT_FORMAT_FIXED":"wx.grid.",
+"GRID_FLOAT_FORMAT_SCIENTIFIC":"wx.grid.",
+"GRID_FLOAT_FORMAT_UPPER":"wx.grid.",
+"GROW":"wx.",
+"GUIEventLoop":"wx.",
+"Gauge":"wx.",
+"GaugeNameStr":"wx.",
+"GenericAboutBox":"wx.adv.",
+"GenericCalendarCtrl":"wx.adv.",
+"GenericDatePickerCtrl":"wx.adv.",
+"GenericDirCtrl":"wx.",
+"GenericDragImage":"wx.",
+"GenericMessageDialog":"wx.",
+"GenericProgressDialog":"wx.",
+"GeometryCentre":"wx.",
+"GetAccelFromString":"wx.",
+"GetActiveWindow":"wx.",
+"GetApp":"wx.",
+"GetBatteryState":"wx.",
+"GetClientDisplayRect":"wx.",
+"GetColourFromUser":"wx.",
+"GetDisplayName":"wx.",
+"GetDisplayPPI":"wx.",
+"GetDisplaySize":"wx.",
+"GetDisplaySizeMM":"wx.",
+"GetEmailAddress":"wx.",
+"GetEnv":"wx.",
+"GetEnvMap":"wx.",
+"GetFontFromUser":"wx.",
+"GetFreeMemory":"wx.",
+"GetFullHostName":"wx.",
+"GetHomeDir":"wx.",
+"GetHostName":"wx.",
+"GetKeyState":"wx.",
+"GetLibraryVersionInfo":"wx.",
+"GetLinuxDistributionInfo":"wx.",
+"GetMousePosition":"wx.",
+"GetMouseState":"wx.",
+"GetOsDescription":"wx.",
+"GetOsVersion":"wx.",
+"GetPasswordFromUser":"wx.",
+"GetPasswordFromUserPromptStr":"wx.",
+"GetPowerType":"wx.",
+"GetProcessId":"wx.",
+"GetSelectedChoices":"wx.",
+"GetSingleChoice":"wx.",
+"GetSingleChoiceData":"wx.",
+"GetSingleChoiceIndex":"wx.",
+"GetTextFromUser":"wx.",
+"GetTextFromUserPromptStr":"wx.",
+"GetTopLevelParent":"wx.",
+"GetTopLevelWindows":"wx.",
+"GetTranslation":"wx.",
+"GetUserHome":"wx.",
+"GetUserId":"wx.",
+"GetUserName":"wx.",
+"Getenv":"wx.",
+"GraphicsBitmap":"wx.",
+"GraphicsBrush":"wx.",
+"GraphicsContext":"wx.",
+"GraphicsFont":"wx.",
+"GraphicsGradientStop":"wx.",
+"GraphicsGradientStops":"wx.",
+"GraphicsMatrix":"wx.",
+"GraphicsObject":"wx.",
+"GraphicsPath":"wx.",
+"GraphicsPen":"wx.",
+"GraphicsRenderer":"wx.",
+"Grid":"wx.grid.",
+"GridBagSizer":"wx.",
+"GridCellAttr":"wx.grid.",
+"GridCellAttrProvider":"wx.grid.",
+"GridCellAutoWrapStringEditor":"wx.grid.",
+"GridCellAutoWrapStringRenderer":"wx.grid.",
+"GridCellBoolEditor":"wx.grid.",
+"GridCellBoolRenderer":"wx.grid.",
+"GridCellChoiceEditor":"wx.grid.",
+"GridCellCoords":"wx.grid.",
+"GridCellDateTimeRenderer":"wx.grid.",
+"GridCellEditor":"wx.grid.",
+"GridCellEnumEditor":"wx.grid.",
+"GridCellEnumRenderer":"wx.grid.",
+"GridCellFloatEditor":"wx.grid.",
+"GridCellFloatFormat":"wx.grid.",
+"GridCellFloatRenderer":"wx.grid.",
+"GridCellNumberEditor":"wx.grid.",
+"GridCellNumberRenderer":"wx.grid.",
+"GridCellRenderer":"wx.grid.",
+"GridCellStringRenderer":"wx.grid.",
+"GridCellTextEditor":"wx.grid.",
+"GridColumnHeaderRenderer":"wx.grid.",
+"GridColumnHeaderRendererDefault":"wx.grid.",
+"GridCornerHeaderRenderer":"wx.grid.",
+"GridCornerHeaderRendererDefault":"wx.grid.",
+"GridEditorCreatedEvent":"wx.grid.",
+"GridEvent":"wx.grid.",
+"GridHeaderLabelsRenderer":"wx.grid.",
+"GridNameStr":"wx.grid.",
+"GridRangeSelectEvent":"wx.grid.",
+"GridRenderStyle":"wx.grid.",
+"GridRowHeaderRenderer":"wx.grid.",
+"GridRowHeaderRendererDefault":"wx.grid.",
+"GridSelectionModes":"wx.grid.Grid.",
+"GridSizeEvent":"wx.grid.",
+"GridSizer":"wx.",
+"GridSizesInfo":"wx.grid.",
+"GridStringTable":"wx.grid.",
+"GridTableBase":"wx.grid.",
+"GridTableMessage":"wx.grid.",
+"GridTableRequest":"wx.grid.",
+"GridUpdateLocker":"wx.grid.",
+"HDR_SORT_ICON_DOWN":"wx.",
+"HDR_SORT_ICON_NONE":"wx.",
+"HDR_SORT_ICON_UP":"wx.",
+"HD_ALLOW_HIDE":"wx.",
+"HD_ALLOW_REORDER":"wx.",
+"HD_DEFAULT_STYLE":"wx.",
+"HELP":"wx.",
+"HELP_NETSCAPE":"wx.",
+"HELP_SEARCH_ALL":"wx.",
+"HELP_SEARCH_INDEX":"wx.",
+"HF_BOOKMARKS":"wx.html.",
+"HF_CONTENTS":"wx.html.",
+"HF_DEFAULT_STYLE":"wx.html.",
+"HF_DIALOG":"wx.html.",
+"HF_EMBEDDED":"wx.html.",
+"HF_FLAT_TOOLBAR":"wx.html.",
+"HF_FRAME":"wx.html.",
+"HF_ICONS_BOOK":"wx.html.",
+"HF_ICONS_BOOK_CHAPTER":"wx.html.",
+"HF_ICONS_FOLDER":"wx.html.",
+"HF_INDEX":"wx.html.",
+"HF_MERGE_BOOKS":"wx.html.",
+"HF_MODAL":"wx.html.",
+"HF_OPEN_FILES":"wx.html.",
+"HF_PRINT":"wx.html.",
+"HF_SEARCH":"wx.html.",
+"HF_TOOLBAR":"wx.html.",
+"HL_ALIGN_CENTRE":"wx.adv.",
+"HL_ALIGN_LEFT":"wx.adv.",
+"HL_ALIGN_RIGHT":"wx.adv.",
+"HL_CONTEXTMENU":"wx.adv.",
+"HL_DEFAULT_STYLE":"wx.adv.",
+"HORIZONTAL":"wx.",
+"HOURGLASS_CURSOR":"wx.",
+"HSCROLL":"wx.",
+"HSVValue":"wx.Image.",
+"HScrolledWindow":"wx.",
+"HTMLCursor":"wx.html.HtmlWindowInterface.",
+"HTMLDataObject":"wx.",
+"HTML_ALIGN_BOTTOM":"wx.html.",
+"HTML_ALIGN_CENTER":"wx.html.",
+"HTML_ALIGN_JUSTIFY":"wx.html.",
+"HTML_ALIGN_LEFT":"wx.html.",
+"HTML_ALIGN_RIGHT":"wx.html.",
+"HTML_ALIGN_TOP":"wx.html.",
+"HTML_BLOCK":"wx.html.",
+"HTML_CLR_BACKGROUND":"wx.html.",
+"HTML_CLR_FOREGROUND":"wx.html.",
+"HTML_CLR_TRANSPARENT_BACKGROUND":"wx.html.",
+"HTML_COND_ISANCHOR":"wx.html.",
+"HTML_COND_ISIMAGEMAP":"wx.html.",
+"HTML_COND_USER":"wx.html.",
+"HTML_FIND_EXACT":"wx.html.",
+"HTML_FIND_NEAREST_AFTER":"wx.html.",
+"HTML_FIND_NEAREST_BEFORE":"wx.html.",
+"HTML_INDENT_ALL":"wx.html.",
+"HTML_INDENT_BOTTOM":"wx.html.",
+"HTML_INDENT_HORIZONTAL":"wx.html.",
+"HTML_INDENT_LEFT":"wx.html.",
+"HTML_INDENT_RIGHT":"wx.html.",
+"HTML_INDENT_TOP":"wx.html.",
+"HTML_INDENT_VERTICAL":"wx.html.",
+"HTML_OPEN":"wx.html.",
+"HTML_REDIRECT":"wx.html.",
+"HTML_SCRIPT_NORMAL":"wx.html.",
+"HTML_SCRIPT_SUB":"wx.html.",
+"HTML_SCRIPT_SUP":"wx.html.",
+"HTML_SEL_CHANGING":"wx.html.",
+"HTML_SEL_IN":"wx.html.",
+"HTML_SEL_OUT":"wx.html.",
+"HTML_UNITS_PERCENT":"wx.html.",
+"HTML_UNITS_PIXELS":"wx.html.",
+"HTML_URL_IMAGE":"wx.html.",
+"HTML_URL_OTHER":"wx.html.",
+"HTML_URL_PAGE":"wx.html.",
+"HT_MAX":"wx.",
+"HT_NOWHERE":"wx.",
+"HT_SCROLLBAR_ARROW_LINE_1":"wx.",
+"HT_SCROLLBAR_ARROW_LINE_2":"wx.",
+"HT_SCROLLBAR_ARROW_PAGE_1":"wx.",
+"HT_SCROLLBAR_ARROW_PAGE_2":"wx.",
+"HT_SCROLLBAR_BAR_1":"wx.",
+"HT_SCROLLBAR_BAR_2":"wx.",
+"HT_SCROLLBAR_FIRST":"wx.",
+"HT_SCROLLBAR_LAST":"wx.",
+"HT_SCROLLBAR_THUMB":"wx.",
+"HT_WINDOW_CORNER":"wx.",
+"HT_WINDOW_HORZ_SCROLLBAR":"wx.",
+"HT_WINDOW_INSIDE":"wx.",
+"HT_WINDOW_OUTSIDE":"wx.",
+"HT_WINDOW_VERT_SCROLLBAR":"wx.",
+"HVScrolledWindow":"wx.",
+"HW_DEFAULT_STYLE":"wx.html.",
+"HW_NO_SELECTION":"wx.html.",
+"HW_SCROLLBAR_AUTO":"wx.html.",
+"HW_SCROLLBAR_NEVER":"wx.html.",
+"HandleFatalExceptions":"wx.",
+"HeaderButtonParams":"wx.",
+"HeaderColumn":"wx.",
+"HeaderColumnSimple":"wx.",
+"HeaderCtrl":"wx.",
+"HeaderCtrlEvent":"wx.",
+"HeaderCtrlNameStr":"wx.",
+"HeaderCtrlSimple":"wx.",
+"HeaderSortIconType":"wx.",
+"Height":"wx.",
+"HelpControllerBase":"wx.",
+"HelpControllerHelpProvider":"wx.",
+"HelpEvent":"wx.",
+"HelpProvider":"wx.",
+"HelpSearchMode":"wx.",
+"HitTest":"wx.",
+"HtmlBookRecord":"wx.html.",
+"HtmlCell":"wx.html.",
+"HtmlCellEvent":"wx.html.",
+"HtmlColourCell":"wx.html.",
+"HtmlContainerCell":"wx.html.",
+"HtmlDCRenderer":"wx.html.",
+"HtmlEasyPrinting":"wx.html.",
+"HtmlFilter":"wx.html.",
+"HtmlFontCell":"wx.html.",
+"HtmlHelpController":"wx.html.",
+"HtmlHelpData":"wx.html.",
+"HtmlHelpDataItem":"wx.html.",
+"HtmlHelpDialog":"wx.html.",
+"HtmlHelpFrame":"wx.html.",
+"HtmlHelpWindow":"wx.html.",
+"HtmlLinkEvent":"wx.html.",
+"HtmlLinkInfo":"wx.html.",
+"HtmlListBox":"wx.html.",
+"HtmlListBoxNameStr":"wx.html.",
+"HtmlModalHelp":"wx.html.",
+"HtmlOpeningStatus":"wx.html.",
+"HtmlParser":"wx.html.",
+"HtmlPrintout":"wx.html.",
+"HtmlRenderingInfo":"wx.html.",
+"HtmlRenderingState":"wx.html.",
+"HtmlRenderingStyle":"wx.html.",
+"HtmlScriptMode":"wx.html.",
+"HtmlSelection":"wx.html.",
+"HtmlSelectionState":"wx.html.",
+"HtmlTag":"wx.html.",
+"HtmlTagHandler":"wx.html.",
+"HtmlURLType":"wx.html.",
+"HtmlWidgetCell":"wx.html.",
+"HtmlWinParser":"wx.html.",
+"HtmlWinParser_AddTagHandler":"wx.html.",
+"HtmlWinTagHandler":"wx.html.",
+"HtmlWindow":"wx.html.",
+"HtmlWindowInterface":"wx.html.",
+"HtmlWordCell":"wx.html.",
+"HtmlWordWithTabsCell":"wx.html.",
+"HyperlinkCtrl":"wx.adv.",
+"HyperlinkCtrlNameStr":"wx.adv.",
+"HyperlinkEvent":"wx.adv.",
+"ICONIZE":"wx.",
+"ICON_ASTERISK":"wx.",
+"ICON_AUTH_NEEDED":"wx.",
+"ICON_ERROR":"wx.",
+"ICON_EXCLAMATION":"wx.",
+"ICON_HAND":"wx.",
+"ICON_INFORMATION":"wx.",
+"ICON_MASK":"wx.",
+"ICON_NONE":"wx.",
+"ICON_QUESTION":"wx.",
+"ICON_SCREEN_DEPTH":"wx.",
+"ICON_STOP":"wx.",
+"ICON_WARNING":"wx.",
+"IDLE_PROCESS_ALL":"wx.",
+"IDLE_PROCESS_SPECIFIED":"wx.",
+"ID_ABORT":"wx.",
+"ID_ABOUT":"wx.",
+"ID_ADD":"wx.",
+"ID_ANY":"wx.",
+"ID_APPLY":"wx.",
+"ID_AUTO_HIGHEST":"wx.",
+"ID_AUTO_LOWEST":"wx.",
+"ID_BACKWARD":"wx.",
+"ID_BOLD":"wx.",
+"ID_BOTTOM":"wx.",
+"ID_CANCEL":"wx.",
+"ID_CDROM":"wx.",
+"ID_CLEAR":"wx.",
+"ID_CLOSE":"wx.",
+"ID_CLOSE_ALL":"wx.",
+"ID_CLOSE_FRAME":"wx.",
+"ID_CONTEXT_HELP":"wx.",
+"ID_CONVERT":"wx.",
+"ID_COPY":"wx.",
+"ID_CUT":"wx.",
+"ID_DEFAULT":"wx.",
+"ID_DELETE":"wx.",
+"ID_DOWN":"wx.",
+"ID_DUPLICATE":"wx.",
+"ID_EDIT":"wx.",
+"ID_EXECUTE":"wx.",
+"ID_EXIT":"wx.",
+"ID_FILE":"wx.",
+"ID_FILE1":"wx.",
+"ID_FILE2":"wx.",
+"ID_FILE3":"wx.",
+"ID_FILE4":"wx.",
+"ID_FILE5":"wx.",
+"ID_FILE6":"wx.",
+"ID_FILE7":"wx.",
+"ID_FILE8":"wx.",
+"ID_FILE9":"wx.",
+"ID_FILECTRL":"wx.",
+"ID_FILEDLGG":"wx.",
+"ID_FIND":"wx.",
+"ID_FIRST":"wx.",
+"ID_FLOPPY":"wx.",
+"ID_FORWARD":"wx.",
+"ID_HARDDISK":"wx.",
+"ID_HELP":"wx.",
+"ID_HELP_COMMANDS":"wx.",
+"ID_HELP_CONTENTS":"wx.",
+"ID_HELP_CONTEXT":"wx.",
+"ID_HELP_INDEX":"wx.",
+"ID_HELP_PROCEDURES":"wx.",
+"ID_HELP_SEARCH":"wx.",
+"ID_HIGHEST":"wx.",
+"ID_HOME":"wx.",
+"ID_HTML_BACK":"wx.html.",
+"ID_HTML_BOOKMARKSADD":"wx.html.",
+"ID_HTML_BOOKMARKSLIST":"wx.html.",
+"ID_HTML_BOOKMARKSREMOVE":"wx.html.",
+"ID_HTML_COUNTINFO":"wx.html.",
+"ID_HTML_DOWN":"wx.html.",
+"ID_HTML_FORWARD":"wx.html.",
+"ID_HTML_HELPFRAME":"wx.html.",
+"ID_HTML_INDEXBUTTON":"wx.html.",
+"ID_HTML_INDEXBUTTONALL":"wx.html.",
+"ID_HTML_INDEXLIST":"wx.html.",
+"ID_HTML_INDEXPAGE":"wx.html.",
+"ID_HTML_INDEXTEXT":"wx.html.",
+"ID_HTML_NOTEBOOK":"wx.html.",
+"ID_HTML_OPENFILE":"wx.html.",
+"ID_HTML_OPTIONS":"wx.html.",
+"ID_HTML_PANEL":"wx.html.",
+"ID_HTML_PRINT":"wx.html.",
+"ID_HTML_SEARCHBUTTON":"wx.html.",
+"ID_HTML_SEARCHCHOICE":"wx.html.",
+"ID_HTML_SEARCHLIST":"wx.html.",
+"ID_HTML_SEARCHPAGE":"wx.html.",
+"ID_HTML_SEARCHTEXT":"wx.html.",
+"ID_HTML_TREECTRL":"wx.html.",
+"ID_HTML_UP":"wx.html.",
+"ID_HTML_UPNODE":"wx.html.",
+"ID_ICONIZE_FRAME":"wx.",
+"ID_IGNORE":"wx.",
+"ID_INDENT":"wx.",
+"ID_INDEX":"wx.",
+"ID_INFO":"wx.",
+"ID_ITALIC":"wx.",
+"ID_JUMP_TO":"wx.",
+"ID_JUSTIFY_CENTER":"wx.",
+"ID_JUSTIFY_FILL":"wx.",
+"ID_JUSTIFY_LEFT":"wx.",
+"ID_JUSTIFY_RIGHT":"wx.",
+"ID_LAST":"wx.",
+"ID_LOWEST":"wx.",
+"ID_MAXIMIZE_FRAME":"wx.",
+"ID_MDI_WINDOW_ARRANGE_ICONS":"wx.",
+"ID_MDI_WINDOW_CASCADE":"wx.",
+"ID_MDI_WINDOW_FIRST":"wx.",
+"ID_MDI_WINDOW_LAST":"wx.",
+"ID_MDI_WINDOW_NEXT":"wx.",
+"ID_MDI_WINDOW_PREV":"wx.",
+"ID_MDI_WINDOW_TILE_HORZ":"wx.",
+"ID_MDI_WINDOW_TILE_VERT":"wx.",
+"ID_MORE":"wx.",
+"ID_MOVE_FRAME":"wx.",
+"ID_NETWORK":"wx.",
+"ID_NEW":"wx.",
+"ID_NO":"wx.",
+"ID_NONE":"wx.",
+"ID_NOTOALL":"wx.",
+"ID_OK":"wx.",
+"ID_OPEN":"wx.",
+"ID_PAGE_SETUP":"wx.",
+"ID_PASTE":"wx.",
+"ID_PREFERENCES":"wx.",
+"ID_PREVIEW":"wx.",
+"ID_PREVIEW_CLOSE":"wx.",
+"ID_PREVIEW_FIRST":"wx.",
+"ID_PREVIEW_GOTO":"wx.",
+"ID_PREVIEW_LAST":"wx.",
+"ID_PREVIEW_NEXT":"wx.",
+"ID_PREVIEW_PREVIOUS":"wx.",
+"ID_PREVIEW_PRINT":"wx.",
+"ID_PREVIEW_ZOOM":"wx.",
+"ID_PREVIEW_ZOOM_IN":"wx.",
+"ID_PREVIEW_ZOOM_OUT":"wx.",
+"ID_PRINT":"wx.",
+"ID_PRINT_SETUP":"wx.",
+"ID_PROPERTIES":"wx.",
+"ID_REDO":"wx.",
+"ID_REFRESH":"wx.",
+"ID_REMOVE":"wx.",
+"ID_REPLACE":"wx.",
+"ID_REPLACE_ALL":"wx.",
+"ID_RESET":"wx.",
+"ID_RESIZE_FRAME":"wx.",
+"ID_RESTORE_FRAME":"wx.",
+"ID_RETRY":"wx.",
+"ID_REVERT":"wx.",
+"ID_REVERT_TO_SAVED":"wx.",
+"ID_RICHTEXT_PROPERTIES1":"wx.richtext.",
+"ID_RICHTEXT_PROPERTIES2":"wx.richtext.",
+"ID_RICHTEXT_PROPERTIES3":"wx.richtext.",
+"ID_SAVE":"wx.",
+"ID_SAVEAS":"wx.",
+"ID_SELECTALL":"wx.",
+"ID_SELECT_COLOR":"wx.",
+"ID_SELECT_FONT":"wx.",
+"ID_SEPARATOR":"wx.",
+"ID_SETUP":"wx.",
+"ID_SORT_ASCENDING":"wx.",
+"ID_SORT_DESCENDING":"wx.",
+"ID_SPELL_CHECK":"wx.",
+"ID_STATIC":"wx.",
+"ID_STOP":"wx.",
+"ID_STRIKETHROUGH":"wx.",
+"ID_SYSTEM_MENU":"wx.",
+"ID_TOP":"wx.",
+"ID_UNDELETE":"wx.",
+"ID_UNDERLINE":"wx.",
+"ID_UNDO":"wx.",
+"ID_UNINDENT":"wx.",
+"ID_UP":"wx.",
+"ID_VIEW_DETAILS":"wx.",
+"ID_VIEW_LARGEICONS":"wx.",
+"ID_VIEW_LIST":"wx.",
+"ID_VIEW_SMALLICONS":"wx.",
+"ID_VIEW_SORTDATE":"wx.",
+"ID_VIEW_SORTNAME":"wx.",
+"ID_VIEW_SORTSIZE":"wx.",
+"ID_VIEW_SORTTYPE":"wx.",
+"ID_YES":"wx.",
+"ID_YESTOALL":"wx.",
+"ID_ZOOM_100":"wx.",
+"ID_ZOOM_FIT":"wx.",
+"ID_ZOOM_IN":"wx.",
+"ID_ZOOM_OUT":"wx.",
+"IMAGELIST_DRAW_FOCUSED":"wx.",
+"IMAGELIST_DRAW_NORMAL":"wx.",
+"IMAGELIST_DRAW_SELECTED":"wx.",
+"IMAGELIST_DRAW_TRANSPARENT":"wx.",
+"IMAGE_ALPHA_OPAQUE":"wx.",
+"IMAGE_ALPHA_THRESHOLD":"wx.",
+"IMAGE_ALPHA_TRANSPARENT":"wx.",
+"IMAGE_LIST_NORMAL":"wx.",
+"IMAGE_LIST_SMALL":"wx.",
+"IMAGE_LIST_STATE":"wx.",
+"IMAGE_OPTION_BMP_FORMAT":"wx.",
+"IMAGE_OPTION_CUR_HOTSPOT_X":"wx.",
+"IMAGE_OPTION_CUR_HOTSPOT_Y":"wx.",
+"IMAGE_OPTION_FILENAME":"wx.",
+"IMAGE_OPTION_GIF_COMMENT":"wx.",
+"IMAGE_OPTION_MAX_HEIGHT":"wx.",
+"IMAGE_OPTION_MAX_WIDTH":"wx.",
+"IMAGE_OPTION_ORIGINAL_HEIGHT":"wx.",
+"IMAGE_OPTION_ORIGINAL_WIDTH":"wx.",
+"IMAGE_OPTION_PNG_BITDEPTH":"wx.",
+"IMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE":"wx.",
+"IMAGE_OPTION_PNG_COMPRESSION_LEVEL":"wx.",
+"IMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL":"wx.",
+"IMAGE_OPTION_PNG_COMPRESSION_STRATEGY":"wx.",
+"IMAGE_OPTION_PNG_FILTER":"wx.",
+"IMAGE_OPTION_PNG_FORMAT":"wx.",
+"IMAGE_OPTION_QUALITY":"wx.",
+"IMAGE_OPTION_RESOLUTION":"wx.",
+"IMAGE_OPTION_RESOLUTIONUNIT":"wx.",
+"IMAGE_OPTION_RESOLUTIONX":"wx.",
+"IMAGE_OPTION_RESOLUTIONY":"wx.",
+"IMAGE_OPTION_TIFF_BITSPERSAMPLE":"wx.",
+"IMAGE_OPTION_TIFF_COMPRESSION":"wx.",
+"IMAGE_OPTION_TIFF_IMAGEDESCRIPTOR":"wx.",
+"IMAGE_OPTION_TIFF_PHOTOMETRIC":"wx.",
+"IMAGE_OPTION_TIFF_SAMPLESPERPIXEL":"wx.",
+"IMAGE_QUALITY_BICUBIC":"wx.",
+"IMAGE_QUALITY_BILINEAR":"wx.",
+"IMAGE_QUALITY_BOX_AVERAGE":"wx.",
+"IMAGE_QUALITY_HIGH":"wx.",
+"IMAGE_QUALITY_NEAREST":"wx.",
+"IMAGE_QUALITY_NORMAL":"wx.",
+"IMAGE_RESOLUTION_CM":"wx.",
+"IMAGE_RESOLUTION_INCHES":"wx.",
+"IMAGE_RESOLUTION_NONE":"wx.",
+"INT16_MAX":"wx.",
+"INT16_MIN":"wx.",
+"INT32_MAX":"wx.",
+"INT32_MIN":"wx.",
+"INT64_MAX":"wx.",
+"INT64_MIN":"wx.",
+"INT8_MAX":"wx.",
+"INT8_MIN":"wx.",
+"INTERPOLATION_BEST":"wx.",
+"INTERPOLATION_DEFAULT":"wx.",
+"INTERPOLATION_FAST":"wx.",
+"INTERPOLATION_GOOD":"wx.",
+"INTERPOLATION_NONE":"wx.",
+"INT_MAX":"wx.html.",
+"INVERT":"wx.",
+"ITALIC_FONT":"wx.",
+"ITEM_CHECK":"wx.",
+"ITEM_DROPDOWN":"wx.",
+"ITEM_MAX":"wx.",
+"ITEM_NORMAL":"wx.",
+"ITEM_RADIO":"wx.",
+"ITEM_SEPARATOR":"wx.",
+"Icon":"wx.",
+"IconBundle":"wx.",
+"IconLocation":"wx.",
+"IconizeEvent":"wx.",
+"IdManager":"wx.",
+"IdleEvent":"wx.",
+"IdleMode":"wx.",
+"Image":"wx.",
+"ImageFromBitmap":"wx.",
+"ImageFromBuffer":"wx.",
+"ImageFromData":"wx.",
+"ImageFromDataWithAlpha":"wx.",
+"ImageFromStream":"wx.",
+"ImageHandler":"wx.",
+"ImageHistogram":"wx.",
+"ImageList":"wx.",
+"ImagePNGType":"wx.",
+"ImageResizeQuality":"wx.",
+"ImageResolution":"wx.",
+"InRegion":"wx.",
+"IndividualLayoutConstraint":"wx.",
+"InfoBar":"wx.",
+"InfoMessageBox":"wx.",
+"InitAllImageHandlers":"wx.",
+"InitDialogEvent":"wx.",
+"Initialize":"wx.",
+"InputStream":"wx.",
+"Inside":"wx.",
+"Int16":"wx.",
+"Int32":"wx.",
+"Int64":"wx.",
+"Int8":"wx.",
+"IntPtr":"wx.",
+"InternetFSHandler":"wx.",
+"InterpolationQuality":"wx.",
+"IntersectRect":"wx.",
+"InvalidDateTime":"wx.",
+"IsBusy":"wx.",
+"IsDebuggerRunning":"wx.",
+"IsDragResultOk":"wx.",
+"IsMainThread":"wx.",
+"IsPlatform64Bit":"wx.",
+"IsPlatformLittleEndian":"wx.",
+"ItemContainer":"wx.",
+"ItemContainerImmutable":"wx.",
+"ItemKind":"wx.",
+"JOIN_BEVEL":"wx.",
+"JOIN_INVALID":"wx.",
+"JOIN_MITER":"wx.",
+"JOIN_ROUND":"wx.",
+"JOYSTICK1":"wx.",
+"JOYSTICK2":"wx.",
+"JOY_BUTTON1":"wx.",
+"JOY_BUTTON2":"wx.",
+"JOY_BUTTON3":"wx.",
+"JOY_BUTTON4":"wx.",
+"JOY_BUTTON_ANY":"wx.",
+"Joystick":"wx.adv.",
+"JoystickEvent":"wx.",
+"KILL_ACCESS_DENIED":"wx.",
+"KILL_BAD_SIGNAL":"wx.",
+"KILL_CHILDREN":"wx.",
+"KILL_ERROR":"wx.",
+"KILL_NOCHILDREN":"wx.",
+"KILL_NO_PROCESS":"wx.",
+"KILL_OK":"wx.",
+"KeyCategoryFlags":"wx.",
+"KeyCode":"wx.",
+"KeyEvent":"wx.",
+"KeyModifier":"wx.",
+"KeyboardState":"wx.",
+"Kill":"wx.",
+"KillError":"wx.",
+"KillFlags":"wx.",
+"Kind":"wx.StockPreferencesPage.",
+"LANDSCAPE":"wx.",
+"LANGUAGE_ABKHAZIAN":"wx.",
+"LANGUAGE_AFAR":"wx.",
+"LANGUAGE_AFRIKAANS":"wx.",
+"LANGUAGE_ALBANIAN":"wx.",
+"LANGUAGE_AMHARIC":"wx.",
+"LANGUAGE_ARABIC":"wx.",
+"LANGUAGE_ARABIC_ALGERIA":"wx.",
+"LANGUAGE_ARABIC_BAHRAIN":"wx.",
+"LANGUAGE_ARABIC_EGYPT":"wx.",
+"LANGUAGE_ARABIC_IRAQ":"wx.",
+"LANGUAGE_ARABIC_JORDAN":"wx.",
+"LANGUAGE_ARABIC_KUWAIT":"wx.",
+"LANGUAGE_ARABIC_LEBANON":"wx.",
+"LANGUAGE_ARABIC_LIBYA":"wx.",
+"LANGUAGE_ARABIC_MOROCCO":"wx.",
+"LANGUAGE_ARABIC_OMAN":"wx.",
+"LANGUAGE_ARABIC_QATAR":"wx.",
+"LANGUAGE_ARABIC_SAUDI_ARABIA":"wx.",
+"LANGUAGE_ARABIC_SUDAN":"wx.",
+"LANGUAGE_ARABIC_SYRIA":"wx.",
+"LANGUAGE_ARABIC_TUNISIA":"wx.",
+"LANGUAGE_ARABIC_UAE":"wx.",
+"LANGUAGE_ARABIC_YEMEN":"wx.",
+"LANGUAGE_ARMENIAN":"wx.",
+"LANGUAGE_ASSAMESE":"wx.",
+"LANGUAGE_ASTURIAN":"wx.",
+"LANGUAGE_AYMARA":"wx.",
+"LANGUAGE_AZERI":"wx.",
+"LANGUAGE_AZERI_CYRILLIC":"wx.",
+"LANGUAGE_AZERI_LATIN":"wx.",
+"LANGUAGE_BASHKIR":"wx.",
+"LANGUAGE_BASQUE":"wx.",
+"LANGUAGE_BELARUSIAN":"wx.",
+"LANGUAGE_BENGALI":"wx.",
+"LANGUAGE_BHUTANI":"wx.",
+"LANGUAGE_BIHARI":"wx.",
+"LANGUAGE_BISLAMA":"wx.",
+"LANGUAGE_BOSNIAN":"wx.",
+"LANGUAGE_BRETON":"wx.",
+"LANGUAGE_BULGARIAN":"wx.",
+"LANGUAGE_BURMESE":"wx.",
+"LANGUAGE_CAMBODIAN":"wx.",
+"LANGUAGE_CATALAN":"wx.",
+"LANGUAGE_CHINESE":"wx.",
+"LANGUAGE_CHINESE_HONGKONG":"wx.",
+"LANGUAGE_CHINESE_MACAU":"wx.",
+"LANGUAGE_CHINESE_SIMPLIFIED":"wx.",
+"LANGUAGE_CHINESE_SINGAPORE":"wx.",
+"LANGUAGE_CHINESE_TAIWAN":"wx.",
+"LANGUAGE_CHINESE_TRADITIONAL":"wx.",
+"LANGUAGE_CORSICAN":"wx.",
+"LANGUAGE_CROATIAN":"wx.",
+"LANGUAGE_CZECH":"wx.",
+"LANGUAGE_DANISH":"wx.",
+"LANGUAGE_DEFAULT":"wx.",
+"LANGUAGE_DUTCH":"wx.",
+"LANGUAGE_DUTCH_BELGIAN":"wx.",
+"LANGUAGE_ENGLISH":"wx.",
+"LANGUAGE_ENGLISH_AUSTRALIA":"wx.",
+"LANGUAGE_ENGLISH_BELIZE":"wx.",
+"LANGUAGE_ENGLISH_BOTSWANA":"wx.",
+"LANGUAGE_ENGLISH_CANADA":"wx.",
+"LANGUAGE_ENGLISH_CARIBBEAN":"wx.",
+"LANGUAGE_ENGLISH_DENMARK":"wx.",
+"LANGUAGE_ENGLISH_EIRE":"wx.",
+"LANGUAGE_ENGLISH_JAMAICA":"wx.",
+"LANGUAGE_ENGLISH_NEW_ZEALAND":"wx.",
+"LANGUAGE_ENGLISH_PHILIPPINES":"wx.",
+"LANGUAGE_ENGLISH_SOUTH_AFRICA":"wx.",
+"LANGUAGE_ENGLISH_TRINIDAD":"wx.",
+"LANGUAGE_ENGLISH_UK":"wx.",
+"LANGUAGE_ENGLISH_US":"wx.",
+"LANGUAGE_ENGLISH_ZIMBABWE":"wx.",
+"LANGUAGE_ESPERANTO":"wx.",
+"LANGUAGE_ESTONIAN":"wx.",
+"LANGUAGE_FAEROESE":"wx.",
+"LANGUAGE_FARSI":"wx.",
+"LANGUAGE_FIJI":"wx.",
+"LANGUAGE_FINNISH":"wx.",
+"LANGUAGE_FRENCH":"wx.",
+"LANGUAGE_FRENCH_BELGIAN":"wx.",
+"LANGUAGE_FRENCH_CANADIAN":"wx.",
+"LANGUAGE_FRENCH_LUXEMBOURG":"wx.",
+"LANGUAGE_FRENCH_MONACO":"wx.",
+"LANGUAGE_FRENCH_SWISS":"wx.",
+"LANGUAGE_FRISIAN":"wx.",
+"LANGUAGE_GALICIAN":"wx.",
+"LANGUAGE_GEORGIAN":"wx.",
+"LANGUAGE_GERMAN":"wx.",
+"LANGUAGE_GERMAN_AUSTRIAN":"wx.",
+"LANGUAGE_GERMAN_BELGIUM":"wx.",
+"LANGUAGE_GERMAN_LIECHTENSTEIN":"wx.",
+"LANGUAGE_GERMAN_LUXEMBOURG":"wx.",
+"LANGUAGE_GERMAN_SWISS":"wx.",
+"LANGUAGE_GREEK":"wx.",
+"LANGUAGE_GREENLANDIC":"wx.",
+"LANGUAGE_GUARANI":"wx.",
+"LANGUAGE_GUJARATI":"wx.",
+"LANGUAGE_HAUSA":"wx.",
+"LANGUAGE_HEBREW":"wx.",
+"LANGUAGE_HINDI":"wx.",
+"LANGUAGE_HUNGARIAN":"wx.",
+"LANGUAGE_ICELANDIC":"wx.",
+"LANGUAGE_INDONESIAN":"wx.",
+"LANGUAGE_INTERLINGUA":"wx.",
+"LANGUAGE_INTERLINGUE":"wx.",
+"LANGUAGE_INUKTITUT":"wx.",
+"LANGUAGE_INUPIAK":"wx.",
+"LANGUAGE_IRISH":"wx.",
+"LANGUAGE_ITALIAN":"wx.",
+"LANGUAGE_ITALIAN_SWISS":"wx.",
+"LANGUAGE_JAPANESE":"wx.",
+"LANGUAGE_JAVANESE":"wx.",
+"LANGUAGE_KABYLE":"wx.",
+"LANGUAGE_KANNADA":"wx.",
+"LANGUAGE_KASHMIRI":"wx.",
+"LANGUAGE_KASHMIRI_INDIA":"wx.",
+"LANGUAGE_KAZAKH":"wx.",
+"LANGUAGE_KERNEWEK":"wx.",
+"LANGUAGE_KINYARWANDA":"wx.",
+"LANGUAGE_KIRGHIZ":"wx.",
+"LANGUAGE_KIRUNDI":"wx.",
+"LANGUAGE_KONKANI":"wx.",
+"LANGUAGE_KOREAN":"wx.",
+"LANGUAGE_KURDISH":"wx.",
+"LANGUAGE_LAOTHIAN":"wx.",
+"LANGUAGE_LATIN":"wx.",
+"LANGUAGE_LATVIAN":"wx.",
+"LANGUAGE_LINGALA":"wx.",
+"LANGUAGE_LITHUANIAN":"wx.",
+"LANGUAGE_MACEDONIAN":"wx.",
+"LANGUAGE_MALAGASY":"wx.",
+"LANGUAGE_MALAY":"wx.",
+"LANGUAGE_MALAYALAM":"wx.",
+"LANGUAGE_MALAY_BRUNEI_DARUSSALAM":"wx.",
+"LANGUAGE_MALAY_MALAYSIA":"wx.",
+"LANGUAGE_MALTESE":"wx.",
+"LANGUAGE_MANIPURI":"wx.",
+"LANGUAGE_MAORI":"wx.",
+"LANGUAGE_MARATHI":"wx.",
+"LANGUAGE_MOLDAVIAN":"wx.",
+"LANGUAGE_MONGOLIAN":"wx.",
+"LANGUAGE_NAURU":"wx.",
+"LANGUAGE_NEPALI":"wx.",
+"LANGUAGE_NEPALI_INDIA":"wx.",
+"LANGUAGE_NORWEGIAN_BOKMAL":"wx.",
+"LANGUAGE_NORWEGIAN_NYNORSK":"wx.",
+"LANGUAGE_OCCITAN":"wx.",
+"LANGUAGE_ORIYA":"wx.",
+"LANGUAGE_OROMO":"wx.",
+"LANGUAGE_PASHTO":"wx.",
+"LANGUAGE_POLISH":"wx.",
+"LANGUAGE_PORTUGUESE":"wx.",
+"LANGUAGE_PORTUGUESE_BRAZILIAN":"wx.",
+"LANGUAGE_PUNJABI":"wx.",
+"LANGUAGE_QUECHUA":"wx.",
+"LANGUAGE_RHAETO_ROMANCE":"wx.",
+"LANGUAGE_ROMANIAN":"wx.",
+"LANGUAGE_RUSSIAN":"wx.",
+"LANGUAGE_RUSSIAN_UKRAINE":"wx.",
+"LANGUAGE_SAMI":"wx.",
+"LANGUAGE_SAMOAN":"wx.",
+"LANGUAGE_SANGHO":"wx.",
+"LANGUAGE_SANSKRIT":"wx.",
+"LANGUAGE_SCOTS_GAELIC":"wx.",
+"LANGUAGE_SERBIAN":"wx.",
+"LANGUAGE_SERBIAN_CYRILLIC":"wx.",
+"LANGUAGE_SERBIAN_LATIN":"wx.",
+"LANGUAGE_SERBO_CROATIAN":"wx.",
+"LANGUAGE_SESOTHO":"wx.",
+"LANGUAGE_SETSWANA":"wx.",
+"LANGUAGE_SHONA":"wx.",
+"LANGUAGE_SINDHI":"wx.",
+"LANGUAGE_SINHALESE":"wx.",
+"LANGUAGE_SISWATI":"wx.",
+"LANGUAGE_SLOVAK":"wx.",
+"LANGUAGE_SLOVENIAN":"wx.",
+"LANGUAGE_SOMALI":"wx.",
+"LANGUAGE_SPANISH":"wx.",
+"LANGUAGE_SPANISH_ARGENTINA":"wx.",
+"LANGUAGE_SPANISH_BOLIVIA":"wx.",
+"LANGUAGE_SPANISH_CHILE":"wx.",
+"LANGUAGE_SPANISH_COLOMBIA":"wx.",
+"LANGUAGE_SPANISH_COSTA_RICA":"wx.",
+"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC":"wx.",
+"LANGUAGE_SPANISH_ECUADOR":"wx.",
+"LANGUAGE_SPANISH_EL_SALVADOR":"wx.",
+"LANGUAGE_SPANISH_GUATEMALA":"wx.",
+"LANGUAGE_SPANISH_HONDURAS":"wx.",
+"LANGUAGE_SPANISH_MEXICAN":"wx.",
+"LANGUAGE_SPANISH_MODERN":"wx.",
+"LANGUAGE_SPANISH_NICARAGUA":"wx.",
+"LANGUAGE_SPANISH_PANAMA":"wx.",
+"LANGUAGE_SPANISH_PARAGUAY":"wx.",
+"LANGUAGE_SPANISH_PERU":"wx.",
+"LANGUAGE_SPANISH_PUERTO_RICO":"wx.",
+"LANGUAGE_SPANISH_URUGUAY":"wx.",
+"LANGUAGE_SPANISH_US":"wx.",
+"LANGUAGE_SPANISH_VENEZUELA":"wx.",
+"LANGUAGE_SUNDANESE":"wx.",
+"LANGUAGE_SWAHILI":"wx.",
+"LANGUAGE_SWEDISH":"wx.",
+"LANGUAGE_SWEDISH_FINLAND":"wx.",
+"LANGUAGE_TAGALOG":"wx.",
+"LANGUAGE_TAJIK":"wx.",
+"LANGUAGE_TAMIL":"wx.",
+"LANGUAGE_TATAR":"wx.",
+"LANGUAGE_TELUGU":"wx.",
+"LANGUAGE_THAI":"wx.",
+"LANGUAGE_TIBETAN":"wx.",
+"LANGUAGE_TIGRINYA":"wx.",
+"LANGUAGE_TONGA":"wx.",
+"LANGUAGE_TSONGA":"wx.",
+"LANGUAGE_TURKISH":"wx.",
+"LANGUAGE_TURKMEN":"wx.",
+"LANGUAGE_TWI":"wx.",
+"LANGUAGE_UIGHUR":"wx.",
+"LANGUAGE_UKRAINIAN":"wx.",
+"LANGUAGE_UNKNOWN":"wx.",
+"LANGUAGE_URDU":"wx.",
+"LANGUAGE_URDU_INDIA":"wx.",
+"LANGUAGE_URDU_PAKISTAN":"wx.",
+"LANGUAGE_USER_DEFINED":"wx.",
+"LANGUAGE_UZBEK":"wx.",
+"LANGUAGE_UZBEK_CYRILLIC":"wx.",
+"LANGUAGE_UZBEK_LATIN":"wx.",
+"LANGUAGE_VALENCIAN":"wx.",
+"LANGUAGE_VIETNAMESE":"wx.",
+"LANGUAGE_VOLAPUK":"wx.",
+"LANGUAGE_WELSH":"wx.",
+"LANGUAGE_WOLOF":"wx.",
+"LANGUAGE_XHOSA":"wx.",
+"LANGUAGE_YIDDISH":"wx.",
+"LANGUAGE_YORUBA":"wx.",
+"LANGUAGE_ZHUANG":"wx.",
+"LANGUAGE_ZULU":"wx.",
+"LAYOUT_BOTTOM":"wx.adv.",
+"LAYOUT_DEFAULT_MARGIN":"wx.",
+"LAYOUT_HORIZONTAL":"wx.adv.",
+"LAYOUT_LEFT":"wx.adv.",
+"LAYOUT_NONE":"wx.adv.",
+"LAYOUT_RIGHT":"wx.adv.",
+"LAYOUT_TOP":"wx.adv.",
+"LAYOUT_VERTICAL":"wx.adv.",
+"LB_ALIGN_MASK":"wx.",
+"LB_ALWAYS_SB":"wx.",
+"LB_BOTTOM":"wx.",
+"LB_DEFAULT":"wx.",
+"LB_EXTENDED":"wx.",
+"LB_HSCROLL":"wx.",
+"LB_INT_HEIGHT":"wx.",
+"LB_LEFT":"wx.",
+"LB_MULTIPLE":"wx.",
+"LB_NEEDED_SB":"wx.",
+"LB_NO_SB":"wx.",
+"LB_OWNERDRAW":"wx.",
+"LB_RIGHT":"wx.",
+"LB_SINGLE":"wx.",
+"LB_SORT":"wx.",
+"LB_TOP":"wx.",
+"LC_ALIGN_LEFT":"wx.",
+"LC_ALIGN_TOP":"wx.",
+"LC_AUTOARRANGE":"wx.",
+"LC_EDIT_LABELS":"wx.",
+"LC_HRULES":"wx.",
+"LC_ICON":"wx.",
+"LC_LIST":"wx.",
+"LC_MASK_ALIGN":"wx.",
+"LC_MASK_SORT":"wx.",
+"LC_MASK_TYPE":"wx.",
+"LC_NO_HEADER":"wx.",
+"LC_NO_SORT_HEADER":"wx.",
+"LC_REPORT":"wx.",
+"LC_SINGLE_SEL":"wx.",
+"LC_SMALL_ICON":"wx.",
+"LC_SORT_ASCENDING":"wx.",
+"LC_SORT_DESCENDING":"wx.",
+"LC_VIRTUAL":"wx.",
+"LC_VRULES":"wx.",
+"LEFT":"wx.",
+"LIGHT_GREY":"wx.",
+"LIGHT_GREY_BRUSH":"wx.",
+"LIGHT_GREY_PEN":"wx.",
+"LIST_ALIGN_DEFAULT":"wx.",
+"LIST_ALIGN_LEFT":"wx.",
+"LIST_ALIGN_SNAP_TO_GRID":"wx.",
+"LIST_ALIGN_TOP":"wx.",
+"LIST_AUTOSIZE":"wx.",
+"LIST_AUTOSIZE_USEHEADER":"wx.",
+"LIST_FIND_DOWN":"wx.",
+"LIST_FIND_LEFT":"wx.",
+"LIST_FIND_RIGHT":"wx.",
+"LIST_FIND_UP":"wx.",
+"LIST_FORMAT_CENTER":"wx.",
+"LIST_FORMAT_CENTRE":"wx.",
+"LIST_FORMAT_LEFT":"wx.",
+"LIST_FORMAT_RIGHT":"wx.",
+"LIST_GETSUBITEMRECT_WHOLEITEM":"wx.",
+"LIST_HITTEST_ABOVE":"wx.",
+"LIST_HITTEST_BELOW":"wx.",
+"LIST_HITTEST_NOWHERE":"wx.",
+"LIST_HITTEST_ONITEM":"wx.",
+"LIST_HITTEST_ONITEMICON":"wx.",
+"LIST_HITTEST_ONITEMLABEL":"wx.",
+"LIST_HITTEST_ONITEMRIGHT":"wx.",
+"LIST_HITTEST_ONITEMSTATEICON":"wx.",
+"LIST_HITTEST_TOLEFT":"wx.",
+"LIST_HITTEST_TORIGHT":"wx.",
+"LIST_MASK_DATA":"wx.",
+"LIST_MASK_FORMAT":"wx.",
+"LIST_MASK_IMAGE":"wx.",
+"LIST_MASK_STATE":"wx.",
+"LIST_MASK_TEXT":"wx.",
+"LIST_MASK_WIDTH":"wx.",
+"LIST_NEXT_ABOVE":"wx.",
+"LIST_NEXT_ALL":"wx.",
+"LIST_NEXT_BELOW":"wx.",
+"LIST_NEXT_LEFT":"wx.",
+"LIST_NEXT_RIGHT":"wx.",
+"LIST_RECT_BOUNDS":"wx.",
+"LIST_RECT_ICON":"wx.",
+"LIST_RECT_LABEL":"wx.",
+"LIST_SET_ITEM":"wx.",
+"LIST_STATE_CUT":"wx.",
+"LIST_STATE_DISABLED":"wx.",
+"LIST_STATE_DONTCARE":"wx.",
+"LIST_STATE_DROPHILITED":"wx.",
+"LIST_STATE_FILTERED":"wx.",
+"LIST_STATE_FOCUSED":"wx.",
+"LIST_STATE_INUSE":"wx.",
+"LIST_STATE_PICKED":"wx.",
+"LIST_STATE_SELECTED":"wx.",
+"LIST_STATE_SOURCE":"wx.",
+"LI_HORIZONTAL":"wx.",
+"LI_VERTICAL":"wx.",
+"LOCALE_CAT_DATE":"wx.",
+"LOCALE_CAT_DEFAULT":"wx.",
+"LOCALE_CAT_MONEY":"wx.",
+"LOCALE_CAT_NUMBER":"wx.",
+"LOCALE_DATE_TIME_FMT":"wx.",
+"LOCALE_DECIMAL_POINT":"wx.",
+"LOCALE_LONG_DATE_FMT":"wx.",
+"LOCALE_SHORT_DATE_FMT":"wx.",
+"LOCALE_THOUSANDS_SEP":"wx.",
+"LOCALE_TIME_FMT":"wx.",
+"LOG_Debug":"wx.",
+"LOG_Error":"wx.",
+"LOG_FatalError":"wx.",
+"LOG_Info":"wx.",
+"LOG_Max":"wx.",
+"LOG_Message":"wx.",
+"LOG_Progress":"wx.",
+"LOG_Status":"wx.",
+"LOG_Trace":"wx.",
+"LOG_User":"wx.",
+"LOG_Warning":"wx.",
+"Language":"wx.",
+"LanguageInfo":"wx.",
+"LaunchDefaultApplication":"wx.",
+"LaunchDefaultBrowser":"wx.",
+"LayoutAlgorithm":"wx.adv.",
+"LayoutAlignment":"wx.adv.",
+"LayoutConstraints":"wx.",
+"LayoutDirection":"wx.",
+"LayoutOrientation":"wx.adv.",
+"Layout_Default":"wx.",
+"Layout_LeftToRight":"wx.",
+"Layout_RightToLeft":"wx.",
+"Left":"wx.",
+"LeftOf":"wx.",
+"LinuxDistributionInfo":"wx.",
+"ListBox":"wx.",
+"ListColumnFormat":"wx.",
+"ListCtrl":"wx.",
+"ListCtrlNameStr":"wx.",
+"ListEvent":"wx.",
+"ListItem":"wx.",
+"ListItemAttr":"wx.",
+"ListView":"wx.",
+"Listbook":"wx.",
+"LoadFileSelector":"wx.",
+"LoadUserResource":"wx.",
+"Locale":"wx.",
+"LocaleCategory":"wx.",
+"LocaleInfo":"wx.",
+"Log":"wx.",
+"LogBuffer":"wx.",
+"LogChain":"wx.",
+"LogDebug":"wx.",
+"LogError":"wx.",
+"LogFatalError":"wx.",
+"LogFormatter":"wx.",
+"LogGeneric":"wx.",
+"LogGui":"wx.",
+"LogInterposer":"wx.",
+"LogInterposerTemp":"wx.",
+"LogLevel":"wx.",
+"LogLevelValues":"wx.",
+"LogMessage":"wx.",
+"LogNull":"wx.",
+"LogRecordInfo":"wx.",
+"LogStatus":"wx.",
+"LogStderr":"wx.",
+"LogSysError":"wx.",
+"LogTextCtrl":"wx.",
+"LogTrace":"wx.",
+"LogVerbose":"wx.",
+"LogWarning":"wx.",
+"LogWindow":"wx.",
+"MAXIMIZE":"wx.",
+"MAXIMIZE_BOX":"wx.",
+"MB_DOCKABLE":"wx.",
+"MDIChildFrame":"wx.",
+"MDIClientWindow":"wx.",
+"MDIParentFrame":"wx.",
+"MEDIACTRLPLAYERCONTROLS_DEFAULT":"wx.media.",
+"MEDIACTRLPLAYERCONTROLS_NONE":"wx.media.",
+"MEDIACTRLPLAYERCONTROLS_STEP":"wx.media.",
+"MEDIACTRLPLAYERCONTROLS_VOLUME":"wx.media.",
+"MEDIASTATE_PAUSED":"wx.media.",
+"MEDIASTATE_PLAYING":"wx.media.",
+"MEDIASTATE_STOPPED":"wx.media.",
+"MEDIUM_GREY_BRUSH":"wx.",
+"MEDIUM_GREY_PEN":"wx.",
+"MENU_TEAROFF":"wx.",
+"MINIMIZE":"wx.",
+"MINIMIZE_BOX":"wx.",
+"MM_LOMETRIC":"wx.",
+"MM_METRIC":"wx.",
+"MM_POINTS":"wx.",
+"MM_TEXT":"wx.",
+"MM_TWIPS":"wx.",
+"MOD_ALL":"wx.",
+"MOD_ALT":"wx.",
+"MOD_ALTGR":"wx.",
+"MOD_CMD":"wx.",
+"MOD_CONTROL":"wx.",
+"MOD_META":"wx.",
+"MOD_NONE":"wx.",
+"MOD_RAW_CONTROL":"wx.",
+"MOD_SHIFT":"wx.",
+"MOD_WIN":"wx.",
+"MORE":"wx.",
+"MOUSE_BTN_ANY":"wx.",
+"MOUSE_BTN_AUX1":"wx.",
+"MOUSE_BTN_AUX2":"wx.",
+"MOUSE_BTN_LEFT":"wx.",
+"MOUSE_BTN_MAX":"wx.",
+"MOUSE_BTN_MIDDLE":"wx.",
+"MOUSE_BTN_NONE":"wx.",
+"MOUSE_BTN_RIGHT":"wx.",
+"MOUSE_WHEEL_HORIZONTAL":"wx.",
+"MOUSE_WHEEL_VERTICAL":"wx.",
+"MacThemeColour":"wx.",
+"MakeMetafilePlaceable":"wx.msw.",
+"MappingMode":"wx.",
+"Mask":"wx.",
+"Matrix2D":"wx.",
+"MaximizeEvent":"wx.",
+"MediaCtrl":"wx.media.",
+"MediaCtrlPlayerControls":"wx.media.",
+"MediaEvent":"wx.media.",
+"MediaState":"wx.media.",
+"MemoryDC":"wx.",
+"MemoryFSHandler":"wx.",
+"Menu":"wx.",
+"MenuBar":"wx.",
+"MenuEvent":"wx.",
+"MenuItem":"wx.",
+"MessageBox":"wx.",
+"MessageBoxCaptionStr":"wx.",
+"MessageDialog":"wx.",
+"MessageParameters":"wx.FileType.",
+"Metafile":"wx.msw.",
+"MetafileDC":"wx.msw.",
+"MicroSleep":"wx.",
+"MilliSleep":"wx.",
+"MimeTypesManager":"wx.",
+"MiniFrame":"wx.",
+"MirrorDC":"wx.",
+"ModalDialogHook":"wx.",
+"Month":"wx.DateTime.",
+"MouseButton":"wx.",
+"MouseCaptureChangedEvent":"wx.",
+"MouseCaptureLostEvent":"wx.",
+"MouseEvent":"wx.",
+"MouseEventsManager":"wx.",
+"MouseState":"wx.",
+"MouseWheelAxis":"wx.",
+"MoveEvent":"wx.",
+"MultiChoiceDialog":"wx.",
+"NAND":"wx.",
+"NB_BOTTOM":"wx.",
+"NB_DEFAULT":"wx.",
+"NB_FIXEDWIDTH":"wx.",
+"NB_FLAT":"wx.",
+"NB_HITTEST_NOWHERE":"wx.",
+"NB_HITTEST_ONICON":"wx.",
+"NB_HITTEST_ONITEM":"wx.",
+"NB_HITTEST_ONLABEL":"wx.",
+"NB_HITTEST_ONPAGE":"wx.",
+"NB_LEFT":"wx.",
+"NB_MULTILINE":"wx.",
+"NB_NOPAGETHEME":"wx.",
+"NB_RIGHT":"wx.",
+"NB_TOP":"wx.",
+"NO":"wx.",
+"NOR":"wx.",
+"NORMAL_FONT":"wx.",
+"NORTH":"wx.",
+"NOT_FOUND":"wx.",
+"NO_BORDER":"wx.",
+"NO_DEFAULT":"wx.",
+"NO_FULL_REPAINT_ON_RESIZE":"wx.",
+"NO_IMAGE":"wx.",
+"NO_OP":"wx.",
+"NameFlags":"wx.DateTime.",
+"NativeFontInfo":"wx.",
+"NativePixelData":"wx.",
+"NativePixelData_Accessor":"wx.",
+"NavigationKeyEvent":"wx.",
+"NavigationKeyEventFlags":"wx.NavigationKeyEvent.",
+"NewEventType":"wx.",
+"NewId":"wx.",
+"NonOwnedWindow":"wx.",
+"Notebook":"wx.",
+"NotebookNameStr":"wx.",
+"NotificationMessage":"wx.adv.",
+"NotifyEvent":"wx.",
+"Now":"wx.",
+"NullAcceleratorTable":"wx.",
+"NullAnimation":"wx.adv.",
+"NullBitmap":"wx.",
+"NullBrush":"wx.",
+"NullColour":"wx.",
+"NullCursor":"wx.",
+"NullFont":"wx.",
+"NullGraphicsBitmap":"wx.",
+"NullGraphicsBrush":"wx.",
+"NullGraphicsFont":"wx.",
+"NullGraphicsMatrix":"wx.",
+"NullGraphicsPath":"wx.",
+"NullGraphicsPen":"wx.",
+"NullIcon":"wx.",
+"NullIconBundle":"wx.",
+"NullImage":"wx.",
+"NullPen":"wx.",
+"NullRegion":"wx.",
+"ODCB_DCLICK_CYCLES":"wx.adv.",
+"ODCB_PAINTING_CONTROL":"wx.adv.",
+"ODCB_PAINTING_SELECTED":"wx.adv.",
+"ODCB_STD_CONTROL_PAINT":"wx.adv.",
+"ODDEVEN_RULE":"wx.",
+"OK":"wx.",
+"OK_DEFAULT":"wx.",
+"OR":"wx.",
+"ORIENTATION_MASK":"wx.",
+"OR_INVERT":"wx.",
+"OR_REVERSE":"wx.",
+"OS_DOS":"wx.",
+"OS_MAC":"wx.",
+"OS_MAC_OS":"wx.",
+"OS_MAC_OSX_DARWIN":"wx.",
+"OS_OS2":"wx.",
+"OS_UNIX":"wx.",
+"OS_UNIX_AIX":"wx.",
+"OS_UNIX_FREEBSD":"wx.",
+"OS_UNIX_HPUX":"wx.",
+"OS_UNIX_LINUX":"wx.",
+"OS_UNIX_NETBSD":"wx.",
+"OS_UNIX_OPENBSD":"wx.",
+"OS_UNIX_SOLARIS":"wx.",
+"OS_UNKNOWN":"wx.",
+"OS_WINDOWS":"wx.",
+"OS_WINDOWS_9X":"wx.",
+"OS_WINDOWS_CE":"wx.",
+"OS_WINDOWS_MICRO":"wx.",
+"OS_WINDOWS_NT":"wx.",
+"Object":"wx.",
+"ObjectRefData":"wx.",
+"OperatingSystemId":"wx.",
+"Orientation":"wx.",
+"Origin":"wx.HelpEvent.",
+"OutBottom":"wx.",
+"OutCode":"wx.",
+"OutLeft":"wx.",
+"OutRegion":"wx.",
+"OutRight":"wx.",
+"OutTop":"wx.",
+"OutputStream":"wx.",
+"Overlay":"wx.",
+"OwnerDrawnComboBox":"wx.adv.",
+"OwnerDrawnComboBoxPaintingFlags":"wx.adv.",
+"PAGE_ALL":"wx.html.",
+"PAGE_EVEN":"wx.html.",
+"PAGE_ODD":"wx.html.",
+"PAPER_10X11":"wx.",
+"PAPER_10X14":"wx.",
+"PAPER_11X17":"wx.",
+"PAPER_12X11":"wx.",
+"PAPER_15X11":"wx.",
+"PAPER_9X11":"wx.",
+"PAPER_A2":"wx.",
+"PAPER_A3":"wx.",
+"PAPER_A3_EXTRA":"wx.",
+"PAPER_A3_EXTRA_TRANSVERSE":"wx.",
+"PAPER_A3_ROTATED":"wx.",
+"PAPER_A3_TRANSVERSE":"wx.",
+"PAPER_A4":"wx.",
+"PAPER_A4SMALL":"wx.",
+"PAPER_A4_EXTRA":"wx.",
+"PAPER_A4_PLUS":"wx.",
+"PAPER_A4_ROTATED":"wx.",
+"PAPER_A4_TRANSVERSE":"wx.",
+"PAPER_A5":"wx.",
+"PAPER_A5_EXTRA":"wx.",
+"PAPER_A5_ROTATED":"wx.",
+"PAPER_A5_TRANSVERSE":"wx.",
+"PAPER_A6":"wx.",
+"PAPER_A6_ROTATED":"wx.",
+"PAPER_A_PLUS":"wx.",
+"PAPER_B4":"wx.",
+"PAPER_B4_JIS_ROTATED":"wx.",
+"PAPER_B5":"wx.",
+"PAPER_B5_EXTRA":"wx.",
+"PAPER_B5_JIS_ROTATED":"wx.",
+"PAPER_B5_TRANSVERSE":"wx.",
+"PAPER_B6_JIS":"wx.",
+"PAPER_B6_JIS_ROTATED":"wx.",
+"PAPER_B_PLUS":"wx.",
+"PAPER_CSHEET":"wx.",
+"PAPER_DBL_JAPANESE_POSTCARD":"wx.",
+"PAPER_DBL_JAPANESE_POSTCARD_ROTATED":"wx.",
+"PAPER_DSHEET":"wx.",
+"PAPER_ENV_10":"wx.",
+"PAPER_ENV_11":"wx.",
+"PAPER_ENV_12":"wx.",
+"PAPER_ENV_14":"wx.",
+"PAPER_ENV_9":"wx.",
+"PAPER_ENV_B4":"wx.",
+"PAPER_ENV_B5":"wx.",
+"PAPER_ENV_B6":"wx.",
+"PAPER_ENV_C3":"wx.",
+"PAPER_ENV_C4":"wx.",
+"PAPER_ENV_C5":"wx.",
+"PAPER_ENV_C6":"wx.",
+"PAPER_ENV_C65":"wx.",
+"PAPER_ENV_DL":"wx.",
+"PAPER_ENV_INVITE":"wx.",
+"PAPER_ENV_ITALY":"wx.",
+"PAPER_ENV_MONARCH":"wx.",
+"PAPER_ENV_PERSONAL":"wx.",
+"PAPER_ESHEET":"wx.",
+"PAPER_EXECUTIVE":"wx.",
+"PAPER_FANFOLD_LGL_GERMAN":"wx.",
+"PAPER_FANFOLD_STD_GERMAN":"wx.",
+"PAPER_FANFOLD_US":"wx.",
+"PAPER_FOLIO":"wx.",
+"PAPER_ISO_B4":"wx.",
+"PAPER_JAPANESE_POSTCARD":"wx.",
+"PAPER_JAPANESE_POSTCARD_ROTATED":"wx.",
+"PAPER_JENV_CHOU3":"wx.",
+"PAPER_JENV_CHOU3_ROTATED":"wx.",
+"PAPER_JENV_CHOU4":"wx.",
+"PAPER_JENV_CHOU4_ROTATED":"wx.",
+"PAPER_JENV_KAKU2":"wx.",
+"PAPER_JENV_KAKU2_ROTATED":"wx.",
+"PAPER_JENV_KAKU3":"wx.",
+"PAPER_JENV_KAKU3_ROTATED":"wx.",
+"PAPER_JENV_YOU4":"wx.",
+"PAPER_JENV_YOU4_ROTATED":"wx.",
+"PAPER_LEDGER":"wx.",
+"PAPER_LEGAL":"wx.",
+"PAPER_LEGAL_EXTRA":"wx.",
+"PAPER_LETTER":"wx.",
+"PAPER_LETTERSMALL":"wx.",
+"PAPER_LETTER_EXTRA":"wx.",
+"PAPER_LETTER_EXTRA_TRANSVERSE":"wx.",
+"PAPER_LETTER_PLUS":"wx.",
+"PAPER_LETTER_ROTATED":"wx.",
+"PAPER_LETTER_TRANSVERSE":"wx.",
+"PAPER_NONE":"wx.",
+"PAPER_NOTE":"wx.",
+"PAPER_P16K":"wx.",
+"PAPER_P16K_ROTATED":"wx.",
+"PAPER_P32K":"wx.",
+"PAPER_P32KBIG":"wx.",
+"PAPER_P32KBIG_ROTATED":"wx.",
+"PAPER_P32K_ROTATED":"wx.",
+"PAPER_PENV_1":"wx.",
+"PAPER_PENV_10":"wx.",
+"PAPER_PENV_10_ROTATED":"wx.",
+"PAPER_PENV_1_ROTATED":"wx.",
+"PAPER_PENV_2":"wx.",
+"PAPER_PENV_2_ROTATED":"wx.",
+"PAPER_PENV_3":"wx.",
+"PAPER_PENV_3_ROTATED":"wx.",
+"PAPER_PENV_4":"wx.",
+"PAPER_PENV_4_ROTATED":"wx.",
+"PAPER_PENV_5":"wx.",
+"PAPER_PENV_5_ROTATED":"wx.",
+"PAPER_PENV_6":"wx.",
+"PAPER_PENV_6_ROTATED":"wx.",
+"PAPER_PENV_7":"wx.",
+"PAPER_PENV_7_ROTATED":"wx.",
+"PAPER_PENV_8":"wx.",
+"PAPER_PENV_8_ROTATED":"wx.",
+"PAPER_PENV_9":"wx.",
+"PAPER_PENV_9_ROTATED":"wx.",
+"PAPER_QUARTO":"wx.",
+"PAPER_STATEMENT":"wx.",
+"PAPER_TABLOID":"wx.",
+"PAPER_TABLOID_EXTRA":"wx.",
+"PB_SMALL":"wx.",
+"PB_USE_TEXTCTRL":"wx.",
+"PD_APP_MODAL":"wx.",
+"PD_AUTO_HIDE":"wx.",
+"PD_CAN_ABORT":"wx.",
+"PD_CAN_SKIP":"wx.",
+"PD_ELAPSED_TIME":"wx.",
+"PD_ESTIMATED_TIME":"wx.",
+"PD_REMAINING_TIME":"wx.",
+"PD_SMOOTH":"wx.",
+"PENSTYLE_BDIAGONAL_HATCH":"wx.",
+"PENSTYLE_CROSSDIAG_HATCH":"wx.",
+"PENSTYLE_CROSS_HATCH":"wx.",
+"PENSTYLE_DOT":"wx.",
+"PENSTYLE_DOT_DASH":"wx.",
+"PENSTYLE_FDIAGONAL_HATCH":"wx.",
+"PENSTYLE_FIRST_HATCH":"wx.",
+"PENSTYLE_HORIZONTAL_HATCH":"wx.",
+"PENSTYLE_INVALID":"wx.",
+"PENSTYLE_LAST_HATCH":"wx.",
+"PENSTYLE_LONG_DASH":"wx.",
+"PENSTYLE_SHORT_DASH":"wx.",
+"PENSTYLE_SOLID":"wx.",
+"PENSTYLE_STIPPLE":"wx.",
+"PENSTYLE_STIPPLE_MASK":"wx.",
+"PENSTYLE_STIPPLE_MASK_OPAQUE":"wx.",
+"PENSTYLE_TRANSPARENT":"wx.",
+"PENSTYLE_USER_DASH":"wx.",
+"PENSTYLE_VERTICAL_HATCH":"wx.",
+"PNG_TYPE_COLOUR":"wx.",
+"PNG_TYPE_GREY":"wx.",
+"PNG_TYPE_GREY_RED":"wx.",
+"PNG_TYPE_PALETTE":"wx.",
+"POPUP_WINDOW":"wx.",
+"PORTRAIT":"wx.",
+"PORT_BASE":"wx.",
+"PORT_COCOA":"wx.",
+"PORT_DFB":"wx.",
+"PORT_GTK":"wx.",
+"PORT_MAC":"wx.",
+"PORT_MOTIF":"wx.",
+"PORT_MSW":"wx.",
+"PORT_OS2":"wx.",
+"PORT_UNKNOWN":"wx.",
+"PORT_WINCE":"wx.",
+"PORT_X11":"wx.",
+"POWER_BATTERY":"wx.",
+"POWER_SOCKET":"wx.",
+"POWER_UNKNOWN":"wx.",
+"PREVIEW_DEFAULT":"wx.",
+"PREVIEW_FIRST":"wx.",
+"PREVIEW_GOTO":"wx.",
+"PREVIEW_LAST":"wx.",
+"PREVIEW_NEXT":"wx.",
+"PREVIEW_PREVIOUS":"wx.",
+"PREVIEW_PRINT":"wx.",
+"PREVIEW_ZOOM":"wx.",
+"PRINTBIN_AUTO":"wx.",
+"PRINTBIN_CASSETTE":"wx.",
+"PRINTBIN_DEFAULT":"wx.",
+"PRINTBIN_ENVELOPE":"wx.",
+"PRINTBIN_ENVMANUAL":"wx.",
+"PRINTBIN_FORMSOURCE":"wx.",
+"PRINTBIN_LARGECAPACITY":"wx.",
+"PRINTBIN_LARGEFMT":"wx.",
+"PRINTBIN_LOWER":"wx.",
+"PRINTBIN_MANUAL":"wx.",
+"PRINTBIN_MIDDLE":"wx.",
+"PRINTBIN_ONLYONE":"wx.",
+"PRINTBIN_SMALLFMT":"wx.",
+"PRINTBIN_TRACTOR":"wx.",
+"PRINTBIN_USER":"wx.",
+"PRINTER_CANCELLED":"wx.",
+"PRINTER_ERROR":"wx.",
+"PRINTER_NO_ERROR":"wx.",
+"PRINT_MODE_FILE":"wx.",
+"PRINT_MODE_NONE":"wx.",
+"PRINT_MODE_PREVIEW":"wx.",
+"PRINT_MODE_PRINTER":"wx.",
+"PRINT_MODE_STREAM":"wx.",
+"PRINT_QUALITY_DRAFT":"wx.",
+"PRINT_QUALITY_HIGH":"wx.",
+"PRINT_QUALITY_LOW":"wx.",
+"PRINT_QUALITY_MEDIUM":"wx.",
+"PageSetupDialog":"wx.",
+"PageSetupDialogData":"wx.",
+"PaintDC":"wx.",
+"PaintEvent":"wx.",
+"PaletteChangedEvent":"wx.",
+"Panel":"wx.",
+"PanelNameStr":"wx.",
+"PaperSize":"wx.",
+"PartRegion":"wx.",
+"PasswordEntryDialog":"wx.",
+"Pen":"wx.",
+"PenCap":"wx.",
+"PenJoin":"wx.",
+"PenList":"wx.",
+"PenStyle":"wx.",
+"PercentOf":"wx.",
+"PickerBase":"wx.",
+"PixelDataBase":"wx.",
+"PlatformInformation":"wx.",
+"Point":"wx.",
+"Point2D":"wx.",
+"PolygonFillMode":"wx.",
+"PopupTransientWindow":"wx.",
+"PopupWindow":"wx.",
+"PortId":"wx.",
+"Position":"wx.",
+"PostDelete":"wx.",
+"PostEvent":"wx.",
+"PostScriptDC":"wx.",
+"PowerEvent":"wx.",
+"PowerType":"wx.",
+"PreferencesEditor":"wx.",
+"PreferencesPage":"wx.",
+"PreviewCanvas":"wx.",
+"PreviewControlBar":"wx.",
+"PreviewFrame":"wx.",
+"PreviewFrameModalityKind":"wx.",
+"PreviewFrame_AppModal":"wx.",
+"PreviewFrame_NonModal":"wx.",
+"PreviewFrame_WindowModal":"wx.",
+"PrintAbortDialog":"wx.",
+"PrintBin":"wx.",
+"PrintData":"wx.",
+"PrintDialog":"wx.",
+"PrintDialogData":"wx.",
+"PrintMode":"wx.",
+"PrintOrientation":"wx.",
+"PrintPreview":"wx.",
+"PrintQuality":"wx.",
+"Printer":"wx.",
+"PrinterDC":"wx.",
+"PrinterError":"wx.",
+"Printout":"wx.",
+"Process":"wx.",
+"ProcessEvent":"wx.",
+"ProgressDialog":"wx.",
+"PropagateOnce":"wx.",
+"PropagationDisabler":"wx.",
+"PyApp":"wx.",
+"PyAxBaseWindow":"wx.msw.",
+"PyCommandEvent":"wx.",
+"PyDataViewModel":"wx.dataview.",
+"PyEvent":"wx.",
+"PyEventBinder":"wx.",
+"PyOnDemandOutputWindow":"wx.",
+"PySimpleApp":"wx.",
+"Qsort":"wx.",
+"QueryLayoutInfoEvent":"wx.adv.",
+"QueryNewPaletteEvent":"wx.",
+"QueueEvent":"wx.",
+"RAISED_BORDER":"wx.",
+"RA_HORIZONTAL":"wx.",
+"RA_LEFTTORIGHT":"wx.",
+"RA_SPECIFY_COLS":"wx.",
+"RA_SPECIFY_ROWS":"wx.",
+"RA_TOPTOBOTTOM":"wx.",
+"RA_VERTICAL":"wx.",
+"RB_GROUP":"wx.",
+"RB_SINGLE":"wx.",
+"RED":"wx.",
+"RED_BRUSH":"wx.",
+"RED_PEN":"wx.",
+"REMOVE_LEADING_SPACES":"wx.",
+"RESERVE_SPACE_EVEN_IF_HIDDEN":"wx.",
+"RESET":"wx.",
+"RESIZE_BORDER":"wx.",
+"RETAINED":"wx.",
+"RE_CENTER_CARET":"wx.richtext.",
+"RE_CENTRE_CARET":"wx.richtext.",
+"RE_MULTILINE":"wx.richtext.",
+"RE_READONLY":"wx.richtext.",
+"RGBValue":"wx.Image.",
+"RICHTEXT_ALL":"wx.richtext.",
+"RICHTEXT_ALT_DOWN":"wx.richtext.",
+"RICHTEXT_CACHE_SIZE":"wx.richtext.",
+"RICHTEXT_CHANGE_ATTRIBUTES":"wx.richtext.",
+"RICHTEXT_CHANGE_OBJECT":"wx.richtext.",
+"RICHTEXT_CHANGE_STYLE":"wx.richtext.",
+"RICHTEXT_CTRL_DOWN":"wx.richtext.",
+"RICHTEXT_DEFAULT_CARET_WIDTH":"wx.richtext.",
+"RICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD":"wx.richtext.",
+"RICHTEXT_DEFAULT_FOCUSSED_BACKGROUND":"wx.richtext.",
+"RICHTEXT_DEFAULT_FOCUS_RECT_COLOUR":"wx.richtext.",
+"RICHTEXT_DEFAULT_IMAGE_SIZE":"wx.richtext.",
+"RICHTEXT_DEFAULT_LAYOUT_INTERVAL":"wx.richtext.",
+"RICHTEXT_DEFAULT_MARGIN":"wx.richtext.",
+"RICHTEXT_DEFAULT_OVERALL_SIZE":"wx.richtext.",
+"RICHTEXT_DEFAULT_SPACING":"wx.richtext.",
+"RICHTEXT_DEFAULT_TYPE_COLOUR":"wx.richtext.",
+"RICHTEXT_DEFAULT_UNFOCUSSED_BACKGROUND":"wx.richtext.",
+"RICHTEXT_DEFAULT_UNSELECTED_BACKGROUND":"wx.richtext.",
+"RICHTEXT_DELETE":"wx.richtext.",
+"RICHTEXT_DRAW_GUIDELINES":"wx.richtext.",
+"RICHTEXT_DRAW_IGNORE_CACHE":"wx.richtext.",
+"RICHTEXT_DRAW_PRINT":"wx.richtext.",
+"RICHTEXT_DRAW_SELECTED":"wx.richtext.",
+"RICHTEXT_EX_NO_GUIDELINES":"wx.richtext.",
+"RICHTEXT_FIXED_HEIGHT":"wx.richtext.",
+"RICHTEXT_FIXED_WIDTH":"wx.richtext.",
+"RICHTEXT_FORMATTED":"wx.richtext.",
+"RICHTEXT_HANDLER_CONVERT_FACENAMES":"wx.richtext.",
+"RICHTEXT_HANDLER_INCLUDE_STYLESHEET":"wx.richtext.",
+"RICHTEXT_HANDLER_NO_HEADER_FOOTER":"wx.richtext.",
+"RICHTEXT_HANDLER_SAVE_IMAGES_TO_BASE64":"wx.richtext.",
+"RICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES":"wx.richtext.",
+"RICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY":"wx.richtext.",
+"RICHTEXT_HEIGHT_ONLY":"wx.richtext.",
+"RICHTEXT_HITTEST_AFTER":"wx.richtext.",
+"RICHTEXT_HITTEST_BEFORE":"wx.richtext.",
+"RICHTEXT_HITTEST_HONOUR_ATOMIC":"wx.richtext.",
+"RICHTEXT_HITTEST_NONE":"wx.richtext.",
+"RICHTEXT_HITTEST_NO_FLOATING_OBJECTS":"wx.richtext.",
+"RICHTEXT_HITTEST_NO_NESTED_OBJECTS":"wx.richtext.",
+"RICHTEXT_HITTEST_ON":"wx.richtext.",
+"RICHTEXT_HITTEST_OUTSIDE":"wx.richtext.",
+"RICHTEXT_INSERT":"wx.richtext.",
+"RICHTEXT_INSERT_INTERACTIVE":"wx.richtext.",
+"RICHTEXT_INSERT_NONE":"wx.richtext.",
+"RICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE":"wx.richtext.",
+"RICHTEXT_LAYOUT_SPECIFIED_RECT":"wx.richtext.",
+"RICHTEXT_NONE":"wx.richtext.",
+"RICHTEXT_NO_SELECTION":"wx.richtext.",
+"RICHTEXT_ORGANISER_APPLY_STYLES":"wx.richtext.",
+"RICHTEXT_ORGANISER_BROWSE":"wx.richtext.",
+"RICHTEXT_ORGANISER_BROWSE_NUMBERING":"wx.richtext.",
+"RICHTEXT_ORGANISER_CREATE_STYLES":"wx.richtext.",
+"RICHTEXT_ORGANISER_DELETE_STYLES":"wx.richtext.",
+"RICHTEXT_ORGANISER_EDIT_STYLES":"wx.richtext.",
+"RICHTEXT_ORGANISER_OK_CANCEL":"wx.richtext.",
+"RICHTEXT_ORGANISER_ORGANISE":"wx.richtext.",
+"RICHTEXT_ORGANISER_RENAME_STYLES":"wx.richtext.",
+"RICHTEXT_ORGANISER_RENUMBER":"wx.richtext.",
+"RICHTEXT_ORGANISER_SHOW_ALL":"wx.richtext.",
+"RICHTEXT_ORGANISER_SHOW_BOX":"wx.richtext.",
+"RICHTEXT_ORGANISER_SHOW_CHARACTER":"wx.richtext.",
+"RICHTEXT_ORGANISER_SHOW_LIST":"wx.richtext.",
+"RICHTEXT_ORGANISER_SHOW_PARAGRAPH":"wx.richtext.",
+"RICHTEXT_PAGE_ALL":"wx.richtext.",
+"RICHTEXT_PAGE_CENTRE":"wx.richtext.",
+"RICHTEXT_PAGE_EVEN":"wx.richtext.",
+"RICHTEXT_PAGE_LEFT":"wx.richtext.",
+"RICHTEXT_PAGE_ODD":"wx.richtext.",
+"RICHTEXT_PAGE_RIGHT":"wx.richtext.",
+"RICHTEXT_SETPROPERTIES_CHARACTERS_ONLY":"wx.richtext.",
+"RICHTEXT_SETPROPERTIES_NONE":"wx.richtext.",
+"RICHTEXT_SETPROPERTIES_PARAGRAPHS_ONLY":"wx.richtext.",
+"RICHTEXT_SETPROPERTIES_REMOVE":"wx.richtext.",
+"RICHTEXT_SETPROPERTIES_RESET":"wx.richtext.",
+"RICHTEXT_SETPROPERTIES_WITH_UNDO":"wx.richtext.",
+"RICHTEXT_SETSTYLE_CHARACTERS_ONLY":"wx.richtext.",
+"RICHTEXT_SETSTYLE_NONE":"wx.richtext.",
+"RICHTEXT_SETSTYLE_OPTIMIZE":"wx.richtext.",
+"RICHTEXT_SETSTYLE_PARAGRAPHS_ONLY":"wx.richtext.",
+"RICHTEXT_SETSTYLE_REMOVE":"wx.richtext.",
+"RICHTEXT_SETSTYLE_RENUMBER":"wx.richtext.",
+"RICHTEXT_SETSTYLE_RESET":"wx.richtext.",
+"RICHTEXT_SETSTYLE_SPECIFY_LEVEL":"wx.richtext.",
+"RICHTEXT_SETSTYLE_WITH_UNDO":"wx.richtext.",
+"RICHTEXT_SHIFT_DOWN":"wx.richtext.",
+"RICHTEXT_TYPE_ANY":"wx.richtext.",
+"RICHTEXT_TYPE_HTML":"wx.richtext.",
+"RICHTEXT_TYPE_PDF":"wx.richtext.",
+"RICHTEXT_TYPE_RTF":"wx.richtext.",
+"RICHTEXT_TYPE_TEXT":"wx.richtext.",
+"RICHTEXT_TYPE_XML":"wx.richtext.",
+"RICHTEXT_UNFORMATTED":"wx.richtext.",
+"RICHTEXT_VARIABLE_HEIGHT":"wx.richtext.",
+"RICHTEXT_VARIABLE_WIDTH":"wx.richtext.",
+"RIGHT":"wx.",
+"RadioBox":"wx.",
+"RadioBoxNameStr":"wx.",
+"RadioButton":"wx.",
+"RadioButtonNameStr":"wx.",
+"RasterOperationMode":"wx.",
+"RealPoint":"wx.",
+"RearrangeCtrl":"wx.",
+"RearrangeDialog":"wx.",
+"RearrangeDialogNameStr":"wx.",
+"RearrangeList":"wx.",
+"RearrangeListNameStr":"wx.",
+"Reason":"wx.ActivateEvent.",
+"Rect":"wx.",
+"Rect2D":"wx.",
+"RefCounter":"wx.",
+"Region":"wx.",
+"RegionContain":"wx.",
+"RegionIterator":"wx.",
+"RegisterId":"wx.",
+"Relationship":"wx.",
+"RendererNative":"wx.",
+"RendererVersion":"wx.",
+"ResourceCat":"wx.StandardPaths.",
+"RichMessageDialog":"wx.",
+"RichTextAction":"wx.richtext.",
+"RichTextApplyStyle":"wx.richtext.",
+"RichTextAttr":"wx.richtext.",
+"RichTextBitlistsEqPartial":"wx.richtext.",
+"RichTextBox":"wx.richtext.",
+"RichTextBuffer":"wx.richtext.",
+"RichTextBufferDataObject":"wx.richtext.",
+"RichTextCell":"wx.richtext.",
+"RichTextCharacterStyleDefinition":"wx.richtext.",
+"RichTextCombineBitlists":"wx.richtext.",
+"RichTextCommand":"wx.richtext.",
+"RichTextCommandId":"wx.richtext.",
+"RichTextCompositeObject":"wx.richtext.",
+"RichTextContextMenuPropertiesInfo":"wx.richtext.",
+"RichTextCtrl":"wx.richtext.",
+"RichTextCtrlSelectionState":"wx.richtext.",
+"RichTextCtrlSelectionState_CommonAncestor":"wx.richtext.",
+"RichTextCtrlSelectionState_Normal":"wx.richtext.",
+"RichTextDecimalToRoman":"wx.richtext.",
+"RichTextDrawingContext":"wx.richtext.",
+"RichTextDrawingHandler":"wx.richtext.",
+"RichTextEvent":"wx.richtext.",
+"RichTextField":"wx.richtext.",
+"RichTextFieldType":"wx.richtext.",
+"RichTextFieldTypeStandard":"wx.richtext.",
+"RichTextFileHandler":"wx.richtext.",
+"RichTextFileType":"wx.richtext.",
+"RichTextFontTable":"wx.richtext.",
+"RichTextHTMLHandler":"wx.richtext.",
+"RichTextHasStyle":"wx.richtext.",
+"RichTextHeaderFooterData":"wx.richtext.",
+"RichTextHitTestFlags":"wx.richtext.",
+"RichTextImage":"wx.richtext.",
+"RichTextImageBlock":"wx.richtext.",
+"RichTextLine":"wx.richtext.",
+"RichTextLineBreakChar":"wx.richtext.",
+"RichTextListStyleDefinition":"wx.richtext.",
+"RichTextModuleInit":"wx.richtext.",
+"RichTextObject":"wx.richtext.",
+"RichTextObjectAddress":"wx.richtext.",
+"RichTextOddEvenPage":"wx.richtext.",
+"RichTextPageLocation":"wx.richtext.",
+"RichTextParagraph":"wx.richtext.",
+"RichTextParagraphLayoutBox":"wx.richtext.",
+"RichTextParagraphStyleDefinition":"wx.richtext.",
+"RichTextPlainText":"wx.richtext.",
+"RichTextPlainTextHandler":"wx.richtext.",
+"RichTextPrinting":"wx.richtext.",
+"RichTextPrintout":"wx.richtext.",
+"RichTextProperties":"wx.richtext.",
+"RichTextRange":"wx.richtext.",
+"RichTextRemoveStyle":"wx.richtext.",
+"RichTextRenderer":"wx.richtext.",
+"RichTextSelection":"wx.richtext.",
+"RichTextSplitParaCharStyles":"wx.richtext.",
+"RichTextStdRenderer":"wx.richtext.",
+"RichTextStyleComboCtrl":"wx.richtext.",
+"RichTextStyleDefinition":"wx.richtext.",
+"RichTextStyleListBox":"wx.richtext.",
+"RichTextStyleListCtrl":"wx.richtext.",
+"RichTextStyleOrganiserDialog":"wx.richtext.",
+"RichTextStyleSheet":"wx.richtext.",
+"RichTextStyleType":"wx.richtext.RichTextStyleListBox.",
+"RichTextTable":"wx.richtext.",
+"RichTextTabsEq":"wx.richtext.",
+"RichTextXMLHandler":"wx.richtext.",
+"RichToolTip":"wx.adv.",
+"Right":"wx.",
+"RightOf":"wx.",
+"SASH_BOTTOM":"wx.adv.",
+"SASH_LEFT":"wx.adv.",
+"SASH_NONE":"wx.adv.",
+"SASH_RIGHT":"wx.adv.",
+"SASH_STATUS_OK":"wx.adv.",
+"SASH_STATUS_OUT_OF_RANGE":"wx.adv.",
+"SASH_TOP":"wx.adv.",
+"SB_FLAT":"wx.",
+"SB_HORIZONTAL":"wx.",
+"SB_NORMAL":"wx.",
+"SB_RAISED":"wx.",
+"SB_SUNKEN":"wx.",
+"SB_VERTICAL":"wx.",
+"SCRIPT_MUL_FACTOR":"wx.richtext.",
+"SEND_EVENT_POST":"wx.",
+"SET":"wx.",
+"SETUP":"wx.",
+"SHAPED":"wx.",
+"SHOW_EFFECT_BLEND":"wx.",
+"SHOW_EFFECT_EXPAND":"wx.",
+"SHOW_EFFECT_MAX":"wx.",
+"SHOW_EFFECT_NONE":"wx.",
+"SHOW_EFFECT_ROLL_TO_BOTTOM":"wx.",
+"SHOW_EFFECT_ROLL_TO_LEFT":"wx.",
+"SHOW_EFFECT_ROLL_TO_RIGHT":"wx.",
+"SHOW_EFFECT_ROLL_TO_TOP":"wx.",
+"SHOW_EFFECT_SLIDE_TO_BOTTOM":"wx.",
+"SHOW_EFFECT_SLIDE_TO_LEFT":"wx.",
+"SHOW_EFFECT_SLIDE_TO_RIGHT":"wx.",
+"SHOW_EFFECT_SLIDE_TO_TOP":"wx.",
+"SHOW_SB_ALWAYS":"wx.",
+"SHOW_SB_DEFAULT":"wx.",
+"SHOW_SB_NEVER":"wx.",
+"SHRINK":"wx.",
+"SHUTDOWN_FORCE":"wx.",
+"SHUTDOWN_LOGOFF":"wx.",
+"SHUTDOWN_POWEROFF":"wx.",
+"SHUTDOWN_REBOOT":"wx.",
+"SIGABRT":"wx.",
+"SIGALRM":"wx.",
+"SIGBUS":"wx.",
+"SIGEMT":"wx.",
+"SIGFPE":"wx.",
+"SIGHUP":"wx.",
+"SIGILL":"wx.",
+"SIGINT":"wx.",
+"SIGKILL":"wx.",
+"SIGNONE":"wx.",
+"SIGPIPE":"wx.",
+"SIGQUIT":"wx.",
+"SIGSEGV":"wx.",
+"SIGSYS":"wx.",
+"SIGTERM":"wx.",
+"SIGTRAP":"wx.",
+"SIMPLE_BORDER":"wx.",
+"SIZER_FLAG_BITS_MASK":"wx.",
+"SIZE_ALLOW_MINUS_ONE":"wx.",
+"SIZE_AUTO":"wx.",
+"SIZE_AUTO_HEIGHT":"wx.",
+"SIZE_AUTO_WIDTH":"wx.",
+"SIZE_FORCE":"wx.",
+"SIZE_FORCE_EVENT":"wx.",
+"SIZE_NO_ADJUSTMENTS":"wx.",
+"SIZE_USE_EXISTING":"wx.",
+"SL_AUTOTICKS":"wx.",
+"SL_BOTH":"wx.",
+"SL_BOTTOM":"wx.",
+"SL_HORIZONTAL":"wx.",
+"SL_INVERSE":"wx.",
+"SL_LABELS":"wx.",
+"SL_LEFT":"wx.",
+"SL_MIN_MAX_LABELS":"wx.",
+"SL_RIGHT":"wx.",
+"SL_SELRANGE":"wx.",
+"SL_TICKS":"wx.",
+"SL_TOP":"wx.",
+"SL_VALUE_LABEL":"wx.",
+"SL_VERTICAL":"wx.",
+"SMALL_FONT":"wx.",
+"SOUND_ASYNC":"wx.adv.",
+"SOUND_LOOP":"wx.adv.",
+"SOUND_SYNC":"wx.adv.",
+"SOUTH":"wx.",
+"SPLASH_CENTRE_ON_PARENT":"wx.adv.",
+"SPLASH_CENTRE_ON_SCREEN":"wx.adv.",
+"SPLASH_NO_CENTRE":"wx.adv.",
+"SPLASH_NO_TIMEOUT":"wx.adv.",
+"SPLASH_TIMEOUT":"wx.adv.",
+"SPLIT_DRAG_DRAGGING":"wx.",
+"SPLIT_DRAG_LEFT_DOWN":"wx.",
+"SPLIT_DRAG_NONE":"wx.",
+"SPLIT_HORIZONTAL":"wx.",
+"SPLIT_VERTICAL":"wx.",
+"SP_3D":"wx.",
+"SP_3DBORDER":"wx.",
+"SP_3DSASH":"wx.",
+"SP_ARROW_KEYS":"wx.",
+"SP_BORDER":"wx.",
+"SP_HORIZONTAL":"wx.",
+"SP_LIVE_UPDATE":"wx.",
+"SP_NOBORDER":"wx.",
+"SP_NOSASH":"wx.",
+"SP_NO_XP_THEME":"wx.",
+"SP_PERMIT_UNSPLIT":"wx.",
+"SP_THIN_SASH":"wx.",
+"SP_VERTICAL":"wx.",
+"SP_WRAP":"wx.",
+"SRC_INVERT":"wx.",
+"STANDARD_CURSOR":"wx.",
+"STATIC_BORDER":"wx.",
+"STAY_ON_TOP":"wx.",
+"STB_DEFAULT_STYLE":"wx.",
+"STB_ELLIPSIZE_END":"wx.",
+"STB_ELLIPSIZE_MIDDLE":"wx.",
+"STB_ELLIPSIZE_START":"wx.",
+"STB_SHOW_TIPS":"wx.",
+"STB_SIZEGRIP":"wx.",
+"STCNameStr":"wx.stc.",
+"STC_4GL_BLOCK":"wx.stc.",
+"STC_4GL_BLOCK_":"wx.stc.",
+"STC_4GL_CHARACTER":"wx.stc.",
+"STC_4GL_CHARACTER_":"wx.stc.",
+"STC_4GL_COMMENT1":"wx.stc.",
+"STC_4GL_COMMENT1_":"wx.stc.",
+"STC_4GL_COMMENT2":"wx.stc.",
+"STC_4GL_COMMENT2_":"wx.stc.",
+"STC_4GL_COMMENT3":"wx.stc.",
+"STC_4GL_COMMENT3_":"wx.stc.",
+"STC_4GL_COMMENT4":"wx.stc.",
+"STC_4GL_COMMENT4_":"wx.stc.",
+"STC_4GL_COMMENT5":"wx.stc.",
+"STC_4GL_COMMENT5_":"wx.stc.",
+"STC_4GL_COMMENT6":"wx.stc.",
+"STC_4GL_COMMENT6_":"wx.stc.",
+"STC_4GL_DEFAULT":"wx.stc.",
+"STC_4GL_DEFAULT_":"wx.stc.",
+"STC_4GL_END":"wx.stc.",
+"STC_4GL_END_":"wx.stc.",
+"STC_4GL_IDENTIFIER":"wx.stc.",
+"STC_4GL_IDENTIFIER_":"wx.stc.",
+"STC_4GL_NUMBER":"wx.stc.",
+"STC_4GL_NUMBER_":"wx.stc.",
+"STC_4GL_OPERATOR":"wx.stc.",
+"STC_4GL_OPERATOR_":"wx.stc.",
+"STC_4GL_PREPROCESSOR":"wx.stc.",
+"STC_4GL_PREPROCESSOR_":"wx.stc.",
+"STC_4GL_STRING":"wx.stc.",
+"STC_4GL_STRING_":"wx.stc.",
+"STC_4GL_WORD":"wx.stc.",
+"STC_4GL_WORD_":"wx.stc.",
+"STC_A68K_COMMENT":"wx.stc.",
+"STC_A68K_COMMENT_DOXYGEN":"wx.stc.",
+"STC_A68K_COMMENT_SPECIAL":"wx.stc.",
+"STC_A68K_COMMENT_WORD":"wx.stc.",
+"STC_A68K_CPUINSTRUCTION":"wx.stc.",
+"STC_A68K_DEFAULT":"wx.stc.",
+"STC_A68K_DIRECTIVE":"wx.stc.",
+"STC_A68K_EXTINSTRUCTION":"wx.stc.",
+"STC_A68K_IDENTIFIER":"wx.stc.",
+"STC_A68K_LABEL":"wx.stc.",
+"STC_A68K_MACRO_ARG":"wx.stc.",
+"STC_A68K_MACRO_DECLARATION":"wx.stc.",
+"STC_A68K_NUMBER_BIN":"wx.stc.",
+"STC_A68K_NUMBER_DEC":"wx.stc.",
+"STC_A68K_NUMBER_HEX":"wx.stc.",
+"STC_A68K_OPERATOR":"wx.stc.",
+"STC_A68K_REGISTER":"wx.stc.",
+"STC_A68K_STRING1":"wx.stc.",
+"STC_A68K_STRING2":"wx.stc.",
+"STC_ABAQUS_ARGUMENT":"wx.stc.",
+"STC_ABAQUS_COMMAND":"wx.stc.",
+"STC_ABAQUS_COMMENT":"wx.stc.",
+"STC_ABAQUS_COMMENTBLOCK":"wx.stc.",
+"STC_ABAQUS_DEFAULT":"wx.stc.",
+"STC_ABAQUS_FUNCTION":"wx.stc.",
+"STC_ABAQUS_NUMBER":"wx.stc.",
+"STC_ABAQUS_OPERATOR":"wx.stc.",
+"STC_ABAQUS_PROCESSOR":"wx.stc.",
+"STC_ABAQUS_SLASHCOMMAND":"wx.stc.",
+"STC_ABAQUS_STARCOMMAND":"wx.stc.",
+"STC_ABAQUS_STRING":"wx.stc.",
+"STC_ABAQUS_WORD":"wx.stc.",
+"STC_ADA_CHARACTER":"wx.stc.",
+"STC_ADA_CHARACTEREOL":"wx.stc.",
+"STC_ADA_COMMENTLINE":"wx.stc.",
+"STC_ADA_DEFAULT":"wx.stc.",
+"STC_ADA_DELIMITER":"wx.stc.",
+"STC_ADA_IDENTIFIER":"wx.stc.",
+"STC_ADA_ILLEGAL":"wx.stc.",
+"STC_ADA_LABEL":"wx.stc.",
+"STC_ADA_NUMBER":"wx.stc.",
+"STC_ADA_STRING":"wx.stc.",
+"STC_ADA_STRINGEOL":"wx.stc.",
+"STC_ADA_WORD":"wx.stc.",
+"STC_ALPHA_NOALPHA":"wx.stc.",
+"STC_ALPHA_OPAQUE":"wx.stc.",
+"STC_ALPHA_TRANSPARENT":"wx.stc.",
+"STC_ANNOTATION_BOXED":"wx.stc.",
+"STC_ANNOTATION_HIDDEN":"wx.stc.",
+"STC_ANNOTATION_STANDARD":"wx.stc.",
+"STC_APDL_ARGUMENT":"wx.stc.",
+"STC_APDL_COMMAND":"wx.stc.",
+"STC_APDL_COMMENT":"wx.stc.",
+"STC_APDL_COMMENTBLOCK":"wx.stc.",
+"STC_APDL_DEFAULT":"wx.stc.",
+"STC_APDL_FUNCTION":"wx.stc.",
+"STC_APDL_NUMBER":"wx.stc.",
+"STC_APDL_OPERATOR":"wx.stc.",
+"STC_APDL_PROCESSOR":"wx.stc.",
+"STC_APDL_SLASHCOMMAND":"wx.stc.",
+"STC_APDL_STARCOMMAND":"wx.stc.",
+"STC_APDL_STRING":"wx.stc.",
+"STC_APDL_WORD":"wx.stc.",
+"STC_ASM_CHARACTER":"wx.stc.",
+"STC_ASM_COMMENT":"wx.stc.",
+"STC_ASM_COMMENTBLOCK":"wx.stc.",
+"STC_ASM_COMMENTDIRECTIVE":"wx.stc.",
+"STC_ASM_CPUINSTRUCTION":"wx.stc.",
+"STC_ASM_DEFAULT":"wx.stc.",
+"STC_ASM_DIRECTIVE":"wx.stc.",
+"STC_ASM_DIRECTIVEOPERAND":"wx.stc.",
+"STC_ASM_EXTINSTRUCTION":"wx.stc.",
+"STC_ASM_IDENTIFIER":"wx.stc.",
+"STC_ASM_MATHINSTRUCTION":"wx.stc.",
+"STC_ASM_NUMBER":"wx.stc.",
+"STC_ASM_OPERATOR":"wx.stc.",
+"STC_ASM_REGISTER":"wx.stc.",
+"STC_ASM_STRING":"wx.stc.",
+"STC_ASM_STRINGEOL":"wx.stc.",
+"STC_ASN1_ATTRIBUTE":"wx.stc.",
+"STC_ASN1_COMMENT":"wx.stc.",
+"STC_ASN1_DEFAULT":"wx.stc.",
+"STC_ASN1_DESCRIPTOR":"wx.stc.",
+"STC_ASN1_IDENTIFIER":"wx.stc.",
+"STC_ASN1_KEYWORD":"wx.stc.",
+"STC_ASN1_OID":"wx.stc.",
+"STC_ASN1_OPERATOR":"wx.stc.",
+"STC_ASN1_SCALAR":"wx.stc.",
+"STC_ASN1_STRING":"wx.stc.",
+"STC_ASN1_TYPE":"wx.stc.",
+"STC_ASY_CHARACTER":"wx.stc.",
+"STC_ASY_COMMENT":"wx.stc.",
+"STC_ASY_COMMENTLINE":"wx.stc.",
+"STC_ASY_COMMENTLINEDOC":"wx.stc.",
+"STC_ASY_DEFAULT":"wx.stc.",
+"STC_ASY_IDENTIFIER":"wx.stc.",
+"STC_ASY_NUMBER":"wx.stc.",
+"STC_ASY_OPERATOR":"wx.stc.",
+"STC_ASY_STRING":"wx.stc.",
+"STC_ASY_STRINGEOL":"wx.stc.",
+"STC_ASY_WORD":"wx.stc.",
+"STC_ASY_WORD2":"wx.stc.",
+"STC_AU3_COMMENT":"wx.stc.",
+"STC_AU3_COMMENTBLOCK":"wx.stc.",
+"STC_AU3_COMOBJ":"wx.stc.",
+"STC_AU3_DEFAULT":"wx.stc.",
+"STC_AU3_EXPAND":"wx.stc.",
+"STC_AU3_FUNCTION":"wx.stc.",
+"STC_AU3_KEYWORD":"wx.stc.",
+"STC_AU3_MACRO":"wx.stc.",
+"STC_AU3_NUMBER":"wx.stc.",
+"STC_AU3_OPERATOR":"wx.stc.",
+"STC_AU3_PREPROCESSOR":"wx.stc.",
+"STC_AU3_SENT":"wx.stc.",
+"STC_AU3_SPECIAL":"wx.stc.",
+"STC_AU3_STRING":"wx.stc.",
+"STC_AU3_UDF":"wx.stc.",
+"STC_AU3_VARIABLE":"wx.stc.",
+"STC_AVE_COMMENT":"wx.stc.",
+"STC_AVE_DEFAULT":"wx.stc.",
+"STC_AVE_ENUM":"wx.stc.",
+"STC_AVE_IDENTIFIER":"wx.stc.",
+"STC_AVE_NUMBER":"wx.stc.",
+"STC_AVE_OPERATOR":"wx.stc.",
+"STC_AVE_STRING":"wx.stc.",
+"STC_AVE_STRINGEOL":"wx.stc.",
+"STC_AVE_WORD":"wx.stc.",
+"STC_AVE_WORD1":"wx.stc.",
+"STC_AVE_WORD2":"wx.stc.",
+"STC_AVE_WORD3":"wx.stc.",
+"STC_AVE_WORD4":"wx.stc.",
+"STC_AVE_WORD5":"wx.stc.",
+"STC_AVE_WORD6":"wx.stc.",
+"STC_AVS_CLIPPROP":"wx.stc.",
+"STC_AVS_COMMENTBLOCK":"wx.stc.",
+"STC_AVS_COMMENTBLOCKN":"wx.stc.",
+"STC_AVS_COMMENTLINE":"wx.stc.",
+"STC_AVS_DEFAULT":"wx.stc.",
+"STC_AVS_FILTER":"wx.stc.",
+"STC_AVS_FUNCTION":"wx.stc.",
+"STC_AVS_IDENTIFIER":"wx.stc.",
+"STC_AVS_KEYWORD":"wx.stc.",
+"STC_AVS_NUMBER":"wx.stc.",
+"STC_AVS_OPERATOR":"wx.stc.",
+"STC_AVS_PLUGIN":"wx.stc.",
+"STC_AVS_STRING":"wx.stc.",
+"STC_AVS_TRIPLESTRING":"wx.stc.",
+"STC_AVS_USERDFN":"wx.stc.",
+"STC_BAAN_COMMENT":"wx.stc.",
+"STC_BAAN_COMMENTDOC":"wx.stc.",
+"STC_BAAN_DEFAULT":"wx.stc.",
+"STC_BAAN_IDENTIFIER":"wx.stc.",
+"STC_BAAN_NUMBER":"wx.stc.",
+"STC_BAAN_OPERATOR":"wx.stc.",
+"STC_BAAN_PREPROCESSOR":"wx.stc.",
+"STC_BAAN_STRING":"wx.stc.",
+"STC_BAAN_STRINGEOL":"wx.stc.",
+"STC_BAAN_WORD":"wx.stc.",
+"STC_BAAN_WORD2":"wx.stc.",
+"STC_BAT_COMMAND":"wx.stc.",
+"STC_BAT_COMMENT":"wx.stc.",
+"STC_BAT_DEFAULT":"wx.stc.",
+"STC_BAT_HIDE":"wx.stc.",
+"STC_BAT_IDENTIFIER":"wx.stc.",
+"STC_BAT_LABEL":"wx.stc.",
+"STC_BAT_OPERATOR":"wx.stc.",
+"STC_BAT_WORD":"wx.stc.",
+"STC_B_ASM":"wx.stc.",
+"STC_B_BINNUMBER":"wx.stc.",
+"STC_B_COMMENT":"wx.stc.",
+"STC_B_CONSTANT":"wx.stc.",
+"STC_B_DATE":"wx.stc.",
+"STC_B_DEFAULT":"wx.stc.",
+"STC_B_ERROR":"wx.stc.",
+"STC_B_HEXNUMBER":"wx.stc.",
+"STC_B_IDENTIFIER":"wx.stc.",
+"STC_B_KEYWORD":"wx.stc.",
+"STC_B_KEYWORD2":"wx.stc.",
+"STC_B_KEYWORD3":"wx.stc.",
+"STC_B_KEYWORD4":"wx.stc.",
+"STC_B_LABEL":"wx.stc.",
+"STC_B_NUMBER":"wx.stc.",
+"STC_B_OPERATOR":"wx.stc.",
+"STC_B_PREPROCESSOR":"wx.stc.",
+"STC_B_STRING":"wx.stc.",
+"STC_B_STRINGEOL":"wx.stc.",
+"STC_CACHE_CARET":"wx.stc.",
+"STC_CACHE_DOCUMENT":"wx.stc.",
+"STC_CACHE_NONE":"wx.stc.",
+"STC_CACHE_PAGE":"wx.stc.",
+"STC_CAML_CHAR":"wx.stc.",
+"STC_CAML_COMMENT":"wx.stc.",
+"STC_CAML_COMMENT1":"wx.stc.",
+"STC_CAML_COMMENT2":"wx.stc.",
+"STC_CAML_COMMENT3":"wx.stc.",
+"STC_CAML_DEFAULT":"wx.stc.",
+"STC_CAML_IDENTIFIER":"wx.stc.",
+"STC_CAML_KEYWORD":"wx.stc.",
+"STC_CAML_KEYWORD2":"wx.stc.",
+"STC_CAML_KEYWORD3":"wx.stc.",
+"STC_CAML_LINENUM":"wx.stc.",
+"STC_CAML_NUMBER":"wx.stc.",
+"STC_CAML_OPERATOR":"wx.stc.",
+"STC_CAML_STRING":"wx.stc.",
+"STC_CAML_TAGNAME":"wx.stc.",
+"STC_CAML_WHITE":"wx.stc.",
+"STC_CARETSTICKY_OFF":"wx.stc.",
+"STC_CARETSTICKY_ON":"wx.stc.",
+"STC_CARETSTICKY_WHITESPACE":"wx.stc.",
+"STC_CARETSTYLE_BLOCK":"wx.stc.",
+"STC_CARETSTYLE_INVISIBLE":"wx.stc.",
+"STC_CARETSTYLE_LINE":"wx.stc.",
+"STC_CARET_EVEN":"wx.stc.",
+"STC_CARET_JUMPS":"wx.stc.",
+"STC_CARET_SLOP":"wx.stc.",
+"STC_CARET_STRICT":"wx.stc.",
+"STC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE":"wx.stc.",
+"STC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE":"wx.stc.",
+"STC_CASE_LOWER":"wx.stc.",
+"STC_CASE_MIXED":"wx.stc.",
+"STC_CASE_UPPER":"wx.stc.",
+"STC_CHARSET_8859_15":"wx.stc.",
+"STC_CHARSET_ANSI":"wx.stc.",
+"STC_CHARSET_ARABIC":"wx.stc.",
+"STC_CHARSET_BALTIC":"wx.stc.",
+"STC_CHARSET_CHINESEBIG5":"wx.stc.",
+"STC_CHARSET_CYRILLIC":"wx.stc.",
+"STC_CHARSET_DEFAULT":"wx.stc.",
+"STC_CHARSET_EASTEUROPE":"wx.stc.",
+"STC_CHARSET_GB2312":"wx.stc.",
+"STC_CHARSET_GREEK":"wx.stc.",
+"STC_CHARSET_HANGUL":"wx.stc.",
+"STC_CHARSET_HEBREW":"wx.stc.",
+"STC_CHARSET_JOHAB":"wx.stc.",
+"STC_CHARSET_MAC":"wx.stc.",
+"STC_CHARSET_OEM":"wx.stc.",
+"STC_CHARSET_RUSSIAN":"wx.stc.",
+"STC_CHARSET_SHIFTJIS":"wx.stc.",
+"STC_CHARSET_SYMBOL":"wx.stc.",
+"STC_CHARSET_THAI":"wx.stc.",
+"STC_CHARSET_TURKISH":"wx.stc.",
+"STC_CHARSET_VIETNAMESE":"wx.stc.",
+"STC_CLW_ATTRIBUTE":"wx.stc.",
+"STC_CLW_BUILTIN_PROCEDURES_FUNCTION":"wx.stc.",
+"STC_CLW_COMMENT":"wx.stc.",
+"STC_CLW_COMPILER_DIRECTIVE":"wx.stc.",
+"STC_CLW_DEFAULT":"wx.stc.",
+"STC_CLW_DEPRECATED":"wx.stc.",
+"STC_CLW_ERROR":"wx.stc.",
+"STC_CLW_INTEGER_CONSTANT":"wx.stc.",
+"STC_CLW_KEYWORD":"wx.stc.",
+"STC_CLW_LABEL":"wx.stc.",
+"STC_CLW_PICTURE_STRING":"wx.stc.",
+"STC_CLW_REAL_CONSTANT":"wx.stc.",
+"STC_CLW_RUNTIME_EXPRESSIONS":"wx.stc.",
+"STC_CLW_STANDARD_EQUATE":"wx.stc.",
+"STC_CLW_STRING":"wx.stc.",
+"STC_CLW_STRUCTURE_DATA_TYPE":"wx.stc.",
+"STC_CLW_USER_IDENTIFIER":"wx.stc.",
+"STC_CMAKE_COMMANDS":"wx.stc.",
+"STC_CMAKE_COMMENT":"wx.stc.",
+"STC_CMAKE_DEFAULT":"wx.stc.",
+"STC_CMAKE_FOREACHDEF":"wx.stc.",
+"STC_CMAKE_IFDEFINEDEF":"wx.stc.",
+"STC_CMAKE_MACRODEF":"wx.stc.",
+"STC_CMAKE_NUMBER":"wx.stc.",
+"STC_CMAKE_PARAMETERS":"wx.stc.",
+"STC_CMAKE_STRINGDQ":"wx.stc.",
+"STC_CMAKE_STRINGLQ":"wx.stc.",
+"STC_CMAKE_STRINGRQ":"wx.stc.",
+"STC_CMAKE_STRINGVAR":"wx.stc.",
+"STC_CMAKE_USERDEFINED":"wx.stc.",
+"STC_CMAKE_VARIABLE":"wx.stc.",
+"STC_CMAKE_WHILEDEF":"wx.stc.",
+"STC_CMD_BACKTAB":"wx.stc.",
+"STC_CMD_CANCEL":"wx.stc.",
+"STC_CMD_CHARLEFT":"wx.stc.",
+"STC_CMD_CHARLEFTEXTEND":"wx.stc.",
+"STC_CMD_CHARLEFTRECTEXTEND":"wx.stc.",
+"STC_CMD_CHARRIGHT":"wx.stc.",
+"STC_CMD_CHARRIGHTEXTEND":"wx.stc.",
+"STC_CMD_CHARRIGHTRECTEXTEND":"wx.stc.",
+"STC_CMD_CLEAR":"wx.stc.",
+"STC_CMD_COPY":"wx.stc.",
+"STC_CMD_CUT":"wx.stc.",
+"STC_CMD_DELETEBACK":"wx.stc.",
+"STC_CMD_DELETEBACKNOTLINE":"wx.stc.",
+"STC_CMD_DELLINELEFT":"wx.stc.",
+"STC_CMD_DELLINERIGHT":"wx.stc.",
+"STC_CMD_DELWORDLEFT":"wx.stc.",
+"STC_CMD_DELWORDRIGHT":"wx.stc.",
+"STC_CMD_DELWORDRIGHTEND":"wx.stc.",
+"STC_CMD_DOCUMENTEND":"wx.stc.",
+"STC_CMD_DOCUMENTENDEXTEND":"wx.stc.",
+"STC_CMD_DOCUMENTSTART":"wx.stc.",
+"STC_CMD_DOCUMENTSTARTEXTEND":"wx.stc.",
+"STC_CMD_EDITTOGGLEOVERTYPE":"wx.stc.",
+"STC_CMD_FORMFEED":"wx.stc.",
+"STC_CMD_HOME":"wx.stc.",
+"STC_CMD_HOMEDISPLAY":"wx.stc.",
+"STC_CMD_HOMEDISPLAYEXTEND":"wx.stc.",
+"STC_CMD_HOMEEXTEND":"wx.stc.",
+"STC_CMD_HOMERECTEXTEND":"wx.stc.",
+"STC_CMD_HOMEWRAP":"wx.stc.",
+"STC_CMD_HOMEWRAPEXTEND":"wx.stc.",
+"STC_CMD_LINECOPY":"wx.stc.",
+"STC_CMD_LINECUT":"wx.stc.",
+"STC_CMD_LINEDELETE":"wx.stc.",
+"STC_CMD_LINEDOWN":"wx.stc.",
+"STC_CMD_LINEDOWNEXTEND":"wx.stc.",
+"STC_CMD_LINEDOWNRECTEXTEND":"wx.stc.",
+"STC_CMD_LINEDUPLICATE":"wx.stc.",
+"STC_CMD_LINEEND":"wx.stc.",
+"STC_CMD_LINEENDDISPLAY":"wx.stc.",
+"STC_CMD_LINEENDDISPLAYEXTEND":"wx.stc.",
+"STC_CMD_LINEENDEXTEND":"wx.stc.",
+"STC_CMD_LINEENDRECTEXTEND":"wx.stc.",
+"STC_CMD_LINEENDWRAP":"wx.stc.",
+"STC_CMD_LINEENDWRAPEXTEND":"wx.stc.",
+"STC_CMD_LINESCROLLDOWN":"wx.stc.",
+"STC_CMD_LINESCROLLUP":"wx.stc.",
+"STC_CMD_LINETRANSPOSE":"wx.stc.",
+"STC_CMD_LINEUP":"wx.stc.",
+"STC_CMD_LINEUPEXTEND":"wx.stc.",
+"STC_CMD_LINEUPRECTEXTEND":"wx.stc.",
+"STC_CMD_LOWERCASE":"wx.stc.",
+"STC_CMD_MOVESELECTEDLINESDOWN":"wx.stc.",
+"STC_CMD_MOVESELECTEDLINESUP":"wx.stc.",
+"STC_CMD_NEWLINE":"wx.stc.",
+"STC_CMD_PAGEDOWN":"wx.stc.",
+"STC_CMD_PAGEDOWNEXTEND":"wx.stc.",
+"STC_CMD_PAGEDOWNRECTEXTEND":"wx.stc.",
+"STC_CMD_PAGEUP":"wx.stc.",
+"STC_CMD_PAGEUPEXTEND":"wx.stc.",
+"STC_CMD_PAGEUPRECTEXTEND":"wx.stc.",
+"STC_CMD_PARADOWN":"wx.stc.",
+"STC_CMD_PARADOWNEXTEND":"wx.stc.",
+"STC_CMD_PARAUP":"wx.stc.",
+"STC_CMD_PARAUPEXTEND":"wx.stc.",
+"STC_CMD_PASTE":"wx.stc.",
+"STC_CMD_REDO":"wx.stc.",
+"STC_CMD_SCROLLTOEND":"wx.stc.",
+"STC_CMD_SCROLLTOSTART":"wx.stc.",
+"STC_CMD_SELECTALL":"wx.stc.",
+"STC_CMD_STUTTEREDPAGEDOWN":"wx.stc.",
+"STC_CMD_STUTTEREDPAGEDOWNEXTEND":"wx.stc.",
+"STC_CMD_STUTTEREDPAGEUP":"wx.stc.",
+"STC_CMD_STUTTEREDPAGEUPEXTEND":"wx.stc.",
+"STC_CMD_TAB":"wx.stc.",
+"STC_CMD_UNDO":"wx.stc.",
+"STC_CMD_UPPERCASE":"wx.stc.",
+"STC_CMD_VCHOME":"wx.stc.",
+"STC_CMD_VCHOMEEXTEND":"wx.stc.",
+"STC_CMD_VCHOMERECTEXTEND":"wx.stc.",
+"STC_CMD_VCHOMEWRAP":"wx.stc.",
+"STC_CMD_VCHOMEWRAPEXTEND":"wx.stc.",
+"STC_CMD_VERTICALCENTRECARET":"wx.stc.",
+"STC_CMD_WORDLEFT":"wx.stc.",
+"STC_CMD_WORDLEFTEND":"wx.stc.",
+"STC_CMD_WORDLEFTENDEXTEND":"wx.stc.",
+"STC_CMD_WORDLEFTEXTEND":"wx.stc.",
+"STC_CMD_WORDPARTLEFT":"wx.stc.",
+"STC_CMD_WORDPARTLEFTEXTEND":"wx.stc.",
+"STC_CMD_WORDPARTRIGHT":"wx.stc.",
+"STC_CMD_WORDPARTRIGHTEXTEND":"wx.stc.",
+"STC_CMD_WORDRIGHT":"wx.stc.",
+"STC_CMD_WORDRIGHTEND":"wx.stc.",
+"STC_CMD_WORDRIGHTENDEXTEND":"wx.stc.",
+"STC_CMD_WORDRIGHTEXTEND":"wx.stc.",
+"STC_CMD_ZOOMIN":"wx.stc.",
+"STC_CMD_ZOOMOUT":"wx.stc.",
+"STC_COFFEESCRIPT_CHARACTER":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENT":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENTBLOCK":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENTDOC":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENTDOCKEYWORD":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENTDOCKEYWORDERROR":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENTLINE":"wx.stc.",
+"STC_COFFEESCRIPT_COMMENTLINEDOC":"wx.stc.",
+"STC_COFFEESCRIPT_DEFAULT":"wx.stc.",
+"STC_COFFEESCRIPT_GLOBALCLASS":"wx.stc.",
+"STC_COFFEESCRIPT_HASHQUOTEDSTRING":"wx.stc.",
+"STC_COFFEESCRIPT_IDENTIFIER":"wx.stc.",
+"STC_COFFEESCRIPT_NUMBER":"wx.stc.",
+"STC_COFFEESCRIPT_OPERATOR":"wx.stc.",
+"STC_COFFEESCRIPT_PREPROCESSOR":"wx.stc.",
+"STC_COFFEESCRIPT_REGEX":"wx.stc.",
+"STC_COFFEESCRIPT_STRING":"wx.stc.",
+"STC_COFFEESCRIPT_STRINGEOL":"wx.stc.",
+"STC_COFFEESCRIPT_STRINGRAW":"wx.stc.",
+"STC_COFFEESCRIPT_TRIPLEVERBATIM":"wx.stc.",
+"STC_COFFEESCRIPT_UUID":"wx.stc.",
+"STC_COFFEESCRIPT_VERBATIM":"wx.stc.",
+"STC_COFFEESCRIPT_VERBOSE_REGEX":"wx.stc.",
+"STC_COFFEESCRIPT_VERBOSE_REGEX_COMMENT":"wx.stc.",
+"STC_COFFEESCRIPT_WORD":"wx.stc.",
+"STC_COFFEESCRIPT_WORD2":"wx.stc.",
+"STC_CONF_COMMENT":"wx.stc.",
+"STC_CONF_DEFAULT":"wx.stc.",
+"STC_CONF_DIRECTIVE":"wx.stc.",
+"STC_CONF_EXTENSION":"wx.stc.",
+"STC_CONF_IDENTIFIER":"wx.stc.",
+"STC_CONF_IP":"wx.stc.",
+"STC_CONF_NUMBER":"wx.stc.",
+"STC_CONF_OPERATOR":"wx.stc.",
+"STC_CONF_PARAMETER":"wx.stc.",
+"STC_CONF_STRING":"wx.stc.",
+"STC_CP_UTF8":"wx.stc.",
+"STC_CSOUND_ARATE_VAR":"wx.stc.",
+"STC_CSOUND_COMMENT":"wx.stc.",
+"STC_CSOUND_COMMENTBLOCK":"wx.stc.",
+"STC_CSOUND_DEFAULT":"wx.stc.",
+"STC_CSOUND_GLOBAL_VAR":"wx.stc.",
+"STC_CSOUND_HEADERSTMT":"wx.stc.",
+"STC_CSOUND_IDENTIFIER":"wx.stc.",
+"STC_CSOUND_INSTR":"wx.stc.",
+"STC_CSOUND_IRATE_VAR":"wx.stc.",
+"STC_CSOUND_KRATE_VAR":"wx.stc.",
+"STC_CSOUND_NUMBER":"wx.stc.",
+"STC_CSOUND_OPCODE":"wx.stc.",
+"STC_CSOUND_OPERATOR":"wx.stc.",
+"STC_CSOUND_PARAM":"wx.stc.",
+"STC_CSOUND_STRINGEOL":"wx.stc.",
+"STC_CSOUND_USERKEYWORD":"wx.stc.",
+"STC_CSS_ATTRIBUTE":"wx.stc.",
+"STC_CSS_CLASS":"wx.stc.",
+"STC_CSS_COMMENT":"wx.stc.",
+"STC_CSS_DEFAULT":"wx.stc.",
+"STC_CSS_DIRECTIVE":"wx.stc.",
+"STC_CSS_DOUBLESTRING":"wx.stc.",
+"STC_CSS_EXTENDED_IDENTIFIER":"wx.stc.",
+"STC_CSS_EXTENDED_PSEUDOCLASS":"wx.stc.",
+"STC_CSS_EXTENDED_PSEUDOELEMENT":"wx.stc.",
+"STC_CSS_ID":"wx.stc.",
+"STC_CSS_IDENTIFIER":"wx.stc.",
+"STC_CSS_IDENTIFIER2":"wx.stc.",
+"STC_CSS_IDENTIFIER3":"wx.stc.",
+"STC_CSS_IMPORTANT":"wx.stc.",
+"STC_CSS_MEDIA":"wx.stc.",
+"STC_CSS_OPERATOR":"wx.stc.",
+"STC_CSS_PSEUDOCLASS":"wx.stc.",
+"STC_CSS_PSEUDOELEMENT":"wx.stc.",
+"STC_CSS_SINGLESTRING":"wx.stc.",
+"STC_CSS_TAG":"wx.stc.",
+"STC_CSS_UNKNOWN_IDENTIFIER":"wx.stc.",
+"STC_CSS_UNKNOWN_PSEUDOCLASS":"wx.stc.",
+"STC_CSS_VALUE":"wx.stc.",
+"STC_CSS_VARIABLE":"wx.stc.",
+"STC_CURSORARROW":"wx.stc.",
+"STC_CURSORNORMAL":"wx.stc.",
+"STC_CURSORREVERSEARROW":"wx.stc.",
+"STC_CURSORWAIT":"wx.stc.",
+"STC_C_CHARACTER":"wx.stc.",
+"STC_C_COMMENT":"wx.stc.",
+"STC_C_COMMENTDOC":"wx.stc.",
+"STC_C_COMMENTDOCKEYWORD":"wx.stc.",
+"STC_C_COMMENTDOCKEYWORDERROR":"wx.stc.",
+"STC_C_COMMENTLINE":"wx.stc.",
+"STC_C_COMMENTLINEDOC":"wx.stc.",
+"STC_C_DEFAULT":"wx.stc.",
+"STC_C_GLOBALCLASS":"wx.stc.",
+"STC_C_HASHQUOTEDSTRING":"wx.stc.",
+"STC_C_IDENTIFIER":"wx.stc.",
+"STC_C_NUMBER":"wx.stc.",
+"STC_C_OPERATOR":"wx.stc.",
+"STC_C_PREPROCESSOR":"wx.stc.",
+"STC_C_PREPROCESSORCOMMENT":"wx.stc.",
+"STC_C_REGEX":"wx.stc.",
+"STC_C_STRING":"wx.stc.",
+"STC_C_STRINGEOL":"wx.stc.",
+"STC_C_STRINGRAW":"wx.stc.",
+"STC_C_TRIPLEVERBATIM":"wx.stc.",
+"STC_C_UUID":"wx.stc.",
+"STC_C_VERBATIM":"wx.stc.",
+"STC_C_WORD":"wx.stc.",
+"STC_C_WORD2":"wx.stc.",
+"STC_DIFF_ADDED":"wx.stc.",
+"STC_DIFF_CHANGED":"wx.stc.",
+"STC_DIFF_COMMAND":"wx.stc.",
+"STC_DIFF_COMMENT":"wx.stc.",
+"STC_DIFF_DEFAULT":"wx.stc.",
+"STC_DIFF_DELETED":"wx.stc.",
+"STC_DIFF_HEADER":"wx.stc.",
+"STC_DIFF_POSITION":"wx.stc.",
+"STC_D_CHARACTER":"wx.stc.",
+"STC_D_COMMENT":"wx.stc.",
+"STC_D_COMMENTDOC":"wx.stc.",
+"STC_D_COMMENTDOCKEYWORD":"wx.stc.",
+"STC_D_COMMENTDOCKEYWORDERROR":"wx.stc.",
+"STC_D_COMMENTLINE":"wx.stc.",
+"STC_D_COMMENTLINEDOC":"wx.stc.",
+"STC_D_COMMENTNESTED":"wx.stc.",
+"STC_D_DEFAULT":"wx.stc.",
+"STC_D_IDENTIFIER":"wx.stc.",
+"STC_D_NUMBER":"wx.stc.",
+"STC_D_OPERATOR":"wx.stc.",
+"STC_D_STRING":"wx.stc.",
+"STC_D_STRINGB":"wx.stc.",
+"STC_D_STRINGEOL":"wx.stc.",
+"STC_D_STRINGR":"wx.stc.",
+"STC_D_TYPEDEF":"wx.stc.",
+"STC_D_WORD":"wx.stc.",
+"STC_D_WORD2":"wx.stc.",
+"STC_D_WORD3":"wx.stc.",
+"STC_D_WORD5":"wx.stc.",
+"STC_D_WORD6":"wx.stc.",
+"STC_D_WORD7":"wx.stc.",
+"STC_ECL_ADDED":"wx.stc.",
+"STC_ECL_CHANGED":"wx.stc.",
+"STC_ECL_CHARACTER":"wx.stc.",
+"STC_ECL_COMMENT":"wx.stc.",
+"STC_ECL_COMMENTDOC":"wx.stc.",
+"STC_ECL_COMMENTDOCKEYWORD":"wx.stc.",
+"STC_ECL_COMMENTDOCKEYWORDERROR":"wx.stc.",
+"STC_ECL_COMMENTLINE":"wx.stc.",
+"STC_ECL_COMMENTLINEDOC":"wx.stc.",
+"STC_ECL_DEFAULT":"wx.stc.",
+"STC_ECL_DELETED":"wx.stc.",
+"STC_ECL_IDENTIFIER":"wx.stc.",
+"STC_ECL_MOVED":"wx.stc.",
+"STC_ECL_NUMBER":"wx.stc.",
+"STC_ECL_OPERATOR":"wx.stc.",
+"STC_ECL_PREPROCESSOR":"wx.stc.",
+"STC_ECL_REGEX":"wx.stc.",
+"STC_ECL_STRING":"wx.stc.",
+"STC_ECL_STRINGEOL":"wx.stc.",
+"STC_ECL_UNKNOWN":"wx.stc.",
+"STC_ECL_UUID":"wx.stc.",
+"STC_ECL_VERBATIM":"wx.stc.",
+"STC_ECL_WORD0":"wx.stc.",
+"STC_ECL_WORD1":"wx.stc.",
+"STC_ECL_WORD2":"wx.stc.",
+"STC_ECL_WORD3":"wx.stc.",
+"STC_ECL_WORD4":"wx.stc.",
+"STC_ECL_WORD5":"wx.stc.",
+"STC_EDGE_BACKGROUND":"wx.stc.",
+"STC_EDGE_LINE":"wx.stc.",
+"STC_EDGE_NONE":"wx.stc.",
+"STC_EFF_QUALITY_ANTIALIASED":"wx.stc.",
+"STC_EFF_QUALITY_DEFAULT":"wx.stc.",
+"STC_EFF_QUALITY_LCD_OPTIMIZED":"wx.stc.",
+"STC_EFF_QUALITY_MASK":"wx.stc.",
+"STC_EFF_QUALITY_NON_ANTIALIASED":"wx.stc.",
+"STC_EIFFEL_CHARACTER":"wx.stc.",
+"STC_EIFFEL_COMMENTLINE":"wx.stc.",
+"STC_EIFFEL_DEFAULT":"wx.stc.",
+"STC_EIFFEL_IDENTIFIER":"wx.stc.",
+"STC_EIFFEL_NUMBER":"wx.stc.",
+"STC_EIFFEL_OPERATOR":"wx.stc.",
+"STC_EIFFEL_STRING":"wx.stc.",
+"STC_EIFFEL_STRINGEOL":"wx.stc.",
+"STC_EIFFEL_WORD":"wx.stc.",
+"STC_EOL_CR":"wx.stc.",
+"STC_EOL_CRLF":"wx.stc.",
+"STC_EOL_LF":"wx.stc.",
+"STC_ERLANG_ATOM":"wx.stc.",
+"STC_ERLANG_ATOM_QUOTED":"wx.stc.",
+"STC_ERLANG_BIFS":"wx.stc.",
+"STC_ERLANG_CHARACTER":"wx.stc.",
+"STC_ERLANG_COMMENT":"wx.stc.",
+"STC_ERLANG_COMMENT_DOC":"wx.stc.",
+"STC_ERLANG_COMMENT_DOC_MACRO":"wx.stc.",
+"STC_ERLANG_COMMENT_FUNCTION":"wx.stc.",
+"STC_ERLANG_COMMENT_MODULE":"wx.stc.",
+"STC_ERLANG_DEFAULT":"wx.stc.",
+"STC_ERLANG_FUNCTION_NAME":"wx.stc.",
+"STC_ERLANG_KEYWORD":"wx.stc.",
+"STC_ERLANG_MACRO":"wx.stc.",
+"STC_ERLANG_MACRO_QUOTED":"wx.stc.",
+"STC_ERLANG_MODULES":"wx.stc.",
+"STC_ERLANG_MODULES_ATT":"wx.stc.",
+"STC_ERLANG_NODE_NAME":"wx.stc.",
+"STC_ERLANG_NODE_NAME_QUOTED":"wx.stc.",
+"STC_ERLANG_NUMBER":"wx.stc.",
+"STC_ERLANG_OPERATOR":"wx.stc.",
+"STC_ERLANG_PREPROC":"wx.stc.",
+"STC_ERLANG_RECORD":"wx.stc.",
+"STC_ERLANG_RECORD_QUOTED":"wx.stc.",
+"STC_ERLANG_STRING":"wx.stc.",
+"STC_ERLANG_UNKNOWN":"wx.stc.",
+"STC_ERLANG_VARIABLE":"wx.stc.",
+"STC_ERR_ABSF":"wx.stc.",
+"STC_ERR_BORLAND":"wx.stc.",
+"STC_ERR_CMD":"wx.stc.",
+"STC_ERR_CTAG":"wx.stc.",
+"STC_ERR_DEFAULT":"wx.stc.",
+"STC_ERR_DIFF_ADDITION":"wx.stc.",
+"STC_ERR_DIFF_CHANGED":"wx.stc.",
+"STC_ERR_DIFF_DELETION":"wx.stc.",
+"STC_ERR_DIFF_MESSAGE":"wx.stc.",
+"STC_ERR_ELF":"wx.stc.",
+"STC_ERR_GCC":"wx.stc.",
+"STC_ERR_IFC":"wx.stc.",
+"STC_ERR_IFORT":"wx.stc.",
+"STC_ERR_JAVA_STACK":"wx.stc.",
+"STC_ERR_LUA":"wx.stc.",
+"STC_ERR_MS":"wx.stc.",
+"STC_ERR_NET":"wx.stc.",
+"STC_ERR_PERL":"wx.stc.",
+"STC_ERR_PHP":"wx.stc.",
+"STC_ERR_PYTHON":"wx.stc.",
+"STC_ERR_TIDY":"wx.stc.",
+"STC_ERR_VALUE":"wx.stc.",
+"STC_ESCRIPT_BRACE":"wx.stc.",
+"STC_ESCRIPT_COMMENT":"wx.stc.",
+"STC_ESCRIPT_COMMENTDOC":"wx.stc.",
+"STC_ESCRIPT_COMMENTLINE":"wx.stc.",
+"STC_ESCRIPT_DEFAULT":"wx.stc.",
+"STC_ESCRIPT_IDENTIFIER":"wx.stc.",
+"STC_ESCRIPT_NUMBER":"wx.stc.",
+"STC_ESCRIPT_OPERATOR":"wx.stc.",
+"STC_ESCRIPT_STRING":"wx.stc.",
+"STC_ESCRIPT_WORD":"wx.stc.",
+"STC_ESCRIPT_WORD2":"wx.stc.",
+"STC_ESCRIPT_WORD3":"wx.stc.",
+"STC_FIND_MATCHCASE":"wx.stc.",
+"STC_FIND_POSIX":"wx.stc.",
+"STC_FIND_REGEXP":"wx.stc.",
+"STC_FIND_WHOLEWORD":"wx.stc.",
+"STC_FIND_WORDSTART":"wx.stc.",
+"STC_FOLDFLAG_LEVELNUMBERS":"wx.stc.",
+"STC_FOLDFLAG_LINEAFTER_CONTRACTED":"wx.stc.",
+"STC_FOLDFLAG_LINEAFTER_EXPANDED":"wx.stc.",
+"STC_FOLDFLAG_LINEBEFORE_CONTRACTED":"wx.stc.",
+"STC_FOLDFLAG_LINEBEFORE_EXPANDED":"wx.stc.",
+"STC_FOLDLEVELBASE":"wx.stc.",
+"STC_FOLDLEVELHEADERFLAG":"wx.stc.",
+"STC_FOLDLEVELNUMBERMASK":"wx.stc.",
+"STC_FOLDLEVELWHITEFLAG":"wx.stc.",
+"STC_FONT_SIZE_MULTIPLIER":"wx.stc.",
+"STC_FORTH_COMMENT":"wx.stc.",
+"STC_FORTH_COMMENT_ML":"wx.stc.",
+"STC_FORTH_CONTROL":"wx.stc.",
+"STC_FORTH_DEFAULT":"wx.stc.",
+"STC_FORTH_DEFWORD":"wx.stc.",
+"STC_FORTH_IDENTIFIER":"wx.stc.",
+"STC_FORTH_KEYWORD":"wx.stc.",
+"STC_FORTH_LOCALE":"wx.stc.",
+"STC_FORTH_NUMBER":"wx.stc.",
+"STC_FORTH_PREWORD1":"wx.stc.",
+"STC_FORTH_PREWORD2":"wx.stc.",
+"STC_FORTH_STRING":"wx.stc.",
+"STC_FS_COMMENT":"wx.stc.",
+"STC_FS_COMMENTDOC":"wx.stc.",
+"STC_FS_COMMENTDOCKEYWORD":"wx.stc.",
+"STC_FS_COMMENTDOCKEYWORDERROR":"wx.stc.",
+"STC_FS_COMMENTDOC_C":"wx.stc.",
+"STC_FS_COMMENTLINE":"wx.stc.",
+"STC_FS_COMMENTLINEDOC":"wx.stc.",
+"STC_FS_COMMENTLINEDOC_C":"wx.stc.",
+"STC_FS_CONSTANT":"wx.stc.",
+"STC_FS_DATE":"wx.stc.",
+"STC_FS_DEFAULT":"wx.stc.",
+"STC_FS_DEFAULT_C":"wx.stc.",
+"STC_FS_DISABLEDCODE":"wx.stc.",
+"STC_FS_IDENTIFIER":"wx.stc.",
+"STC_FS_IDENTIFIER_C":"wx.stc.",
+"STC_FS_KEYWORD":"wx.stc.",
+"STC_FS_KEYWORD2":"wx.stc.",
+"STC_FS_KEYWORD2_C":"wx.stc.",
+"STC_FS_KEYWORD3":"wx.stc.",
+"STC_FS_KEYWORD4":"wx.stc.",
+"STC_FS_KEYWORD_C":"wx.stc.",
+"STC_FS_NUMBER":"wx.stc.",
+"STC_FS_NUMBER_C":"wx.stc.",
+"STC_FS_OPERATOR":"wx.stc.",
+"STC_FS_OPERATOR_C":"wx.stc.",
+"STC_FS_PREPROCESSOR":"wx.stc.",
+"STC_FS_PREPROCESSOR_C":"wx.stc.",
+"STC_FS_STRING":"wx.stc.",
+"STC_FS_STRINGEOL":"wx.stc.",
+"STC_FS_STRINGEOL_C":"wx.stc.",
+"STC_FS_STRING_C":"wx.stc.",
+"STC_FS_WORDOPERATOR":"wx.stc.",
+"STC_F_COMMENT":"wx.stc.",
+"STC_F_CONTINUATION":"wx.stc.",
+"STC_F_DEFAULT":"wx.stc.",
+"STC_F_IDENTIFIER":"wx.stc.",
+"STC_F_LABEL":"wx.stc.",
+"STC_F_NUMBER":"wx.stc.",
+"STC_F_OPERATOR":"wx.stc.",
+"STC_F_OPERATOR2":"wx.stc.",
+"STC_F_PREPROCESSOR":"wx.stc.",
+"STC_F_STRING1":"wx.stc.",
+"STC_F_STRING2":"wx.stc.",
+"STC_F_STRINGEOL":"wx.stc.",
+"STC_F_WORD":"wx.stc.",
+"STC_F_WORD2":"wx.stc.",
+"STC_F_WORD3":"wx.stc.",
+"STC_GAP_CHAR":"wx.stc.",
+"STC_GAP_COMMENT":"wx.stc.",
+"STC_GAP_DEFAULT":"wx.stc.",
+"STC_GAP_IDENTIFIER":"wx.stc.",
+"STC_GAP_KEYWORD":"wx.stc.",
+"STC_GAP_KEYWORD2":"wx.stc.",
+"STC_GAP_KEYWORD3":"wx.stc.",
+"STC_GAP_KEYWORD4":"wx.stc.",
+"STC_GAP_NUMBER":"wx.stc.",
+"STC_GAP_OPERATOR":"wx.stc.",
+"STC_GAP_STRING":"wx.stc.",
+"STC_GAP_STRINGEOL":"wx.stc.",
+"STC_GC_ATTRIBUTE":"wx.stc.",
+"STC_GC_COMMAND":"wx.stc.",
+"STC_GC_COMMENTBLOCK":"wx.stc.",
+"STC_GC_COMMENTLINE":"wx.stc.",
+"STC_GC_CONTROL":"wx.stc.",
+"STC_GC_DEFAULT":"wx.stc.",
+"STC_GC_EVENT":"wx.stc.",
+"STC_GC_GLOBAL":"wx.stc.",
+"STC_GC_OPERATOR":"wx.stc.",
+"STC_GC_STRING":"wx.stc.",
+"STC_HA_CAPITAL":"wx.stc.",
+"STC_HA_CHARACTER":"wx.stc.",
+"STC_HA_CLASS":"wx.stc.",
+"STC_HA_COMMENTBLOCK":"wx.stc.",
+"STC_HA_COMMENTBLOCK2":"wx.stc.",
+"STC_HA_COMMENTBLOCK3":"wx.stc.",
+"STC_HA_COMMENTLINE":"wx.stc.",
+"STC_HA_DATA":"wx.stc.",
+"STC_HA_DEFAULT":"wx.stc.",
+"STC_HA_IDENTIFIER":"wx.stc.",
+"STC_HA_IMPORT":"wx.stc.",
+"STC_HA_INSTANCE":"wx.stc.",
+"STC_HA_KEYWORD":"wx.stc.",
+"STC_HA_MODULE":"wx.stc.",
+"STC_HA_NUMBER":"wx.stc.",
+"STC_HA_OPERATOR":"wx.stc.",
+"STC_HA_STRING":"wx.stc.",
+"STC_HBA_COMMENTLINE":"wx.stc.",
+"STC_HBA_DEFAULT":"wx.stc.",
+"STC_HBA_IDENTIFIER":"wx.stc.",
+"STC_HBA_NUMBER":"wx.stc.",
+"STC_HBA_START":"wx.stc.",
+"STC_HBA_STRING":"wx.stc.",
+"STC_HBA_STRINGEOL":"wx.stc.",
+"STC_HBA_WORD":"wx.stc.",
+"STC_HB_COMMENTLINE":"wx.stc.",
+"STC_HB_DEFAULT":"wx.stc.",
+"STC_HB_IDENTIFIER":"wx.stc.",
+"STC_HB_NUMBER":"wx.stc.",
+"STC_HB_START":"wx.stc.",
+"STC_HB_STRING":"wx.stc.",
+"STC_HB_STRINGEOL":"wx.stc.",
+"STC_HB_WORD":"wx.stc.",
+"STC_HJA_COMMENT":"wx.stc.",
+"STC_HJA_COMMENTDOC":"wx.stc.",
+"STC_HJA_COMMENTLINE":"wx.stc.",
+"STC_HJA_DEFAULT":"wx.stc.",
+"STC_HJA_DOUBLESTRING":"wx.stc.",
+"STC_HJA_KEYWORD":"wx.stc.",
+"STC_HJA_NUMBER":"wx.stc.",
+"STC_HJA_REGEX":"wx.stc.",
+"STC_HJA_SINGLESTRING":"wx.stc.",
+"STC_HJA_START":"wx.stc.",
+"STC_HJA_STRINGEOL":"wx.stc.",
+"STC_HJA_SYMBOLS":"wx.stc.",
+"STC_HJA_WORD":"wx.stc.",
+"STC_HJ_COMMENT":"wx.stc.",
+"STC_HJ_COMMENTDOC":"wx.stc.",
+"STC_HJ_COMMENTLINE":"wx.stc.",
+"STC_HJ_DEFAULT":"wx.stc.",
+"STC_HJ_DOUBLESTRING":"wx.stc.",
+"STC_HJ_KEYWORD":"wx.stc.",
+"STC_HJ_NUMBER":"wx.stc.",
+"STC_HJ_REGEX":"wx.stc.",
+"STC_HJ_SINGLESTRING":"wx.stc.",
+"STC_HJ_START":"wx.stc.",
+"STC_HJ_STRINGEOL":"wx.stc.",
+"STC_HJ_SYMBOLS":"wx.stc.",
+"STC_HJ_WORD":"wx.stc.",
+"STC_HPA_CHARACTER":"wx.stc.",
+"STC_HPA_CLASSNAME":"wx.stc.",
+"STC_HPA_COMMENTLINE":"wx.stc.",
+"STC_HPA_DEFAULT":"wx.stc.",
+"STC_HPA_DEFNAME":"wx.stc.",
+"STC_HPA_IDENTIFIER":"wx.stc.",
+"STC_HPA_NUMBER":"wx.stc.",
+"STC_HPA_OPERATOR":"wx.stc.",
+"STC_HPA_START":"wx.stc.",
+"STC_HPA_STRING":"wx.stc.",
+"STC_HPA_TRIPLE":"wx.stc.",
+"STC_HPA_TRIPLEDOUBLE":"wx.stc.",
+"STC_HPA_WORD":"wx.stc.",
+"STC_HPHP_COMMENT":"wx.stc.",
+"STC_HPHP_COMMENTLINE":"wx.stc.",
+"STC_HPHP_COMPLEX_VARIABLE":"wx.stc.",
+"STC_HPHP_DEFAULT":"wx.stc.",
+"STC_HPHP_HSTRING":"wx.stc.",
+"STC_HPHP_HSTRING_VARIABLE":"wx.stc.",
+"STC_HPHP_NUMBER":"wx.stc.",
+"STC_HPHP_OPERATOR":"wx.stc.",
+"STC_HPHP_SIMPLESTRING":"wx.stc.",
+"STC_HPHP_VARIABLE":"wx.stc.",
+"STC_HPHP_WORD":"wx.stc.",
+"STC_HP_CHARACTER":"wx.stc.",
+"STC_HP_CLASSNAME":"wx.stc.",
+"STC_HP_COMMENTLINE":"wx.stc.",
+"STC_HP_DEFAULT":"wx.stc.",
+"STC_HP_DEFNAME":"wx.stc.",
+"STC_HP_IDENTIFIER":"wx.stc.",
+"STC_HP_NUMBER":"wx.stc.",
+"STC_HP_OPERATOR":"wx.stc.",
+"STC_HP_START":"wx.stc.",
+"STC_HP_STRING":"wx.stc.",
+"STC_HP_TRIPLE":"wx.stc.",
+"STC_HP_TRIPLEDOUBLE":"wx.stc.",
+"STC_HP_WORD":"wx.stc.",
+"STC_H_ASP":"wx.stc.",
+"STC_H_ASPAT":"wx.stc.",
+"STC_H_ATTRIBUTE":"wx.stc.",
+"STC_H_ATTRIBUTEUNKNOWN":"wx.stc.",
+"STC_H_CDATA":"wx.stc.",
+"STC_H_COMMENT":"wx.stc.",
+"STC_H_DEFAULT":"wx.stc.",
+"STC_H_DOUBLESTRING":"wx.stc.",
+"STC_H_ENTITY":"wx.stc.",
+"STC_H_NUMBER":"wx.stc.",
+"STC_H_OTHER":"wx.stc.",
+"STC_H_QUESTION":"wx.stc.",
+"STC_H_SCRIPT":"wx.stc.",
+"STC_H_SGML_1ST_PARAM":"wx.stc.",
+"STC_H_SGML_1ST_PARAM_COMMENT":"wx.stc.",
+"STC_H_SGML_BLOCK_DEFAULT":"wx.stc.",
+"STC_H_SGML_COMMAND":"wx.stc.",
+"STC_H_SGML_COMMENT":"wx.stc.",
+"STC_H_SGML_DEFAULT":"wx.stc.",
+"STC_H_SGML_DOUBLESTRING":"wx.stc.",
+"STC_H_SGML_ENTITY":"wx.stc.",
+"STC_H_SGML_ERROR":"wx.stc.",
+"STC_H_SGML_SIMPLESTRING":"wx.stc.",
+"STC_H_SGML_SPECIAL":"wx.stc.",
+"STC_H_SINGLESTRING":"wx.stc.",
+"STC_H_TAG":"wx.stc.",
+"STC_H_TAGEND":"wx.stc.",
+"STC_H_TAGUNKNOWN":"wx.stc.",
+"STC_H_VALUE":"wx.stc.",
+"STC_H_XCCOMMENT":"wx.stc.",
+"STC_H_XMLEND":"wx.stc.",
+"STC_H_XMLSTART":"wx.stc.",
+"STC_INDIC0_MASK":"wx.stc.",
+"STC_INDIC1_MASK":"wx.stc.",
+"STC_INDIC2_MASK":"wx.stc.",
+"STC_INDICS_MASK":"wx.stc.",
+"STC_INDIC_BOX":"wx.stc.",
+"STC_INDIC_CONTAINER":"wx.stc.",
+"STC_INDIC_DASH":"wx.stc.",
+"STC_INDIC_DIAGONAL":"wx.stc.",
+"STC_INDIC_DOTBOX":"wx.stc.",
+"STC_INDIC_DOTS":"wx.stc.",
+"STC_INDIC_HIDDEN":"wx.stc.",
+"STC_INDIC_MAX":"wx.stc.",
+"STC_INDIC_PLAIN":"wx.stc.",
+"STC_INDIC_ROUNDBOX":"wx.stc.",
+"STC_INDIC_SQUIGGLE":"wx.stc.",
+"STC_INDIC_SQUIGGLELOW":"wx.stc.",
+"STC_INDIC_STRAIGHTBOX":"wx.stc.",
+"STC_INDIC_STRIKE":"wx.stc.",
+"STC_INDIC_TT":"wx.stc.",
+"STC_INNO_COMMENT":"wx.stc.",
+"STC_INNO_COMMENT_PASCAL":"wx.stc.",
+"STC_INNO_DEFAULT":"wx.stc.",
+"STC_INNO_IDENTIFIER":"wx.stc.",
+"STC_INNO_INLINE_EXPANSION":"wx.stc.",
+"STC_INNO_KEYWORD":"wx.stc.",
+"STC_INNO_KEYWORD_PASCAL":"wx.stc.",
+"STC_INNO_KEYWORD_USER":"wx.stc.",
+"STC_INNO_PARAMETER":"wx.stc.",
+"STC_INNO_PREPROC":"wx.stc.",
+"STC_INNO_SECTION":"wx.stc.",
+"STC_INNO_STRING_DOUBLE":"wx.stc.",
+"STC_INNO_STRING_SINGLE":"wx.stc.",
+"STC_INVALID_POSITION":"wx.stc.",
+"STC_IV_LOOKBOTH":"wx.stc.",
+"STC_IV_LOOKFORWARD":"wx.stc.",
+"STC_IV_NONE":"wx.stc.",
+"STC_IV_REAL":"wx.stc.",
+"STC_KEYWORDSET_MAX":"wx.stc.",
+"STC_KEY_ADD":"wx.stc.",
+"STC_KEY_BACK":"wx.stc.",
+"STC_KEY_DELETE":"wx.stc.",
+"STC_KEY_DIVIDE":"wx.stc.",
+"STC_KEY_DOWN":"wx.stc.",
+"STC_KEY_END":"wx.stc.",
+"STC_KEY_ESCAPE":"wx.stc.",
+"STC_KEY_HOME":"wx.stc.",
+"STC_KEY_INSERT":"wx.stc.",
+"STC_KEY_LEFT":"wx.stc.",
+"STC_KEY_MENU":"wx.stc.",
+"STC_KEY_NEXT":"wx.stc.",
+"STC_KEY_PRIOR":"wx.stc.",
+"STC_KEY_RETURN":"wx.stc.",
+"STC_KEY_RIGHT":"wx.stc.",
+"STC_KEY_RWIN":"wx.stc.",
+"STC_KEY_SUBTRACT":"wx.stc.",
+"STC_KEY_TAB":"wx.stc.",
+"STC_KEY_UP":"wx.stc.",
+"STC_KEY_WIN":"wx.stc.",
+"STC_KIX_COMMENT":"wx.stc.",
+"STC_KIX_DEFAULT":"wx.stc.",
+"STC_KIX_FUNCTIONS":"wx.stc.",
+"STC_KIX_IDENTIFIER":"wx.stc.",
+"STC_KIX_KEYWORD":"wx.stc.",
+"STC_KIX_MACRO":"wx.stc.",
+"STC_KIX_NUMBER":"wx.stc.",
+"STC_KIX_OPERATOR":"wx.stc.",
+"STC_KIX_STRING1":"wx.stc.",
+"STC_KIX_STRING2":"wx.stc.",
+"STC_KIX_VAR":"wx.stc.",
+"STC_LASTSTEPINUNDOREDO":"wx.stc.",
+"STC_LEXER_START":"wx.stc.",
+"STC_LEX_A68K":"wx.stc.",
+"STC_LEX_ABAQUS":"wx.stc.",
+"STC_LEX_ADA":"wx.stc.",
+"STC_LEX_APDL":"wx.stc.",
+"STC_LEX_ASM":"wx.stc.",
+"STC_LEX_ASN1":"wx.stc.",
+"STC_LEX_ASYMPTOTE":"wx.stc.",
+"STC_LEX_AU3":"wx.stc.",
+"STC_LEX_AUTOMATIC":"wx.stc.",
+"STC_LEX_AVE":"wx.stc.",
+"STC_LEX_AVS":"wx.stc.",
+"STC_LEX_BAAN":"wx.stc.",
+"STC_LEX_BASH":"wx.stc.",
+"STC_LEX_BATCH":"wx.stc.",
+"STC_LEX_BLITZBASIC":"wx.stc.",
+"STC_LEX_BULLANT":"wx.stc.",
+"STC_LEX_CAML":"wx.stc.",
+"STC_LEX_CLW":"wx.stc.",
+"STC_LEX_CLWNOCASE":"wx.stc.",
+"STC_LEX_CMAKE":"wx.stc.",
+"STC_LEX_COBOL":"wx.stc.",
+"STC_LEX_COFFEESCRIPT":"wx.stc.",
+"STC_LEX_CONF":"wx.stc.",
+"STC_LEX_CONTAINER":"wx.stc.",
+"STC_LEX_CPP":"wx.stc.",
+"STC_LEX_CPPNOCASE":"wx.stc.",
+"STC_LEX_CSOUND":"wx.stc.",
+"STC_LEX_CSS":"wx.stc.",
+"STC_LEX_D":"wx.stc.",
+"STC_LEX_DIFF":"wx.stc.",
+"STC_LEX_ECL":"wx.stc.",
+"STC_LEX_EIFFEL":"wx.stc.",
+"STC_LEX_EIFFELKW":"wx.stc.",
+"STC_LEX_ERLANG":"wx.stc.",
+"STC_LEX_ERRORLIST":"wx.stc.",
+"STC_LEX_ESCRIPT":"wx.stc.",
+"STC_LEX_F77":"wx.stc.",
+"STC_LEX_FLAGSHIP":"wx.stc.",
+"STC_LEX_FORTH":"wx.stc.",
+"STC_LEX_FORTRAN":"wx.stc.",
+"STC_LEX_FREEBASIC":"wx.stc.",
+"STC_LEX_GAP":"wx.stc.",
+"STC_LEX_GUI4CLI":"wx.stc.",
+"STC_LEX_HASKELL":"wx.stc.",
+"STC_LEX_HTML":"wx.stc.",
+"STC_LEX_INNOSETUP":"wx.stc.",
+"STC_LEX_KIX":"wx.stc.",
+"STC_LEX_LATEX":"wx.stc.",
+"STC_LEX_LISP":"wx.stc.",
+"STC_LEX_LOT":"wx.stc.",
+"STC_LEX_LOUT":"wx.stc.",
+"STC_LEX_LUA":"wx.stc.",
+"STC_LEX_MAGIK":"wx.stc.",
+"STC_LEX_MAKEFILE":"wx.stc.",
+"STC_LEX_MARKDOWN":"wx.stc.",
+"STC_LEX_MATLAB":"wx.stc.",
+"STC_LEX_METAPOST":"wx.stc.",
+"STC_LEX_MMIXAL":"wx.stc.",
+"STC_LEX_MODULA":"wx.stc.",
+"STC_LEX_MSSQL":"wx.stc.",
+"STC_LEX_MYSQL":"wx.stc.",
+"STC_LEX_NIMROD":"wx.stc.",
+"STC_LEX_NNCRONTAB":"wx.stc.",
+"STC_LEX_NSIS":"wx.stc.",
+"STC_LEX_NULL":"wx.stc.",
+"STC_LEX_OCTAVE":"wx.stc.",
+"STC_LEX_OPAL":"wx.stc.",
+"STC_LEX_OSCRIPT":"wx.stc.",
+"STC_LEX_PASCAL":"wx.stc.",
+"STC_LEX_PERL":"wx.stc.",
+"STC_LEX_PHPSCRIPT":"wx.stc.",
+"STC_LEX_PLM":"wx.stc.",
+"STC_LEX_PO":"wx.stc.",
+"STC_LEX_POV":"wx.stc.",
+"STC_LEX_POWERBASIC":"wx.stc.",
+"STC_LEX_POWERPRO":"wx.stc.",
+"STC_LEX_POWERSHELL":"wx.stc.",
+"STC_LEX_PROGRESS":"wx.stc.",
+"STC_LEX_PROPERTIES":"wx.stc.",
+"STC_LEX_PS":"wx.stc.",
+"STC_LEX_PUREBASIC":"wx.stc.",
+"STC_LEX_PYTHON":"wx.stc.",
+"STC_LEX_R":"wx.stc.",
+"STC_LEX_REBOL":"wx.stc.",
+"STC_LEX_RUBY":"wx.stc.",
+"STC_LEX_SCRIPTOL":"wx.stc.",
+"STC_LEX_SMALLTALK":"wx.stc.",
+"STC_LEX_SML":"wx.stc.",
+"STC_LEX_SORCUS":"wx.stc.",
+"STC_LEX_SPECMAN":"wx.stc.",
+"STC_LEX_SPICE":"wx.stc.",
+"STC_LEX_SQL":"wx.stc.",
+"STC_LEX_TACL":"wx.stc.",
+"STC_LEX_TADS3":"wx.stc.",
+"STC_LEX_TAL":"wx.stc.",
+"STC_LEX_TCL":"wx.stc.",
+"STC_LEX_TCMD":"wx.stc.",
+"STC_LEX_TEX":"wx.stc.",
+"STC_LEX_TXT2TAGS":"wx.stc.",
+"STC_LEX_VB":"wx.stc.",
+"STC_LEX_VBSCRIPT":"wx.stc.",
+"STC_LEX_VERILOG":"wx.stc.",
+"STC_LEX_VHDL":"wx.stc.",
+"STC_LEX_VISUALPROLOG":"wx.stc.",
+"STC_LEX_XCODE":"wx.stc.",
+"STC_LEX_XML":"wx.stc.",
+"STC_LEX_YAML":"wx.stc.",
+"STC_LISP_COMMENT":"wx.stc.",
+"STC_LISP_DEFAULT":"wx.stc.",
+"STC_LISP_IDENTIFIER":"wx.stc.",
+"STC_LISP_KEYWORD":"wx.stc.",
+"STC_LISP_KEYWORD_KW":"wx.stc.",
+"STC_LISP_MULTI_COMMENT":"wx.stc.",
+"STC_LISP_NUMBER":"wx.stc.",
+"STC_LISP_OPERATOR":"wx.stc.",
+"STC_LISP_SPECIAL":"wx.stc.",
+"STC_LISP_STRING":"wx.stc.",
+"STC_LISP_STRINGEOL":"wx.stc.",
+"STC_LISP_SYMBOL":"wx.stc.",
+"STC_LOT_ABORT":"wx.stc.",
+"STC_LOT_BREAK":"wx.stc.",
+"STC_LOT_DEFAULT":"wx.stc.",
+"STC_LOT_FAIL":"wx.stc.",
+"STC_LOT_HEADER":"wx.stc.",
+"STC_LOT_PASS":"wx.stc.",
+"STC_LOT_SET":"wx.stc.",
+"STC_LOUT_COMMENT":"wx.stc.",
+"STC_LOUT_DEFAULT":"wx.stc.",
+"STC_LOUT_IDENTIFIER":"wx.stc.",
+"STC_LOUT_NUMBER":"wx.stc.",
+"STC_LOUT_OPERATOR":"wx.stc.",
+"STC_LOUT_STRING":"wx.stc.",
+"STC_LOUT_STRINGEOL":"wx.stc.",
+"STC_LOUT_WORD":"wx.stc.",
+"STC_LOUT_WORD2":"wx.stc.",
+"STC_LOUT_WORD3":"wx.stc.",
+"STC_LOUT_WORD4":"wx.stc.",
+"STC_LUA_CHARACTER":"wx.stc.",
+"STC_LUA_COMMENT":"wx.stc.",
+"STC_LUA_COMMENTDOC":"wx.stc.",
+"STC_LUA_COMMENTLINE":"wx.stc.",
+"STC_LUA_DEFAULT":"wx.stc.",
+"STC_LUA_IDENTIFIER":"wx.stc.",
+"STC_LUA_LABEL":"wx.stc.",
+"STC_LUA_LITERALSTRING":"wx.stc.",
+"STC_LUA_NUMBER":"wx.stc.",
+"STC_LUA_OPERATOR":"wx.stc.",
+"STC_LUA_PREPROCESSOR":"wx.stc.",
+"STC_LUA_STRING":"wx.stc.",
+"STC_LUA_STRINGEOL":"wx.stc.",
+"STC_LUA_WORD":"wx.stc.",
+"STC_LUA_WORD2":"wx.stc.",
+"STC_LUA_WORD3":"wx.stc.",
+"STC_LUA_WORD4":"wx.stc.",
+"STC_LUA_WORD5":"wx.stc.",
+"STC_LUA_WORD6":"wx.stc.",
+"STC_LUA_WORD7":"wx.stc.",
+"STC_LUA_WORD8":"wx.stc.",
+"STC_L_CMDOPT":"wx.stc.",
+"STC_L_COMMAND":"wx.stc.",
+"STC_L_COMMENT":"wx.stc.",
+"STC_L_COMMENT2":"wx.stc.",
+"STC_L_DEFAULT":"wx.stc.",
+"STC_L_ERROR":"wx.stc.",
+"STC_L_MATH":"wx.stc.",
+"STC_L_MATH2":"wx.stc.",
+"STC_L_SHORTCMD":"wx.stc.",
+"STC_L_SPECIAL":"wx.stc.",
+"STC_L_TAG":"wx.stc.",
+"STC_L_TAG2":"wx.stc.",
+"STC_L_VERBATIM":"wx.stc.",
+"STC_MAGIK_BRACE_BLOCK":"wx.stc.",
+"STC_MAGIK_BRACKET_BLOCK":"wx.stc.",
+"STC_MAGIK_CHARACTER":"wx.stc.",
+"STC_MAGIK_COMMENT":"wx.stc.",
+"STC_MAGIK_CONTAINER":"wx.stc.",
+"STC_MAGIK_DEFAULT":"wx.stc.",
+"STC_MAGIK_FLOW":"wx.stc.",
+"STC_MAGIK_HYPER_COMMENT":"wx.stc.",
+"STC_MAGIK_IDENTIFIER":"wx.stc.",
+"STC_MAGIK_KEYWORD":"wx.stc.",
+"STC_MAGIK_NUMBER":"wx.stc.",
+"STC_MAGIK_OPERATOR":"wx.stc.",
+"STC_MAGIK_PRAGMA":"wx.stc.",
+"STC_MAGIK_SQBRACKET_BLOCK":"wx.stc.",
+"STC_MAGIK_STRING":"wx.stc.",
+"STC_MAGIK_SYMBOL":"wx.stc.",
+"STC_MAGIK_UNKNOWN_KEYWORD":"wx.stc.",
+"STC_MAKE_COMMENT":"wx.stc.",
+"STC_MAKE_DEFAULT":"wx.stc.",
+"STC_MAKE_IDENTIFIER":"wx.stc.",
+"STC_MAKE_IDEOL":"wx.stc.",
+"STC_MAKE_OPERATOR":"wx.stc.",
+"STC_MAKE_PREPROCESSOR":"wx.stc.",
+"STC_MAKE_TARGET":"wx.stc.",
+"STC_MARGINOPTION_NONE":"wx.stc.",
+"STC_MARGINOPTION_SUBLINESELECT":"wx.stc.",
+"STC_MARGIN_BACK":"wx.stc.",
+"STC_MARGIN_FORE":"wx.stc.",
+"STC_MARGIN_NUMBER":"wx.stc.",
+"STC_MARGIN_RTEXT":"wx.stc.",
+"STC_MARGIN_SYMBOL":"wx.stc.",
+"STC_MARGIN_TEXT":"wx.stc.",
+"STC_MARKDOWN_BLOCKQUOTE":"wx.stc.",
+"STC_MARKDOWN_CODE":"wx.stc.",
+"STC_MARKDOWN_CODE2":"wx.stc.",
+"STC_MARKDOWN_CODEBK":"wx.stc.",
+"STC_MARKDOWN_DEFAULT":"wx.stc.",
+"STC_MARKDOWN_EM1":"wx.stc.",
+"STC_MARKDOWN_EM2":"wx.stc.",
+"STC_MARKDOWN_HEADER1":"wx.stc.",
+"STC_MARKDOWN_HEADER2":"wx.stc.",
+"STC_MARKDOWN_HEADER3":"wx.stc.",
+"STC_MARKDOWN_HEADER4":"wx.stc.",
+"STC_MARKDOWN_HEADER5":"wx.stc.",
+"STC_MARKDOWN_HEADER6":"wx.stc.",
+"STC_MARKDOWN_HRULE":"wx.stc.",
+"STC_MARKDOWN_LINE_BEGIN":"wx.stc.",
+"STC_MARKDOWN_LINK":"wx.stc.",
+"STC_MARKDOWN_OLIST_ITEM":"wx.stc.",
+"STC_MARKDOWN_PRECHAR":"wx.stc.",
+"STC_MARKDOWN_STRIKEOUT":"wx.stc.",
+"STC_MARKDOWN_STRONG1":"wx.stc.",
+"STC_MARKDOWN_STRONG2":"wx.stc.",
+"STC_MARKDOWN_ULIST_ITEM":"wx.stc.",
+"STC_MARKER_MAX":"wx.stc.",
+"STC_MARKNUM_FOLDER":"wx.stc.",
+"STC_MARKNUM_FOLDEREND":"wx.stc.",
+"STC_MARKNUM_FOLDERMIDTAIL":"wx.stc.",
+"STC_MARKNUM_FOLDEROPEN":"wx.stc.",
+"STC_MARKNUM_FOLDEROPENMID":"wx.stc.",
+"STC_MARKNUM_FOLDERSUB":"wx.stc.",
+"STC_MARKNUM_FOLDERTAIL":"wx.stc.",
+"STC_MARK_ARROW":"wx.stc.",
+"STC_MARK_ARROWDOWN":"wx.stc.",
+"STC_MARK_ARROWS":"wx.stc.",
+"STC_MARK_AVAILABLE":"wx.stc.",
+"STC_MARK_BACKGROUND":"wx.stc.",
+"STC_MARK_BOXMINUS":"wx.stc.",
+"STC_MARK_BOXMINUSCONNECTED":"wx.stc.",
+"STC_MARK_BOXPLUS":"wx.stc.",
+"STC_MARK_BOXPLUSCONNECTED":"wx.stc.",
+"STC_MARK_CHARACTER":"wx.stc.",
+"STC_MARK_CIRCLE":"wx.stc.",
+"STC_MARK_CIRCLEMINUS":"wx.stc.",
+"STC_MARK_CIRCLEMINUSCONNECTED":"wx.stc.",
+"STC_MARK_CIRCLEPLUS":"wx.stc.",
+"STC_MARK_CIRCLEPLUSCONNECTED":"wx.stc.",
+"STC_MARK_DOTDOTDOT":"wx.stc.",
+"STC_MARK_EMPTY":"wx.stc.",
+"STC_MARK_FULLRECT":"wx.stc.",
+"STC_MARK_LCORNER":"wx.stc.",
+"STC_MARK_LCORNERCURVE":"wx.stc.",
+"STC_MARK_LEFTRECT":"wx.stc.",
+"STC_MARK_MINUS":"wx.stc.",
+"STC_MARK_PIXMAP":"wx.stc.",
+"STC_MARK_PLUS":"wx.stc.",
+"STC_MARK_RGBAIMAGE":"wx.stc.",
+"STC_MARK_ROUNDRECT":"wx.stc.",
+"STC_MARK_SHORTARROW":"wx.stc.",
+"STC_MARK_SMALLRECT":"wx.stc.",
+"STC_MARK_TCORNER":"wx.stc.",
+"STC_MARK_TCORNERCURVE":"wx.stc.",
+"STC_MARK_UNDERLINE":"wx.stc.",
+"STC_MARK_VLINE":"wx.stc.",
+"STC_MASK_FOLDERS":"wx.stc.",
+"STC_MATLAB_COMMAND":"wx.stc.",
+"STC_MATLAB_COMMENT":"wx.stc.",
+"STC_MATLAB_DEFAULT":"wx.stc.",
+"STC_MATLAB_DOUBLEQUOTESTRING":"wx.stc.",
+"STC_MATLAB_IDENTIFIER":"wx.stc.",
+"STC_MATLAB_KEYWORD":"wx.stc.",
+"STC_MATLAB_NUMBER":"wx.stc.",
+"STC_MATLAB_OPERATOR":"wx.stc.",
+"STC_MATLAB_STRING":"wx.stc.",
+"STC_METAPOST_COMMAND":"wx.stc.",
+"STC_METAPOST_DEFAULT":"wx.stc.",
+"STC_METAPOST_EXTRA":"wx.stc.",
+"STC_METAPOST_GROUP":"wx.stc.",
+"STC_METAPOST_SPECIAL":"wx.stc.",
+"STC_METAPOST_SYMBOL":"wx.stc.",
+"STC_METAPOST_TEXT":"wx.stc.",
+"STC_MMIXAL_CHAR":"wx.stc.",
+"STC_MMIXAL_COMMENT":"wx.stc.",
+"STC_MMIXAL_HEX":"wx.stc.",
+"STC_MMIXAL_INCLUDE":"wx.stc.",
+"STC_MMIXAL_LABEL":"wx.stc.",
+"STC_MMIXAL_LEADWS":"wx.stc.",
+"STC_MMIXAL_NUMBER":"wx.stc.",
+"STC_MMIXAL_OPCODE":"wx.stc.",
+"STC_MMIXAL_OPCODE_POST":"wx.stc.",
+"STC_MMIXAL_OPCODE_PRE":"wx.stc.",
+"STC_MMIXAL_OPCODE_UNKNOWN":"wx.stc.",
+"STC_MMIXAL_OPCODE_VALID":"wx.stc.",
+"STC_MMIXAL_OPERANDS":"wx.stc.",
+"STC_MMIXAL_OPERATOR":"wx.stc.",
+"STC_MMIXAL_REF":"wx.stc.",
+"STC_MMIXAL_REGISTER":"wx.stc.",
+"STC_MMIXAL_STRING":"wx.stc.",
+"STC_MMIXAL_SYMBOL":"wx.stc.",
+"STC_MODEVENTMASKALL":"wx.stc.",
+"STC_MODULA_BADSTR":"wx.stc.",
+"STC_MODULA_BASENUM":"wx.stc.",
+"STC_MODULA_CHAR":"wx.stc.",
+"STC_MODULA_CHARSPEC":"wx.stc.",
+"STC_MODULA_COMMENT":"wx.stc.",
+"STC_MODULA_DEFAULT":"wx.stc.",
+"STC_MODULA_DOXYCOMM":"wx.stc.",
+"STC_MODULA_DOXYKEY":"wx.stc.",
+"STC_MODULA_FLOAT":"wx.stc.",
+"STC_MODULA_KEYWORD":"wx.stc.",
+"STC_MODULA_NUMBER":"wx.stc.",
+"STC_MODULA_OPERATOR":"wx.stc.",
+"STC_MODULA_PRAGMA":"wx.stc.",
+"STC_MODULA_PRGKEY":"wx.stc.",
+"STC_MODULA_PROC":"wx.stc.",
+"STC_MODULA_RESERVED":"wx.stc.",
+"STC_MODULA_STRING":"wx.stc.",
+"STC_MODULA_STRSPEC":"wx.stc.",
+"STC_MOD_BEFOREDELETE":"wx.stc.",
+"STC_MOD_BEFOREINSERT":"wx.stc.",
+"STC_MOD_CHANGEANNOTATION":"wx.stc.",
+"STC_MOD_CHANGEFOLD":"wx.stc.",
+"STC_MOD_CHANGEINDICATOR":"wx.stc.",
+"STC_MOD_CHANGELINESTATE":"wx.stc.",
+"STC_MOD_CHANGEMARGIN":"wx.stc.",
+"STC_MOD_CHANGEMARKER":"wx.stc.",
+"STC_MOD_CHANGESTYLE":"wx.stc.",
+"STC_MOD_CONTAINER":"wx.stc.",
+"STC_MOD_DELETETEXT":"wx.stc.",
+"STC_MOD_INSERTTEXT":"wx.stc.",
+"STC_MOD_LEXERSTATE":"wx.stc.",
+"STC_MSSQL_COLUMN_NAME":"wx.stc.",
+"STC_MSSQL_COLUMN_NAME_2":"wx.stc.",
+"STC_MSSQL_COMMENT":"wx.stc.",
+"STC_MSSQL_DATATYPE":"wx.stc.",
+"STC_MSSQL_DEFAULT":"wx.stc.",
+"STC_MSSQL_DEFAULT_PREF_DATATYPE":"wx.stc.",
+"STC_MSSQL_FUNCTION":"wx.stc.",
+"STC_MSSQL_GLOBAL_VARIABLE":"wx.stc.",
+"STC_MSSQL_IDENTIFIER":"wx.stc.",
+"STC_MSSQL_LINE_COMMENT":"wx.stc.",
+"STC_MSSQL_NUMBER":"wx.stc.",
+"STC_MSSQL_OPERATOR":"wx.stc.",
+"STC_MSSQL_STATEMENT":"wx.stc.",
+"STC_MSSQL_STORED_PROCEDURE":"wx.stc.",
+"STC_MSSQL_STRING":"wx.stc.",
+"STC_MSSQL_SYSTABLE":"wx.stc.",
+"STC_MSSQL_VARIABLE":"wx.stc.",
+"STC_MULTILINEUNDOREDO":"wx.stc.",
+"STC_MULTIPASTE_EACH":"wx.stc.",
+"STC_MULTIPASTE_ONCE":"wx.stc.",
+"STC_MULTISTEPUNDOREDO":"wx.stc.",
+"STC_MYSQL_COMMENT":"wx.stc.",
+"STC_MYSQL_COMMENTLINE":"wx.stc.",
+"STC_MYSQL_DATABASEOBJECT":"wx.stc.",
+"STC_MYSQL_DEFAULT":"wx.stc.",
+"STC_MYSQL_DQSTRING":"wx.stc.",
+"STC_MYSQL_FUNCTION":"wx.stc.",
+"STC_MYSQL_HIDDENCOMMAND":"wx.stc.",
+"STC_MYSQL_IDENTIFIER":"wx.stc.",
+"STC_MYSQL_KEYWORD":"wx.stc.",
+"STC_MYSQL_KNOWNSYSTEMVARIABLE":"wx.stc.",
+"STC_MYSQL_MAJORKEYWORD":"wx.stc.",
+"STC_MYSQL_NUMBER":"wx.stc.",
+"STC_MYSQL_OPERATOR":"wx.stc.",
+"STC_MYSQL_PROCEDUREKEYWORD":"wx.stc.",
+"STC_MYSQL_QUOTEDIDENTIFIER":"wx.stc.",
+"STC_MYSQL_SQSTRING":"wx.stc.",
+"STC_MYSQL_STRING":"wx.stc.",
+"STC_MYSQL_SYSTEMVARIABLE":"wx.stc.",
+"STC_MYSQL_USER1":"wx.stc.",
+"STC_MYSQL_USER2":"wx.stc.",
+"STC_MYSQL_USER3":"wx.stc.",
+"STC_MYSQL_VARIABLE":"wx.stc.",
+"STC_NNCRONTAB_ASTERISK":"wx.stc.",
+"STC_NNCRONTAB_COMMENT":"wx.stc.",
+"STC_NNCRONTAB_DEFAULT":"wx.stc.",
+"STC_NNCRONTAB_ENVIRONMENT":"wx.stc.",
+"STC_NNCRONTAB_IDENTIFIER":"wx.stc.",
+"STC_NNCRONTAB_KEYWORD":"wx.stc.",
+"STC_NNCRONTAB_MODIFIER":"wx.stc.",
+"STC_NNCRONTAB_NUMBER":"wx.stc.",
+"STC_NNCRONTAB_SECTION":"wx.stc.",
+"STC_NNCRONTAB_STRING":"wx.stc.",
+"STC_NNCRONTAB_TASK":"wx.stc.",
+"STC_NSIS_COMMENT":"wx.stc.",
+"STC_NSIS_COMMENTBOX":"wx.stc.",
+"STC_NSIS_DEFAULT":"wx.stc.",
+"STC_NSIS_FUNCTION":"wx.stc.",
+"STC_NSIS_FUNCTIONDEF":"wx.stc.",
+"STC_NSIS_IFDEFINEDEF":"wx.stc.",
+"STC_NSIS_LABEL":"wx.stc.",
+"STC_NSIS_MACRODEF":"wx.stc.",
+"STC_NSIS_NUMBER":"wx.stc.",
+"STC_NSIS_PAGEEX":"wx.stc.",
+"STC_NSIS_SECTIONDEF":"wx.stc.",
+"STC_NSIS_SECTIONGROUP":"wx.stc.",
+"STC_NSIS_STRINGDQ":"wx.stc.",
+"STC_NSIS_STRINGLQ":"wx.stc.",
+"STC_NSIS_STRINGRQ":"wx.stc.",
+"STC_NSIS_STRINGVAR":"wx.stc.",
+"STC_NSIS_SUBSECTIONDEF":"wx.stc.",
+"STC_NSIS_USERDEFINED":"wx.stc.",
+"STC_NSIS_VARIABLE":"wx.stc.",
+"STC_OPAL_BOOL_CONST":"wx.stc.",
+"STC_OPAL_COMMENT_BLOCK":"wx.stc.",
+"STC_OPAL_COMMENT_LINE":"wx.stc.",
+"STC_OPAL_DEFAULT":"wx.stc.",
+"STC_OPAL_INTEGER":"wx.stc.",
+"STC_OPAL_KEYWORD":"wx.stc.",
+"STC_OPAL_PAR":"wx.stc.",
+"STC_OPAL_SORT":"wx.stc.",
+"STC_OPAL_SPACE":"wx.stc.",
+"STC_OPAL_STRING":"wx.stc.",
+"STC_OPTIONAL_START":"wx.stc.",
+"STC_OSCRIPT_BLOCK_COMMENT":"wx.stc.",
+"STC_OSCRIPT_CONSTANT":"wx.stc.",
+"STC_OSCRIPT_DEFAULT":"wx.stc.",
+"STC_OSCRIPT_DOC_COMMENT":"wx.stc.",
+"STC_OSCRIPT_DOUBLEQUOTE_STRING":"wx.stc.",
+"STC_OSCRIPT_FUNCTION":"wx.stc.",
+"STC_OSCRIPT_GLOBAL":"wx.stc.",
+"STC_OSCRIPT_IDENTIFIER":"wx.stc.",
+"STC_OSCRIPT_KEYWORD":"wx.stc.",
+"STC_OSCRIPT_LABEL":"wx.stc.",
+"STC_OSCRIPT_LINE_COMMENT":"wx.stc.",
+"STC_OSCRIPT_METHOD":"wx.stc.",
+"STC_OSCRIPT_NUMBER":"wx.stc.",
+"STC_OSCRIPT_OBJECT":"wx.stc.",
+"STC_OSCRIPT_OPERATOR":"wx.stc.",
+"STC_OSCRIPT_PREPROCESSOR":"wx.stc.",
+"STC_OSCRIPT_PROPERTY":"wx.stc.",
+"STC_OSCRIPT_SINGLEQUOTE_STRING":"wx.stc.",
+"STC_OSCRIPT_TYPE":"wx.stc.",
+"STC_PAS_ASM":"wx.stc.",
+"STC_PAS_CHARACTER":"wx.stc.",
+"STC_PAS_COMMENT":"wx.stc.",
+"STC_PAS_COMMENT2":"wx.stc.",
+"STC_PAS_COMMENTLINE":"wx.stc.",
+"STC_PAS_DEFAULT":"wx.stc.",
+"STC_PAS_HEXNUMBER":"wx.stc.",
+"STC_PAS_IDENTIFIER":"wx.stc.",
+"STC_PAS_NUMBER":"wx.stc.",
+"STC_PAS_OPERATOR":"wx.stc.",
+"STC_PAS_PREPROCESSOR":"wx.stc.",
+"STC_PAS_PREPROCESSOR2":"wx.stc.",
+"STC_PAS_STRING":"wx.stc.",
+"STC_PAS_STRINGEOL":"wx.stc.",
+"STC_PAS_WORD":"wx.stc.",
+"STC_PERFORMED_REDO":"wx.stc.",
+"STC_PERFORMED_UNDO":"wx.stc.",
+"STC_PERFORMED_USER":"wx.stc.",
+"STC_PLM_COMMENT":"wx.stc.",
+"STC_PLM_CONTROL":"wx.stc.",
+"STC_PLM_DEFAULT":"wx.stc.",
+"STC_PLM_IDENTIFIER":"wx.stc.",
+"STC_PLM_KEYWORD":"wx.stc.",
+"STC_PLM_NUMBER":"wx.stc.",
+"STC_PLM_OPERATOR":"wx.stc.",
+"STC_PLM_STRING":"wx.stc.",
+"STC_PL_ARRAY":"wx.stc.",
+"STC_PL_BACKTICKS":"wx.stc.",
+"STC_PL_BACKTICKS_VAR":"wx.stc.",
+"STC_PL_CHARACTER":"wx.stc.",
+"STC_PL_COMMENTLINE":"wx.stc.",
+"STC_PL_DATASECTION":"wx.stc.",
+"STC_PL_DEFAULT":"wx.stc.",
+"STC_PL_ERROR":"wx.stc.",
+"STC_PL_FORMAT":"wx.stc.",
+"STC_PL_FORMAT_IDENT":"wx.stc.",
+"STC_PL_HASH":"wx.stc.",
+"STC_PL_HERE_DELIM":"wx.stc.",
+"STC_PL_HERE_Q":"wx.stc.",
+"STC_PL_HERE_QQ":"wx.stc.",
+"STC_PL_HERE_QQ_VAR":"wx.stc.",
+"STC_PL_HERE_QX":"wx.stc.",
+"STC_PL_HERE_QX_VAR":"wx.stc.",
+"STC_PL_IDENTIFIER":"wx.stc.",
+"STC_PL_LONGQUOTE":"wx.stc.",
+"STC_PL_NUMBER":"wx.stc.",
+"STC_PL_OPERATOR":"wx.stc.",
+"STC_PL_POD":"wx.stc.",
+"STC_PL_POD_VERB":"wx.stc.",
+"STC_PL_PREPROCESSOR":"wx.stc.",
+"STC_PL_PUNCTUATION":"wx.stc.",
+"STC_PL_REGEX":"wx.stc.",
+"STC_PL_REGEX_VAR":"wx.stc.",
+"STC_PL_REGSUBST":"wx.stc.",
+"STC_PL_REGSUBST_VAR":"wx.stc.",
+"STC_PL_SCALAR":"wx.stc.",
+"STC_PL_STRING":"wx.stc.",
+"STC_PL_STRING_Q":"wx.stc.",
+"STC_PL_STRING_QQ":"wx.stc.",
+"STC_PL_STRING_QQ_VAR":"wx.stc.",
+"STC_PL_STRING_QR":"wx.stc.",
+"STC_PL_STRING_QR_VAR":"wx.stc.",
+"STC_PL_STRING_QW":"wx.stc.",
+"STC_PL_STRING_QX":"wx.stc.",
+"STC_PL_STRING_QX_VAR":"wx.stc.",
+"STC_PL_STRING_VAR":"wx.stc.",
+"STC_PL_SUB_PROTOTYPE":"wx.stc.",
+"STC_PL_SYMBOLTABLE":"wx.stc.",
+"STC_PL_VARIABLE_INDEXER":"wx.stc.",
+"STC_PL_WORD":"wx.stc.",
+"STC_PL_XLAT":"wx.stc.",
+"STC_POV_BADDIRECTIVE":"wx.stc.",
+"STC_POV_COMMENT":"wx.stc.",
+"STC_POV_COMMENTLINE":"wx.stc.",
+"STC_POV_DEFAULT":"wx.stc.",
+"STC_POV_DIRECTIVE":"wx.stc.",
+"STC_POV_IDENTIFIER":"wx.stc.",
+"STC_POV_NUMBER":"wx.stc.",
+"STC_POV_OPERATOR":"wx.stc.",
+"STC_POV_STRING":"wx.stc.",
+"STC_POV_STRINGEOL":"wx.stc.",
+"STC_POV_WORD2":"wx.stc.",
+"STC_POV_WORD3":"wx.stc.",
+"STC_POV_WORD4":"wx.stc.",
+"STC_POV_WORD5":"wx.stc.",
+"STC_POV_WORD6":"wx.stc.",
+"STC_POV_WORD7":"wx.stc.",
+"STC_POV_WORD8":"wx.stc.",
+"STC_POWERPRO_ALTQUOTE":"wx.stc.",
+"STC_POWERPRO_COMMENTBLOCK":"wx.stc.",
+"STC_POWERPRO_COMMENTLINE":"wx.stc.",
+"STC_POWERPRO_DEFAULT":"wx.stc.",
+"STC_POWERPRO_DOUBLEQUOTEDSTRING":"wx.stc.",
+"STC_POWERPRO_FUNCTION":"wx.stc.",
+"STC_POWERPRO_IDENTIFIER":"wx.stc.",
+"STC_POWERPRO_LINECONTINUE":"wx.stc.",
+"STC_POWERPRO_NUMBER":"wx.stc.",
+"STC_POWERPRO_OPERATOR":"wx.stc.",
+"STC_POWERPRO_SINGLEQUOTEDSTRING":"wx.stc.",
+"STC_POWERPRO_STRINGEOL":"wx.stc.",
+"STC_POWERPRO_VERBATIM":"wx.stc.",
+"STC_POWERPRO_WORD":"wx.stc.",
+"STC_POWERPRO_WORD2":"wx.stc.",
+"STC_POWERPRO_WORD3":"wx.stc.",
+"STC_POWERPRO_WORD4":"wx.stc.",
+"STC_POWERSHELL_ALIAS":"wx.stc.",
+"STC_POWERSHELL_CHARACTER":"wx.stc.",
+"STC_POWERSHELL_CMDLET":"wx.stc.",
+"STC_POWERSHELL_COMMENT":"wx.stc.",
+"STC_POWERSHELL_COMMENTSTREAM":"wx.stc.",
+"STC_POWERSHELL_DEFAULT":"wx.stc.",
+"STC_POWERSHELL_FUNCTION":"wx.stc.",
+"STC_POWERSHELL_IDENTIFIER":"wx.stc.",
+"STC_POWERSHELL_KEYWORD":"wx.stc.",
+"STC_POWERSHELL_NUMBER":"wx.stc.",
+"STC_POWERSHELL_OPERATOR":"wx.stc.",
+"STC_POWERSHELL_STRING":"wx.stc.",
+"STC_POWERSHELL_USER1":"wx.stc.",
+"STC_POWERSHELL_VARIABLE":"wx.stc.",
+"STC_PO_COMMENT":"wx.stc.",
+"STC_PO_DEFAULT":"wx.stc.",
+"STC_PO_FUZZY":"wx.stc.",
+"STC_PO_MSGCTXT":"wx.stc.",
+"STC_PO_MSGCTXT_TEXT":"wx.stc.",
+"STC_PO_MSGID":"wx.stc.",
+"STC_PO_MSGID_TEXT":"wx.stc.",
+"STC_PO_MSGSTR":"wx.stc.",
+"STC_PO_MSGSTR_TEXT":"wx.stc.",
+"STC_PRINT_BLACKONWHITE":"wx.stc.",
+"STC_PRINT_COLOURONWHITE":"wx.stc.",
+"STC_PRINT_COLOURONWHITEDEFAULTBG":"wx.stc.",
+"STC_PRINT_INVERTLIGHT":"wx.stc.",
+"STC_PRINT_NORMAL":"wx.stc.",
+"STC_PROPS_ASSIGNMENT":"wx.stc.",
+"STC_PROPS_COMMENT":"wx.stc.",
+"STC_PROPS_DEFAULT":"wx.stc.",
+"STC_PROPS_DEFVAL":"wx.stc.",
+"STC_PROPS_KEY":"wx.stc.",
+"STC_PROPS_SECTION":"wx.stc.",
+"STC_PS_BADSTRINGCHAR":"wx.stc.",
+"STC_PS_BASE85STRING":"wx.stc.",
+"STC_PS_COMMENT":"wx.stc.",
+"STC_PS_DEFAULT":"wx.stc.",
+"STC_PS_DSC_COMMENT":"wx.stc.",
+"STC_PS_DSC_VALUE":"wx.stc.",
+"STC_PS_HEXSTRING":"wx.stc.",
+"STC_PS_IMMEVAL":"wx.stc.",
+"STC_PS_KEYWORD":"wx.stc.",
+"STC_PS_LITERAL":"wx.stc.",
+"STC_PS_NAME":"wx.stc.",
+"STC_PS_NUMBER":"wx.stc.",
+"STC_PS_PAREN_ARRAY":"wx.stc.",
+"STC_PS_PAREN_DICT":"wx.stc.",
+"STC_PS_PAREN_PROC":"wx.stc.",
+"STC_PS_TEXT":"wx.stc.",
+"STC_P_CHARACTER":"wx.stc.",
+"STC_P_CLASSNAME":"wx.stc.",
+"STC_P_COMMENTBLOCK":"wx.stc.",
+"STC_P_COMMENTLINE":"wx.stc.",
+"STC_P_DECORATOR":"wx.stc.",
+"STC_P_DEFAULT":"wx.stc.",
+"STC_P_DEFNAME":"wx.stc.",
+"STC_P_IDENTIFIER":"wx.stc.",
+"STC_P_NUMBER":"wx.stc.",
+"STC_P_OPERATOR":"wx.stc.",
+"STC_P_STRING":"wx.stc.",
+"STC_P_STRINGEOL":"wx.stc.",
+"STC_P_TRIPLE":"wx.stc.",
+"STC_P_TRIPLEDOUBLE":"wx.stc.",
+"STC_P_WORD":"wx.stc.",
+"STC_P_WORD2":"wx.stc.",
+"STC_RB_BACKTICKS":"wx.stc.",
+"STC_RB_CHARACTER":"wx.stc.",
+"STC_RB_CLASSNAME":"wx.stc.",
+"STC_RB_CLASS_VAR":"wx.stc.",
+"STC_RB_COMMENTLINE":"wx.stc.",
+"STC_RB_DATASECTION":"wx.stc.",
+"STC_RB_DEFAULT":"wx.stc.",
+"STC_RB_DEFNAME":"wx.stc.",
+"STC_RB_ERROR":"wx.stc.",
+"STC_RB_GLOBAL":"wx.stc.",
+"STC_RB_HERE_DELIM":"wx.stc.",
+"STC_RB_HERE_Q":"wx.stc.",
+"STC_RB_HERE_QQ":"wx.stc.",
+"STC_RB_HERE_QX":"wx.stc.",
+"STC_RB_IDENTIFIER":"wx.stc.",
+"STC_RB_INSTANCE_VAR":"wx.stc.",
+"STC_RB_MODULE_NAME":"wx.stc.",
+"STC_RB_NUMBER":"wx.stc.",
+"STC_RB_OPERATOR":"wx.stc.",
+"STC_RB_POD":"wx.stc.",
+"STC_RB_REGEX":"wx.stc.",
+"STC_RB_STDERR":"wx.stc.",
+"STC_RB_STDIN":"wx.stc.",
+"STC_RB_STDOUT":"wx.stc.",
+"STC_RB_STRING":"wx.stc.",
+"STC_RB_STRING_Q":"wx.stc.",
+"STC_RB_STRING_QQ":"wx.stc.",
+"STC_RB_STRING_QR":"wx.stc.",
+"STC_RB_STRING_QW":"wx.stc.",
+"STC_RB_STRING_QX":"wx.stc.",
+"STC_RB_SYMBOL":"wx.stc.",
+"STC_RB_UPPER_BOUND":"wx.stc.",
+"STC_RB_WORD":"wx.stc.",
+"STC_RB_WORD_DEMOTED":"wx.stc.",
+"STC_REBOL_BINARY":"wx.stc.",
+"STC_REBOL_BRACEDSTRING":"wx.stc.",
+"STC_REBOL_CHARACTER":"wx.stc.",
+"STC_REBOL_COMMENTBLOCK":"wx.stc.",
+"STC_REBOL_COMMENTLINE":"wx.stc.",
+"STC_REBOL_DATE":"wx.stc.",
+"STC_REBOL_DEFAULT":"wx.stc.",
+"STC_REBOL_EMAIL":"wx.stc.",
+"STC_REBOL_FILE":"wx.stc.",
+"STC_REBOL_IDENTIFIER":"wx.stc.",
+"STC_REBOL_ISSUE":"wx.stc.",
+"STC_REBOL_MONEY":"wx.stc.",
+"STC_REBOL_NUMBER":"wx.stc.",
+"STC_REBOL_OPERATOR":"wx.stc.",
+"STC_REBOL_PAIR":"wx.stc.",
+"STC_REBOL_PREFACE":"wx.stc.",
+"STC_REBOL_QUOTEDSTRING":"wx.stc.",
+"STC_REBOL_TAG":"wx.stc.",
+"STC_REBOL_TIME":"wx.stc.",
+"STC_REBOL_TUPLE":"wx.stc.",
+"STC_REBOL_URL":"wx.stc.",
+"STC_REBOL_WORD":"wx.stc.",
+"STC_REBOL_WORD2":"wx.stc.",
+"STC_REBOL_WORD3":"wx.stc.",
+"STC_REBOL_WORD4":"wx.stc.",
+"STC_REBOL_WORD5":"wx.stc.",
+"STC_REBOL_WORD6":"wx.stc.",
+"STC_REBOL_WORD7":"wx.stc.",
+"STC_REBOL_WORD8":"wx.stc.",
+"STC_R_BASEKWORD":"wx.stc.",
+"STC_R_COMMENT":"wx.stc.",
+"STC_R_DEFAULT":"wx.stc.",
+"STC_R_IDENTIFIER":"wx.stc.",
+"STC_R_INFIX":"wx.stc.",
+"STC_R_INFIXEOL":"wx.stc.",
+"STC_R_KWORD":"wx.stc.",
+"STC_R_NUMBER":"wx.stc.",
+"STC_R_OPERATOR":"wx.stc.",
+"STC_R_OTHERKWORD":"wx.stc.",
+"STC_R_STRING":"wx.stc.",
+"STC_R_STRING2":"wx.stc.",
+"STC_SCMOD_ALT":"wx.stc.",
+"STC_SCMOD_CTRL":"wx.stc.",
+"STC_SCMOD_META":"wx.stc.",
+"STC_SCMOD_NORM":"wx.stc.",
+"STC_SCMOD_SHIFT":"wx.stc.",
+"STC_SCMOD_SUPER":"wx.stc.",
+"STC_SCRIPTOL_CHARACTER":"wx.stc.",
+"STC_SCRIPTOL_CLASSNAME":"wx.stc.",
+"STC_SCRIPTOL_COMMENTBLOCK":"wx.stc.",
+"STC_SCRIPTOL_COMMENTLINE":"wx.stc.",
+"STC_SCRIPTOL_CSTYLE":"wx.stc.",
+"STC_SCRIPTOL_DEFAULT":"wx.stc.",
+"STC_SCRIPTOL_IDENTIFIER":"wx.stc.",
+"STC_SCRIPTOL_KEYWORD":"wx.stc.",
+"STC_SCRIPTOL_NUMBER":"wx.stc.",
+"STC_SCRIPTOL_OPERATOR":"wx.stc.",
+"STC_SCRIPTOL_PERSISTENT":"wx.stc.",
+"STC_SCRIPTOL_PREPROCESSOR":"wx.stc.",
+"STC_SCRIPTOL_STRING":"wx.stc.",
+"STC_SCRIPTOL_STRINGEOL":"wx.stc.",
+"STC_SCRIPTOL_TRIPLE":"wx.stc.",
+"STC_SCRIPTOL_WHITE":"wx.stc.",
+"STC_SCVS_NONE":"wx.stc.",
+"STC_SCVS_RECTANGULARSELECTION":"wx.stc.",
+"STC_SCVS_USERACCESSIBLE":"wx.stc.",
+"STC_SEL_LINES":"wx.stc.",
+"STC_SEL_RECTANGLE":"wx.stc.",
+"STC_SEL_STREAM":"wx.stc.",
+"STC_SEL_THIN":"wx.stc.",
+"STC_SH_BACKTICKS":"wx.stc.",
+"STC_SH_CHARACTER":"wx.stc.",
+"STC_SH_COMMENTLINE":"wx.stc.",
+"STC_SH_DEFAULT":"wx.stc.",
+"STC_SH_ERROR":"wx.stc.",
+"STC_SH_HERE_DELIM":"wx.stc.",
+"STC_SH_HERE_Q":"wx.stc.",
+"STC_SH_IDENTIFIER":"wx.stc.",
+"STC_SH_NUMBER":"wx.stc.",
+"STC_SH_OPERATOR":"wx.stc.",
+"STC_SH_PARAM":"wx.stc.",
+"STC_SH_SCALAR":"wx.stc.",
+"STC_SH_STRING":"wx.stc.",
+"STC_SH_WORD":"wx.stc.",
+"STC_SML_CHAR":"wx.stc.",
+"STC_SML_COMMENT":"wx.stc.",
+"STC_SML_COMMENT1":"wx.stc.",
+"STC_SML_COMMENT2":"wx.stc.",
+"STC_SML_COMMENT3":"wx.stc.",
+"STC_SML_DEFAULT":"wx.stc.",
+"STC_SML_IDENTIFIER":"wx.stc.",
+"STC_SML_KEYWORD":"wx.stc.",
+"STC_SML_KEYWORD2":"wx.stc.",
+"STC_SML_KEYWORD3":"wx.stc.",
+"STC_SML_LINENUM":"wx.stc.",
+"STC_SML_NUMBER":"wx.stc.",
+"STC_SML_OPERATOR":"wx.stc.",
+"STC_SML_STRING":"wx.stc.",
+"STC_SML_TAGNAME":"wx.stc.",
+"STC_SN_CODE":"wx.stc.",
+"STC_SN_COMMENTLINE":"wx.stc.",
+"STC_SN_COMMENTLINEBANG":"wx.stc.",
+"STC_SN_DEFAULT":"wx.stc.",
+"STC_SN_IDENTIFIER":"wx.stc.",
+"STC_SN_NUMBER":"wx.stc.",
+"STC_SN_OPERATOR":"wx.stc.",
+"STC_SN_PREPROCESSOR":"wx.stc.",
+"STC_SN_REGEXTAG":"wx.stc.",
+"STC_SN_SIGNAL":"wx.stc.",
+"STC_SN_STRING":"wx.stc.",
+"STC_SN_STRINGEOL":"wx.stc.",
+"STC_SN_USER":"wx.stc.",
+"STC_SN_WORD":"wx.stc.",
+"STC_SN_WORD2":"wx.stc.",
+"STC_SN_WORD3":"wx.stc.",
+"STC_SORCUS_COMMAND":"wx.stc.",
+"STC_SORCUS_COMMENTLINE":"wx.stc.",
+"STC_SORCUS_CONSTANT":"wx.stc.",
+"STC_SORCUS_DEFAULT":"wx.stc.",
+"STC_SORCUS_IDENTIFIER":"wx.stc.",
+"STC_SORCUS_NUMBER":"wx.stc.",
+"STC_SORCUS_OPERATOR":"wx.stc.",
+"STC_SORCUS_PARAMETER":"wx.stc.",
+"STC_SORCUS_STRING":"wx.stc.",
+"STC_SORCUS_STRINGEOL":"wx.stc.",
+"STC_SPICE_COMMENTLINE":"wx.stc.",
+"STC_SPICE_DEFAULT":"wx.stc.",
+"STC_SPICE_DELIMITER":"wx.stc.",
+"STC_SPICE_IDENTIFIER":"wx.stc.",
+"STC_SPICE_KEYWORD":"wx.stc.",
+"STC_SPICE_KEYWORD2":"wx.stc.",
+"STC_SPICE_KEYWORD3":"wx.stc.",
+"STC_SPICE_NUMBER":"wx.stc.",
+"STC_SPICE_VALUE":"wx.stc.",
+"STC_SQL_CHARACTER":"wx.stc.",
+"STC_SQL_COMMENT":"wx.stc.",
+"STC_SQL_COMMENTDOC":"wx.stc.",
+"STC_SQL_COMMENTDOCKEYWORD":"wx.stc.",
+"STC_SQL_COMMENTDOCKEYWORDERROR":"wx.stc.",
+"STC_SQL_COMMENTLINE":"wx.stc.",
+"STC_SQL_COMMENTLINEDOC":"wx.stc.",
+"STC_SQL_DEFAULT":"wx.stc.",
+"STC_SQL_IDENTIFIER":"wx.stc.",
+"STC_SQL_NUMBER":"wx.stc.",
+"STC_SQL_OPERATOR":"wx.stc.",
+"STC_SQL_QUOTEDIDENTIFIER":"wx.stc.",
+"STC_SQL_SQLPLUS":"wx.stc.",
+"STC_SQL_SQLPLUS_COMMENT":"wx.stc.",
+"STC_SQL_SQLPLUS_PROMPT":"wx.stc.",
+"STC_SQL_STRING":"wx.stc.",
+"STC_SQL_USER1":"wx.stc.",
+"STC_SQL_USER2":"wx.stc.",
+"STC_SQL_USER3":"wx.stc.",
+"STC_SQL_USER4":"wx.stc.",
+"STC_SQL_WORD":"wx.stc.",
+"STC_SQL_WORD2":"wx.stc.",
+"STC_START":"wx.stc.",
+"STC_STARTACTION":"wx.stc.",
+"STC_STATUS_BADALLOC":"wx.stc.",
+"STC_STATUS_FAILURE":"wx.stc.",
+"STC_STATUS_OK":"wx.stc.",
+"STC_STYLE_BRACEBAD":"wx.stc.",
+"STC_STYLE_BRACELIGHT":"wx.stc.",
+"STC_STYLE_CALLTIP":"wx.stc.",
+"STC_STYLE_CONTROLCHAR":"wx.stc.",
+"STC_STYLE_DEFAULT":"wx.stc.",
+"STC_STYLE_INDENTGUIDE":"wx.stc.",
+"STC_STYLE_LASTPREDEFINED":"wx.stc.",
+"STC_STYLE_LINENUMBER":"wx.stc.",
+"STC_STYLE_MAX":"wx.stc.",
+"STC_ST_ASSIGN":"wx.stc.",
+"STC_ST_BINARY":"wx.stc.",
+"STC_ST_BOOL":"wx.stc.",
+"STC_ST_CHARACTER":"wx.stc.",
+"STC_ST_COMMENT":"wx.stc.",
+"STC_ST_DEFAULT":"wx.stc.",
+"STC_ST_GLOBAL":"wx.stc.",
+"STC_ST_KWSEND":"wx.stc.",
+"STC_ST_NIL":"wx.stc.",
+"STC_ST_NUMBER":"wx.stc.",
+"STC_ST_RETURN":"wx.stc.",
+"STC_ST_SELF":"wx.stc.",
+"STC_ST_SPECIAL":"wx.stc.",
+"STC_ST_SPEC_SEL":"wx.stc.",
+"STC_ST_STRING":"wx.stc.",
+"STC_ST_SUPER":"wx.stc.",
+"STC_ST_SYMBOL":"wx.stc.",
+"STC_T3_BLOCK_COMMENT":"wx.stc.",
+"STC_T3_BRACE":"wx.stc.",
+"STC_T3_DEFAULT":"wx.stc.",
+"STC_T3_D_STRING":"wx.stc.",
+"STC_T3_HTML_DEFAULT":"wx.stc.",
+"STC_T3_HTML_STRING":"wx.stc.",
+"STC_T3_HTML_TAG":"wx.stc.",
+"STC_T3_IDENTIFIER":"wx.stc.",
+"STC_T3_KEYWORD":"wx.stc.",
+"STC_T3_LIB_DIRECTIVE":"wx.stc.",
+"STC_T3_LINE_COMMENT":"wx.stc.",
+"STC_T3_MSG_PARAM":"wx.stc.",
+"STC_T3_NUMBER":"wx.stc.",
+"STC_T3_OPERATOR":"wx.stc.",
+"STC_T3_PREPROCESSOR":"wx.stc.",
+"STC_T3_S_STRING":"wx.stc.",
+"STC_T3_USER1":"wx.stc.",
+"STC_T3_USER2":"wx.stc.",
+"STC_T3_USER3":"wx.stc.",
+"STC_T3_X_DEFAULT":"wx.stc.",
+"STC_T3_X_STRING":"wx.stc.",
+"STC_TCL_BLOCK_COMMENT":"wx.stc.",
+"STC_TCL_COMMENT":"wx.stc.",
+"STC_TCL_COMMENTLINE":"wx.stc.",
+"STC_TCL_COMMENT_BOX":"wx.stc.",
+"STC_TCL_DEFAULT":"wx.stc.",
+"STC_TCL_EXPAND":"wx.stc.",
+"STC_TCL_IDENTIFIER":"wx.stc.",
+"STC_TCL_IN_QUOTE":"wx.stc.",
+"STC_TCL_MODIFIER":"wx.stc.",
+"STC_TCL_NUMBER":"wx.stc.",
+"STC_TCL_OPERATOR":"wx.stc.",
+"STC_TCL_SUBSTITUTION":"wx.stc.",
+"STC_TCL_SUB_BRACE":"wx.stc.",
+"STC_TCL_WORD":"wx.stc.",
+"STC_TCL_WORD2":"wx.stc.",
+"STC_TCL_WORD3":"wx.stc.",
+"STC_TCL_WORD4":"wx.stc.",
+"STC_TCL_WORD5":"wx.stc.",
+"STC_TCL_WORD6":"wx.stc.",
+"STC_TCL_WORD7":"wx.stc.",
+"STC_TCL_WORD8":"wx.stc.",
+"STC_TCL_WORD_IN_QUOTE":"wx.stc.",
+"STC_TCMD_CLABEL":"wx.stc.",
+"STC_TCMD_COMMAND":"wx.stc.",
+"STC_TCMD_COMMENT":"wx.stc.",
+"STC_TCMD_DEFAULT":"wx.stc.",
+"STC_TCMD_ENVIRONMENT":"wx.stc.",
+"STC_TCMD_EXPANSION":"wx.stc.",
+"STC_TCMD_HIDE":"wx.stc.",
+"STC_TCMD_IDENTIFIER":"wx.stc.",
+"STC_TCMD_LABEL":"wx.stc.",
+"STC_TCMD_OPERATOR":"wx.stc.",
+"STC_TCMD_WORD":"wx.stc.",
+"STC_TECHNOLOGY_DEFAULT":"wx.stc.",
+"STC_TECHNOLOGY_DIRECTWRITE":"wx.stc.",
+"STC_TEX_COMMAND":"wx.stc.",
+"STC_TEX_DEFAULT":"wx.stc.",
+"STC_TEX_GROUP":"wx.stc.",
+"STC_TEX_SPECIAL":"wx.stc.",
+"STC_TEX_SYMBOL":"wx.stc.",
+"STC_TEX_TEXT":"wx.stc.",
+"STC_TIME_FOREVER":"wx.stc.",
+"STC_TXT2TAGS_BLOCKQUOTE":"wx.stc.",
+"STC_TXT2TAGS_CODE":"wx.stc.",
+"STC_TXT2TAGS_CODE2":"wx.stc.",
+"STC_TXT2TAGS_CODEBK":"wx.stc.",
+"STC_TXT2TAGS_COMMENT":"wx.stc.",
+"STC_TXT2TAGS_DEFAULT":"wx.stc.",
+"STC_TXT2TAGS_EM1":"wx.stc.",
+"STC_TXT2TAGS_EM2":"wx.stc.",
+"STC_TXT2TAGS_HEADER1":"wx.stc.",
+"STC_TXT2TAGS_HEADER2":"wx.stc.",
+"STC_TXT2TAGS_HEADER3":"wx.stc.",
+"STC_TXT2TAGS_HEADER4":"wx.stc.",
+"STC_TXT2TAGS_HEADER5":"wx.stc.",
+"STC_TXT2TAGS_HEADER6":"wx.stc.",
+"STC_TXT2TAGS_HRULE":"wx.stc.",
+"STC_TXT2TAGS_LINE_BEGIN":"wx.stc.",
+"STC_TXT2TAGS_LINK":"wx.stc.",
+"STC_TXT2TAGS_OLIST_ITEM":"wx.stc.",
+"STC_TXT2TAGS_OPTION":"wx.stc.",
+"STC_TXT2TAGS_POSTPROC":"wx.stc.",
+"STC_TXT2TAGS_PRECHAR":"wx.stc.",
+"STC_TXT2TAGS_PREPROC":"wx.stc.",
+"STC_TXT2TAGS_STRIKEOUT":"wx.stc.",
+"STC_TXT2TAGS_STRONG1":"wx.stc.",
+"STC_TXT2TAGS_STRONG2":"wx.stc.",
+"STC_TXT2TAGS_ULIST_ITEM":"wx.stc.",
+"STC_TYPE_BOOLEAN":"wx.stc.",
+"STC_TYPE_INTEGER":"wx.stc.",
+"STC_TYPE_STRING":"wx.stc.",
+"STC_UNDO_MAY_COALESCE":"wx.stc.",
+"STC_UPDATE_CONTENT":"wx.stc.",
+"STC_UPDATE_H_SCROLL":"wx.stc.",
+"STC_UPDATE_SELECTION":"wx.stc.",
+"STC_UPDATE_V_SCROLL":"wx.stc.",
+"STC_VHDL_ATTRIBUTE":"wx.stc.",
+"STC_VHDL_COMMENT":"wx.stc.",
+"STC_VHDL_COMMENTLINEBANG":"wx.stc.",
+"STC_VHDL_DEFAULT":"wx.stc.",
+"STC_VHDL_IDENTIFIER":"wx.stc.",
+"STC_VHDL_KEYWORD":"wx.stc.",
+"STC_VHDL_NUMBER":"wx.stc.",
+"STC_VHDL_OPERATOR":"wx.stc.",
+"STC_VHDL_STDFUNCTION":"wx.stc.",
+"STC_VHDL_STDOPERATOR":"wx.stc.",
+"STC_VHDL_STDPACKAGE":"wx.stc.",
+"STC_VHDL_STDTYPE":"wx.stc.",
+"STC_VHDL_STRING":"wx.stc.",
+"STC_VHDL_STRINGEOL":"wx.stc.",
+"STC_VHDL_USERWORD":"wx.stc.",
+"STC_VISIBLE_SLOP":"wx.stc.",
+"STC_VISIBLE_STRICT":"wx.stc.",
+"STC_VISUALPROLOG_ANONYMOUS":"wx.stc.",
+"STC_VISUALPROLOG_CHARACTER":"wx.stc.",
+"STC_VISUALPROLOG_CHARACTER_ESCAPE_ERROR":"wx.stc.",
+"STC_VISUALPROLOG_CHARACTER_TOO_MANY":"wx.stc.",
+"STC_VISUALPROLOG_COMMENT_BLOCK":"wx.stc.",
+"STC_VISUALPROLOG_COMMENT_KEY":"wx.stc.",
+"STC_VISUALPROLOG_COMMENT_KEY_ERROR":"wx.stc.",
+"STC_VISUALPROLOG_COMMENT_LINE":"wx.stc.",
+"STC_VISUALPROLOG_DEFAULT":"wx.stc.",
+"STC_VISUALPROLOG_IDENTIFIER":"wx.stc.",
+"STC_VISUALPROLOG_KEY_DIRECTIVE":"wx.stc.",
+"STC_VISUALPROLOG_KEY_MAJOR":"wx.stc.",
+"STC_VISUALPROLOG_KEY_MINOR":"wx.stc.",
+"STC_VISUALPROLOG_NUMBER":"wx.stc.",
+"STC_VISUALPROLOG_OPERATOR":"wx.stc.",
+"STC_VISUALPROLOG_STRING":"wx.stc.",
+"STC_VISUALPROLOG_STRING_EOL_OPEN":"wx.stc.",
+"STC_VISUALPROLOG_STRING_ESCAPE":"wx.stc.",
+"STC_VISUALPROLOG_STRING_ESCAPE_ERROR":"wx.stc.",
+"STC_VISUALPROLOG_STRING_VERBATIM":"wx.stc.",
+"STC_VISUALPROLOG_STRING_VERBATIM_EOL":"wx.stc.",
+"STC_VISUALPROLOG_STRING_VERBATIM_SPECIAL":"wx.stc.",
+"STC_VISUALPROLOG_VARIABLE":"wx.stc.",
+"STC_V_COMMENT":"wx.stc.",
+"STC_V_COMMENTLINE":"wx.stc.",
+"STC_V_COMMENTLINEBANG":"wx.stc.",
+"STC_V_DEFAULT":"wx.stc.",
+"STC_V_IDENTIFIER":"wx.stc.",
+"STC_V_NUMBER":"wx.stc.",
+"STC_V_OPERATOR":"wx.stc.",
+"STC_V_PREPROCESSOR":"wx.stc.",
+"STC_V_STRING":"wx.stc.",
+"STC_V_STRINGEOL":"wx.stc.",
+"STC_V_USER":"wx.stc.",
+"STC_V_WORD":"wx.stc.",
+"STC_V_WORD2":"wx.stc.",
+"STC_V_WORD3":"wx.stc.",
+"STC_WEIGHT_BOLD":"wx.stc.",
+"STC_WEIGHT_NORMAL":"wx.stc.",
+"STC_WEIGHT_SEMIBOLD":"wx.stc.",
+"STC_WRAPINDENT_FIXED":"wx.stc.",
+"STC_WRAPINDENT_INDENT":"wx.stc.",
+"STC_WRAPINDENT_SAME":"wx.stc.",
+"STC_WRAPVISUALFLAGLOC_DEFAULT":"wx.stc.",
+"STC_WRAPVISUALFLAGLOC_END_BY_TEXT":"wx.stc.",
+"STC_WRAPVISUALFLAGLOC_START_BY_TEXT":"wx.stc.",
+"STC_WRAPVISUALFLAG_END":"wx.stc.",
+"STC_WRAPVISUALFLAG_MARGIN":"wx.stc.",
+"STC_WRAPVISUALFLAG_NONE":"wx.stc.",
+"STC_WRAPVISUALFLAG_START":"wx.stc.",
+"STC_WRAP_CHAR":"wx.stc.",
+"STC_WRAP_NONE":"wx.stc.",
+"STC_WRAP_WORD":"wx.stc.",
+"STC_WS_INVISIBLE":"wx.stc.",
+"STC_WS_VISIBLEAFTERINDENT":"wx.stc.",
+"STC_WS_VISIBLEALWAYS":"wx.stc.",
+"STC_YAML_COMMENT":"wx.stc.",
+"STC_YAML_DEFAULT":"wx.stc.",
+"STC_YAML_DOCUMENT":"wx.stc.",
+"STC_YAML_ERROR":"wx.stc.",
+"STC_YAML_IDENTIFIER":"wx.stc.",
+"STC_YAML_KEYWORD":"wx.stc.",
+"STC_YAML_NUMBER":"wx.stc.",
+"STC_YAML_OPERATOR":"wx.stc.",
+"STC_YAML_REFERENCE":"wx.stc.",
+"STC_YAML_TEXT":"wx.stc.",
+"STREAM_EOF":"wx.",
+"STREAM_NO_ERROR":"wx.",
+"STREAM_READ_ERROR":"wx.",
+"STREAM_WRITE_ERROR":"wx.",
+"STRETCH_MASK":"wx.",
+"STRETCH_NOT":"wx.",
+"ST_ELLIPSIZE_END":"wx.",
+"ST_ELLIPSIZE_MIDDLE":"wx.",
+"ST_ELLIPSIZE_START":"wx.",
+"ST_NO_AUTORESIZE":"wx.",
+"SUNKEN_BORDER":"wx.",
+"SVGFileDC":"wx.",
+"SWISS_FONT":"wx.",
+"SW_3D":"wx.adv.",
+"SW_3DBORDER":"wx.adv.",
+"SW_3DSASH":"wx.adv.",
+"SW_BORDER":"wx.adv.",
+"SW_NOBORDER":"wx.adv.",
+"SYSTEM_MENU":"wx.",
+"SYS_ANSI_FIXED_FONT":"wx.",
+"SYS_ANSI_VAR_FONT":"wx.",
+"SYS_BORDER_X":"wx.",
+"SYS_BORDER_Y":"wx.",
+"SYS_CAN_DRAW_FRAME_DECORATIONS":"wx.",
+"SYS_CAN_ICONIZE_FRAME":"wx.",
+"SYS_CAPTION_Y":"wx.",
+"SYS_COLOUR_3DDKSHADOW":"wx.",
+"SYS_COLOUR_3DFACE":"wx.",
+"SYS_COLOUR_3DHIGHLIGHT":"wx.",
+"SYS_COLOUR_3DHILIGHT":"wx.",
+"SYS_COLOUR_3DLIGHT":"wx.",
+"SYS_COLOUR_3DSHADOW":"wx.",
+"SYS_COLOUR_ACTIVEBORDER":"wx.",
+"SYS_COLOUR_ACTIVECAPTION":"wx.",
+"SYS_COLOUR_APPWORKSPACE":"wx.",
+"SYS_COLOUR_BACKGROUND":"wx.",
+"SYS_COLOUR_BTNFACE":"wx.",
+"SYS_COLOUR_BTNHIGHLIGHT":"wx.",
+"SYS_COLOUR_BTNHILIGHT":"wx.",
+"SYS_COLOUR_BTNSHADOW":"wx.",
+"SYS_COLOUR_BTNTEXT":"wx.",
+"SYS_COLOUR_CAPTIONTEXT":"wx.",
+"SYS_COLOUR_DESKTOP":"wx.",
+"SYS_COLOUR_FRAMEBK":"wx.",
+"SYS_COLOUR_GRADIENTACTIVECAPTION":"wx.",
+"SYS_COLOUR_GRADIENTINACTIVECAPTION":"wx.",
+"SYS_COLOUR_GRAYTEXT":"wx.",
+"SYS_COLOUR_HIGHLIGHT":"wx.",
+"SYS_COLOUR_HIGHLIGHTTEXT":"wx.",
+"SYS_COLOUR_HOTLIGHT":"wx.",
+"SYS_COLOUR_INACTIVEBORDER":"wx.",
+"SYS_COLOUR_INACTIVECAPTION":"wx.",
+"SYS_COLOUR_INACTIVECAPTIONTEXT":"wx.",
+"SYS_COLOUR_INFOBK":"wx.",
+"SYS_COLOUR_INFOTEXT":"wx.",
+"SYS_COLOUR_LISTBOX":"wx.",
+"SYS_COLOUR_LISTBOXHIGHLIGHTTEXT":"wx.",
+"SYS_COLOUR_LISTBOXTEXT":"wx.",
+"SYS_COLOUR_MENU":"wx.",
+"SYS_COLOUR_MENUBAR":"wx.",
+"SYS_COLOUR_MENUHILIGHT":"wx.",
+"SYS_COLOUR_MENUTEXT":"wx.",
+"SYS_COLOUR_SCROLLBAR":"wx.",
+"SYS_COLOUR_WINDOW":"wx.",
+"SYS_COLOUR_WINDOWFRAME":"wx.",
+"SYS_COLOUR_WINDOWTEXT":"wx.",
+"SYS_CURSOR_X":"wx.",
+"SYS_CURSOR_Y":"wx.",
+"SYS_DCLICK_MSEC":"wx.",
+"SYS_DCLICK_X":"wx.",
+"SYS_DCLICK_Y":"wx.",
+"SYS_DEFAULT_GUI_FONT":"wx.",
+"SYS_DEVICE_DEFAULT_FONT":"wx.",
+"SYS_DRAG_X":"wx.",
+"SYS_DRAG_Y":"wx.",
+"SYS_EDGE_X":"wx.",
+"SYS_EDGE_Y":"wx.",
+"SYS_FRAMESIZE_X":"wx.",
+"SYS_FRAMESIZE_Y":"wx.",
+"SYS_HSCROLL_ARROW_X":"wx.",
+"SYS_HSCROLL_ARROW_Y":"wx.",
+"SYS_HSCROLL_Y":"wx.",
+"SYS_HTHUMB_X":"wx.",
+"SYS_ICONSPACING_X":"wx.",
+"SYS_ICONSPACING_Y":"wx.",
+"SYS_ICON_X":"wx.",
+"SYS_ICON_Y":"wx.",
+"SYS_MENU_Y":"wx.",
+"SYS_MOUSE_BUTTONS":"wx.",
+"SYS_NETWORK_PRESENT":"wx.",
+"SYS_OEM_FIXED_FONT":"wx.",
+"SYS_PENWINDOWS_PRESENT":"wx.",
+"SYS_SCREEN_DESKTOP":"wx.",
+"SYS_SCREEN_NONE":"wx.",
+"SYS_SCREEN_PDA":"wx.",
+"SYS_SCREEN_SMALL":"wx.",
+"SYS_SCREEN_TINY":"wx.",
+"SYS_SCREEN_X":"wx.",
+"SYS_SCREEN_Y":"wx.",
+"SYS_SHOW_SOUNDS":"wx.",
+"SYS_SMALLICON_X":"wx.",
+"SYS_SMALLICON_Y":"wx.",
+"SYS_SWAP_BUTTONS":"wx.",
+"SYS_SYSTEM_FONT":"wx.",
+"SYS_TABLET_PRESENT":"wx.",
+"SYS_VSCROLL_ARROW_X":"wx.",
+"SYS_VSCROLL_ARROW_Y":"wx.",
+"SYS_VSCROLL_X":"wx.",
+"SYS_VTHUMB_Y":"wx.",
+"SYS_WINDOWMIN_X":"wx.",
+"SYS_WINDOWMIN_Y":"wx.",
+"SafeShowMessage":"wx.",
+"SafeYield":"wx.",
+"SameAs":"wx.",
+"SashDragStatus":"wx.adv.",
+"SashEdgePosition":"wx.adv.",
+"SashEvent":"wx.adv.",
+"SashLayoutWindow":"wx.adv.",
+"SashWindow":"wx.adv.",
+"SaveFileSelector":"wx.",
+"ScreenDC":"wx.",
+"ScrollBar":"wx.",
+"ScrollBarNameStr":"wx.",
+"ScrollEvent":"wx.",
+"ScrollWinEvent":"wx.",
+"ScrollbarVisibility":"wx.",
+"Scrolled":"wx.",
+"ScrolledCanvas":"wx.",
+"ScrolledWindow":"wx.",
+"SearchCtrl":"wx.",
+"SearchCtrlNameStr":"wx.",
+"SeekMode":"wx.",
+"SetAssertHandler":"wx.",
+"SetCursor":"wx.",
+"SetCursorEvent":"wx.",
+"SetDefaultAssertHandler":"wx.",
+"SetDisplayName":"wx.",
+"SetEnv":"wx.",
+"SettableHeaderColumn":"wx.",
+"Shell":"wx.",
+"ShowEffect":"wx.",
+"ShowEvent":"wx.",
+"ShowTip":"wx.adv.",
+"Shutdown":"wx.",
+"ShutdownFlags":"wx.",
+"Signal":"wx.",
+"SimpleHelpProvider":"wx.",
+"SimpleHtmlListBox":"wx.html.",
+"SingleChoiceDialog":"wx.",
+"SingleInstanceChecker":"wx.",
+"Size":"wx.",
+"SizeEvent":"wx.",
+"Sizer":"wx.",
+"SizerFlagBits":"wx.",
+"SizerFlags":"wx.",
+"SizerItem":"wx.",
+"Sleep":"wx.",
+"Slider":"wx.",
+"SliderNameStr":"wx.",
+"SortCallback":"wx.",
+"Sound":"wx.adv.",
+"SpinButton":"wx.",
+"SpinCtrl":"wx.",
+"SpinCtrlDouble":"wx.",
+"SpinDoubleEvent":"wx.",
+"SpinEvent":"wx.",
+"SplashScreen":"wx.adv.",
+"SplitMode":"wx.",
+"SplitterEvent":"wx.",
+"SplitterRenderParams":"wx.",
+"SplitterWindow":"wx.",
+"StandardID":"wx.",
+"StandardPaths":"wx.",
+"StaticBitmap":"wx.",
+"StaticBitmapNameStr":"wx.",
+"StaticBox":"wx.",
+"StaticBoxNameStr":"wx.",
+"StaticBoxSizer":"wx.",
+"StaticLine":"wx.",
+"StaticLineNameStr":"wx.",
+"StaticText":"wx.",
+"StaticTextNameStr":"wx.",
+"StatusBar":"wx.",
+"StatusBarNameStr":"wx.",
+"StatusBarPane":"wx.",
+"StdDialogButtonSizer":"wx.",
+"StockCursor":"wx.",
+"StockPreferencesPage":"wx.",
+"StopWatch":"wx.",
+"StreamBase":"wx.",
+"StreamError":"wx.",
+"Stretch":"wx.",
+"StripMenuCodes":"wx.",
+"Strip_Accel":"wx.",
+"Strip_All":"wx.",
+"Strip_Mnemonics":"wx.",
+"StyledTextCtrl":"wx.stc.",
+"StyledTextEvent":"wx.stc.",
+"Swap":"wx.",
+"SymbolPickerDialog":"wx.richtext.",
+"SysColourChangedEvent":"wx.",
+"SysErrorCode":"wx.",
+"SysErrorMsg":"wx.",
+"SystemColour":"wx.",
+"SystemFeature":"wx.",
+"SystemFont":"wx.",
+"SystemMetric":"wx.",
+"SystemOptions":"wx.",
+"SystemScreenType":"wx.",
+"SystemSettings":"wx.",
+"TAB_TRAVERSAL":"wx.",
+"TBI_CUSTOM_STATUSITEM":"wx.adv.",
+"TBI_DEFAULT_TYPE":"wx.adv.",
+"TBI_DOCK":"wx.adv.",
+"TBK_BUTTONBAR":"wx.",
+"TBK_HORZ_LAYOUT":"wx.",
+"TB_3DBUTTONS":"wx.",
+"TB_BOTTOM":"wx.",
+"TB_DEFAULT_STYLE":"wx.",
+"TB_DOCKABLE":"wx.",
+"TB_FLAT":"wx.",
+"TB_HORIZONTAL":"wx.",
+"TB_HORZ_LAYOUT":"wx.",
+"TB_HORZ_TEXT":"wx.",
+"TB_LEFT":"wx.",
+"TB_NOALIGN":"wx.",
+"TB_NODIVIDER":"wx.",
+"TB_NOICONS":"wx.",
+"TB_NO_TOOLTIPS":"wx.",
+"TB_RIGHT":"wx.",
+"TB_TEXT":"wx.",
+"TB_TOP":"wx.",
+"TB_VERTICAL":"wx.",
+"TC_BOTTOM":"wx.",
+"TC_FIXEDWIDTH":"wx.",
+"TC_LEFT":"wx.",
+"TC_MULTILINE":"wx.",
+"TC_OWNERDRAW":"wx.",
+"TC_RIGHT":"wx.",
+"TC_RIGHTJUSTIFY":"wx.",
+"TC_TOP":"wx.",
+"TEXT_ALIGNMENT_CENTER":"wx.",
+"TEXT_ALIGNMENT_CENTRE":"wx.",
+"TEXT_ALIGNMENT_DEFAULT":"wx.",
+"TEXT_ALIGNMENT_JUSTIFIED":"wx.",
+"TEXT_ALIGNMENT_LEFT":"wx.",
+"TEXT_ALIGNMENT_RIGHT":"wx.",
+"TEXT_ATTR_ALIGNMENT":"wx.",
+"TEXT_ATTR_ALL":"wx.",
+"TEXT_ATTR_BACKGROUND_COLOUR":"wx.",
+"TEXT_ATTR_BULLET":"wx.",
+"TEXT_ATTR_BULLET_NAME":"wx.",
+"TEXT_ATTR_BULLET_NUMBER":"wx.",
+"TEXT_ATTR_BULLET_STYLE":"wx.",
+"TEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE":"wx.",
+"TEXT_ATTR_BULLET_STYLE_ALIGN_LEFT":"wx.",
+"TEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT":"wx.",
+"TEXT_ATTR_BULLET_STYLE_ARABIC":"wx.",
+"TEXT_ATTR_BULLET_STYLE_BITMAP":"wx.",
+"TEXT_ATTR_BULLET_STYLE_CONTINUATION":"wx.",
+"TEXT_ATTR_BULLET_STYLE_LETTERS_LOWER":"wx.",
+"TEXT_ATTR_BULLET_STYLE_LETTERS_UPPER":"wx.",
+"TEXT_ATTR_BULLET_STYLE_NONE":"wx.",
+"TEXT_ATTR_BULLET_STYLE_OUTLINE":"wx.",
+"TEXT_ATTR_BULLET_STYLE_PARENTHESES":"wx.",
+"TEXT_ATTR_BULLET_STYLE_PERIOD":"wx.",
+"TEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS":"wx.",
+"TEXT_ATTR_BULLET_STYLE_ROMAN_LOWER":"wx.",
+"TEXT_ATTR_BULLET_STYLE_ROMAN_UPPER":"wx.",
+"TEXT_ATTR_BULLET_STYLE_STANDARD":"wx.",
+"TEXT_ATTR_BULLET_STYLE_SYMBOL":"wx.",
+"TEXT_ATTR_BULLET_TEXT":"wx.",
+"TEXT_ATTR_CHARACTER":"wx.",
+"TEXT_ATTR_CHARACTER_STYLE_NAME":"wx.",
+"TEXT_ATTR_EFFECTS":"wx.",
+"TEXT_ATTR_EFFECT_CAPITALS":"wx.",
+"TEXT_ATTR_EFFECT_DOUBLE_STRIKETHROUGH":"wx.",
+"TEXT_ATTR_EFFECT_EMBOSS":"wx.",
+"TEXT_ATTR_EFFECT_ENGRAVE":"wx.",
+"TEXT_ATTR_EFFECT_NONE":"wx.",
+"TEXT_ATTR_EFFECT_OUTLINE":"wx.",
+"TEXT_ATTR_EFFECT_SHADOW":"wx.",
+"TEXT_ATTR_EFFECT_SMALL_CAPITALS":"wx.",
+"TEXT_ATTR_EFFECT_STRIKETHROUGH":"wx.",
+"TEXT_ATTR_EFFECT_SUBSCRIPT":"wx.",
+"TEXT_ATTR_EFFECT_SUPERSCRIPT":"wx.",
+"TEXT_ATTR_FONT":"wx.",
+"TEXT_ATTR_FONT_ENCODING":"wx.",
+"TEXT_ATTR_FONT_FACE":"wx.",
+"TEXT_ATTR_FONT_FAMILY":"wx.",
+"TEXT_ATTR_FONT_ITALIC":"wx.",
+"TEXT_ATTR_FONT_PIXEL_SIZE":"wx.",
+"TEXT_ATTR_FONT_POINT_SIZE":"wx.",
+"TEXT_ATTR_FONT_SIZE":"wx.",
+"TEXT_ATTR_FONT_STRIKETHROUGH":"wx.",
+"TEXT_ATTR_FONT_UNDERLINE":"wx.",
+"TEXT_ATTR_FONT_WEIGHT":"wx.",
+"TEXT_ATTR_KEEP_FIRST_PARA_STYLE":"wx.richtext.",
+"TEXT_ATTR_LEFT_INDENT":"wx.",
+"TEXT_ATTR_LINE_SPACING":"wx.",
+"TEXT_ATTR_LINE_SPACING_HALF":"wx.",
+"TEXT_ATTR_LINE_SPACING_NORMAL":"wx.",
+"TEXT_ATTR_LINE_SPACING_TWICE":"wx.",
+"TEXT_ATTR_LIST_STYLE_NAME":"wx.",
+"TEXT_ATTR_OUTLINE_LEVEL":"wx.",
+"TEXT_ATTR_PAGE_BREAK":"wx.",
+"TEXT_ATTR_PARAGRAPH":"wx.",
+"TEXT_ATTR_PARAGRAPH_STYLE_NAME":"wx.",
+"TEXT_ATTR_PARA_SPACING_AFTER":"wx.",
+"TEXT_ATTR_PARA_SPACING_BEFORE":"wx.",
+"TEXT_ATTR_RIGHT_INDENT":"wx.",
+"TEXT_ATTR_TABS":"wx.",
+"TEXT_ATTR_TEXT_COLOUR":"wx.",
+"TEXT_ATTR_UNITS_HUNDREDTHS_POINT":"wx.richtext.",
+"TEXT_ATTR_UNITS_MASK":"wx.richtext.",
+"TEXT_ATTR_UNITS_PERCENTAGE":"wx.richtext.",
+"TEXT_ATTR_UNITS_PIXELS":"wx.richtext.",
+"TEXT_ATTR_UNITS_POINTS":"wx.richtext.",
+"TEXT_ATTR_UNITS_TENTHS_MM":"wx.richtext.",
+"TEXT_ATTR_URL":"wx.",
+"TEXT_ATTR_VALUE_VALID":"wx.richtext.",
+"TEXT_ATTR_VALUE_VALID_MASK":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_COLOUR":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_DASHED":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_DOTTED":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_DOUBLE":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_GROOVE":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_INSET":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_MEDIUM":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_NONE":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_OUTSET":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_RIDGE":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_SOLID":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_STYLE":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_THICK":"wx.richtext.",
+"TEXT_BOX_ATTR_BORDER_THIN":"wx.richtext.",
+"TEXT_BOX_ATTR_CLEAR":"wx.richtext.",
+"TEXT_BOX_ATTR_CLEAR_BOTH":"wx.richtext.",
+"TEXT_BOX_ATTR_CLEAR_LEFT":"wx.richtext.",
+"TEXT_BOX_ATTR_CLEAR_NONE":"wx.richtext.",
+"TEXT_BOX_ATTR_CLEAR_RIGHT":"wx.richtext.",
+"TEXT_BOX_ATTR_COLLAPSE_BORDERS":"wx.richtext.",
+"TEXT_BOX_ATTR_COLLAPSE_FULL":"wx.richtext.",
+"TEXT_BOX_ATTR_COLLAPSE_NONE":"wx.richtext.",
+"TEXT_BOX_ATTR_FLOAT":"wx.richtext.",
+"TEXT_BOX_ATTR_FLOAT_LEFT":"wx.richtext.",
+"TEXT_BOX_ATTR_FLOAT_NONE":"wx.richtext.",
+"TEXT_BOX_ATTR_FLOAT_RIGHT":"wx.richtext.",
+"TEXT_BOX_ATTR_POSITION_ABSOLUTE":"wx.richtext.",
+"TEXT_BOX_ATTR_POSITION_FIXED":"wx.richtext.",
+"TEXT_BOX_ATTR_POSITION_MASK":"wx.richtext.",
+"TEXT_BOX_ATTR_POSITION_RELATIVE":"wx.richtext.",
+"TEXT_BOX_ATTR_POSITION_STATIC":"wx.richtext.",
+"TEXT_BOX_ATTR_VERTICAL_ALIGNMENT":"wx.richtext.",
+"TEXT_BOX_ATTR_VERTICAL_ALIGNMENT_BOTTOM":"wx.richtext.",
+"TEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE":"wx.richtext.",
+"TEXT_BOX_ATTR_VERTICAL_ALIGNMENT_NONE":"wx.richtext.",
+"TEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP":"wx.richtext.",
+"TEXT_TYPE_ANY":"wx.",
+"TE_AUTO_URL":"wx.",
+"TE_BESTWRAP":"wx.",
+"TE_CENTER":"wx.",
+"TE_CENTRE":"wx.",
+"TE_CHARWRAP":"wx.",
+"TE_DONTWRAP":"wx.",
+"TE_HT_BEFORE":"wx.",
+"TE_HT_BELOW":"wx.",
+"TE_HT_BEYOND":"wx.",
+"TE_HT_ON_TEXT":"wx.",
+"TE_HT_UNKNOWN":"wx.",
+"TE_LEFT":"wx.",
+"TE_MULTILINE":"wx.",
+"TE_NOHIDESEL":"wx.",
+"TE_NO_VSCROLL":"wx.",
+"TE_PASSWORD":"wx.",
+"TE_PROCESS_ENTER":"wx.",
+"TE_PROCESS_TAB":"wx.",
+"TE_READONLY":"wx.",
+"TE_RICH":"wx.",
+"TE_RICH2":"wx.",
+"TE_RIGHT":"wx.",
+"TE_WORDWRAP":"wx.",
+"TILE":"wx.",
+"TIMER_CONTINUOUS":"wx.",
+"TIMER_ONE_SHOT":"wx.",
+"TINY_CAPTION":"wx.",
+"TITLEBAR_BUTTON_CLOSE":"wx.",
+"TITLEBAR_BUTTON_HELP":"wx.",
+"TITLEBAR_BUTTON_ICONIZE":"wx.",
+"TITLEBAR_BUTTON_MAXIMIZE":"wx.",
+"TITLEBAR_BUTTON_RESTORE":"wx.",
+"TLI_FIRST":"wx.dataview.",
+"TLI_LAST":"wx.dataview.",
+"TL_3STATE":"wx.dataview.",
+"TL_CHECKBOX":"wx.dataview.",
+"TL_DEFAULT_STYLE":"wx.dataview.",
+"TL_MULTIPLE":"wx.dataview.",
+"TL_NO_HEADER":"wx.dataview.",
+"TL_SINGLE":"wx.dataview.",
+"TL_STYLE_MASK":"wx.dataview.",
+"TL_USER_3STATE":"wx.dataview.",
+"TOOL_STYLE_BUTTON":"wx.",
+"TOOL_STYLE_CONTROL":"wx.",
+"TOOL_STYLE_SEPARATOR":"wx.",
+"TOP":"wx.",
+"TP_DEFAULT":"wx.adv.",
+"TRANSPARENT_BRUSH":"wx.",
+"TRANSPARENT_PEN":"wx.",
+"TRANSPARENT_WINDOW":"wx.",
+"TREE_HITTEST_ABOVE":"wx.",
+"TREE_HITTEST_BELOW":"wx.",
+"TREE_HITTEST_NOWHERE":"wx.",
+"TREE_HITTEST_ONITEM":"wx.",
+"TREE_HITTEST_ONITEMBUTTON":"wx.",
+"TREE_HITTEST_ONITEMICON":"wx.",
+"TREE_HITTEST_ONITEMINDENT":"wx.",
+"TREE_HITTEST_ONITEMLABEL":"wx.",
+"TREE_HITTEST_ONITEMLOWERPART":"wx.",
+"TREE_HITTEST_ONITEMRIGHT":"wx.",
+"TREE_HITTEST_ONITEMSTATEICON":"wx.",
+"TREE_HITTEST_ONITEMUPPERPART":"wx.",
+"TREE_HITTEST_TOLEFT":"wx.",
+"TREE_HITTEST_TORIGHT":"wx.",
+"TREE_ITEMSTATE_NEXT":"wx.",
+"TREE_ITEMSTATE_NONE":"wx.",
+"TREE_ITEMSTATE_PREV":"wx.",
+"TR_DEFAULT_STYLE":"wx.",
+"TR_EDIT_LABELS":"wx.",
+"TR_FULL_ROW_HIGHLIGHT":"wx.",
+"TR_HAS_BUTTONS":"wx.",
+"TR_HAS_VARIABLE_ROW_HEIGHT":"wx.",
+"TR_HIDE_ROOT":"wx.",
+"TR_LINES_AT_ROOT":"wx.",
+"TR_MULTIPLE":"wx.",
+"TR_NO_BUTTONS":"wx.",
+"TR_NO_LINES":"wx.",
+"TR_ROW_LINES":"wx.",
+"TR_SINGLE":"wx.",
+"TR_TWIST_BUTTONS":"wx.",
+"TZ":"wx.DateTime.",
+"TabBehaviour":"wx.grid.Grid.",
+"TaskBarIcon":"wx.adv.",
+"TaskBarIconEvent":"wx.adv.",
+"TaskBarIconType":"wx.adv.",
+"TextAttr":"wx.",
+"TextAttrAlignment":"wx.",
+"TextAttrBorder":"wx.richtext.",
+"TextAttrBorderFlags":"wx.richtext.",
+"TextAttrBorderStyle":"wx.richtext.",
+"TextAttrBorderWidth":"wx.richtext.",
+"TextAttrBorders":"wx.richtext.",
+"TextAttrBulletStyle":"wx.",
+"TextAttrCollectCommonAttributes":"wx.richtext.",
+"TextAttrDimension":"wx.richtext.",
+"TextAttrDimensionConverter":"wx.richtext.",
+"TextAttrDimensionFlags":"wx.richtext.",
+"TextAttrDimensions":"wx.richtext.",
+"TextAttrEffects":"wx.",
+"TextAttrEq":"wx.richtext.",
+"TextAttrFlags":"wx.",
+"TextAttrLineSpacing":"wx.",
+"TextAttrSize":"wx.richtext.",
+"TextAttrUnits":"wx.richtext.",
+"TextAttrValueFlags":"wx.richtext.",
+"TextBoxAttr":"wx.richtext.",
+"TextBoxAttrClearStyle":"wx.richtext.",
+"TextBoxAttrCollapseMode":"wx.richtext.",
+"TextBoxAttrFlags":"wx.richtext.",
+"TextBoxAttrFloatStyle":"wx.richtext.",
+"TextBoxAttrPosition":"wx.richtext.",
+"TextBoxAttrVerticalAlignment":"wx.richtext.",
+"TextCompleter":"wx.",
+"TextCompleterSimple":"wx.",
+"TextCoord":"wx.",
+"TextCtrl":"wx.",
+"TextCtrlHitTestResult":"wx.",
+"TextCtrlNameStr":"wx.",
+"TextDataObject":"wx.",
+"TextDropTarget":"wx.",
+"TextEntry":"wx.",
+"TextEntryDialog":"wx.",
+"TextEntryDialogStyle":"wx.",
+"TextPos":"wx.",
+"TextUrlEvent":"wx.",
+"TheApp":"wx.",
+"TheBrushList":"wx.",
+"TheColourDatabase":"wx.",
+"TheFontList":"wx.",
+"TheMimeTypesManager":"wx.",
+"ThePenList":"wx.",
+"TimePickerCtrl":"wx.adv.",
+"TimeSpan":"wx.",
+"TimeZone":"wx.DateTime.",
+"Timer":"wx.",
+"TimerEvent":"wx.",
+"TimerRunner":"wx.",
+"TipKind":"wx.adv.",
+"TipKind_Auto":"wx.adv.",
+"TipKind_Bottom":"wx.adv.",
+"TipKind_BottomLeft":"wx.adv.",
+"TipKind_BottomRight":"wx.adv.",
+"TipKind_None":"wx.adv.",
+"TipKind_Top":"wx.adv.",
+"TipKind_TopLeft":"wx.adv.",
+"TipKind_TopRight":"wx.adv.",
+"TipProvider":"wx.adv.",
+"TipWindow":"wx.",
+"TitleBarButton":"wx.",
+"Tm":"wx.DateTime.",
+"ToString":"wx.",
+"ToggleButton":"wx.",
+"ToolBar":"wx.",
+"ToolBarNameStr":"wx.",
+"ToolBarToolBase":"wx.",
+"ToolBarToolStyle":"wx.",
+"ToolTip":"wx.",
+"Toolbook":"wx.",
+"Top":"wx.",
+"TopLevelWindow":"wx.",
+"Trackable":"wx.",
+"Translations":"wx.",
+"TranslationsLoader":"wx.",
+"TransparentColour":"wx.",
+"Trap":"wx.",
+"TreeCtrl":"wx.",
+"TreeCtrlNameStr":"wx.",
+"TreeEvent":"wx.",
+"TreeItemIcon":"wx.",
+"TreeItemIcon_Expanded":"wx.",
+"TreeItemIcon_Max":"wx.",
+"TreeItemIcon_Normal":"wx.",
+"TreeItemIcon_Selected":"wx.",
+"TreeItemIcon_SelectedExpanded":"wx.",
+"TreeItemId":"wx.",
+"TreeItemIdValue":"wx.",
+"TreeListCtrl":"wx.dataview.",
+"TreeListCtrlNameStr":"wx.dataview.",
+"TreeListEvent":"wx.dataview.",
+"TreeListEventHandler":"wx.dataview.",
+"TreeListItem":"wx.dataview.",
+"TreeListItemComparator":"wx.dataview.",
+"TreeListItems":"wx.dataview.",
+"Treebook":"wx.",
+"UChar":"wx.",
+"UIActionSimulator":"wx.",
+"UINT16_MAX":"wx.",
+"UINT32_MAX":"wx.",
+"UINT64_MAX":"wx.",
+"UINT8_MAX":"wx.",
+"UIntPtr":"wx.",
+"UP":"wx.",
+"UPDATE_UI_FROMIDLE":"wx.",
+"UPDATE_UI_NONE":"wx.",
+"UPDATE_UI_PROCESS_ALL":"wx.",
+"UPDATE_UI_PROCESS_SPECIFIED":"wx.",
+"UPDATE_UI_RECURSE":"wx.",
+"URLDataObject":"wx.",
+"USER_ATTENTION_ERROR":"wx.",
+"USER_ATTENTION_INFO":"wx.",
+"Uint16":"wx.",
+"Uint32":"wx.",
+"Uint64":"wx.",
+"Uint8":"wx.",
+"Unconstrained":"wx.",
+"Uninitialize":"wx.",
+"UnsetEnv":"wx.",
+"UpdateUI":"wx.",
+"UpdateUIEvent":"wx.",
+"UpdateUIMode":"wx.",
+"Usleep":"wx.",
+"VERTICAL":"wx.",
+"VListBox":"wx.",
+"VListBoxNameStr":"wx.",
+"VLogDebug":"wx.",
+"VLogError":"wx.",
+"VLogFatalError":"wx.",
+"VLogGeneric":"wx.",
+"VLogMessage":"wx.",
+"VLogStatus":"wx.",
+"VLogSysError":"wx.",
+"VLogTrace":"wx.",
+"VLogVerbose":"wx.",
+"VLogWarning":"wx.",
+"VSCROLL":"wx.",
+"VScrolledWindow":"wx.",
+"VaCopy":"wx.",
+"Validator":"wx.",
+"VarHScrollHelper":"wx.",
+"VarHVScrollHelper":"wx.",
+"VarScrollHelperBase":"wx.",
+"VarVScrollHelper":"wx.",
+"VersionInfo":"wx.",
+"VideoMode":"wx.",
+"VisualAttributes":"wx.",
+"WANTS_CHARS":"wx.",
+"WEBKIT_NAV_BACK_NEXT":"wx.webkit.",
+"WEBKIT_NAV_FORM_RESUBMITTED":"wx.webkit.",
+"WEBKIT_NAV_FORM_SUBMITTED":"wx.webkit.",
+"WEBKIT_NAV_LINK_CLICKED":"wx.webkit.",
+"WEBKIT_NAV_OTHER":"wx.webkit.",
+"WEBKIT_NAV_RELOAD":"wx.webkit.",
+"WEBKIT_STATE_FAILED":"wx.webkit.",
+"WEBKIT_STATE_NEGOTIATING":"wx.webkit.",
+"WEBKIT_STATE_REDIRECTING":"wx.webkit.",
+"WEBKIT_STATE_START":"wx.webkit.",
+"WEBKIT_STATE_STOP":"wx.webkit.",
+"WEBKIT_STATE_TRANSFERRING":"wx.webkit.",
+"WEBVIEW_FIND_BACKWARDS":"wx.html2.",
+"WEBVIEW_FIND_DEFAULT":"wx.html2.",
+"WEBVIEW_FIND_ENTIRE_WORD":"wx.html2.",
+"WEBVIEW_FIND_HIGHLIGHT_RESULT":"wx.html2.",
+"WEBVIEW_FIND_MATCH_CASE":"wx.html2.",
+"WEBVIEW_FIND_WRAP":"wx.html2.",
+"WEBVIEW_NAV_ERR_AUTH":"wx.html2.",
+"WEBVIEW_NAV_ERR_CERTIFICATE":"wx.html2.",
+"WEBVIEW_NAV_ERR_CONNECTION":"wx.html2.",
+"WEBVIEW_NAV_ERR_NOT_FOUND":"wx.html2.",
+"WEBVIEW_NAV_ERR_OTHER":"wx.html2.",
+"WEBVIEW_NAV_ERR_REQUEST":"wx.html2.",
+"WEBVIEW_NAV_ERR_SECURITY":"wx.html2.",
+"WEBVIEW_NAV_ERR_USER_CANCELLED":"wx.html2.",
+"WEBVIEW_RELOAD_DEFAULT":"wx.html2.",
+"WEBVIEW_RELOAD_NO_CACHE":"wx.html2.",
+"WEBVIEW_ZOOM_LARGE":"wx.html2.",
+"WEBVIEW_ZOOM_LARGEST":"wx.html2.",
+"WEBVIEW_ZOOM_MEDIUM":"wx.html2.",
+"WEBVIEW_ZOOM_SMALL":"wx.html2.",
+"WEBVIEW_ZOOM_TINY":"wx.html2.",
+"WEBVIEW_ZOOM_TYPE_LAYOUT":"wx.html2.",
+"WEBVIEW_ZOOM_TYPE_TEXT":"wx.html2.",
+"WEST":"wx.",
+"WHITE":"wx.",
+"WHITE_BRUSH":"wx.",
+"WHITE_PEN":"wx.",
+"WINDING_RULE":"wx.",
+"WINDOW_STYLE_MASK":"wx.",
+"WINDOW_VARIANT_LARGE":"wx.",
+"WINDOW_VARIANT_MAX":"wx.",
+"WINDOW_VARIANT_MINI":"wx.",
+"WINDOW_VARIANT_NORMAL":"wx.",
+"WINDOW_VARIANT_SMALL":"wx.",
+"WIZARD_EX_HELPBUTTON":"wx.adv.",
+"WIZARD_HALIGN_CENTRE":"wx.adv.",
+"WIZARD_HALIGN_LEFT":"wx.adv.",
+"WIZARD_HALIGN_RIGHT":"wx.adv.",
+"WIZARD_TILE":"wx.adv.",
+"WIZARD_VALIGN_BOTTOM":"wx.adv.",
+"WIZARD_VALIGN_CENTRE":"wx.adv.",
+"WIZARD_VALIGN_TOP":"wx.adv.",
+"WRAPSIZER_DEFAULT_FLAGS":"wx.",
+"WS_EX_BLOCK_EVENTS":"wx.",
+"WS_EX_CONTEXTHELP":"wx.",
+"WS_EX_PROCESS_IDLE":"wx.",
+"WS_EX_PROCESS_UI_UPDATES":"wx.",
+"WS_EX_THEMED_BACKGROUND":"wx.",
+"WS_EX_TRANSIENT":"wx.",
+"WS_EX_VALIDATE_RECURSIVELY":"wx.",
+"WXK_ADD":"wx.",
+"WXK_ALT":"wx.",
+"WXK_BACK":"wx.",
+"WXK_CANCEL":"wx.",
+"WXK_CAPITAL":"wx.",
+"WXK_CATEGORY_ARROW":"wx.",
+"WXK_CATEGORY_CUT":"wx.",
+"WXK_CATEGORY_JUMP":"wx.",
+"WXK_CATEGORY_NAVIGATION":"wx.",
+"WXK_CATEGORY_PAGING":"wx.",
+"WXK_CATEGORY_TAB":"wx.",
+"WXK_CLEAR":"wx.",
+"WXK_COMMAND":"wx.",
+"WXK_CONTROL":"wx.",
+"WXK_CONTROL_A":"wx.",
+"WXK_CONTROL_B":"wx.",
+"WXK_CONTROL_C":"wx.",
+"WXK_CONTROL_D":"wx.",
+"WXK_CONTROL_E":"wx.",
+"WXK_CONTROL_F":"wx.",
+"WXK_CONTROL_G":"wx.",
+"WXK_CONTROL_H":"wx.",
+"WXK_CONTROL_I":"wx.",
+"WXK_CONTROL_J":"wx.",
+"WXK_CONTROL_K":"wx.",
+"WXK_CONTROL_L":"wx.",
+"WXK_CONTROL_M":"wx.",
+"WXK_CONTROL_N":"wx.",
+"WXK_CONTROL_O":"wx.",
+"WXK_CONTROL_P":"wx.",
+"WXK_CONTROL_Q":"wx.",
+"WXK_CONTROL_R":"wx.",
+"WXK_CONTROL_S":"wx.",
+"WXK_CONTROL_T":"wx.",
+"WXK_CONTROL_U":"wx.",
+"WXK_CONTROL_V":"wx.",
+"WXK_CONTROL_W":"wx.",
+"WXK_CONTROL_X":"wx.",
+"WXK_CONTROL_Y":"wx.",
+"WXK_CONTROL_Z":"wx.",
+"WXK_DECIMAL":"wx.",
+"WXK_DELETE":"wx.",
+"WXK_DIVIDE":"wx.",
+"WXK_DOWN":"wx.",
+"WXK_END":"wx.",
+"WXK_ESCAPE":"wx.",
+"WXK_EXECUTE":"wx.",
+"WXK_F1":"wx.",
+"WXK_F10":"wx.",
+"WXK_F11":"wx.",
+"WXK_F12":"wx.",
+"WXK_F13":"wx.",
+"WXK_F14":"wx.",
+"WXK_F15":"wx.",
+"WXK_F16":"wx.",
+"WXK_F17":"wx.",
+"WXK_F18":"wx.",
+"WXK_F19":"wx.",
+"WXK_F2":"wx.",
+"WXK_F20":"wx.",
+"WXK_F21":"wx.",
+"WXK_F22":"wx.",
+"WXK_F23":"wx.",
+"WXK_F24":"wx.",
+"WXK_F3":"wx.",
+"WXK_F4":"wx.",
+"WXK_F5":"wx.",
+"WXK_F6":"wx.",
+"WXK_F7":"wx.",
+"WXK_F8":"wx.",
+"WXK_F9":"wx.",
+"WXK_HELP":"wx.",
+"WXK_HOME":"wx.",
+"WXK_INSERT":"wx.",
+"WXK_LBUTTON":"wx.",
+"WXK_LEFT":"wx.",
+"WXK_MBUTTON":"wx.",
+"WXK_MENU":"wx.",
+"WXK_MULTIPLY":"wx.",
+"WXK_NONE":"wx.",
+"WXK_NUMLOCK":"wx.",
+"WXK_NUMPAD0":"wx.",
+"WXK_NUMPAD1":"wx.",
+"WXK_NUMPAD2":"wx.",
+"WXK_NUMPAD3":"wx.",
+"WXK_NUMPAD4":"wx.",
+"WXK_NUMPAD5":"wx.",
+"WXK_NUMPAD6":"wx.",
+"WXK_NUMPAD7":"wx.",
+"WXK_NUMPAD8":"wx.",
+"WXK_NUMPAD9":"wx.",
+"WXK_NUMPAD_ADD":"wx.",
+"WXK_NUMPAD_BEGIN":"wx.",
+"WXK_NUMPAD_DECIMAL":"wx.",
+"WXK_NUMPAD_DELETE":"wx.",
+"WXK_NUMPAD_DIVIDE":"wx.",
+"WXK_NUMPAD_DOWN":"wx.",
+"WXK_NUMPAD_END":"wx.",
+"WXK_NUMPAD_ENTER":"wx.",
+"WXK_NUMPAD_EQUAL":"wx.",
+"WXK_NUMPAD_F1":"wx.",
+"WXK_NUMPAD_F2":"wx.",
+"WXK_NUMPAD_F3":"wx.",
+"WXK_NUMPAD_F4":"wx.",
+"WXK_NUMPAD_HOME":"wx.",
+"WXK_NUMPAD_INSERT":"wx.",
+"WXK_NUMPAD_LEFT":"wx.",
+"WXK_NUMPAD_MULTIPLY":"wx.",
+"WXK_NUMPAD_PAGEDOWN":"wx.",
+"WXK_NUMPAD_PAGEUP":"wx.",
+"WXK_NUMPAD_RIGHT":"wx.",
+"WXK_NUMPAD_SEPARATOR":"wx.",
+"WXK_NUMPAD_SPACE":"wx.",
+"WXK_NUMPAD_SUBTRACT":"wx.",
+"WXK_NUMPAD_TAB":"wx.",
+"WXK_NUMPAD_UP":"wx.",
+"WXK_PAGEDOWN":"wx.",
+"WXK_PAGEUP":"wx.",
+"WXK_PAUSE":"wx.",
+"WXK_PRINT":"wx.",
+"WXK_RAW_CONTROL":"wx.",
+"WXK_RBUTTON":"wx.",
+"WXK_RETURN":"wx.",
+"WXK_RIGHT":"wx.",
+"WXK_SCROLL":"wx.",
+"WXK_SELECT":"wx.",
+"WXK_SEPARATOR":"wx.",
+"WXK_SHIFT":"wx.",
+"WXK_SNAPSHOT":"wx.",
+"WXK_SPACE":"wx.",
+"WXK_SPECIAL1":"wx.",
+"WXK_SPECIAL10":"wx.",
+"WXK_SPECIAL11":"wx.",
+"WXK_SPECIAL12":"wx.",
+"WXK_SPECIAL13":"wx.",
+"WXK_SPECIAL14":"wx.",
+"WXK_SPECIAL15":"wx.",
+"WXK_SPECIAL16":"wx.",
+"WXK_SPECIAL17":"wx.",
+"WXK_SPECIAL18":"wx.",
+"WXK_SPECIAL19":"wx.",
+"WXK_SPECIAL2":"wx.",
+"WXK_SPECIAL20":"wx.",
+"WXK_SPECIAL3":"wx.",
+"WXK_SPECIAL4":"wx.",
+"WXK_SPECIAL5":"wx.",
+"WXK_SPECIAL6":"wx.",
+"WXK_SPECIAL7":"wx.",
+"WXK_SPECIAL8":"wx.",
+"WXK_SPECIAL9":"wx.",
+"WXK_START":"wx.",
+"WXK_SUBTRACT":"wx.",
+"WXK_TAB":"wx.",
+"WXK_UP":"wx.",
+"WXK_WINDOWS_LEFT":"wx.",
+"WXK_WINDOWS_MENU":"wx.",
+"WXK_WINDOWS_RIGHT":"wx.",
+"WXMSG":"wx.msw.",
+"WX_GL_AUX_BUFFERS":"wx.glcanvas.",
+"WX_GL_BUFFER_SIZE":"wx.glcanvas.",
+"WX_GL_CORE_PROFILE":"wx.glcanvas.",
+"WX_GL_DEPTH_SIZE":"wx.glcanvas.",
+"WX_GL_DOUBLEBUFFER":"wx.glcanvas.",
+"WX_GL_LEVEL":"wx.glcanvas.",
+"WX_GL_MAJOR_VERSION":"wx.glcanvas.",
+"WX_GL_MINOR_VERSION":"wx.glcanvas.",
+"WX_GL_MIN_ACCUM_ALPHA":"wx.glcanvas.",
+"WX_GL_MIN_ACCUM_BLUE":"wx.glcanvas.",
+"WX_GL_MIN_ACCUM_GREEN":"wx.glcanvas.",
+"WX_GL_MIN_ACCUM_RED":"wx.glcanvas.",
+"WX_GL_MIN_ALPHA":"wx.glcanvas.",
+"WX_GL_MIN_BLUE":"wx.glcanvas.",
+"WX_GL_MIN_GREEN":"wx.glcanvas.",
+"WX_GL_MIN_RED":"wx.glcanvas.",
+"WX_GL_RGBA":"wx.glcanvas.",
+"WX_GL_SAMPLES":"wx.glcanvas.",
+"WX_GL_SAMPLE_BUFFERS":"wx.glcanvas.",
+"WX_GL_STENCIL_SIZE":"wx.glcanvas.",
+"WX_GL_STEREO":"wx.glcanvas.",
+"WakeUpIdle":"wx.",
+"WebKitBeforeLoadEvent":"wx.webkit.",
+"WebKitCtrl":"wx.webkit.",
+"WebKitCtrlNameStr":"wx.webkit.",
+"WebKitNewWindowEvent":"wx.webkit.",
+"WebKitStateChangedEvent":"wx.webkit.",
+"WebView":"wx.html2.",
+"WebViewArchiveHandler":"wx.html2.",
+"WebViewBackendDefault":"wx.html2.",
+"WebViewBackendIE":"wx.html2.",
+"WebViewBackendWebKit":"wx.html2.",
+"WebViewDefaultURLStr":"wx.html2.",
+"WebViewEvent":"wx.html2.",
+"WebViewFSHandler":"wx.html2.",
+"WebViewFactory":"wx.html2.",
+"WebViewFindFlags":"wx.html2.",
+"WebViewHandler":"wx.html2.",
+"WebViewHistoryItem":"wx.html2.",
+"WebViewNameStr":"wx.html2.",
+"WebViewNavigationError":"wx.html2.",
+"WebViewReloadFlags":"wx.html2.",
+"WebViewZoom":"wx.html2.",
+"WebViewZoomType":"wx.html2.",
+"WeekDay":"wx.DateTime.",
+"WeekFlags":"wx.DateTime.",
+"Width":"wx.",
+"Window":"wx.",
+"WindowBase":"wx.",
+"WindowCreateEvent":"wx.",
+"WindowDC":"wx.",
+"WindowDestroyEvent":"wx.",
+"WindowDisabler":"wx.",
+"WindowID":"wx.",
+"WindowModalDialogEvent":"wx.",
+"WindowVariant":"wx.",
+"WithImages":"wx.",
+"Wizard":"wx.adv.",
+"WizardEvent":"wx.adv.",
+"WizardPage":"wx.adv.",
+"WizardPageSimple":"wx.adv.",
+"Word":"wx.",
+"WrapSizer":"wx.",
+"XMLDOC_KEEP_WHITESPACE_NODES":"wx.xml.",
+"XMLDOC_NONE":"wx.xml.",
+"XML_ATTRIBUTE_NODE":"wx.xml.",
+"XML_CDATA_SECTION_NODE":"wx.xml.",
+"XML_COMMENT_NODE":"wx.xml.",
+"XML_DOCUMENT_FRAG_NODE":"wx.xml.",
+"XML_DOCUMENT_NODE":"wx.xml.",
+"XML_DOCUMENT_TYPE_NODE":"wx.xml.",
+"XML_ELEMENT_NODE":"wx.xml.",
+"XML_ENTITY_NODE":"wx.xml.",
+"XML_ENTITY_REF_NODE":"wx.xml.",
+"XML_HTML_DOCUMENT_NODE":"wx.xml.",
+"XML_NOTATION_NODE":"wx.xml.",
+"XML_NO_INDENTATION":"wx.xml.",
+"XML_PI_NODE":"wx.xml.",
+"XML_TEXT_NODE":"wx.xml.",
+"XOR":"wx.",
+"XRCCTRL":"wx.xrc.",
+"XRCID":"wx.xrc.",
+"XRC_NO_RELOADING":"wx.xrc.",
+"XRC_NO_SUBCLASSING":"wx.xrc.",
+"XRC_USE_LOCALE":"wx.xrc.",
+"XmlAttribute":"wx.xml.",
+"XmlDocument":"wx.xml.",
+"XmlDocumentLoadFlag":"wx.xml.",
+"XmlNode":"wx.xml.",
+"XmlNodeType":"wx.xml.",
+"XmlResource":"wx.xrc.",
+"XmlResourceFlags":"wx.xrc.",
+"XmlResourceHandler":"wx.xrc.",
+"XmlSubclassFactory":"wx.xrc.",
+"YELLOW":"wx.",
+"YELLOW_BRUSH":"wx.",
+"YELLOW_PEN":"wx.",
+"YES":"wx.",
+"YES_DEFAULT":"wx.",
+"YES_NO":"wx.",
+"Year":"wx.DateTime.",
+"Yield":"wx.",
+"_":"wx.",
+"__DECLARE_EVT0":"wx.",
+"__DECLARE_EVT1":"wx.",
+"__DECLARE_EVT2":"wx.",
+"byte":"wx.",
+"date2pydate":"wx.",
+"operator!=":"wx.",
+"operator*":"wx.",
+"operator+":"wx.",
+"operator-":"wx.",
+"operator/":"wx.",
+"operator==":"wx.",
+"pydate2wxdate":"wx.",
+"ssize_t":"wx.",
+"time_t":"wx.",
+"ulong":"wx.",
+"version":"wx.",
+"wxEVT_ACTIVATE":"wx.",
+"wxEVT_ACTIVATE_APP":"wx.",
+"wxEVT_ANY":"wx.",
+"wxEVT_AUX1_DCLICK":"wx.",
+"wxEVT_AUX1_DOWN":"wx.",
+"wxEVT_AUX1_UP":"wx.",
+"wxEVT_AUX2_DCLICK":"wx.",
+"wxEVT_AUX2_DOWN":"wx.",
+"wxEVT_AUX2_UP":"wx.",
+"wxEVT_BUTTON":"wx.",
+"wxEVT_CALCULATE_LAYOUT":"wx.adv.",
+"wxEVT_CALENDAR_DAY_CHANGED":"wx.adv.",
+"wxEVT_CALENDAR_DOUBLECLICKED":"wx.adv.",
+"wxEVT_CALENDAR_MONTH_CHANGED":"wx.adv.",
+"wxEVT_CALENDAR_PAGE_CHANGED":"wx.adv.",
+"wxEVT_CALENDAR_SEL_CHANGED":"wx.adv.",
+"wxEVT_CALENDAR_WEEKDAY_CLICKED":"wx.adv.",
+"wxEVT_CALENDAR_WEEK_CLICKED":"wx.adv.",
+"wxEVT_CALENDAR_YEAR_CHANGED":"wx.adv.",
+"wxEVT_CATEGORY_ALL":"wx.",
+"wxEVT_CATEGORY_SOCKET":"wx.",
+"wxEVT_CATEGORY_THREAD":"wx.",
+"wxEVT_CATEGORY_TIMER":"wx.",
+"wxEVT_CATEGORY_UI":"wx.",
+"wxEVT_CATEGORY_USER_INPUT":"wx.",
+"wxEVT_CHAR":"wx.",
+"wxEVT_CHAR_HOOK":"wx.",
+"wxEVT_CHECKBOX":"wx.",
+"wxEVT_CHECKLISTBOX":"wx.",
+"wxEVT_CHILD_FOCUS":"wx.",
+"wxEVT_CHOICE":"wx.",
+"wxEVT_CHOICEBOOK_PAGE_CHANGED":"wx.",
+"wxEVT_CHOICEBOOK_PAGE_CHANGING":"wx.",
+"wxEVT_CLOSE_WINDOW":"wx.",
+"wxEVT_COLLAPSIBLEPANE_CHANGED":"wx.",
+"wxEVT_COLOURPICKER_CHANGED":"wx.",
+"wxEVT_COMBOBOX":"wx.",
+"wxEVT_COMBOBOX_CLOSEUP":"wx.",
+"wxEVT_COMBOBOX_DROPDOWN":"wx.",
+"wxEVT_COMMAND_ENTER":"wx.",
+"wxEVT_COMMAND_KILL_FOCUS":"wx.",
+"wxEVT_COMMAND_LEFT_CLICK":"wx.",
+"wxEVT_COMMAND_LEFT_DCLICK":"wx.",
+"wxEVT_COMMAND_RIGHT_CLICK":"wx.",
+"wxEVT_COMMAND_RIGHT_DCLICK":"wx.",
+"wxEVT_COMMAND_SET_FOCUS":"wx.",
+"wxEVT_CONTEXT_MENU":"wx.",
+"wxEVT_CREATE":"wx.",
+"wxEVT_DATAVIEW_CACHE_HINT":"wx.dataview.",
+"wxEVT_DATAVIEW_COLUMN_HEADER_CLICK":"wx.dataview.",
+"wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK":"wx.dataview.",
+"wxEVT_DATAVIEW_COLUMN_REORDERED":"wx.dataview.",
+"wxEVT_DATAVIEW_COLUMN_SORTED":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_ACTIVATED":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_BEGIN_DRAG":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_COLLAPSED":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_COLLAPSING":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_CONTEXT_MENU":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_DROP":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_EDITING_DONE":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_EDITING_STARTED":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_EXPANDED":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_EXPANDING":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_START_EDITING":"wx.dataview.",
+"wxEVT_DATAVIEW_ITEM_VALUE_CHANGED":"wx.dataview.",
+"wxEVT_DATAVIEW_SELECTION_CHANGED":"wx.dataview.",
+"wxEVT_DATE_CHANGED":"wx.adv.",
+"wxEVT_DESTROY":"wx.",
+"wxEVT_DETAILED_HELP":"wx.",
+"wxEVT_DIRCTRL_FILEACTIVATED":"wx.",
+"wxEVT_DIRCTRL_SELECTIONCHANGED":"wx.",
+"wxEVT_DIRPICKER_CHANGED":"wx.",
+"wxEVT_DISPLAY_CHANGED":"wx.",
+"wxEVT_DROP_FILES":"wx.",
+"wxEVT_END_PROCESS":"wx.",
+"wxEVT_END_SESSION":"wx.",
+"wxEVT_ENTER_WINDOW":"wx.",
+"wxEVT_ERASE_BACKGROUND":"wx.",
+"wxEVT_FILECTRL_FILEACTIVATED":"wx.",
+"wxEVT_FILECTRL_FILTERCHANGED":"wx.",
+"wxEVT_FILECTRL_FOLDERCHANGED":"wx.",
+"wxEVT_FILECTRL_SELECTIONCHANGED":"wx.",
+"wxEVT_FILEPICKER_CHANGED":"wx.",
+"wxEVT_FIND":"wx.",
+"wxEVT_FIND_CLOSE":"wx.",
+"wxEVT_FIND_NEXT":"wx.",
+"wxEVT_FIND_REPLACE":"wx.",
+"wxEVT_FIND_REPLACE_ALL":"wx.",
+"wxEVT_FONTPICKER_CHANGED":"wx.",
+"wxEVT_FSWATCHER":"wx.",
+"wxEVT_GRID_CELL_BEGIN_DRAG":"wx.grid.",
+"wxEVT_GRID_CELL_CHANGED":"wx.grid.",
+"wxEVT_GRID_CELL_CHANGING":"wx.grid.",
+"wxEVT_GRID_CELL_LEFT_CLICK":"wx.grid.",
+"wxEVT_GRID_CELL_LEFT_DCLICK":"wx.grid.",
+"wxEVT_GRID_CELL_RIGHT_CLICK":"wx.grid.",
+"wxEVT_GRID_CELL_RIGHT_DCLICK":"wx.grid.",
+"wxEVT_GRID_COL_AUTO_SIZE":"wx.grid.",
+"wxEVT_GRID_COL_MOVE":"wx.grid.",
+"wxEVT_GRID_COL_SIZE":"wx.grid.",
+"wxEVT_GRID_COL_SORT":"wx.grid.",
+"wxEVT_GRID_EDITOR_CREATED":"wx.grid.",
+"wxEVT_GRID_EDITOR_HIDDEN":"wx.grid.",
+"wxEVT_GRID_EDITOR_SHOWN":"wx.grid.",
+"wxEVT_GRID_LABEL_LEFT_CLICK":"wx.grid.",
+"wxEVT_GRID_LABEL_LEFT_DCLICK":"wx.grid.",
+"wxEVT_GRID_LABEL_RIGHT_CLICK":"wx.grid.",
+"wxEVT_GRID_LABEL_RIGHT_DCLICK":"wx.grid.",
+"wxEVT_GRID_RANGE_SELECT":"wx.grid.",
+"wxEVT_GRID_ROW_SIZE":"wx.grid.",
+"wxEVT_GRID_SELECT_CELL":"wx.grid.",
+"wxEVT_GRID_TABBING":"wx.grid.",
+"wxEVT_HEADER_BEGIN_REORDER":"wx.",
+"wxEVT_HEADER_BEGIN_RESIZE":"wx.",
+"wxEVT_HEADER_CLICK":"wx.",
+"wxEVT_HEADER_DCLICK":"wx.",
+"wxEVT_HEADER_DRAGGING_CANCELLED":"wx.",
+"wxEVT_HEADER_END_REORDER":"wx.",
+"wxEVT_HEADER_END_RESIZE":"wx.",
+"wxEVT_HEADER_MIDDLE_CLICK":"wx.",
+"wxEVT_HEADER_MIDDLE_DCLICK":"wx.",
+"wxEVT_HEADER_RESIZING":"wx.",
+"wxEVT_HEADER_RIGHT_CLICK":"wx.",
+"wxEVT_HEADER_RIGHT_DCLICK":"wx.",
+"wxEVT_HEADER_SEPARATOR_DCLICK":"wx.",
+"wxEVT_HELP":"wx.",
+"wxEVT_HIBERNATE":"wx.",
+"wxEVT_HOTKEY":"wx.",
+"wxEVT_HTML_CELL_CLICKED":"wx.html.",
+"wxEVT_HTML_CELL_HOVER":"wx.html.",
+"wxEVT_HTML_LINK_CLICKED":"wx.html.",
+"wxEVT_HYPERLINK":"wx.adv.",
+"wxEVT_ICONIZE":"wx.",
+"wxEVT_IDLE":"wx.",
+"wxEVT_INIT_DIALOG":"wx.",
+"wxEVT_JOY_BUTTON_DOWN":"wx.",
+"wxEVT_JOY_BUTTON_UP":"wx.",
+"wxEVT_JOY_MOVE":"wx.",
+"wxEVT_JOY_ZMOVE":"wx.",
+"wxEVT_KEY_DOWN":"wx.",
+"wxEVT_KEY_UP":"wx.",
+"wxEVT_KILL_FOCUS":"wx.",
+"wxEVT_LEAVE_WINDOW":"wx.",
+"wxEVT_LEFT_DCLICK":"wx.",
+"wxEVT_LEFT_DOWN":"wx.",
+"wxEVT_LEFT_UP":"wx.",
+"wxEVT_LISTBOOK_PAGE_CHANGED":"wx.",
+"wxEVT_LISTBOOK_PAGE_CHANGING":"wx.",
+"wxEVT_LISTBOX":"wx.",
+"wxEVT_LISTBOX_DCLICK":"wx.",
+"wxEVT_LIST_BEGIN_DRAG":"wx.",
+"wxEVT_LIST_BEGIN_LABEL_EDIT":"wx.",
+"wxEVT_LIST_BEGIN_RDRAG":"wx.",
+"wxEVT_LIST_CACHE_HINT":"wx.",
+"wxEVT_LIST_COL_BEGIN_DRAG":"wx.",
+"wxEVT_LIST_COL_CLICK":"wx.",
+"wxEVT_LIST_COL_DRAGGING":"wx.",
+"wxEVT_LIST_COL_END_DRAG":"wx.",
+"wxEVT_LIST_COL_RIGHT_CLICK":"wx.",
+"wxEVT_LIST_DELETE_ALL_ITEMS":"wx.",
+"wxEVT_LIST_DELETE_ITEM":"wx.",
+"wxEVT_LIST_END_LABEL_EDIT":"wx.",
+"wxEVT_LIST_INSERT_ITEM":"wx.",
+"wxEVT_LIST_ITEM_ACTIVATED":"wx.",
+"wxEVT_LIST_ITEM_DESELECTED":"wx.",
+"wxEVT_LIST_ITEM_FOCUSED":"wx.",
+"wxEVT_LIST_ITEM_MIDDLE_CLICK":"wx.",
+"wxEVT_LIST_ITEM_RIGHT_CLICK":"wx.",
+"wxEVT_LIST_ITEM_SELECTED":"wx.",
+"wxEVT_LIST_KEY_DOWN":"wx.",
+"wxEVT_MAXIMIZE":"wx.",
+"wxEVT_MEDIA_FINISHED":"wx.media.",
+"wxEVT_MEDIA_LOADED":"wx.media.",
+"wxEVT_MEDIA_PAUSE":"wx.media.",
+"wxEVT_MEDIA_PLAY":"wx.media.",
+"wxEVT_MEDIA_STATECHANGED":"wx.media.",
+"wxEVT_MEDIA_STOP":"wx.media.",
+"wxEVT_MENU":"wx.",
+"wxEVT_MENU_CLOSE":"wx.",
+"wxEVT_MENU_HIGHLIGHT":"wx.",
+"wxEVT_MENU_OPEN":"wx.",
+"wxEVT_MIDDLE_DCLICK":"wx.",
+"wxEVT_MIDDLE_DOWN":"wx.",
+"wxEVT_MIDDLE_UP":"wx.",
+"wxEVT_MOTION":"wx.",
+"wxEVT_MOUSEWHEEL":"wx.",
+"wxEVT_MOUSE_CAPTURE_CHANGED":"wx.",
+"wxEVT_MOUSE_CAPTURE_LOST":"wx.",
+"wxEVT_MOVE":"wx.",
+"wxEVT_MOVE_END":"wx.",
+"wxEVT_MOVE_START":"wx.",
+"wxEVT_MOVING":"wx.",
+"wxEVT_NAVIGATION_KEY":"wx.",
+"wxEVT_NC_PAINT":"wx.",
+"wxEVT_NOTEBOOK_PAGE_CHANGED":"wx.",
+"wxEVT_NOTEBOOK_PAGE_CHANGING":"wx.",
+"wxEVT_NULL":"wx.",
+"wxEVT_PAINT":"wx.",
+"wxEVT_PALETTE_CHANGED":"wx.",
+"wxEVT_POWER_RESUME":"wx.",
+"wxEVT_POWER_SUSPENDED":"wx.",
+"wxEVT_POWER_SUSPENDING":"wx.",
+"wxEVT_POWER_SUSPEND_CANCEL":"wx.",
+"wxEVT_QUERY_END_SESSION":"wx.",
+"wxEVT_QUERY_LAYOUT_INFO":"wx.adv.",
+"wxEVT_QUERY_NEW_PALETTE":"wx.",
+"wxEVT_RADIOBOX":"wx.",
+"wxEVT_RADIOBUTTON":"wx.",
+"wxEVT_RICHTEXT_BUFFER_RESET":"wx.richtext.",
+"wxEVT_RICHTEXT_CHARACTER":"wx.richtext.",
+"wxEVT_RICHTEXT_CONSUMING_CHARACTER":"wx.richtext.",
+"wxEVT_RICHTEXT_CONTENT_DELETED":"wx.richtext.",
+"wxEVT_RICHTEXT_CONTENT_INSERTED":"wx.richtext.",
+"wxEVT_RICHTEXT_DELETE":"wx.richtext.",
+"wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED":"wx.richtext.",
+"wxEVT_RICHTEXT_LEFT_CLICK":"wx.richtext.",
+"wxEVT_RICHTEXT_LEFT_DCLICK":"wx.richtext.",
+"wxEVT_RICHTEXT_MIDDLE_CLICK":"wx.richtext.",
+"wxEVT_RICHTEXT_PROPERTIES_CHANGED":"wx.richtext.",
+"wxEVT_RICHTEXT_RETURN":"wx.richtext.",
+"wxEVT_RICHTEXT_RIGHT_CLICK":"wx.richtext.",
+"wxEVT_RICHTEXT_SELECTION_CHANGED":"wx.richtext.",
+"wxEVT_RICHTEXT_STYLESHEET_CHANGED":"wx.richtext.",
+"wxEVT_RICHTEXT_STYLESHEET_CHANGING":"wx.richtext.",
+"wxEVT_RICHTEXT_STYLESHEET_REPLACED":"wx.richtext.",
+"wxEVT_RICHTEXT_STYLESHEET_REPLACING":"wx.richtext.",
+"wxEVT_RICHTEXT_STYLE_CHANGED":"wx.richtext.",
+"wxEVT_RIGHT_DCLICK":"wx.",
+"wxEVT_RIGHT_DOWN":"wx.",
+"wxEVT_RIGHT_UP":"wx.",
+"wxEVT_SASH_DRAGGED":"wx.adv.",
+"wxEVT_SCROLLBAR":"wx.",
+"wxEVT_SCROLLWIN_BOTTOM":"wx.",
+"wxEVT_SCROLLWIN_LINEDOWN":"wx.",
+"wxEVT_SCROLLWIN_LINEUP":"wx.",
+"wxEVT_SCROLLWIN_PAGEDOWN":"wx.",
+"wxEVT_SCROLLWIN_PAGEUP":"wx.",
+"wxEVT_SCROLLWIN_THUMBRELEASE":"wx.",
+"wxEVT_SCROLLWIN_THUMBTRACK":"wx.",
+"wxEVT_SCROLLWIN_TOP":"wx.",
+"wxEVT_SCROLL_BOTTOM":"wx.",
+"wxEVT_SCROLL_CHANGED":"wx.",
+"wxEVT_SCROLL_LINEDOWN":"wx.",
+"wxEVT_SCROLL_LINEUP":"wx.",
+"wxEVT_SCROLL_PAGEDOWN":"wx.",
+"wxEVT_SCROLL_PAGEUP":"wx.",
+"wxEVT_SCROLL_THUMBRELEASE":"wx.",
+"wxEVT_SCROLL_THUMBTRACK":"wx.",
+"wxEVT_SCROLL_TOP":"wx.",
+"wxEVT_SEARCHCTRL_CANCEL_BTN":"wx.",
+"wxEVT_SEARCHCTRL_SEARCH_BTN":"wx.",
+"wxEVT_SET_CURSOR":"wx.",
+"wxEVT_SET_FOCUS":"wx.",
+"wxEVT_SHOW":"wx.",
+"wxEVT_SIZE":"wx.",
+"wxEVT_SIZING":"wx.",
+"wxEVT_SLIDER":"wx.",
+"wxEVT_SPIN":"wx.",
+"wxEVT_SPINCTRL":"wx.",
+"wxEVT_SPINCTRLDOUBLE":"wx.",
+"wxEVT_SPIN_DOWN":"wx.",
+"wxEVT_SPIN_UP":"wx.",
+"wxEVT_SPLITTER_DOUBLECLICKED":"wx.",
+"wxEVT_SPLITTER_SASH_POS_CHANGED":"wx.",
+"wxEVT_SPLITTER_SASH_POS_CHANGING":"wx.",
+"wxEVT_SPLITTER_UNSPLIT":"wx.",
+"wxEVT_STC_AUTOCOMP_CANCELLED":"wx.stc.",
+"wxEVT_STC_AUTOCOMP_CHAR_DELETED":"wx.stc.",
+"wxEVT_STC_AUTOCOMP_SELECTION":"wx.stc.",
+"wxEVT_STC_CALLTIP_CLICK":"wx.stc.",
+"wxEVT_STC_CHANGE":"wx.stc.",
+"wxEVT_STC_CHARADDED":"wx.stc.",
+"wxEVT_STC_DOUBLECLICK":"wx.stc.",
+"wxEVT_STC_DO_DROP":"wx.stc.",
+"wxEVT_STC_DRAG_OVER":"wx.stc.",
+"wxEVT_STC_DWELLEND":"wx.stc.",
+"wxEVT_STC_DWELLSTART":"wx.stc.",
+"wxEVT_STC_HOTSPOT_CLICK":"wx.stc.",
+"wxEVT_STC_HOTSPOT_DCLICK":"wx.stc.",
+"wxEVT_STC_HOTSPOT_RELEASE_CLICK":"wx.stc.",
+"wxEVT_STC_INDICATOR_CLICK":"wx.stc.",
+"wxEVT_STC_INDICATOR_RELEASE":"wx.stc.",
+"wxEVT_STC_KEY":"wx.stc.",
+"wxEVT_STC_MACRORECORD":"wx.stc.",
+"wxEVT_STC_MARGINCLICK":"wx.stc.",
+"wxEVT_STC_MODIFIED":"wx.stc.",
+"wxEVT_STC_NEEDSHOWN":"wx.stc.",
+"wxEVT_STC_PAINTED":"wx.stc.",
+"wxEVT_STC_ROMODIFYATTEMPT":"wx.stc.",
+"wxEVT_STC_SAVEPOINTLEFT":"wx.stc.",
+"wxEVT_STC_SAVEPOINTREACHED":"wx.stc.",
+"wxEVT_STC_START_DRAG":"wx.stc.",
+"wxEVT_STC_STYLENEEDED":"wx.stc.",
+"wxEVT_STC_UPDATEUI":"wx.stc.",
+"wxEVT_STC_URIDROPPED":"wx.stc.",
+"wxEVT_STC_USERLISTSELECTION":"wx.stc.",
+"wxEVT_STC_ZOOM":"wx.stc.",
+"wxEVT_SYS_COLOUR_CHANGED":"wx.",
+"wxEVT_TASKBAR_BALLOON_CLICK":"wx.adv.",
+"wxEVT_TASKBAR_BALLOON_TIMEOUT":"wx.adv.",
+"wxEVT_TASKBAR_CLICK":"wx.adv.",
+"wxEVT_TASKBAR_LEFT_DCLICK":"wx.adv.",
+"wxEVT_TASKBAR_LEFT_DOWN":"wx.adv.",
+"wxEVT_TASKBAR_LEFT_UP":"wx.adv.",
+"wxEVT_TASKBAR_MOVE":"wx.adv.",
+"wxEVT_TASKBAR_RIGHT_DCLICK":"wx.adv.",
+"wxEVT_TASKBAR_RIGHT_DOWN":"wx.adv.",
+"wxEVT_TASKBAR_RIGHT_UP":"wx.adv.",
+"wxEVT_TEXT":"wx.",
+"wxEVT_TEXT_COPY":"wx.",
+"wxEVT_TEXT_CUT":"wx.",
+"wxEVT_TEXT_ENTER":"wx.",
+"wxEVT_TEXT_MAXLEN":"wx.",
+"wxEVT_TEXT_PASTE":"wx.",
+"wxEVT_TEXT_URL":"wx.",
+"wxEVT_THREAD":"wx.",
+"wxEVT_TIMER":"wx.",
+"wxEVT_TIME_CHANGED":"wx.adv.",
+"wxEVT_TOGGLEBUTTON":"wx.",
+"wxEVT_TOOL":"wx.",
+"wxEVT_TOOLBOOK_PAGE_CHANGED":"wx.",
+"wxEVT_TOOLBOOK_PAGE_CHANGING":"wx.",
+"wxEVT_TOOL_DROPDOWN":"wx.",
+"wxEVT_TOOL_ENTER":"wx.",
+"wxEVT_TOOL_RCLICKED":"wx.",
+"wxEVT_TREEBOOK_NODE_COLLAPSED":"wx.",
+"wxEVT_TREEBOOK_NODE_EXPANDED":"wx.",
+"wxEVT_TREEBOOK_PAGE_CHANGED":"wx.",
+"wxEVT_TREEBOOK_PAGE_CHANGING":"wx.",
+"wxEVT_TREELIST_COLUMN_SORTED":"wx.dataview.",
+"wxEVT_TREELIST_ITEM_ACTIVATED":"wx.dataview.",
+"wxEVT_TREELIST_ITEM_CHECKED":"wx.dataview.",
+"wxEVT_TREELIST_ITEM_CONTEXT_MENU":"wx.dataview.",
+"wxEVT_TREELIST_ITEM_EXPANDED":"wx.dataview.",
+"wxEVT_TREELIST_ITEM_EXPANDING":"wx.dataview.",
+"wxEVT_TREELIST_SELECTION_CHANGED":"wx.dataview.",
+"wxEVT_TREE_BEGIN_DRAG":"wx.",
+"wxEVT_TREE_BEGIN_LABEL_EDIT":"wx.",
+"wxEVT_TREE_BEGIN_RDRAG":"wx.",
+"wxEVT_TREE_DELETE_ITEM":"wx.",
+"wxEVT_TREE_END_DRAG":"wx.",
+"wxEVT_TREE_END_LABEL_EDIT":"wx.",
+"wxEVT_TREE_GET_INFO":"wx.",
+"wxEVT_TREE_ITEM_ACTIVATED":"wx.",
+"wxEVT_TREE_ITEM_COLLAPSED":"wx.",
+"wxEVT_TREE_ITEM_COLLAPSING":"wx.",
+"wxEVT_TREE_ITEM_EXPANDED":"wx.",
+"wxEVT_TREE_ITEM_EXPANDING":"wx.",
+"wxEVT_TREE_ITEM_GETTOOLTIP":"wx.",
+"wxEVT_TREE_ITEM_MENU":"wx.",
+"wxEVT_TREE_ITEM_MIDDLE_CLICK":"wx.",
+"wxEVT_TREE_ITEM_RIGHT_CLICK":"wx.",
+"wxEVT_TREE_KEY_DOWN":"wx.",
+"wxEVT_TREE_SEL_CHANGED":"wx.",
+"wxEVT_TREE_SEL_CHANGING":"wx.",
+"wxEVT_TREE_SET_INFO":"wx.",
+"wxEVT_TREE_STATE_IMAGE_CLICK":"wx.",
+"wxEVT_UPDATE_UI":"wx.",
+"wxEVT_VLBOX":"wx.",
+"wxEVT_WEBKIT_BEFORE_LOAD":"wx.webkit.",
+"wxEVT_WEBKIT_NEW_WINDOW":"wx.webkit.",
+"wxEVT_WEBKIT_STATE_CHANGED":"wx.webkit.",
+"wxEVT_WEBVIEW_ERROR":"wx.html2.",
+"wxEVT_WEBVIEW_LOADED":"wx.html2.",
+"wxEVT_WEBVIEW_NAVIGATED":"wx.html2.",
+"wxEVT_WEBVIEW_NAVIGATING":"wx.html2.",
+"wxEVT_WEBVIEW_NEWWINDOW":"wx.html2.",
+"wxEVT_WEBVIEW_TITLE_CHANGED":"wx.html2.",
+"wxEVT_WINDOW_MODAL_DIALOG_CLOSED":"wx.",
+"wxEVT_WIZARD_BEFORE_PAGE_CHANGED":"wx.adv.",
+"wxEVT_WIZARD_CANCEL":"wx.adv.",
+"wxEVT_WIZARD_FINISHED":"wx.adv.",
+"wxEVT_WIZARD_HELP":"wx.adv.",
+"wxEVT_WIZARD_PAGE_CHANGED":"wx.adv.",
+"wxEVT_WIZARD_PAGE_CHANGING":"wx.adv.",
+"wxEVT_WIZARD_PAGE_SHOWN":"wx.adv."
+}
\ No newline at end of file
diff --git a/docs/sphinx/rest_substitutions/overviews/DocstringsGuidelines.rst b/docs/sphinx/rest_substitutions/overviews/DocstringsGuidelines.rst
index ae0ab163..8650d8d0 100644
--- a/docs/sphinx/rest_substitutions/overviews/DocstringsGuidelines.rst
+++ b/docs/sphinx/rest_substitutions/overviews/DocstringsGuidelines.rst
@@ -9,21 +9,26 @@
 |phoenix_title|  **Phoenix Docstrings Guidelines**
 ==================================================
 
-This document gives a brief introduction about the current docstrings standards
-in the Phoenix project. Most of the documentation in the Phoenix core is automatically
-generated by parsing the wxWidgets XML docs; however, Phoenix has its own pure-Python
-functions and classes in at least two places:
+This document gives a brief introduction about the current docstrings
+standards in the Phoenix project. Most of the documentation in the
+Phoenix core is automatically generated by parsing the wxWidgets XML
+docs; however, Phoenix has its own pure-Python functions and classes
+in at least two places:
 
-* **Core Library**: examples include :ref:`CallLater` and :func:`date2pydate`, which require
-  manual input of the documentation strings. This is achieved by editing the source Python files
-  located in the ``etg`` folder in the Phoenix directory tree;
-* **wx.lib**: the whole of ``wx.lib`` (and its sub-folders) is made up of pure-Python modules,
-  often representing owner-drawn widgets which are not available as wrapped modules. Again,
-  this requires manual editing of the source Python files.
+* **Core Library**: examples include :ref:`wx.CallLater` and
+  :func:`wx.date2pydate`, which require manual input of the
+  documentation strings. This is achieved by editing the source Python
+  files located in the ``etg`` folder in the Phoenix directory tree;
 
-This document is a starting point in setting some reasonable standards on how the pure-Python
-docstrings may be edited and improved to make the overall appearance of the Phoenix documentation
-consistent and pleasant.
+* **wx.lib**: the whole of ``wx.lib`` (and its sub-folders) is made up
+  of pure-Python modules, often representing owner-drawn widgets which
+  are not available as wrapped modules. Again, this requires manual
+  editing of the source Python files.
+
+This document is a starting point in setting some reasonable standards
+on how the pure-Python docstrings may be edited and improved to make
+the overall appearance of the Phoenix documentation consistent and
+pleasant.
 
 
 .. _info field lists:
@@ -31,35 +36,43 @@ consistent and pleasant.
 Info Field Lists
 ----------------
 
-`Info Field Lists` refer to the various options available while documenting a method or a function,
-and in particular its parameters, keywords, return type and possibly raised Python `Exceptions`.
+`Info Field Lists` refer to the various options available while
+documenting a method or a function, and in particular its parameters,
+keywords, return type and possibly raised Python `Exceptions`.
 
-Inside Python object description directives, reST field lists with these fields
-are recognized and formatted nicely:
+Inside Python object description directives, reST field lists with
+these fields are recognized and formatted nicely:
 
-* ``param``, ``parameter``, ``arg``, ``argument``, ``key``, ``keyword``:
-  Description of a parameter.
+* ``param``, ``parameter``, ``arg``, ``argument``, ``key``,
+  ``keyword``: Description of a parameter.
+  
 * ``type``: Type of a parameter.
-* ``raises``, ``raise``, ``except``, ``exception``: That (and when) a specific
-  exception is raised.
+
+* ``raises``, ``raise``, ``except``, ``exception``: That (and when) a
+  specific exception is raised.
+  
 * ``var``, ``ivar``, ``cvar``: Description of a variable.
+
 * ``returns``, ``return``: Description of the return value.
+
 * ``rtype``: Return type.
 
 
-The field names must consist of one of these keywords and an argument (except
-for ``returns`` and ``rtype``, which do not need an argument). This is best
-explained by an example::
+The field names must consist of one of these keywords and an argument
+(except for ``returns`` and ``rtype``, which do not need an
+argument). This is best explained by an example::
 
     .. method:: Set3StateValue(self, state):
 
        Sets the checkbox item to the given `state`.
 
-       :param `state`: can be one of: ``wx.CHK_UNCHECKED`` (check is off), ``wx.CHK_CHECKED``
-        (check is on) or ``wx.CHK_UNDETERMINED`` (check is mixed).
+       :param `state`: can be one of: ``wx.CHK_UNCHECKED`` (check is
+          off), ``wx.CHK_CHECKED`` (check is on) or
+          ``wx.CHK_UNDETERMINED`` (check is mixed).
        :type `state`: integer
 
-       :returns: ``True`` if the value was successfully set, ``False`` otherwise.
+       :returns: ``True`` if the value was successfully set, ``False``
+          otherwise.
        :rtype: bool
 
        :raise: `Exception` when the item is not a 3-state checkbox item.
@@ -69,15 +82,16 @@ explained by an example::
 This will render like this:
 
     .. method:: Set3StateValue(self, state):
-       :noindex:
 
        Sets the checkbox item to the given `state`.
 
-       :param `state`: can be one of: ``wx.CHK_UNCHECKED`` (check is off), ``wx.CHK_CHECKED``
-        (check is on) or ``wx.CHK_UNDETERMINED`` (check is mixed).
+       :param `state`: can be one of: ``wx.CHK_UNCHECKED`` (check is
+          off), ``wx.CHK_CHECKED`` (check is on) or
+          ``wx.CHK_UNDETERMINED`` (check is mixed).
        :type `state`: integer
 
-       :returns: ``True`` if the value was successfully set, ``False`` otherwise.
+       :returns: ``True`` if the value was successfully set, ``False``
+          otherwise.
        :rtype: bool
 
        :raise: `Exception` when the item is not a 3-state checkbox item.
@@ -85,18 +99,21 @@ This will render like this:
 
 |
 
-It is also possible to combine parameter type and description, if the type is a
-single word, like this::
+It is also possible to combine parameter type and description, if the
+type is a single word, like this::
 
-   :param integer `state`: can be one of: ``wx.CHK_UNCHECKED`` (check is off), ``wx.CHK_CHECKED``
-    (check is on) or ``wx.CHK_UNDETERMINED`` (check is mixed).
+   :param integer `state`: can be one of: ``wx.CHK_UNCHECKED`` (check
+      is off), ``wx.CHK_CHECKED`` (check is on) or
+      ``wx.CHK_UNDETERMINED`` (check is mixed).
 
 
 In general, the standards for the ``:param`` field are the following:
 
-1. Do not use the ``@param`` construct, as I am not sure Sphinx and docutils understand it;
-2. Always try and define the parameter type: if the parameter is another Phoenix class, you can simply
-   write this::
+1. Do not use the ``@param`` construct, as I am not sure Sphinx and
+   docutils understand it;
+
+2. Always try and define the parameter type: if the parameter is
+   another Phoenix class, you can simply write this::
 
        :param Point `pt`: the mouse pointer location.
 
@@ -106,12 +123,15 @@ In general, the standards for the ``:param`` field are the following:
        :type `pt`: Point
 
 
-Similarly, for the ``:return:`` and ``:rtype:`` field, you may consider doing the following:
+Similarly, for the ``:return:`` and ``:rtype:`` field, you may
+consider doing the following:
 
-1. Try and put double-backticks on words like ``True``, ``False``, ``None`` and the various
-   Phoenix constants (i.e., ``wx.TR_DEFAULT_STYLE``);
-2. If you can't guess what a method function returns, just leave the ``:returns:`` and ``:rtype:``
-   fields blank.
+1. Try and put double-backticks on words like ``True``, ``False``,
+   ``None`` and the various Phoenix constants (i.e.,
+   ``wx.TR_DEFAULT_STYLE``);
+
+2. If you can't guess what a method function returns, just leave the
+   ``:returns:`` and ``:rtype:`` fields blank.
 
 
 .. seealso:: `Sphinx Info Field List <http://sphinx.pocoo.org/domains.html#info-field-lists>`_
@@ -122,9 +142,11 @@ Similarly, for the ``:return:`` and ``:rtype:`` field, you may consider doing th
 Admonitions
 -----------
 
-Admonitions are specially marked "topics" that can appear anywhere an ordinary body element can.
-They contain arbitrary body elements. Typically, an admonition is rendered as an offset block
-in a document, sometimes outlined or shaded, with a title matching the admonition type. For example::
+Admonitions are specially marked "topics" that can appear anywhere an
+ordinary body element can.  They contain arbitrary body
+elements. Typically, an admonition is rendered as an offset block in a
+document, sometimes outlined or shaded, with a title matching the
+admonition type. For example::
 
     .. warning:: I am a warning.
 
@@ -135,28 +157,41 @@ Will render as:
 
 |
 
-Currently, the `sphinx_generator` tool recognizes the following admonitions:
+Currently, the `sphinx_generator` tool recognizes the following
+admonitions:
 
-1. ``.. note::`` or ``:note:`` : simple annotations to make a particular comment/sentence
-   stand out against the rest of the documentation strings for a particular class, method or function;
-2. ``.. warning::`` : this admonition normally indicates a problem or a severe limitation of a method,
-   class or function. In the Phoenix world, this may also indicate that a particular widget is not
+1. ``.. note::`` or ``:note:`` : simple annotations to make a
+   particular comment/sentence stand out against the rest of the
+   documentation strings for a particular class, method or function;
+
+2. ``.. warning::`` : this admonition normally indicates a problem or
+   a severe limitation of a method, class or function. In the Phoenix
+   world, this may also indicate that a particular widget is not
    supported under one or more platforms;
-3. ``.. deprecated::`` : used to mark deprecated methods, classes or functions;
-4. ``.. availability::`` : normally employed to make the user understand on which platform(s) a particular
-   functionality is supported/available;
-5. ``.. seealso::`` or ``:see:`` : added primarily to facilitate the browsing of the docs, this admonition
-   should be employed every time you think a user may be interested in seeing a related/similar method
-   or a function providing an alternative implementation;
-6. ``.. todo::`` : used to mark incomplete methods/functions, or simply as a remainder for the user and
-   the developer that some more functionality needs to be added.
+   
+3. ``.. deprecated::`` : used to mark deprecated methods, classes or
+   functions;
 
-You can put pretty much anything inside an admonition section, as long as it is properly indented. The
-recommendation is to implement it like this::
+4. ``.. availability::`` : normally employed to make the user
+   understand on which platform(s) a particular functionality is
+   supported/available;
+   
+5. ``.. seealso::`` or ``:see:`` : added primarily to facilitate the
+   browsing of the docs, this admonition should be employed every time
+   you think a user may be interested in seeing a related/similar
+   method or a function providing an alternative implementation;
+   
+6. ``.. todo::`` : used to mark incomplete methods/functions, or
+   simply as a remainder for the user and the developer that some more
+   functionality needs to be added.
+
+You can put pretty much anything inside an admonition section, as long
+as it is properly indented. The recommendation is to implement it like
+this::
 
     .. note::
 
-       The class :ref:`TreeCtrl` can be used to display a tree, with these notes:
+       The class :ref:`wx.TreeCtrl` can be used to display a tree, with these notes:
 
        - The note contains all indented body elements
          following.
@@ -169,7 +204,7 @@ Which will render as follows:
 
 .. note::
 
-   The class :ref:`TreeCtrl` can be used to display a tree, with these notes:
+   The class :ref:`wx.TreeCtrl` can be used to display a tree, with these notes:
 
    - The note contains all indented body elements
      following.
@@ -177,9 +212,11 @@ Which will render as follows:
 
 
 
-In addition to the aforementioned admonitions, you can also use the default Sphinx directives
-like ``.. versionadded::`` and ``.. versionchanged::``, to highlight the fact that some method, 
-function or class has been added/modified starting with a particular Phoenix version.
+In addition to the aforementioned admonitions, you can also use the
+default Sphinx directives like ``.. versionadded::`` and
+``.. versionchanged::``, to highlight the fact that some method,
+function or class has been added/modified starting with a particular
+Phoenix version.
 
 
 .. seealso:: `Sphinx Paragraph-level markup <http://sphinx.pocoo.org/markup/para.html>`_
@@ -192,18 +229,21 @@ Contributing Samples
 
 .. highlight:: python
 
-If you wish to contribute a (short) sample to be included in the documentation, please follow 
-these conventions:
+If you wish to contribute a (short) sample to be included in the
+documentation, please follow these conventions:
 
-1. Name the snippet of code like ``classname.methodname.INTEGER.py``, i.e. if you wish to contribute 2
-   snippets about the :meth:`CheckBox.SetValue` method, please name your snippet files like this:
+1. Name the snippet of code like ``wxmodule.classname.methodname.INTEGER.py``,
+   i.e. if you wish to contribute 2 snippets about the
+   :meth:`wx.CheckBox.SetValue` method, please name your snippet files
+   like this:
 
-   * `CheckBox.SetValue.1.py`
-   * `CheckBox.SetValue.2.py`
-   
-   
-2. At the very top of the snippet file (on the first line), put your name, or your alias, or anything
-   you use as internet name preceeded by a double-hash, i.e.:
+   * ``wx.CheckBox.SetValue.1.py``
+   * ``wx.CheckBox.SetValue.2.py``
+
+
+2. At the very top of the snippet file (on the first line), put your
+   name, or your alias, or anything you use as internet name preceeded
+   by a double-hash, i.e.:
    
    ``##Andrea Gavana``
    
@@ -212,33 +252,34 @@ these conventions:
    
        ##Chris Barker
        #!/usr/bin/env python
-
        """
        A simple test of the GridBagSizer
        http://wiki.wxpython.org/index.cgi/WriteItYourself
        """
    
        # Whatever code here...
-       def SendSizeEvent(self):
-       
+       def SendSizeEvent(self):       
            self.AdjustMySize()
 
 
 
 .. highlight:: rst
 
-This snippet will end up in the snippets `contrib` folder, to differentiate it from the snippets 
-automatically generated when parsing the wxWidgets C++ XML documentation.
+This snippet will end up in the snippets `contrib` folder, to
+differentiate it from the snippets automatically generated when
+parsing the wxWidgets C++ XML documentation.
 
-Please keep the snippets as short as possible: they don't need to be fully-runnable and self contained
-applications, they are simply meant to show a particular/clever/unusual way of using a method, a class
-or a function.
+Please keep the snippets as short as possible: they don't need to be
+fully-runnable and self contained applications, they are simply meant
+to show a particular/clever/unusual way of using a method, a class or
+a function.
 
-Please do send your sample snippets to me at `this <andrea.gavana@gmail.com>`_ e-mail address or 
-you can submit the sample snippets to the `wxWidgets/Phoenix Github repository <https://github.com/wxWidgets/Phoenix>`_.
-The snippets should be placed in the source tree in this folder:
+Please do submit the sample snippets to the
+`wxWidgets/Phoenix Github repository <https://github.com/wxWidgets/Phoenix>`_
+as PR (Pull Request).  The snippets should be placed in the source
+tree in this folder:
 
-``Phoenix/docs/sphinx/rest_substitutions/snippets/python/contrib``
+    ``Phoenix/docs/sphinx/rest_substitutions/snippets/python/contrib``
 
 
 .. _contributing screenshots:
@@ -246,26 +287,30 @@ The snippets should be placed in the source tree in this folder:
 Contributing Screenshots
 ------------------------
 
-Currently Phoenix is relatively short of widgets screenshots, especially on Linux/Mac platforms.
+Currently Phoenix is relatively short of widgets screenshots,
+especially on Linux/Mac platforms.
 
-If you wish to contribute a screenshot of a widget to be included in the documentation, please follow 
-these conventions:
+If you wish to contribute a screenshot of a widget to be included in
+the documentation, please follow these conventions:
 
-- If the widget is a class belonging to the main `wx` namespace, just use the
-  class name in lower case (i.e., `wx.Frame` ==> `frame.png`);
-- If it belongs to a sub-namespace (i.e., `wx.dataview`, `wx.aui`, `wx.html`
-  and so on), it should be named this way (examples):
+- If the widget is a class belonging to the main `wx` namespace, 
+  use the full class name in lower case (i.e., `wx.Frame` ==>
+  `wx.frame.png`);
 
-  1) `wx.dataview.DataViewCtrl` ==> `dataview.dataviewctrl.png`
-  2) `wx.aui.AuiManager` ==> `aui.auimanager.png`
+- If it belongs to a sub-namespace (i.e., `wx.dataview`, `wx.aui`,
+  `wx.html` and so on), it should be named this way (examples):
+
+  1) `wx.dataview.DataViewCtrl` ==> `wx.dataview.dataviewctrl.png`
+  2) `wx.aui.AuiManager` ==> `wx.aui.auimanager.png`
 
 
-Please do send your screenshots to me at `this <andrea.gavana@gmail.com>`_ e-mail address or 
-you can submit the screenshots to the `wxWidgets/Phoenix Github repository <https://github.com/wxWidgets/Phoenix>`_.
-The screenshots should be placed in the source tree in this folder:
+Please submit the screenshots to the
+`wxWidgets/Phoenix Github repository <https://github.com/wxWidgets/Phoenix>`_
+as a PR (Pull Request). The screenshots should be placed in the
+source tree in this folder:
 
-``Phoenix/trunk/docs/sphinx/_static/images/widgets/fullsize``
+    ``Phoenix/trunk/docs/sphinx/_static/images/widgets/fullsize``
 
-Please make sure to put your images in the appropriate sub-folder, depending on the platform you
-chose to take the screenshots on.
+Please make sure to put your images in the appropriate sub-folder,
+depending on the platform you chose to take the screenshots on.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/app_overview.rst b/docs/sphinx/rest_substitutions/overviews/app_overview.rst
index ef269b70..8bf5bed9 100644
--- a/docs/sphinx/rest_substitutions/overviews/app_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/app_overview.rst
@@ -11,33 +11,38 @@
 Introduction
 ------------
 
-A wxPython application does not have a main procedure; the equivalent is the :meth:`AppConsole.OnInit` member defined for a class derived from :ref:`App`.
+A wxPython application does not have a main procedure; the equivalent
+is the :meth:`wx.AppConsole.OnInit` member defined for a class derived
+from :ref:`wx.App`.
 
-`OnInit` will usually create a top window as a bare minimum. Unlike in earlier versions of wxPython, `OnInit` does not return a frame. 
-Instead it returns a boolean value which indicates whether processing should continue (``True``) or not (``False``).
+`OnInit` will usually create a top window as a bare minimum. Unlike in
+earlier versions of wxPython, `OnInit` does not return a frame.
+Instead it returns a boolean value which indicates whether processing
+should continue (``True``) or not (``False``).
 
-An application closes by destroying all windows. Because all frames must be destroyed for the application to exit, it is advisable to use 
-parent frames wherever possible when creating new frames, so that deleting the top level frame will automatically delete child frames. 
-The alternative is to explicitly delete child frames in the top-level frame's :ref:`CloseEvent` handler.
+An application closes by destroying all windows. Because all frames
+must be destroyed for the application to exit, it is advisable to use
+parent frames wherever possible when creating new frames, so that
+deleting the top level frame will automatically delete child frames.
+The alternative is to explicitly delete child frames in the top-level
+frame's :ref:`wx.CloseEvent` handler.
 
-In emergencies the :func:`Exit` function can be called to kill the application however normally the application shuts down automatically, 
-see :ref:`Application Shutdown <application shutdown>`.
+In emergencies the :func:`wx.Exit` function can be called to kill the
+application however, normally the application shuts down automatically
+when the last top-level window closes. See
+:ref:`Application Shutdown <application shutdown>`.
 
 An example of defining an application follows::
 
 
-	class DerivedApp(wx.App):
+    class DerivedApp(wx.App):
 
-	    def OnInit(self):
-
-	        the_frame = wx.Frame(None, -1)
-  	    
-  	        # Other initialization code...
-  	        
-   	        the_frame.Show(True)
-
-	        return True
+        def OnInit(self):
+            the_frame = wx.Frame(None, -1)
 
+            # Other initialization code...
+            the_frame.Show(True)
+            return True
 
 
 .. _application shutdown:
@@ -45,14 +50,20 @@ An example of defining an application follows::
 Application Shutdown
 --------------------
 
-The application normally shuts down when the last of its top level windows is closed. This is normally the expected behaviour and means 
-that it is enough to call :meth:`Window.Close` () in response to the "Exit" menu command if your program has a single top level window. 
-If this behaviour is not desirable :meth:`PyApp.SetExitOnFrameDelete` can be called to change it.
+The application normally shuts down when the last of its top level
+windows is closed. This is normally the expected behaviour and means
+that it is enough to call :meth:`wx.Window.Close`() in response to the
+"Exit" menu command if your program has a single top level window.  If
+this behavior is not desirable :meth:`wx.PyApp.SetExitOnFrameDelete` can
+be called to change it.
 
-.. note:: Note that such logic doesn't apply for the windows shown before the program enters the main loop: in other words, you can
-   safely show a dialog from :meth:`AppConsole.OnInit` and not be afraid that your application terminates when this dialog -- which is the last 
-   top level window for the moment -- is closed.
+.. note:: Note that such logic doesn't apply for the windows shown
+   before the program enters the main loop: in other words, you can
+   safely show a dialog from :meth:`wx.AppConsole.OnInit` and not be
+   afraid that your application terminates when this dialog -- which
+   is the last top level window for the moment -- is closed.
 
 
-Another aspect of the application shutdown is :meth:`AppConsole.OnExit` which is called when the application exits but before wxPython cleans up
-its internal structures. 
+Another aspect of the application shutdown is
+:meth:`wx.AppConsole.OnExit` which is called when the application
+exits but before wxPython cleans up its internal structures.
diff --git a/docs/sphinx/rest_substitutions/overviews/bitmap_overview.rst b/docs/sphinx/rest_substitutions/overviews/bitmap_overview.rst
index e47a23af..66244f4f 100644
--- a/docs/sphinx/rest_substitutions/overviews/bitmap_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/bitmap_overview.rst
@@ -3,19 +3,22 @@
 
 .. _bitmaps and icons:
 
-===============================================
+======================================
 |phoenix_title|  **Bitmaps and Icons**
-===============================================
+======================================
 
 
-The :ref:`Bitmap` class encapsulates the concept of a platform-dependent bitmap, either monochrome or colour. 
-Platform-specific methods for creating a :ref:`Bitmap` object from an existing file are catered for.
+The :ref:`wx.Bitmap` class encapsulates the concept of a
+platform-dependent bitmap, either monochrome or colour.
+Platform-specific methods for creating a :ref:`wx.Bitmap` object from
+an existing file are catered for.
 
-A bitmap created dynamically or loaded from a file can be selected into a memory device context (instance of 
-:ref:`MemoryDC`). This enables the bitmap to be copied to a window or memory device context using :meth:`DC.Blit` (), 
-or to be used as a drawing surface.
+A bitmap created dynamically or loaded from a file can be selected
+into a memory device context (an instance of :ref:`wx.MemoryDC`). This
+enables the bitmap to be copied to a window or memory device context
+using :meth:`wx.DC.Blit`(), or to be used as a drawing surface.
 
-.. seealso:: :ref:`MemoryDC` for an example of drawing onto a bitmap.
+.. seealso:: :ref:`wx.MemoryDC` for an example of drawing onto a bitmap.
 
 
 All wxPython platforms support XPMs for small bitmaps and icons. 
@@ -27,77 +30,70 @@ All wxPython platforms support XPMs for small bitmaps and icons.
 Supported Bitmap File Formats
 -----------------------------
 
-The following lists the formats handled on different platforms. Note that missing or partially-implemented 
-formats are automatically supplemented by using :ref:`Image` to load the data, and then converting it to :ref:`Bitmap`
-form. Note that using :ref:`Image` is the preferred way to load images in wxPython, with the exception of resources
-(XPM-files or native Windows resources).
+The following lists the formats handled on different platforms. Note
+that missing or partially-implemented formats are automatically
+supplemented by using :ref:`wx.Image` to load the data, and then
+converting it to :ref:`wx.Bitmap` form. Note that using
+:ref:`wx.Image` is the preferred way to load images in wxPython, with
+the exception of resources (XPM-files or native Windows resources).
 
 
-Bitmap
-^^^^^^
+wx.Bitmap
+^^^^^^^^^
 
-Under Windows, :ref:`Bitmap` may load the following formats:
+Under Windows, :ref:`wx.Bitmap` may load the following formats:
 
-- Windows bitmap resource (``BITMAP_TYPE_BMP_RESOURCE``)
-- Windows bitmap file (``BITMAP_TYPE_BMP``)
-- XPM data and file (``BITMAP_TYPE_XPM``)
-- All formats that are supported by the :ref:`Image` class.
+- Windows bitmap resource (``wx.BITMAP_TYPE_BMP_RESOURCE``)
+- Windows bitmap file (``wx.BITMAP_TYPE_BMP``)
+- XPM data and file (``wx.BITMAP_TYPE_XPM``)
+- All formats that are supported by the :ref:`wx.Image` class.
 
 
-Under wxGTK, :ref:`Bitmap` may load the following formats:
+Under wxGTK, :ref:`wx.Bitmap` may load the following formats:
 
-- XPM data and file (``BITMAP_TYPE_XPM``)
-- All formats that are supported by the :ref:`Image` class.
+- XPM data and file (``wx.BITMAP_TYPE_XPM``)
+- All formats that are supported by the :ref:`wx.Image` class.
 
 
-Under wxMotif and wxX11, :ref:`Bitmap` may load the following formats:
+Under wxMotif and wxX11, :ref:`wx.Bitmap` may load the following formats:
 
-- XBM data and file (``BITMAP_TYPE_XBM``)
-- XPM data and file (``BITMAP_TYPE_XPM``)
-- All formats that are supported by the :ref:`Image` class.
+- XBM data and file (``wx.BITMAP_TYPE_XBM``)
+- XPM data and file (``wx.BITMAP_TYPE_XPM``)
+- All formats that are supported by the :ref:`wx.Image` class.
 
 
-Icon
-^^^^
+wx.Icon
+^^^^^^^
 
-Under Windows, :ref:`Icon` may load the following formats:
+Under Windows, :ref:`wx.Icon` may load the following formats:
 
-- Windows icon resource (``BITMAP_TYPE_ICO_RESOURCE``)
-- Windows icon file (``BITMAP_TYPE_ICO``)
-- XPM data and file (``BITMAP_TYPE_XPM``)
+- Windows icon resource (``wx.BITMAP_TYPE_ICO_RESOURCE``)
+- Windows icon file (``wx.BITMAP_TYPE_ICO``)
+- XPM data and file (``wx.BITMAP_TYPE_XPM``)
 
 
-Under wxGTK, :ref:`Icon` may load the following formats:
+Under wxGTK, :ref:`wx.Icon` may load the following formats:
 
-- XPM data and file (``BITMAP_TYPE_XPM``)
-- All formats that are supported by the :ref:`Image` class.
+- XPM data and file (``wx.BITMAP_TYPE_XPM``)
+- All formats that are supported by the :ref:`wx.Image` class.
 
 
-Under wxMotif and wxX11, :ref:`Icon` may load the following formats:
 
-- XBM data and file (``BITMAP_TYPE_XBM``)
-- XPM data and file (``BITMAP_TYPE_XPM``)
-- All formats that are supported by the :ref:`Image` class.
+wx.Cursor
+^^^^^^^^^
+
+Under Windows, :ref:`wx.Cursor` may load the following formats:
+
+- Windows cursor resource (``wx.BITMAP_TYPE_CUR_RESOURCE``)
+- Windows cursor file (``wx.BITMAP_TYPE_CUR``)
+- Windows icon file (``wx.BITMAP_TYPE_ICO``)
+- Windows bitmap file (``wx.BITMAP_TYPE_BMP``)
 
 
-Cursor
-^^^^^^
-
-Under Windows, :ref:`Cursor` may load the following formats:
-
-- Windows cursor resource (``BITMAP_TYPE_CUR_RESOURCE``)
-- Windows cursor file (``BITMAP_TYPE_CUR``)
-- Windows icon file (``BITMAP_TYPE_ICO``)
-- Windows bitmap file (``BITMAP_TYPE_BMP``)
-
-
-Under wxGTK, :ref:`Cursor` may load the following formats (in addition to stock cursors):
+Under wxGTK, :ref:`wx.Cursor` may load the following formats (in
+addition to stock cursors):
 
 - None (stock cursors only).
 
 
-Under wxMotif and wxX11, :ref:`Cursor` may load the following formats:
-
-- XBM data and file (``BITMAP_TYPE_XBM``)
-
 
diff --git a/docs/sphinx/rest_substitutions/overviews/bookctrl_overview.rst b/docs/sphinx/rest_substitutions/overviews/bookctrl_overview.rst
index 8e0a5438..4ffd11a3 100644
--- a/docs/sphinx/rest_substitutions/overviews/bookctrl_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/bookctrl_overview.rst
@@ -3,9 +3,9 @@
 
 .. _bookctrl overview:
 
-===============================================
+======================================
 |phoenix_title|  **BookCtrl Overview**
-===============================================
+======================================
 
 
 Introduction
@@ -14,22 +14,24 @@ Introduction
 A book control is a convenient way of displaying multiple pages of information, displayed one page at a time. 
 wxPython has five variants of this control:
 
-- :ref:`Choicebook`: controlled by a :ref:`Choice`
-- :ref:`Listbook`: controlled by a :ref:`ListCtrl`
-- :ref:`Notebook`: uses a row of tabs
-- :ref:`Treebook`: controlled by a :ref:`TreeCtrl`
-- :ref:`Toolbook`: controlled by a :ref:`ToolBar`
+- :ref:`wx.Choicebook`: controlled by a :ref:`wx.Choice`
+- :ref:`wx.Listbook`: controlled by a :ref:`wx.ListCtrl`
+- :ref:`wx.Notebook`: uses a row of tabs
+- :ref:`wx.Treebook`: controlled by a :ref:`wx.TreeCtrl`
+- :ref:`wx.Toolbook`: controlled by a :ref:`wx.ToolBar`
 
 
 
 Best Book
 ---------
 
-:ref:`BookCtrlBase` is mapped to the class best suited for a given platform. Currently it provides :ref:`Choicebook`
-for smartphones equipped with WinCE, and :ref:`Notebook` for all other platforms. The mapping consists of:
+:ref:`wx.BookCtrlBase` is mapped to the class best suited for a given
+platform. Currently it provides :ref:`wx.Choicebook` for smartphones
+equipped with WinCE, and :ref:`wx.Notebook` for all other platforms. The
+mapping consists of:
 
 =============================================== ==================================================
-`BookCtrl`                                      `Choicebook` or `Notebook`
+`wx.BookCtrl`                                   `wx.Choicebook` or `wx.Notebook`
 =============================================== ==================================================
 ``wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED``	        ``wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED`` or ``wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED``
 ``wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING``        ``wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING`` or ``wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING``
@@ -40,9 +42,9 @@ EVT_BOOKCTRL_PAGE_CHANGING                      EVT_CHOICEBOOK_PAGE_CHANGING or
 
 For orientation of the book controller, use following flags in style:
 
-- ``BK_TOP``: controller above pages
-- ``BK_BOTTOM``: controller below pages
-- ``BK_LEFT``: controller on the left
-- ``BK_RIGHT``: controller on the right
-- ``BK_DEFAULT``: native controller placement
+- ``wx.BK_TOP``: controller above pages
+- ``wx.BK_BOTTOM``: controller below pages
+- ``wx.BK_LEFT``: controller on the left
+- ``wx.BK_RIGHT``: controller on the right
+- ``wx.BK_DEFAULT``: native controller placement
 
diff --git a/docs/sphinx/rest_substitutions/overviews/command_overview.rst b/docs/sphinx/rest_substitutions/overviews/command_overview.rst
index 51bf2d60..884c4496 100644
--- a/docs/sphinx/rest_substitutions/overviews/command_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/command_overview.rst
@@ -3,28 +3,32 @@
 
 .. _command overview:
 
-=================================================
+=====================================
 |phoenix_title|  **Command Overview**
-=================================================
+=====================================
 
 
-:class:`Command` is a base class for modelling an application command, which is an action usually 
-performed by selecting a menu item, pressing a toolbar button or any other means provided by 
-the application to change the data or view.
+:class:`wx.Command` is a base class for modelling an application
+command, which is an action usually performed by selecting a menu
+item, pressing a toolbar button or any other means provided by the
+application to change the data or view.
 
-Instead of the application functionality being scattered around if statements and functions in
-a way that may be hard to read and maintain, the functionality for a command is explicitly represented
-as an object which can be manipulated by a framework or application.
+Instead of the application functionality being scattered around if
+statements and functions in a way that may be hard to read and
+maintain, the functionality for a command is explicitly represented as
+an object which can be manipulated by a framework or application.
 
-When a user interface event occurs, the application submits a command to a :class:`CommandProcessor` 
-object to execute and store.
+When a user interface event occurs, the application submits a command
+to a :class:`wx.CommandProcessor` object to execute and store.
 
-The wxPython document/view framework handles Undo and Redo by use of :class:`Command` and :class:`CommandProcessor`
-objects. You might find further uses for :class:`Command`, such as implementing a macro facility that 
-stores, loads and replays commands.
+The wxPython document/view framework handles Undo and Redo by use of
+:class:`wx.Command` and :class:`wx.CommandProcessor` objects. You
+might find further uses for :class:`Command`, such as implementing a
+macro facility that stores, loads and replays commands.
 
-An application can derive a new class for every command, or, more likely, use one class parameterized
-with an integer or string command identifier.
+An application can derive a new class for every command, or, more
+likely, use one class parameterized with an integer or string command
+identifier.
 
 
 .. _commandprocessor overview:
@@ -34,8 +38,10 @@ with an integer or string command identifier.
 =================================================
 
 
-:class:`CommandProcessor` is a class that maintains a history of :class:`Command` instances, with 
-undo/redo functionality built-in. Derive a new class from this if you want different behaviour.
+:class:`wx.CommandProcessor` is a class that maintains a history of
+:class:`wx.Command` instances, with undo/redo functionality
+built-in. Derive a new class from this if you want different
+behaviour.
 
 
 .. _filehistory overview:
@@ -44,22 +50,29 @@ undo/redo functionality built-in. Derive a new class from this if you want diffe
 |phoenix_title|  **FileHistory Overview**
 =================================================
 
-:class:`FileHistory` encapsulates functionality to record the last few files visited, and to allow 
-the user to quickly load these files using the list appended to the File menu. Although :class:`FileHistory`
-is used by :class:`DocManager`, it can be used independently. You may wish to derive from it to allow 
-different behaviour, such as popping up a scrolling list of files.
+:class:`wx.FileHistory` encapsulates functionality to record the last
+few files visited, and to allow the user to quickly load these files
+using the list appended to the File menu. Although
+:class:`wx.FileHistory` is used by :class:`wx.DocManager`, it can be
+used independently. You may wish to derive from it to allow different
+behaviour, such as popping up a scrolling list of files.
 
-By calling :meth:`FileHistory.UseMenu` you can associate a file menu with the file history. The menu will 
-then be used for appending filenames that are added to the history.
+By calling :meth:`wx.FileHistory.UseMenu` you can associate a file
+menu with the file history. The menu will then be used for appending
+filenames that are added to the history.
 
 .. note:: 
 
-   Please notice that currently if the history already contained filenames when UseMenu() is called (e.g. when 
-   initializing a second MDI child frame), the menu is not automatically initialized with the existing filenames
-   in the history and so you need to call :meth:`FileHistory.AddFilesToMenu` after UseMenu() explicitly in order 
-   to initialize the menu with the existing list of MRU files (otherwise an assertion failure is raised in debug builds).
+   Please notice that currently if the history already contained
+   filenames when UseMenu() is called (e.g. when initializing a second
+   MDI child frame), the menu is not automatically initialized with
+   the existing filenames in the history and so you need to call
+   :meth:`wx.FileHistory.AddFilesToMenu` after UseMenu() explicitly in
+   order to initialize the menu with the existing list of MRU files
+   (otherwise an assertion failure is raised in debug builds).
 
-The filenames are appended using menu identifiers in the range ``ID_FILE1`` to ``ID_FILE9``.
+The filenames are appended using menu identifiers in the range
+``wx.ID_FILE1`` to ``wx.ID_FILE9``.
 
 
 
diff --git a/docs/sphinx/rest_substitutions/overviews/common_dialogs_overview.rst b/docs/sphinx/rest_substitutions/overviews/common_dialogs_overview.rst
index bacdd2ff..6b0a85de 100644
--- a/docs/sphinx/rest_substitutions/overviews/common_dialogs_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/common_dialogs_overview.rst
@@ -3,20 +3,25 @@
 
 .. _common dialogs:
 
-===============================================
+===================================
 |phoenix_title|  **Common Dialogs**
-===============================================
+===================================
 
 
-Common dialog classes and functions encapsulate commonly-needed dialog box requirements. They are all 'modal', 
-grabbing the flow of control until the user dismisses the dialog, to make them easy to use within an application.
+Common dialog classes and functions encapsulate commonly-needed dialog
+box requirements. They are all 'modal', grabbing the flow of control
+until the user dismisses the dialog, to make them easy to use within
+an application.
 
-Some dialogs have both platform-dependent and platform-independent implementations, so that if underlying windowing
-systems do not provide the required functionality, the generic classes and functions can stand in. For example, 
-under MS Windows, :ref:`ColourDialog` uses the standard colour selector. There is also an equivalent called 
-`GenericColourDialog` for other platforms, and a macro defines :ref:`ColourDialog` to be the same as 
-`GenericColourDialog` on non-MS Windows platforms. However, under MS Windows, the generic dialog can also be used,
-for testing or other purposes.
+Some dialogs have both platform-dependent and platform-independent
+implementations, so that if underlying windowing systems do not
+provide the required functionality, the generic classes and functions
+can stand in. For example, under MS Windows, :ref:`wx.ColourDialog`
+uses the standard colour selector. There is also an equivalent called
+`wx.GenericColourDialog` for other platforms, and a macro defines
+:ref:`wx.ColourDialog` to be the same as `wx.GenericColourDialog` on
+non-MS Windows platforms. However, under MS Windows, the generic
+dialog can also be used, for testing or other purposes.
 
 
 
@@ -25,35 +30,45 @@ for testing or other purposes.
 ColourDialog Overview
 ---------------------
 
-The :ref:`ColourDialog` presents a colour selector to the user, and returns with colour information.
+The :ref:`wx.ColourDialog` presents a colour selector to the user, and
+returns with colour information.
 
 
 The MS Windows Colour Selector
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Under Windows, the native colour selector common dialog is used. This presents a dialog box with three main regions:
-at the top left, a palette of 48 commonly-used colours is shown. Under this, there is a palette of 16 'custom colours'
-which can be set by the application if desired. Additionally, the user may open up the dialog box to show a right-hand
-panel containing controls to select a precise colour, and add it to the custom colour palette.
+Under Windows, the native colour selector common dialog is used. This
+presents a dialog box with three main regions: at the top left, a
+palette of 48 commonly-used colours is shown. Under this, there is a
+palette of 16 'custom colours' which can be set by the application if
+desired. Additionally, the user may open up the dialog box to show a
+right-hand panel containing controls to select a precise colour, and
+add it to the custom colour palette.
 
 
 The Generic Colour Selector
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Under non-MS Windows platforms, the colour selector is a simulation of most of the features of the MS Windows selector. 
-Two palettes of 48 standard and 16 custom colours are presented, with the right-hand area containing three sliders for 
-the user to select a colour from red, green and blue components. This colour may be added to the custom colour palette, 
-and will replace either the currently selected custom colour, or the first one in the palette if none is selected. 
-The RGB colour sliders are not optional in the generic colour selector. The generic colour selector is also available 
-under MS Windows; use the name `GenericColourDialog`.
+Under non-MS Windows platforms, the colour selector is a simulation of
+most of the features of the MS Windows selector.  Two palettes of 48
+standard and 16 custom colours are presented, with the right-hand area
+containing three sliders for the user to select a colour from red,
+green and blue components. This colour may be added to the custom
+colour palette, and will replace either the currently selected custom
+colour, or the first one in the palette if none is selected.  The RGB
+colour sliders are not optional in the generic colour selector. The
+generic colour selector is also available under MS Windows; use the
+name `wx.GenericColourDialog`.
 
 
 Example
 ^^^^^^^
 
-Here is an example of using :ref:`ColourDialog`, which sets various parameters of a :ref:`ColourData` object, including 
-a grey scale for the custom colours. If the user did not cancel the dialog, the application retrieves the selected colour 
-and uses it to set the background of a window::
+Here is an example of using :ref:`wx.ColourDialog`, which sets various
+parameters of a :ref:`wx.ColourData` object, including a grey scale
+for the custom colours. If the user did not cancel the dialog, the
+application retrieves the selected colour and uses it to set the
+background of a window::
 
 	data = wx.ColourData()
 	data.SetChooseFull(True)
@@ -62,11 +77,8 @@ and uses it to set the background of a window::
 	    colour = wx.Colour(i*16, i*16, i*16)
 	    data.SetCustomColour(i, colour)
 
-
 	dialog = wx.ColourDialog(self, data)
-	
 	if dialog.ShowModal() == wx.ID_OK:
-
 	    retData = dialog.GetColourData()
 	    col = retData.GetColour()
 	    brush = wx.Brush(col, wx.SOLID)
@@ -83,39 +95,44 @@ FontDialog Overview
 -------------------
 
 
-The :ref:`FontDialog` presents a font selector to the user, and returns with font and colour information.
+The :ref:`wx.FontDialog` presents a font selector to the user, and
+returns with font and colour information.
 
 
 The MS Windows Font Selector
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Under Windows, the native font selector common dialog is used. This presents a dialog box with controls for font name, 
-point size, style, weight, underlining, strikeout and text foreground colour. A sample of the font is shown on a white
-area of the dialog box. Note that in the translation from full MS Windows fonts to wxPython font conventions, strikeout
-is ignored and a font family (such as Swiss or Modern) is deduced from the actual font name (such as Arial or Courier).
+Under Windows, the native font selector common dialog is used. This
+presents a dialog box with controls for font name, point size, style,
+weight, underlining, strikeout and text foreground colour. A sample of
+the font is shown on a white area of the dialog box. Note that in the
+translation from full MS Windows fonts to wxPython font conventions,
+strikeout is ignored and a font family (such as Swiss or Modern) is
+deduced from the actual font name (such as Arial or Courier).
 
 
 The Generic Font Selector
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Under non-MS Windows platforms, the font selector is simpler. Controls for font family, point size, style, weight, 
-underlining and text foreground colour are provided, and a sample is shown upon a white background. The generic font
-selector is also available under MS Windows; use the name `GenericFontDialog`.
+Under non-MS Windows platforms, the font selector is simpler. Controls
+for font family, point size, style, weight, underlining and text
+foreground colour are provided, and a sample is shown upon a white
+background. The generic font selector is also available under MS
+Windows; use the name `wx.GenericFontDialog`.
 
 
 Example
 ^^^^^^^
 
-Here is an example of using :ref:`FontDialog`. The application uses the returned font and colour for drawing text on a canvas::
+Here is an example of using :ref:`wx.FontDialog`. The application uses
+the returned font and colour for drawing text on a canvas::
 
 	data = wx.FontData()
 	data.SetInitialFont(canvasFont)
 	data.SetColour(canvasTextColour)
 
 	dialog = wx.FontDialog(self, data)
-	
 	if dialog.ShowModal() == wx.ID_OK:
-
 	    retData = dialog.GetFontData()
 	    canvasFont = retData.GetChosenFont()
 	    canvasTextColour = retData.GetColour()
@@ -130,10 +147,12 @@ PrintDialog Overview
 --------------------
 
 
-This class represents the print and print setup common dialogs. You may obtain a :ref:`PrinterDC` device context from a 
-successfully dismissed print dialog.
+This class represents the print and print setup common dialogs. You
+may obtain a :ref:`wx.PrinterDC` device context from a successfully
+dismissed print dialog.
 
-.. seealso:: :ref:`Printing Framework Overview <printing framework overview>` for an example.
+.. seealso:: :ref:`Printing Framework Overview <printing framework overview>`
+     for an example.
 
 
 
@@ -143,20 +162,28 @@ FileDialog Overview
 -------------------
 
 
-Pops up a file selector box. On Windows and GTK 2.4+, this is the common file selector dialog. In X, this is a file 
-selector box with somewhat less functionality. The path and filename are distinct elements of a full file pathname.
+Pops up a file selector box. On Windows and GTK 2.4+, this is the
+common file selector dialog. In X, this is a file selector box with
+somewhat less functionality. The path and filename are distinct
+elements of a full file pathname.
 
-If path is "", the current directory will be used. If filename is "", no default filename will be supplied. 
-The wildcard determines what files are displayed in the file selector, and file extension supplies a type extension
-for the required filename. Flags may be a combination of ``FD_OPEN``, ``FD_SAVE``, ``FD_OVERWRITE_PROMPT``, 
-``FD_HIDE_READONLY``, ``FD_FILE_MUST_EXIST``, ``FD_MULTIPLE``, ``FD_CHANGE_DIR`` or 0.
+If path is "", the current directory will be used. If filename is "",
+no default filename will be supplied.  The wildcard determines what
+files are displayed in the file selector, and file extension supplies
+a type extension for the required filename. Flags may be a combination
+of ``wx.FD_OPEN``, ``wx.FD_SAVE``, ``wx.FD_OVERWRITE_PROMPT``,
+``wx.FD_HIDE_READONLY``, ``wx.FD_FILE_MUST_EXIST``, ``wx.FD_MULTIPLE``,
+``wx.FD_CHANGE_DIR`` or 0.
 
-Both the X and Windows versions implement a wildcard filter. Typing a filename containing wildcards ``(*, ?)`` in the 
-filename text item, and clicking on Ok, will result in only those files matching the pattern being displayed. In the 
-X version, supplying no default name will result in the wildcard filter being inserted in the filename text item; 
-the filter is ignored if a default name is supplied.
+Both the X and Windows versions implement a wildcard filter. Typing a
+filename containing wildcards ``(\*, ?)`` in the filename text item,
+and clicking on Ok, will result in only those files matching the
+pattern being displayed. In the X version, supplying no default name
+will result in the wildcard filter being inserted in the filename text
+item; the filter is ignored if a default name is supplied.
 
-The wildcard may be a specification for multiple types of file with a description for each, such as::
+The wildcard may be a specification for multiple types of file with a
+description for each, such as::
 
     wildcard = "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
     
@@ -168,7 +195,8 @@ DirDialog Overview
 -------------------
     
 
-This dialog shows a directory selector dialog, allowing the user to select a single directory.
+This dialog shows a directory selector dialog, allowing the user to
+select a single directory.
 
 
 
@@ -177,8 +205,8 @@ This dialog shows a directory selector dialog, allowing the user to select a sin
 TextEntryDialog Overview
 ------------------------
 
-
-This is a dialog with a text entry field. The value that the user entered is obtained using :meth:`TextEntryDialog.GetValue` ().
+This is a dialog with a text entry field. The value that the user
+entered is obtained using :meth:`wx.TextEntryDialog.GetValue` ().
 
 
 
@@ -187,8 +215,8 @@ This is a dialog with a text entry field. The value that the user entered is obt
 PasswordEntryDialog Overview
 ----------------------------
 
-
-This is a dialog with a password entry field. The value that the user entered is obtained using :meth:`TextEntryDialog.GetValue` ().
+This is a dialog with a password entry field. The value that the user
+entered is obtained using :meth:`wx.TextEntryDialog.GetValue` ().
 
 
 
@@ -197,11 +225,12 @@ This is a dialog with a password entry field. The value that the user entered is
 MessageDialog Overview
 ----------------------
 
+This dialog shows a message, plus buttons that can be chosen from
+``OK``, ``Cancel``, ``Yes``, and ``No``. Under Windows, an optional
+icon can be shown, such as an exclamation mark or question mark.
 
-This dialog shows a message, plus buttons that can be chosen from ``OK``, ``Cancel``, ``Yes``, and ``No``. Under Windows, an 
-optional icon can be shown, such as an exclamation mark or question mark.
-
-The return value of :meth:`MessageDialog.ShowModal` () indicates which button the user pressed.
+The return value of :meth:`wx.MessageDialog.ShowModal` () indicates
+which button the user pressed.
 
 
 
@@ -210,9 +239,9 @@ The return value of :meth:`MessageDialog.ShowModal` () indicates which button th
 SingleChoiceDialog Overview
 ---------------------------
 
-
-This dialog shows a list of choices, plus ``OK`` and (optionally) ``Cancel``. The user can select one of them. The selection 
-can be obtained from the dialog as an index, a string or client data.
+This dialog shows a list of choices, plus ``OK`` and (optionally)
+``Cancel``. The user can select one of them. The selection can be
+obtained from the dialog as an index, a string or client data.
 
 
 
@@ -221,6 +250,6 @@ can be obtained from the dialog as an index, a string or client data.
 MultiChoiceDialog Overview
 ---------------------------
 
-
-This dialog shows a list of choices, plus ``OK`` and (optionally) ``Cancel``. The user can select one or more of them.
+This dialog shows a list of choices, plus ``OK`` and (optionally)
+``Cancel``. The user can select one or more of them.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/config_overview.rst b/docs/sphinx/rest_substitutions/overviews/config_overview.rst
index 0833b4eb..1527ec3b 100644
--- a/docs/sphinx/rest_substitutions/overviews/config_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/config_overview.rst
@@ -3,42 +3,61 @@
 
 .. _config overview:
 
-=================================================
+====================================
 |phoenix_title|  **Config Overview**
-=================================================
+====================================
 
 
-This overview briefly describes what the config classes are and what they are for. All the details about
-how to use them may be found in the description of the :ref:`ConfigBase` class and the documentation of 
-the file, registry and INI file based implementations mentions all the features/limitations specific to 
-each one of these versions.
+This overview briefly describes what the config classes are and what
+they are for. All the details about how to use them may be found in
+the description of the :ref:`wx.ConfigBase` class and the
+documentation of the file, registry and INI file based implementations
+mentions all the features/limitations specific to each one of these
+versions.
 
-The config classes provide a way to store some application configuration information. They were especially 
-designed for this usage and, although may probably be used for many other things as well, should be limited
-to it. It means that this information should be:
+The config classes provide a way to store some application
+configuration information. They were especially designed for this
+usage and, although may probably be used for many other things as
+well, should be limited to it. It means that this information should
+be:
 
-- Typed, i.e. strings or numbers for the moment. You cannot store binary data, for example.
-- Small. For instance, it is not recommended to use the Windows registry for amounts of data more than a couple of kilobytes.
-- Not performance critical, neither from speed nor from a memory consumption point of view.
+- Typed, i.e. strings or numbers for the moment. You cannot store
+  binary data, for example.
+- Small. For instance, it is not recommended to use the Windows
+  registry for amounts of data more than a couple of kilobytes.
+- Not performance critical, neither from speed nor from a memory
+  consumption point of view.
 
 
-On the other hand, the features provided make them very useful for storing all kinds of small to medium volumes
-of hierarchically-organized, heterogeneous data. In short, this is a place where you can conveniently stuff
-all your data (numbers and strings) organizing it in a tree where you use the filesystem-like paths to 
-specify the location of a piece of data. In particular, these classes were designed to be as easy to use as possible.
+On the other hand, the features provided make them very useful for
+storing all kinds of small to medium volumes of
+hierarchically-organized, heterogeneous data. In short, this is a
+place where you can conveniently stuff all your data (numbers and
+strings) organizing it in a tree where you use the filesystem-like
+paths to specify the location of a piece of data. In particular, these
+classes were designed to be as easy to use as possible.
 
-From another point of view, they provide an interface which hides the differences between the Windows registry 
-and the standard Unix text format configuration files. Other (future) implementations of :ref:`ConfigBase` might
-also understand GTK resource files or their analogues on the KDE side.
+From another point of view, they provide an interface which hides the
+differences between the Windows registry and the standard Unix text
+format configuration files. Other (future) implementations
+of :ref:`wx.ConfigBase` might also understand GTK resource files or
+their analogues on the KDE side.
 
-In any case, each implementation of :ref:`ConfigBase` does its best to make the data look the same way everywhere. 
-Due to limitations of the underlying physical storage, it may not implement 100% of the base class functionality.
+In any case, each implementation of :ref:`wx.ConfigBase` does its best
+to make the data look the same way everywhere. Due to limitations of
+the underlying physical storage, it may not implement 100% of the base
+class functionality.
 
-There are groups of entries and the entries themselves. Each entry contains either a string or a number (or a 
-boolean value; support for other types of data such as dates or timestamps is planned) and is identified by 
-the full path to it: something like ``/MyApp/UserPreferences/Colors/Foreground``.
+There are groups of entries and the entries themselves. Each entry
+contains either a string or a number (or a boolean value; support for
+other types of data such as dates or timestamps is planned) and is
+identified by the full path to it: something like
+``/MyApp/UserPreferences/Colors/Foreground``.
 
-The previous elements in the path are the group names, and each name may contain an arbitrary number of entries and subgroups.
+The previous elements in the path are the group names, and each name
+may contain an arbitrary number of entries and subgroups.
 
-The path components are always separated with a slash, even though some implementations use the backslash internally.
-Further details (including how to read/write these entries) may be found in the documentation for :ref:`ConfigBase`.
+The path components are always separated with a slash, even though
+some implementations use the backslash internally. Further details
+(including how to read/write these entries) may be found in the
+documentation for :ref:`wx.ConfigBase`.
diff --git a/docs/sphinx/rest_substitutions/overviews/dataobject_overview.rst b/docs/sphinx/rest_substitutions/overviews/dataobject_overview.rst
index 6c60dedd..6dcfcc22 100644
--- a/docs/sphinx/rest_substitutions/overviews/dataobject_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/dataobject_overview.rst
@@ -3,47 +3,63 @@
 
 .. _dataobject overview:
 
-=================================================
+========================================
 |phoenix_title|  **DataObject Overview**
-=================================================
+========================================
 
-This overview discusses data transfer through clipboard or drag and drop. In wxPython, these two ways to transfer 
-data (either between different applications or inside one and the same) are very similar which allows to implement 
-both of them using almost the same code - or, in other words, if you implement drag and drop support for your 
+This overview discusses data transfer through clipboard or drag and
+drop. In wxPython, these two ways to transfer data (either between
+different applications or inside one and the same) are very similar
+which allows to implement both of them using almost the same code -
+or, in other words, if you implement drag and drop support for your
 application, you get clipboard support for free and vice versa.
 
-At the heart of both clipboard and drag and drop operations lies the :class:`DataObject` class. The objects of this 
-class (or, to be precise, classes derived from it) represent the data which is being carried by the mouse during 
-drag and drop operation or copied to or pasted from the clipboard. :class:`DataObject` is a "smart" piece of data 
-because it knows which formats it supports (see `GetFormatCount` and `GetAllFormats`) and knows how to render itself 
-in any of them (see `GetDataHere`). It can also receive its value from the outside in a format it supports if it 
-implements the `SetData` method. Please see the documentation of this class for more details.
+At the heart of both clipboard and drag and drop operations lies the
+:class:`wx.DataObject` class. The objects of this class (or, to be
+precise, classes derived from it) represent the data which is being
+carried by the mouse during drag and drop operation or copied to or
+pasted from the clipboard. :class:`wx.DataObject` is a "smart" piece of
+data because it knows which formats it supports (see `GetFormatCount`
+and `GetAllFormats`) and knows how to render itself in any of them
+(see `GetDataHere`). It can also receive its value from the outside in
+a format it supports if it implements the `SetData` method. Please see
+the documentation of this class for more details.
 
-Both clipboard and drag and drop operations have two sides: the source and target, the data provider and the data 
-receiver. These which may be in the same application and even the same window when, for example, you drag some text 
-from one position to another in a word processor. Let us describe what each of them should do.
+Both clipboard and drag and drop operations have two sides: the source
+and target, the data provider and the data receiver. These which may
+be in the same application and even the same window when, for example,
+you drag some text from one position to another in a word
+processor. Let us describe what each of them should do.
 
 
 The data provider (source) duties
 ---------------------------------
 
-The data provider is responsible for creating a :class:`DataObject` containing the data to be transferred. Then it 
-should either pass it to the clipboard using :meth:`Clipboard.SetData` function or to :class:`DropSource` and call 
-:meth:`DropSource.DoDragDrop` function.
+The data provider is responsible for creating a :class:`wx.DataObject`
+containing the data to be transferred. Then it should either pass it
+to the clipboard using :meth:`wx.Clipboard.SetData` function or to
+:class:`wx.DropSource` and call :meth:`wx.DropSource.DoDragDrop` function.
 
-A small difference is that in the case of clipboard operation, the application usually knows in advance whether it 
-copies or cuts (i.e. copies and deletes) data - in fact, this usually depends on which menu item the user chose. 
-But for drag and drop it can only know it after :meth:`DropSource.DoDragDrop` returns (from its return value).
+A small difference is that in the case of clipboard operation, the
+application usually knows in advance whether it copies or cuts
+(i.e. copies and deletes) data - in fact, this usually depends on
+which menu item the user chose.  But for drag and drop it can only
+know it after :meth:`wx.DropSource.DoDragDrop` returns (from its return
+value).
 
 
 The data receiver (target) duties
 ---------------------------------
 
-To receive (paste in usual terminology) data from the clipboard, you should create a :class:`DataObject` derived 
-class which supports the data formats you need and pass it as argument to :meth:`Clipboard.GetData`. If it returns 
-``False``, no data in (any of) the supported format(s) is available. If it returns ``True``, the data has been 
-successfully transferred to :class:`DataObject`.
+To receive (paste in usual terminology) data from the clipboard, you
+should create a :class:`wx.DataObject` derived class which supports the
+data formats you need and pass it as argument to
+:meth:`wx.Clipboard.GetData`. If it returns ``False``, no data in (any
+of) the supported format(s) is available. If it returns ``True``, the
+data has been successfully transferred to :class:`wx.DataObject`.
 
-For drag and drop case, the :meth:`DropTarget.OnData` virtual function will be called when a data object is dropped, 
-from which the data itself may be requested by calling :meth:`DropTarget.GetData` method which fills the data object.
+For drag and drop case, the :meth:`wx.DropTarget.OnData` virtual function
+will be called when a data object is dropped, from which the data
+itself may be requested by calling :meth:`wx.DropTarget.GetData` method
+which fills the data object.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/datetime_overview.rst b/docs/sphinx/rest_substitutions/overviews/datetime_overview.rst
index 13675878..bdb56655 100644
--- a/docs/sphinx/rest_substitutions/overviews/datetime_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/datetime_overview.rst
@@ -10,65 +10,99 @@
 Introduction
 ------------
 
-wxPython provides a set of powerful classes to work with dates and times. Some of the supported features of :ref:`DateTime` class are:
+wxPython provides a set of powerful classes to work with dates and
+times. Some of the supported features of :ref:`wx.DateTime` class are:
 
-* Wide range: the range of supported dates goes from about 4714 B.C. to some 480 million years in the future.
-* Precision: not using floating point calculations anywhere ensures that the date calculations don't suffer from rounding errors.
-* Many features: not only all usual calculations with dates are supported, but also more exotic week and year day calculations, 
-  work day testing, standard astronomical functions, conversion to and from strings in either strict or free format.
-* Efficiency: objects of :ref:`DateTime` are small (8 bytes) and working with them is fast.
+* Wide range: the range of supported dates goes from about 4714
+  B.C. to some 480 million years in the future.
+
+* Precision: not using floating point calculations anywhere ensures
+  that the date calculations don't suffer from rounding errors.
+
+* Many features: not only all usual calculations with dates are
+  supported, but also more exotic week and year day calculations, work
+  day testing, standard astronomical functions, conversion to and from
+  strings in either strict or free format.
+
+* Efficiency: objects of :ref:`wx.DateTime` are small (8 bytes) and
+  working with them is fast.
 
 
 
 All date/time classes at a glance
 ---------------------------------
 
-There are 3 main classes related to date and time: except :ref:`DateTime` itself which represents an absolute moment in time, 
-there are also two classes - :ref:`TimeSpan` and :ref:`DateSpan` - which represent the intervals of time.
+There are 3 main classes related to date and time: except
+:ref:`wx.DateTime` itself which represents an absolute moment in time,
+there are also two classes - :ref:`wx.TimeSpan` and :ref:`wx.DateSpan` -
+which represent the intervals of time.
 
 
 
 DateTime characteristics
 ------------------------
 
-:ref:`DateTime` stores the time as a signed number of milliseconds since the Epoch which is fixed, by convention, to Jan 1, 1970 - however 
-this is not visible to the class users (in particular, dates prior to the Epoch are handled just as well (or as bad) as the dates after it). 
-But it does mean that the best resolution which can be achieved with this class is 1 millisecond.
+:ref:`wx.DateTime` stores the time as a signed number of milliseconds
+since the Epoch which is fixed, by convention, to Jan 1, 1970 -
+however this is not visible to the class users (in particular, dates
+prior to the Epoch are handled just as well (or as bad) as the dates
+after it).  But it does mean that the best resolution which can be
+achieved with this class is 1 millisecond.
 
-The size of :ref:`DateTime` object is 8 bytes because it is represented as a 64 bit integer. The resulting range of supported dates is
-thus approximatively 580 million years, but due to the current limitations in the Gregorian calendar support, only dates from Nov 24, 4714BC 
-are supported (this is subject to change if there is sufficient interest in doing it).
+The size of :ref:`wx.DateTime` object is 8 bytes because it is
+represented as a 64 bit integer. The resulting range of supported
+dates is thus approximatively 580 million years, but due to the
+current limitations in the Gregorian calendar support, only dates from
+Nov 24, 4714BC are supported (this is subject to change if there is
+sufficient interest in doing it).
 
-Finally, the internal representation is time zone independent (always in GMT) and the time zones only come into play when a date is broken 
-into year/month/day components. See more about timezones below (see :ref:`Time zone considerations <time zone considerations>`).
+Finally, the internal representation is time zone independent (always
+in GMT) and the time zones only come into play when a date is broken
+into year/month/day components. See more about timezones below (see
+:ref:`Time zone considerations <time zone considerations>`).
 
-Currently, the only supported calendar is Gregorian one (which is used even for the dates prior to the historic introduction of this calendar 
-which was first done on Oct 15, 1582 but is, generally speaking, country, and even region, dependent). Future versions will probably have 
-Julian calendar support as well and support for other calendars (Maya, Hebrew, Chinese...) is not ruled out.
+Currently, the only supported calendar is Gregorian one (which is used
+even for the dates prior to the historic introduction of this calendar
+which was first done on Oct 15, 1582 but is, generally speaking,
+country, and even region, dependent). Future versions will probably
+have Julian calendar support as well and support for other calendars
+(Maya, Hebrew, Chinese...) is not ruled out.
 
 
 
 Difference between DateSpan and TimeSpan
 ----------------------------------------
 
-While there is only one logical way to represent an absolute moment in the time (and hence only one :ref:`DateTime` class), there are at 
+While there is only one logical way to represent an absolute moment in
+the time (and hence only one :ref:`wx.DateTime` class), there are at
 least two methods to describe a time interval.
 
-First, there is the direct and self-explaining way implemented by :ref:`TimeSpan`: it is just a difference in milliseconds between two 
-moments in time. Adding or subtracting such an interval to :ref:`DateTime` is always well-defined and is a fast operation.
+First, there is the direct and self-explaining way implemented by
+:ref:`wx.TimeSpan`: it is just a difference in milliseconds between two
+moments in time. Adding or subtracting such an interval to
+:ref:`wx.DateTime` is always well-defined and is a fast operation.
 
-But in the daily life other, calendar-dependent time interval specifications are used. For example, 'one month later' is commonly used. 
-However, it is clear that this is not the same as :ref:`TimeSpan` of 60*60*24*31 seconds because 'one month later' Feb 15 is Mar 15 and 
-not Mar 17 or Mar 16 (depending on whether the year is leap or not).
+But in the daily life other, calendar-dependent time interval
+specifications are used. For example, 'one month later' is commonly
+used.  However, it is clear that this is not the same as
+:ref:`wx.TimeSpan` of 60\*60\*24\*31 seconds because 'one month later'
+Feb 15 is Mar 15 and not Mar 17 or Mar 16 (depending on whether the
+year is leap or not).
 
-This is why there is another class for representing such intervals called :ref:`DateSpan`. It handles these sort of operations in the 
-most natural way possible, but note that manipulating with intervals of this kind is not always well-defined. Consider, for example, 
-Jan 31 + '1 month': this will give Feb 28 (or 29), i.e. the last day of February and not the non-existent Feb 31. Of course, this is 
-what is usually wanted, but you still might be surprised to notice that now subtracting back the same interval from Feb 28 will result 
-in Jan 28 and **not** Jan 31 we started with!
+This is why there is another class for representing such intervals
+called :ref:`wx.DateSpan`. It handles these sort of operations in the
+most natural way possible, but note that manipulating with intervals
+of this kind is not always well-defined. Consider, for example, Jan 31
++ '1 month': this will give Feb 28 (or 29), i.e. the last day of
+February and not the non-existent Feb 31. Of course, this is what is
+usually wanted, but you still might be surprised to notice that now
+subtracting back the same interval from Feb 28 will result in Jan 28
+and **not** Jan 31 we started with!
 
-So, unless you plan to implement some kind of natural language parsing in the program, you should probably use :ref:`TimeSpan` instead 
-of :ref:`DateSpan` (which is also more efficient). However, :ref:`DateSpan` may be very useful in situations when you do need to 
+So, unless you plan to implement some kind of natural language parsing
+in the program, you should probably use :ref:`wx.TimeSpan` instead of
+:ref:`wx.DateSpan` (which is also more efficient). However,
+:ref:`wx.DateSpan` may be very useful in situations when you do need to
 understand what 'in a month' means - of course, it is just::
 
     wx.DateTime.Now() + wx.DateSpan.Month()
@@ -79,26 +113,36 @@ understand what 'in a month' means - of course, it is just::
 Date arithmetics
 ----------------
 
-
-Many different operations may be performed with the dates, however not all of them make sense. For example, multiplying a date by a number
-is an invalid operation, even though multiplying either of the time span classes by a number is perfectly valid.
+Many different operations may be performed with the dates, however not
+all of them make sense. For example, multiplying a date by a number is
+an invalid operation, even though multiplying either of the time span
+classes by a number is perfectly valid.
 
 Here is what can be done:
 
-* **Addition**: a :ref:`TimeSpan` or :ref:`DateSpan` can be added to :ref:`DateTime` resulting in a new :ref:`DateTime` object and also 
-  2 objects of the same span class can be added together giving another object of the same class.
+* **Addition**: a :ref:`wx.TimeSpan` or :ref:`wx.DateSpan` can be added to
+  :ref:`wx.DateTime` resulting in a new :ref:`wx.DateTime` object and also 2
+  objects of the same span class can be added together giving another
+  object of the same class.
   
-* **Subtraction**: the same types of operations as above are allowed and, additionally, a difference between two :ref:`DateTime` objects 
-  can be taken and this will yield :ref:`TimeSpan`.
+* **Subtraction**: the same types of operations as above are allowed
+  and, additionally, a difference between two :ref:`wx.DateTime` objects
+  can be taken and this will yield :ref:`wx.TimeSpan`.
   
-* **Multiplication**: a :ref:`TimeSpan` or :ref:`DateSpan` object can be multiplied by an integer number resulting in an object of the same type.
+* **Multiplication**: a :ref:`wx.TimeSpan` or :ref:`wx.DateSpan` object can
+  be multiplied by an integer number resulting in an object of the
+  same type.
 
-* **Unary minus**: a :ref:`TimeSpan` or :ref:`DateSpan` object may finally be negated giving an interval of the same magnitude but of opposite time direction.
+* **Unary minus**: a :ref:`wx.TimeSpan` or :ref:`wx.DateSpan` object may
+  finally be negated giving an interval of the same magnitude but of
+  opposite time direction.
 
 
-For all these operations there are corresponding global (overloaded) operators and also member functions which are synonyms for them: 
-`Add()`, `Subtract()` and `Multiply()`. Unary minus as well as composite assignment operations (like +=) are only implemented as members and 
-`Neg()` is the synonym for unary minus.
+For all these operations there are corresponding global (overloaded)
+operators and also member functions which are synonyms for them:
+`Add()`, `Subtract()` and `Multiply()`. Unary minus as well as
+composite assignment operations (like +=) are only implemented as
+members and `Neg()` is the synonym for unary minus.
 
 
 
@@ -107,37 +151,54 @@ For all these operations there are corresponding global (overloaded) operators a
 Time zone considerations
 ------------------------
 
-Although the time is always stored internally in GMT, you will usually work in the local time zone. Because of this, all :ref:`DateTime` 
-constructors and setters which take the broken down date assume that these values are for the local time zone. Thus::
+Although the time is always stored internally in GMT, you will usually
+work in the local time zone. Because of this, all :ref:`wx.DateTime`
+constructors and setters which take the broken down date assume that
+these values are for the local time zone. Thus::
 
     wx.DateTimeFromDMY(1, wx.DateTime.Jan, 1970)
 
 
-will not correspond to the :ref:`DateTime` Epoch unless you happen to live in the UK. All methods returning the date components (year, 
-month, day, hour, minute, second...) will also return the correct values for the local time zone by default, so, generally, doing the natural
-things will lead to natural and correct results.
+will not correspond to the :ref:`wx.DateTime` Epoch unless you happen
+to live in the UK. All methods returning the date components (year,
+month, day, hour, minute, second...) will also return the correct
+values for the local time zone by default, so, generally, doing the
+natural things will lead to natural and correct results.
 
-If you only want to do this, you may safely skip the rest of this section. However, if you want to work with different time zones, you
+If you only want to do this, you may safely skip the rest of this
+section. However, if you want to work with different time zones, you
 should read it to the end.
 
-In this (rare) case, you are still limited to the local time zone when constructing :ref:`DateTime` objects, i.e. there is no way to construct
-a :ref:`DateTime` corresponding to the given date in, say, Pacific Standard Time. To do it, you will need to call :meth:`DateTime.ToTimezone` 
-or :meth:`DateTime.MakeTimezone` methods to adjust the date for the target time zone. There are also special versions of these functions 
-:meth:`DateTime.ToUTC` and :meth:`DateTime.MakeUTC` for the most common case - when the date should be constructed in UTC.
+In this (rare) case, you are still limited to the local time zone when
+constructing :ref:`wx.DateTime` objects, i.e. there is no way to
+construct a :ref:`wx.DateTime` corresponding to the given date in,
+say, Pacific Standard Time. To do it, you will need to call
+:meth:`wx.DateTime.ToTimezone` or :meth:`wx.DateTime.MakeTimezone`
+methods to adjust the date for the target time zone. There are also
+special versions of these functions :meth:`wx.DateTime.ToUTC` and
+:meth:`wx.DateTime.MakeUTC` for the most common case - when the date
+should be constructed in UTC.
 
-You also can just retrieve the value for some time zone without converting the object to it first. For this you may pass TimeZone argument to
-any of the methods which are affected by the time zone (all methods getting date components and the date formatting ones, for example). 
-In particular, the `Format()` family of methods accepts a TimeZone parameter and this allows to simply print time in any time zone.
+You also can just retrieve the value for some time zone without
+converting the object to it first. For this you may pass TimeZone
+argument to any of the methods which are affected by the time zone
+(all methods getting date components and the date formatting ones, for
+example).  In particular, the `Format()` family of methods accepts a
+TimeZone parameter and this allows to simply print time in any time
+zone.
 
-To see how to do it, the last issue to address is how to construct a TimeZone object which must be passed to all these methods. First of all, 
-you may construct it manually by specifying the time zone offset in seconds from GMT, but usually you will just use one of the 
-:ref:`Date and Time <date and time>` and let the conversion constructor do the job.
+To see how to do it, the last issue to address is how to construct a
+TimeZone object which must be passed to all these methods. First of
+all, you may construct it manually by specifying the time zone offset
+in seconds from GMT, but usually you will just use one of the
+:ref:`Date and Time <date and time>` and let the conversion
+constructor do the job.
 
 I.e. you would just write::
 
     dt = wx.DateTimeFromDMY(8, wx.DateTime.May, 1977)
-    print "The time is %s in local time zone" % dt.FormatTime()
-    print "The time is %s in GMT" % dt.FormatTime(wx.DateTime.GMT)
+    print("The time is %s in local time zone" % dt.FormatTime())
+    print("The time is %s in GMT" % dt.FormatTime(wx.DateTime.GMT))
 
 
 
@@ -146,16 +207,23 @@ I.e. you would just write::
 Daylight saving time (DST)
 --------------------------
 
-DST (a.k.a. 'summer time') handling is always a delicate task which is better left to the operating system which is supposed to be configured
-by the administrator to behave correctly. Unfortunately, when doing calculations with date outside of the range supported by the standard
+DST (a.k.a. 'summer time') handling is always a delicate task which is
+better left to the operating system which is supposed to be configured
+by the administrator to behave correctly. Unfortunately, when doing
+calculations with date outside of the range supported by the standard
 library, we are forced to deal with these issues ourselves.
 
-Several functions are provided to calculate the beginning and end of DST in the given year and to determine whether it is in effect at the 
-given moment or not, but they should not be considered as absolutely correct because, first of all, they only work more or less correctly 
-for only a handful of countries (any information about other ones appreciated!) and even for them the rules may perfectly well change in the future.
+Several functions are provided to calculate the beginning and end of
+DST in the given year and to determine whether it is in effect at the
+given moment or not, but they should not be considered as absolutely
+correct because, first of all, they only work more or less correctly
+for only a handful of countries (any information about other ones
+appreciated!) and even for them the rules may perfectly well change in
+the future.
 
-The time zone handling methods (see :ref:`Time zone considerations <time zone considerations>`) use these functions too, so they are subject
-to the same limitations.
+The time zone handling methods (see :ref:`Time zone considerations
+<time zone considerations>`) use these functions too, so they are
+subject to the same limitations.
 
 
 
diff --git a/docs/sphinx/rest_substitutions/overviews/dc_overview.rst b/docs/sphinx/rest_substitutions/overviews/dc_overview.rst
index d0024a20..05879734 100644
--- a/docs/sphinx/rest_substitutions/overviews/dc_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/dc_overview.rst
@@ -3,36 +3,49 @@
 
 .. _device contexts:
 
-===============================================
+====================================
 |phoenix_title|  **Device Contexts**
-===============================================
+====================================
 
 
-A :ref:`DC` is a device context onto which graphics and text can be drawn. The device context is intended to represent
-a number of output devices in a generic way, with the same API being used throughout.
+A :ref:`wx.DC` is a device context onto which graphics and text can be
+drawn. The device context is intended to represent a number of output
+devices in a generic way, with the same API being used throughout.
 
-Some device contexts are created temporarily in order to draw on a window. This is true of :ref:`ScreenDC`, :ref:`ClientDC`, 
-:ref:`PaintDC`, and :ref:`WindowDC`. The following describes the differences between these device contexts and when you should use them.
+Some device contexts are created temporarily in order to draw on a
+window. This is true of :ref:`wx.ScreenDC`, :ref:`wx.ClientDC`,
+:ref:`wx.PaintDC`, and :ref:`wx.WindowDC`. The following describes the
+differences between these device contexts and when you should use
+them.
 
-- :ref:`ScreenDC`. Use this to paint on the screen, as opposed to an individual window.
-- :ref:`ClientDC`. Use this to paint on the client area of window (the part without borders and other decorations), but do not use 
-  it from within an :ref:`PaintEvent`.
-- :ref:`PaintDC`. Use this to paint on the client area of a window, but only from within a :ref:`PaintEvent`.
-- :ref:`WindowDC`. Use this to paint on the whole area of a window, including decorations. This may not be available on non-Windows platforms.
+- :ref:`wx.ScreenDC`. Use this to paint on the screen, as opposed to an
+  individual window.
+
+- :ref:`wx.ClientDC`. Use this to paint on the client area of window (the
+  part without borders and other decorations), but do not use it from
+  within an :ref:`wx.PaintEvent`.
+
+- :ref:`wx.PaintDC`. Use this to paint on the client area of a window,
+  but only from within a :ref:`wx.PaintEvent`.
+
+- :ref:`wx.WindowDC`. Use this to paint on the whole area of a window,
+  including decorations. This may not be available on non-Windows
+  platforms.
 
 
-To use a client, paint or window device context, create an object on the stack with the window as argument, for example::
+To use a client, paint or window device context, create an object on
+the stack with the window as argument, for example::
 
 	def OnMyCmd(self, event):
-
 	    dc = wx.ClientDC(window)
 	    DrawMyPicture(dc)
 
 
-
-Try to write code so it is parameterised by :ref:`DC` - if you do this, the same piece of code may write to a number of different devices,
-by passing a different device context. This doesn't work for everything (for example not all device contexts support bitmap drawing)
-but will work most of the time.
+Try to write code so it is parameterised by :ref:`wx.DC` - if you do
+this, the same piece of code may write to a number of different
+devices, by passing a different device context. This doesn't work for
+everything (for example not all device contexts support bitmap
+drawing) but will work most of the time.
 
 
 
diff --git a/docs/sphinx/rest_substitutions/overviews/dialog_overview.rst b/docs/sphinx/rest_substitutions/overviews/dialog_overview.rst
index d17a0ce9..f282ba8e 100644
--- a/docs/sphinx/rest_substitutions/overviews/dialog_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/dialog_overview.rst
@@ -8,15 +8,21 @@
 ====================================
 
 
-A dialog box is similar to a panel, in that it is a window which can be used for placing controls, with the following exceptions:
+A dialog box is similar to a panel, in that it is a window which can
+be used for placing controls, with the following exceptions:
 
 - A surrounding frame is implicitly created.
-- Extra functionality is automatically given to the dialog box, such as tabbing between items (currently Windows only).
-- If the dialog box is `modal`, the calling program is blocked until the dialog box is dismissed.
+
+- Extra functionality is automatically given to the dialog box, such
+  as tabbing between items (currently Windows only).
+
+- If the dialog box is `modal`, the calling program is blocked until
+  the dialog box is dismissed.
 
 
-.. seealso:: :ref:`TopLevelWindow` and :ref:`Window` for inherited member functions. Validation of data in controls is covered in 
-   :ref:`Validator Overview <validator overview>`.
+.. seealso:: :ref:`wx.TopLevelWindow` and :ref:`wx.Window` for inherited
+        member functions. Validation of data in controls is covered in
+        :ref:`Validator Overview <validator overview>`.
 
 
 .. _automatic scrolling dialogs:
@@ -25,29 +31,55 @@ A dialog box is similar to a panel, in that it is a window which can be used for
 Automatic scrolling dialogs
 ---------------------------
 
-As an ever greater variety of mobile hardware comes to market, it becomes more imperative for wxPython applications to adapt to 
-these platforms without putting too much burden on the programmer. One area where wxPython can help is in adapting dialogs for 
-the lower resolution screens that inevitably accompany a smaller form factor. :ref:`Dialog` therefore supplies a global 
-:ref:`DialogLayoutAdapter` class that implements automatic scrolling adaptation for most sizer-based custom dialogs.
+As an ever greater variety of mobile hardware comes to market, it
+becomes more imperative for wxPython applications to adapt to these
+platforms without putting too much burden on the programmer. One area
+where wxPython can help is in adapting dialogs for the lower
+resolution screens that inevitably accompany a smaller form
+factor. :ref:`wx.Dialog` therefore supplies a global
+:ref:`wx.DialogLayoutAdapter` class that implements automatic scrolling
+adaptation for most sizer-based custom dialogs.
 
-Many applications should therefore be able to adapt to small displays with little or no work, as far as dialogs are concerned. 
-By default this adaptation is off. To switch scrolling adaptation on globally in your application, call the static function 
-:meth:`Dialog.EnableLayoutAdaptation` passing ``True``. You can also adjust adaptation on a per-dialog basis by calling 
-:meth:`Dialog.SetLayoutAdaptationMode` with one of ``DIALOG_ADAPTATION_MODE_DEFAULT`` (use the global setting), ``DIALOG_ADAPTATION_MODE_ENABLED``
-or ``DIALOG_ADAPTATION_MODE_DISABLED``.
+Many applications should therefore be able to adapt to small displays
+with little or no work, as far as dialogs are concerned.  By default
+this adaptation is off. To switch scrolling adaptation on globally in
+your application, call the static function
+:meth:`wx.Dialog.EnableLayoutAdaptation` passing ``True``. You can also
+adjust adaptation on a per-dialog basis by calling
+:meth:`wx.Dialog.SetLayoutAdaptationMode` with one of
+``wx.DIALOG_ADAPTATION_MODE_DEFAULT`` (use the global setting),
+``wx.DIALOG_ADAPTATION_MODE_ENABLED`` or
+``wx.DIALOG_ADAPTATION_MODE_DISABLED``.
 
-The last two modes override the global adaptation setting. With adaptation enabled, if the display size is too small for the dialog, 
-wxPython (or rather the standard adapter class :ref:`StandardDialogLayoutAdapter`) will make part of the dialog scrolling, leaving 
-standard buttons in a non-scrolling part at the bottom of the dialog. This is done as follows, in :meth:`DialogLayoutAdapter.DoLayoutAdaptation`
-called from within :meth:`Dialog.Show` or :meth:`Dialog.ShowModal`:
+The last two modes override the global adaptation setting. With
+adaptation enabled, if the display size is too small for the dialog,
+wxPython (or rather the standard adapter class
+:ref:`wx.StandardDialogLayoutAdapter`) will make part of the dialog
+scrolling, leaving standard buttons in a non-scrolling part at the
+bottom of the dialog. This is done as follows, in
+:meth:`wx.DialogLayoutAdapter.DoLayoutAdaptation` called from within
+:meth:`wx.Dialog.Show` or :meth:`wx.Dialog.ShowModal`:
 
-- If :meth:`Dialog.GetContentWindow` returns a window derived from :ref:`BookCtrlBase`, the pages are made scrollable and no other adaptation is done.
-- wxPython looks for a :ref:`StdDialogButtonSizer` and uses it for the non-scrolling part.
-- If that search failed, wxPython looks for a horizontal :ref:`BoxSizer` with one or more standard buttons, with identifiers such as ``ID_OK`` and ``ID_CANCEL``.
-- If that search failed too, wxPython finds 'loose' standard buttons (in any kind of sizer) and adds them to a :ref:`StdDialogButtonSizer`. 
-  If no standard buttons were found, the whole dialog content will scroll.
-- All the children apart from standard buttons are reparented onto a new :ref:`ScrolledWindow` object, using the old top-level sizer 
-  for the scrolled window and creating a new top-level sizer to lay out the scrolled window and standard button sizer.
+- If :meth:`wx.Dialog.GetContentWindow` returns a window derived from
+  :ref:`wx.BookCtrlBase`, the pages are made scrollable and no other
+  adaptation is done.
+
+- wxPython looks for a :ref:`wx.StdDialogButtonSizer` and uses it for the
+  non-scrolling part.
+
+- If that search failed, wxPython looks for a horizontal
+  :ref:`wx.BoxSizer` with one or more standard buttons, with identifiers
+  such as ``wx.ID_OK`` and ``wx.ID_CANCEL``.
+
+- If that search failed too, wxPython finds 'loose' standard buttons
+  (in any kind of sizer) and adds them to a
+  :ref:`wx.StdDialogButtonSizer`.  If no standard buttons were found, the
+  whole dialog content will scroll.
+
+- All the children apart from standard buttons are reparented onto a
+  new :ref:`wx.ScrolledWindow` object, using the old top-level sizer for
+  the scrolled window and creating a new top-level sizer to lay out
+  the scrolled window and standard button sizer.
   
   
 .. _layout adaptation code:
@@ -55,48 +87,83 @@ called from within :meth:`Dialog.Show` or :meth:`Dialog.ShowModal`:
 Customising scrolling adaptation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In addition to switching adaptation on and off globally and per dialog, you can choose how aggressively wxPython will search
-for standard buttons by setting :meth:`Dialog.SetLayoutAdaptationLevel`. By default, all the steps described above will be 
-performed but by setting the level to 1, for example, you can choose to only look for :ref:`StdDialogButtonSizer`.
+In addition to switching adaptation on and off globally and per
+dialog, you can choose how aggressively wxPython will search for
+standard buttons by setting
+:meth:`wx.Dialog.SetLayoutAdaptationLevel`. By default, all the steps
+described above will be performed but by setting the level to 1, for
+example, you can choose to only look for :ref:`wx.StdDialogButtonSizer`.
 
-You can use :meth:`Dialog.AddMainButtonId` to add identifiers for buttons that should also be treated as standard buttons for the non-scrolling area.
+You can use :meth:`wx.Dialog.AddMainButtonId` to add identifiers for
+buttons that should also be treated as standard buttons for the
+non-scrolling area.
 
-You can derive your own class from :ref:`DialogLayoutAdapter` or :ref:`StandardDialogLayoutAdapter` and call :meth:`Dialog.SetLayoutAdapter`, 
-deleting the old object that this function returns. Override the functions `CanDoLayoutAdaptation` and `DoLayoutAdaptation` to test 
-for adaptation applicability and perform the adaptation.
+You can derive your own class from :ref:`wx.DialogLayoutAdapter` or
+:ref:`wx.StandardDialogLayoutAdapter` and call
+:meth:`wx.Dialog.SetLayoutAdapter`, deleting the old object that this
+function returns. Override the functions `CanDoLayoutAdaptation` and
+`DoLayoutAdaptation` to test for adaptation applicability and perform
+the adaptation.
 
-You can also override :meth:`Dialog.CanDoLayoutAdaptation` and :meth:`Dialog.DoLayoutAdaptation` in a class derived from :ref:`Dialog`.
+You can also override :meth:`wx.Dialog.CanDoLayoutAdaptation` and
+:meth:`wx.Dialog.DoLayoutAdaptation` in a class derived from
+:ref:`wx.Dialog`.
 
 
 Situations where automatic scrolling adaptation may fail
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Because adaptation rearranges your sizer and window hierarchy, it is not fool-proof, and may fail in the following situations:
+Because adaptation rearranges your sizer and window hierarchy, it is
+not fool-proof, and may fail in the following situations:
 
 - The dialog doesn't use sizers.
-- The dialog implementation makes assumptions about the window hierarchy, for example getting the parent of a control and casting to the dialog class.
-- The dialog does custom painting and/or event handling not handled by the scrolled window. If this problem can be solved globally, 
-  you can derive a new adapter class from :ref:`StandardDialogLayoutAdapter` and override its `CreateScrolledWindow` function 
-  to return an instance of your own class.
-- The dialog has unusual layout, for example a vertical sizer containing a mixture of standard buttons and other controls.
-- The dialog makes assumptions about the sizer hierarchy, for example to show or hide children of the top-level sizer. However, 
-  the original sizer hierarchy will still hold until `Show` or `ShowModal` is called.
+
+- The dialog implementation makes assumptions about the window
+  hierarchy, for example getting the parent of a control and casting
+  to the dialog class.
+
+- The dialog does custom painting and/or event handling not handled by
+  the scrolled window. If this problem can be solved globally, you can
+  derive a new adapter class from :ref:`wx.StandardDialogLayoutAdapter`
+  and override its `CreateScrolledWindow` function to return an
+  instance of your own class.
+
+- The dialog has unusual layout, for example a vertical sizer
+  containing a mixture of standard buttons and other controls.
+
+- The dialog makes assumptions about the sizer hierarchy, for example
+  to show or hide children of the top-level sizer. However, the
+  original sizer hierarchy will still hold until `Show` or `ShowModal`
+  is called.  
   
-  
-You can help make sure that your dialogs will continue to function after adaptation by:
+You can help make sure that your dialogs will continue to function
+after adaptation by:
 
 - Avoiding the above situations and assumptions;
-- Using :ref:`StdDialogButtonSizer`;
-- Only making assumptions about hierarchy immediately after the dialog is created;
-- Using an intermediate sizer under the main sizer, a false top-level sizer that can be relied on to exist for the purposes of manipulating child sizers and windows;
-- Overriding :meth:`Dialog.GetContentWindow` to return a book control if your dialog implements pages: wxPython will then only make the pages scrollable.
+
+- Using :ref:`wx.StdDialogButtonSizer`;
+
+- Only making assumptions about hierarchy immediately after the dialog
+  is created;
+
+- Using an intermediate sizer under the main sizer, a false top-level
+  sizer that can be relied on to exist for the purposes of
+  manipulating child sizers and windows;
+
+- Overriding :meth:`wx.Dialog.GetContentWindow` to return a book control
+  if your dialog implements pages: wxPython will then only make the
+  pages scrollable.
 
 
 PropertySheetDialog and Wizard
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Adaptation for :ref:`PropertySheetDialog` is always done by simply making the pages scrollable, since :meth:`Dialog.GetContentWindow` returns the dialog's 
-book control and this is handled by the standard layout adapter.
+Adaptation for :ref:`wx.PropertySheetDialog` is always done by simply
+making the pages scrollable, since :meth:`wx.Dialog.GetContentWindow`
+returns the dialog's book control and this is handled by the standard
+layout adapter.
 
-:class:`~adv.Wizard` uses its own `CanDoLayoutAdaptation` and `DoLayoutAdaptation` functions rather than the global adapter: again, only the wizard pages are made scrollable.
+:class:`wx.adv.Wizard` uses its own `CanDoLayoutAdaptation` and
+`DoLayoutAdaptation` functions rather than the global adapter: again,
+only the wizard pages are made scrollable.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/dnd_overview.rst b/docs/sphinx/rest_substitutions/overviews/dnd_overview.rst
index aa8ad9d9..a0eb3d64 100644
--- a/docs/sphinx/rest_substitutions/overviews/dnd_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/dnd_overview.rst
@@ -3,27 +3,30 @@
 
 .. _drag and drop overview:
 
-=================================================
+===========================================
 |phoenix_title|  **Drag and Drop Overview**
-=================================================
+===========================================
 
 
-It may be noted that data transfer to and from the clipboard is quite similar to data transfer 
-with drag and drop and the code to implement these two types is almost the same. In particular, 
-both data transfer mechanisms store data in some kind of :ref:`DataObject` and identify its format(s) using
-the :ref:`DataFormat` class.
+It may be noted that data transfer to and from the clipboard is quite
+similar to data transfer with drag and drop and the code to implement
+these two types is almost the same. In particular, both data transfer
+mechanisms store data in some kind of :ref:`wx.DataObject` and identify
+its format(s) using the :ref:`wx.DataFormat` class.
 
-To be a `drag` source, i.e. to provide the data which may be dragged by the user elsewhere, you
-should implement the following steps:
+To be a `drag` source, i.e. to provide the data which may be dragged
+by the user elsewhere, you should implement the following steps:
 
-- **Preparation**: First of all, a data object must be created and initialized with the data you wish to drag. For example::
+- **Preparation**: First of all, a data object must be created and
+  initialized with the data you wish to drag. For example::
 
       my_data = wx.TextDataObject("This text will be dragged.")
       
     
     
-- **Drag start**: To start the dragging process (typically in response to a mouse click) you must call 
-  :meth:`DropSource.DoDragDrop` like this::
+- **Drag start**: To start the dragging process (typically in response
+  to a mouse click) you must call :meth:`wx.DropSource.DoDragDrop` like
+  this::
   
       dragSource = wx.DropSource(self)
       dragSource.SetData(my_data)
@@ -31,12 +34,17 @@ should implement the following steps:
       
       
       
-- **Dragging**: The call to `DoDragDrop()` blocks the program until the user releases the mouse button (unless
-  you override the :meth:`DropSource.GiveFeedback` function to do something special). When the mouse moves in 
-  a window of a program which understands the same drag-and-drop protocol (any program under Windows or any 
-  program supporting the XDnD protocol under X Windows), the corresponding :ref:`DropTarget` methods are called - see below.
+- **Dragging**: The call to `DoDragDrop()` blocks the program until
+  the user releases the mouse button (unless you override the
+  :meth:`wx.DropSource.GiveFeedback` function to do something
+  special). When the mouse moves in a window of a program which
+  understands the same drag-and-drop protocol (any program under
+  Windows or any program supporting the XDnD protocol under X
+  Windows), the corresponding :ref:`wx.DropTarget` methods are called -
+  see below.
   
-- **Processing the result**: `DoDragDrop()` returns an effect code which is one of the values of :ref:`DragResult`::
+- **Processing the result**: `DoDragDrop()` returns an effect code
+  which is one of the values of :ref:`wx.DragResult`::
 
       if result == wx.DragCopy:
           # Copy the data
@@ -51,20 +59,31 @@ should implement the following steps:
           pass 
           
           
-To be a `drop` target, i.e. to receive the data dropped by the user you should follow the instructions below:
+To be a `drop` target, i.e. to receive the data dropped by the user
+you should follow the instructions below:
 
-- **Initialization**: For a window to be a drop target, it needs to have an associated :ref:`DropTarget` object. Normally, 
-  you will call :meth:`Window.SetDropTarget` during window creation associating your drop target with it. You must 
-  derive a class from :ref:`DropTarget` and override its pure virtual methods. Alternatively, you may derive 
-  from :ref:`TextDropTarget` or :ref:`FileDropTarget` and override their `OnDropText()` or `OnDropFiles()` method.
+- **Initialization**: For a window to be a drop target, it needs to
+  have an associated :ref:`wx.DropTarget` object. Normally, you will
+  call :meth:`wx.Window.SetDropTarget` during window creation
+  associating your drop target with it. You must derive a class from
+  :ref:`wx.DropTarget` and override its pure virtual
+  methods. Alternatively, you may derive from :ref:`wx.TextDropTarget`
+  or :ref:`wx.FileDropTarget` and override their `OnDropText()` or
+  `OnDropFiles()` method.
   
-- **Drop**: When the user releases the mouse over a window, wxPython asks the associated :ref:`DropTarget` object if 
-  it accepts the data. For this, a :ref:`DataObject` must be associated with the drop target and this data object 
-  will be responsible for the format negotiation between the drag source and the drop target. If all goes well, 
-  then :meth:`DropTarget.OnData` will get called and the :ref:`DataObject` belonging to the drop target can get filled with data.
+- **Drop**: When the user releases the mouse over a window, wxPython
+  asks the associated :ref:`wx.DropTarget` object if it accepts the
+  data. For this, a :ref:`wx.DataObject` must be associated with the
+  drop target and this data object will be responsible for the format
+  negotiation between the drag source and the drop target. If all goes
+  well, then :meth:`wx.DropTarget.OnData` will get called and the
+  :ref:`wx.DataObject` belonging to the drop target can get filled
+  with data.
   
-- **The end**: After processing the data, `DoDragDrop()` returns either ``DragCopy`` or ``DragMove`` depending on the 
-  state of the keys ``Ctrl``, ``Shift`` and ``Alt`` at the moment of the drop. There is currently no way for 
-  the drop target to change this return code.
+- **The end**: After processing the data, `DoDragDrop()` returns
+  either ``wx.DragCopy`` or ``wx.DragMove`` depending on the state of
+  the keys ``Ctrl``, ``Shift`` and ``Alt`` at the moment of the
+  drop. There is currently no way for the drop target to change this
+  return code.
   
   
diff --git a/docs/sphinx/rest_substitutions/overviews/events_overview.rst b/docs/sphinx/rest_substitutions/overviews/events_overview.rst
index 2c529a7f..75732073 100644
--- a/docs/sphinx/rest_substitutions/overviews/events_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/events_overview.rst
@@ -8,30 +8,47 @@
 ==============================================
 
 
-Like with all the other GUI frameworks, the control of flow in wxPython applications is event-based: the program
-normally performs most of its actions in response to the events generated by the user. These events can be 
-triggered by using the input devices (such as keyboard, mouse, joystick) directly or, more commonly, by a standard
-control which synthesizes such input events into higher level events: for example, a :ref:`Button` can generate 
-a click event when the user presses the left mouse button on it and then releases it without pressing ``Esc`` in 
-the meanwhile. There are also events which don't directly correspond to the user actions, such as :ref:`TimerEvent`.
+Like with all the other GUI frameworks, the control of flow in
+wxPython applications is event-based: the program normally performs
+most of its actions in response to the events generated by the
+user. These events can be triggered by using the input devices (such
+as keyboard, mouse, joystick) directly or, more commonly, by a
+standard control which synthesizes such input events into higher level
+events: for example, a :ref:`wx.Button` can generate a click event when
+the user presses the left mouse button on it and then releases it
+without pressing ``Esc`` in the meanwhile. There are also events which
+don't directly correspond to the user actions, such as
+:ref:`wx.TimerEvent`.
 
-But in all cases wxPython represents these events in a uniform way and allows you to handle them in the same way
-wherever they originate from. And while the events are normally generated by wxPython itself, you can also do this, 
-which is especially useful when using custom events (see :ref:`Custom Event Summary <custom event summary>`).
+But in all cases wxPython represents these events in a uniform way and
+allows you to handle them in the same way wherever they originate
+from. And while the events are normally generated by wxPython itself,
+you can also do this, which is especially useful when using custom
+events (see :ref:`Custom Event Summary <custom event summary>`).
 
 To be more precise, each event is described by:
 
-- `Event type`: this is simply a value of type `EventType` which uniquely identifies the type of the event. 
-  For example, clicking on a button, selecting an item from a list box and pressing a key on the keyboard all 
-  generate events with different event types.
-- `Event class` carried by the event: each event has some information associated with it and this data is represented
-  by an object of a class derived from :ref:`Event`. Events of different types can use the same event class, for 
-  example both button click and listbox selection events use :ref:`CommandEvent` class (as do all the other simple 
-  control events), but the key press event uses :ref:`KeyEvent` as the information associated with it is different.
-- `Event source`: :ref:`Event` stores the object which generated the event and, for windows, its identifier (see 
-  :ref:`Window Identifiers <window identifiers>`). As it is common to have more than one object generating events of 
-  the same type (e.g. a typical window contains several buttons, all generating the same button click event), checking
-  the event source object or its id allows to distinguish between them.
+- **Event type**: this is simply a value of type `EventType` which
+  uniquely identifies the type of the event.  For example, clicking on
+  a button, selecting an item from a list box and pressing a key on
+  the keyboard all generate events with different event types.
+
+- **Event class**: carried by the event: each event has some information
+  associated with it and this data is represented by an object of a
+  class derived from :ref:`wx.Event`. Events of different types can
+  use the same event class, for example both button click and listbox
+  selection events use :ref:`wx.CommandEvent` class (as do all the
+  other simple control events), but the key press event uses
+  :ref:`wx.KeyEvent` as the information associated with it is
+  different.
+
+- **Event source**: :ref:`wx.Event` stores the object which generated the
+  event and, for windows, its identifier (see :ref:`Window Identifiers
+  <window identifiers>`). As it is common to have more than one object
+  generating events of the same type (e.g. a typical window contains
+  several buttons, all generating the same button click event),
+  checking the event source object or its id allows to distinguish
+  between them.
   
 
 
@@ -40,13 +57,14 @@ To be more precise, each event is described by:
 Event Handling
 --------------
 
-There is one principal way to handle events in wxPython, which uses :meth:`EvtHandler.Bind` () call and can be used 
-to bind and unbind the handlers dynamically, i.e. during run-time depending on some conditions. It also allows the direct
-binding of events to:
+There is one principal way to handle events in wxPython, which uses
+the :meth:`wx.EvtHandler.Bind` call and can be used to bind and unbind
+the handlers dynamically, i.e. during run-time depending on some
+conditions. It also allows the direct binding of events to:
 
-- A handler method in another object.
+- A handler method in the same or another object.
 - An ordinary function like a static method or a global function.
-- An arbitrary function.
+- An arbitrary callable object.
 
 
 
@@ -55,50 +73,53 @@ binding of events to:
 Dynamic Event Handling
 ----------------------
 
-Let us start by looking at the syntax: in any place in your code, but usually in the code of the class defining the handler
-itself, call its `Bind()` method like this::
+Let us start by looking at the syntax: in any place in your code, but
+usually in the code of the class defining the handler itself, call its
+``Bind()`` method like this::
 
 	class MyFrame(wx.Frame):
-	
 	    def __init__(self, parent):
-	    
 	        wx.Frame.__init__(self, parent)
 
                 # Other initialization code...
-                
+		
                 self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT)
 
 
 
-Event handlers can be bound at any moment. For example, it's possible to do some initialization first and only bind the 
-handlers if and when it succeeds. This can avoid the need to test that the object was properly initialized in the event 
-handlers themselves. With `Bind()` they simply won't be called if it wasn't correctly initialized.
+Event handlers can be bound at any moment. For example, it's possible
+to do some initialization first and only bind the handlers if and when
+it succeeds. This can avoid the need to test that the object was
+properly initialized in the event handlers themselves. With ``Bind()``
+they simply won't be called if it wasn't correctly initialized.
 
-As a slight extension of the above, the handlers can also be unbound at any time with :meth:`EvtHandler.Unbind` () (and maybe rebound later). 
+As a slight extension of the above, the handlers can also be unbound
+at any time with :meth:`wx.EvtHandler.Unbind` (and maybe rebound
+later).
 
-Almost last but very, very far from least is the flexibility which allows to bind an event to:
+Almost last but very, very far from least is the flexibility which
+allows to bind an event to:
 
 - A method in another object.
 - An ordinary function like a static method or a global function.
 - An arbitrary function.
 
 
-Let us now look at more examples of how to use different event handlers using the two overloads of `Bind()` function: 
-first one for the object methods and the other one for arbitrary functors (callable objects, including simple functions).
+Let us now look at more examples of how to use different event
+handlers using the two overloads of ``Bind()`` function: first one for
+the object methods and the other one for arbitrary functors (callable
+objects, including simple functions).
 
-In addition to using a method of the object generating the event itself, you can use a method from a completely different
-object as an event handler::
+In addition to using a method of the object generating the event
+itself, you can use a method from a completely different object as an
+event handler::
 
 	def OnFrameExit(event):
-
 	    # Do something useful.
-		pass
-
+	    pass
 
 	class MyFrame(wx.Frame):
-	
 	    def __init__(self, parent):
-	    
 	        wx.Frame.__init__(self, parent)
 
                 # Other initialization code...
@@ -107,7 +128,8 @@ object as an event handler::
 
 
 
-Note that `MyFrameHandler` doesn't need to derive from :ref:`EvtHandler`. 
+Note that `MyFrameHandler` doesn't need to derive from
+:ref:`wx.EvtHandler`.
 
 
 
@@ -116,36 +138,63 @@ Note that `MyFrameHandler` doesn't need to derive from :ref:`EvtHandler`.
 How Events are Processed
 ------------------------
 
-The previous sections explain how to define event handlers but don't address the question of how exactly
-wxPython finds the handler to call for the given event. This section describes the algorithm used in detail. 
+The previous sections explain how to define event handlers but don't
+address the question of how exactly wxPython finds the handler to call
+for the given event. This section describes the algorithm used in
+detail.
 
-When an event is received from the windowing system, wxPython calls :meth:`EvtHandler.ProcessEvent` () on 
-the first event handler object belonging to the window generating the event. The normal order of event table
-searching by `ProcessEvent()` is as follows, with the event processing stopping as soon as a handler is found
-(unless the handler calls :meth:`Event.Skip` () in which case it doesn't count as having handled the event 
-and the search continues):
+When an event is received from the windowing system, wxPython calls
+:meth:`wx.EvtHandler.ProcessEvent` on the first event handler object
+belonging to the window generating the event. The normal order of
+event table searching by ``ProcessEvent`` is as follows, with the
+event processing stopping as soon as a handler is found (unless the
+handler calls :meth:`wx.Event.Skip` in which case it doesn't count as
+having handled the event and the search continues):
 
-1. Before anything else happens, :meth:`AppConsole.FilterEvent` () is called. If it returns anything but -1 (default), 
-   the event handling stops immediately.
-2. If this event handler is disabled via a call to :meth:`EvtHandler.SetEvtHandlerEnabled` () the next three 
-   steps are skipped and the event handler resumes at step (5).
-3. If the object is a :ref:`Window` and has an associated validator, :ref:`Validator` gets a chance to process the event.
-4. The list of dynamically bound event handlers, i.e., those for which `Bind()` was called, is consulted.
-5. The event table containing all the handlers defined using the event table macros in this class and its base classes 
-   is examined. Notice that this means that any event handler defined in a base class will be executed at this step.
-6. The event is passed to the next event handler, if any, in the event handler chain, i.e., the steps (1) to (4) are done
-   for it. Usually there is no next event handler so the control passes to the next step but see :ref:`Event Handlers Chain <event handlers chain>` 
-   for how the next handler may be defined.
-7. If the object is a :ref:`Window` and the event is set to propagate (by default only :ref:`CommandEvent` -derived events are set to propagate), 
-   then the processing restarts from the step (1) (and excluding the step (7)) for the parent window. If this object is not a window
-   but the next handler exists, the event is passed to its parent if it is a window. This ensures that in a common case of 
-   (possibly several) non-window event handlers pushed on top of a window, the event eventually reaches the window parent.
-8. Finally, i.e., if the event is still not processed, the :ref:`App` object itself (which derives from :ref:`EvtHandler`) 
-   gets a last chance to process it.
+1. Before anything else happens, :meth:`wx.AppConsole.FilterEvent` is
+   called. If it returns anything but -1 (default), the event handling
+   stops immediately.
+
+2. If this event handler is disabled via a call to
+   :meth:`wx.EvtHandler.SetEvtHandlerEnabled` the next three steps are
+   skipped and the event handler resumes at step (5).
+
+3. If the object is a :ref:`wx.Window` and has an associated validator,
+   :ref:`wx.Validator` gets a chance to process the event.
+
+4. The list of dynamically bound event handlers, i.e., those for which
+   ``Bind()`` was called, is consulted.
+
+5. The event table containing all the handlers defined using the event
+   table macros in this class and its base classes is examined. Notice
+   that this means that any event handler defined in a base class will
+   be executed at this step.
+
+6. The event is passed to the next event handler, if any, in the event
+   handler chain, i.e., the steps (1) to (4) are done for it. Usually
+   there is no next event handler so the control passes to the next
+   step but see :ref:`Event Handlers Chain <event handlers chain>` for
+   how the next handler may be defined.
+
+7. If the object is a :ref:`wx.Window` and the event is set to
+   propagate (by default only event types derived from
+   :ref:`wx.CommandEvent` are set to propagate), then the processing
+   restarts from the step (1) (and excluding the step (7)) for the
+   parent window. If this object is not a window but the next handler
+   exists, the event is passed to its parent if it is a window. This
+   ensures that in a common case of (possibly several) non-window
+   event handlers pushed on top of a window, the event eventually
+   reaches the window parent.
+
+8. Finally, i.e., if the event is still not processed, the
+   :ref:`wx.App` object itself (which derives from
+   :ref:`wx.EvtHandler`) gets a last chance to process it.
    
    
-**Please pay close attention to step 6!** People often overlook or get confused by this powerful feature of the wxPython
-event processing system. The details of event propagation up the window hierarchy are described in the next section.
+**Please pay close attention to step 6!** People often overlook or get
+confused by this powerful feature of the wxPython event processing
+system. The details of event propagation up the window hierarchy are
+described in the next section.
 
 
 
@@ -154,32 +203,49 @@ event processing system. The details of event propagation up the window hierarch
 How Events Propagate Upwards
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-As mentioned above, the events of the classes deriving from :ref:`CommandEvent` are propagated by default to the parent
-window if they are not processed in this window itself. But although by default only the command events are propagated 
-like this, other events can be propagated as well because the event handling code uses :meth:`Event.ShouldPropagate` () 
-to check whether an event should be propagated. It is also possible to propagate the event only a limited number of times
-and not until it is processed (or a top level parent window is reached).
+As mentioned above, the events of the classes deriving from
+:ref:`wx.CommandEvent` are propagated by default to the parent window if
+they are not processed in this window itself. But although by default
+only the command events are propagated like this, other events can be
+propagated as well because the event handling code uses
+:meth:`wx.Event.ShouldPropagate` to check whether an event should be
+propagated. It is also possible to propagate the event only a limited
+number of times and not until it is processed (or a top level parent
+window is reached).
 
-Finally, there is another additional complication (which, in fact, simplifies life of wxPython programmers significantly): 
-when propagating the command events up to the parent window, the event propagation stops when it reaches the parent dialog,
-if any. This means that you don't risk getting unexpected events from the dialog controls (which might be left unprocessed 
-by the dialog itself because it doesn't care about them) when a modal dialog is popped up. The events do propagate beyond 
-the frames, however. The rationale for this choice is that there are only a few frames in a typical application and their 
-parent-child relation are well understood by the programmer while it may be difficult, if not impossible, to track down all 
-the dialogs that may be popped up in a complex program (remember that some are created automatically by wxPython). 
-If you need to specify a different behaviour for some reason, you can use :meth:`Window.SetExtraStyle` (``WS_EX_BLOCK_EVENTS``) 
-explicitly to prevent the events from being propagated beyond the given window or unset this flag for the dialogs that 
-have it on by default.
+Finally, there is another additional complication (which, in fact,
+simplifies life of wxPython programmers significantly): when
+propagating the command events up to the parent window, the event
+propagation stops when it reaches the parent dialog, if any. This
+means that you don't risk getting unexpected events from the dialog
+controls (which might be left unprocessed by the dialog itself because
+it doesn't care about them) when a modal dialog is popped up. The
+events do propagate beyond the frames, however. The rationale for this
+choice is that there are only a few frames in a typical application
+and their parent-child relation are well understood by the programmer
+while it may be difficult, if not impossible, to track down all the
+dialogs that may be popped up in a complex program (remember that some
+are created automatically by wxPython).  If you need to specify a
+different behaviour for some reason, you can use
+:meth:`wx.Window.SetExtraStyle` (``wx.WS_EX_BLOCK_EVENTS``) explicitly
+to prevent the events from being propagated beyond the given window or
+unset this flag for the dialogs that have it on by default.
 
-Typically events that deal with a window as a window (size, motion, paint, mouse, keyboard, etc.) are sent only to the window. 
-Events that have a higher level of meaning or are generated by the window itself (button click, menu select, tree expand, etc.) 
-are command events and are sent up to the parent to see if it is interested in the event. More precisely, as said above, all 
-event classes not deriving from :ref:`CommandEvent` (see the :ref:`Event` inheritance diagram) do not propagate upward.
+Typically events that deal with a window as a window (size, motion,
+paint, mouse, keyboard, etc.) are sent only to the window.  Events
+that have a higher level of meaning or are generated by the window
+itself (button click, menu select, tree expand, etc.)  are command
+events and are sent up to the parent to see if it is interested in the
+event. More precisely, as said above, all event classes not deriving
+from :ref:`wx.CommandEvent` (see the :ref:`wx.Event` inheritance
+diagram) do not propagate upward.
 
-In some cases, it might be desired by the programmer to get a certain number of system events in a parent window, for
-example all key events sent to, but not used by, the native controls in a dialog. In this case, a special event handler 
-will have to be written that will override `ProcessEvent()` in order to pass all events (or any selection of them) to the 
-parent window.
+In some cases, it might be desired by the programmer to get a certain
+number of system events in a parent window, for example all key events
+sent to, but not used by, the native controls in a dialog. In this
+case, a special event handler will have to be written that will
+override ``ProcessEvent()`` in order to pass all events (or any
+selection of them) to the parent window.
 
 
 .. _event handlers chain:
@@ -187,18 +253,21 @@ parent window.
 Event Handlers Chain
 ^^^^^^^^^^^^^^^^^^^^
 
-The step 4 of the event propagation algorithm checks for the next handler in the event handler chain. This chain can be formed 
-using :meth:`EvtHandler.SetNextHandler` ():
+Step 4 of the event propagation algorithm checks for the next
+handler in the event handler chain. This chain can be formed using
+:meth:`wx.EvtHandler.SetNextHandler`:
 
 .. figure:: _static/images/overviews/overview_events_chain.png
    :align: center
 
 |
 
-(referring to the image, if `A.ProcessEvent` is called and it doesn't handle the event, `B.ProcessEvent` will be called and so on...).
+(Referring to the image, if ``A.ProcessEvent`` is called and it doesn't
+handle the event, ``B.ProcessEvent`` will be called and so on...).
 
-Additionally, in the case of :ref:`Window` you can build a stack (implemented using :ref:`EvtHandler` double-linked list) using 
-:meth:`Window.PushEventHandler` ():
+Additionally, in the case of :ref:`wx.Window` you can build a stack
+(implemented using :ref:`wx.EvtHandler` double-linked list) using
+:meth:`wx.Window.PushEventHandler`:
 
 .. figure:: _static/images/overviews/overview_events_winstack.png
    :align: center
@@ -207,9 +276,12 @@ Additionally, in the case of :ref:`Window` you can build a stack (implemented us
 
 
 
-(referring to the image, if `W.ProcessEvent` is called, it immediately calls `A.ProcessEvent`; if nor A nor B handle the event, 
-then the :ref:`Window` itself is used -- i.e. the dynamically bind event handlers and static event table entries of :ref:`Window`
-are looked as the last possibility, after all pushed event handlers were tested).
+(Referring to the image, if ``W.ProcessEvent`` is called, it
+immediately calls ``A.ProcessEvent``; if nor A nor B handle the event,
+then the :ref:`wx.Window` itself is used -- i.e. the dynamically bind
+event handlers and static event table entries of :ref:`wx.Window` are
+looked as the last possibility, after all pushed event handlers were
+tested).
 
 By default the chain is empty, i.e. there is no next handler.
 
@@ -222,10 +294,13 @@ Custom Event Summary
 General approach
 ^^^^^^^^^^^^^^^^
 
-Custom event classes allow you to create more polished-seeming controls by allowing the control's user to process updates 
-without needing to sub-class the control. However, to effectively use events, you normally need to create custom event classes. 
+Custom event classes allow you to create more polished-seeming
+controls by allowing the control's user to process updates without
+needing to sub-class the control. However, to effectively use events,
+you normally need to create custom event classes.
 
-This recipe gives you some boilerplate code for creating your own custom event classes::
+This recipe gives you some boilerplate code for creating your own
+custom event classes::
 
 	import wx
 	import wx.lib.newevent
@@ -240,7 +315,8 @@ You can bind the events normally via either binding syntax::
 	EVT_SOME_NEW_EVENT(self, self.handler)
 	
 	
-You can also attach arbitrary data to the event during its creation, then post it to whatever window you choose::
+You can also attach arbitrary data to the event during its creation,
+then post it to whatever window you choose::
 
 	    # Create the event
 	    evt = SomeNewEvent(attr1="hello", attr2=654)
@@ -248,8 +324,10 @@ You can also attach arbitrary data to the event during its creation, then post i
 	    wx.PostEvent(target, evt)
 	    
 	    
-When handling events with such arbitrary data, you can fetch the data via attributes, named the same as the names
-passed in during the event instance creation. That is, given the two keyword arguments passed to SomeNewEvent above::
+When handling events with such arbitrary data, you can fetch the data
+via attributes, named the same as the names passed in during the event
+instance creation. That is, given the two keyword arguments passed to
+``SomeNewEvent`` above::
 
 
 	    def handler(self, evt):
@@ -269,22 +347,34 @@ Miscellaneous Notes
 User Generated Events vs Programmatically Generated Events
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-While generically a :ref:`Event` can be generated both by user actions (e.g., resize of a :ref:`Window`) and by calls to functions 
-(e.g., :meth:`Window.SetSize`), wxPython controls normally send :ref:`CommandEvent` -derived events only for the user-generated 
+While generically a :ref:`wx.Event` can be generated both by user actions
+(e.g., resize of a :ref:`wx.Window`) and by calls to functions (e.g.,
+:meth:`wx.Window.SetSize`), wxPython controls normally send
+:ref:`wx.CommandEvent` -derived events only for the user-generated
 events. The only exceptions to this rule are:
 
-- :meth:`BookCtrlBase.AddPage` No event-free alternatives
-- :meth:`BookCtrlBase.AdvanceSelection` No event-free alternatives
-- :meth:`BookCtrlBase.DeletePage` No event-free alternatives
-- :meth:`Notebook.SetSelection`: Use :meth:`Notebook.ChangeSelection` instead, as :meth:`Notebook.SetSelection` is deprecated
-- :meth:`TreeCtrl.Delete`: No event-free alternatives
-- :meth:`TreeCtrl.DeleteAllItems`: No event-free alternatives
-- :meth:`TreeCtrl.EditLabel`: No event-free alternatives
-- All :ref:`TextCtrl` methods
+- :meth:`wx.BookCtrlBase.AddPage` No event-free alternatives
+
+- :meth:`wx.BookCtrlBase.AdvanceSelection` No event-free alternatives
+
+- :meth:`wx.BookCtrlBase.DeletePage` No event-free alternatives
+
+- :meth:`wx.Notebook.SetSelection`: Use :meth:`wx.Notebook.ChangeSelection`
+  instead, as :meth:`wx.Notebook.SetSelection` is deprecated
+
+- :meth:`wx.TreeCtrl.Delete`: No event-free alternatives
+
+- :meth:`wx.TreeCtrl.DeleteAllItems`: No event-free alternatives
+
+- :meth:`wx.TreeCtrl.EditLabel`: No event-free alternatives
+
+- All :ref:`wx.TextCtrl` methods
 
 
-:meth:`TextEntry.ChangeValue` can be used instead of :meth:`TextEntry.SetValue` but the other functions, such as :meth:`TextEntry.Replace`
-or :meth:`TextCtrl.WriteText` don't have event-free equivalents.
+:meth:`wx.TextEntry.ChangeValue` can be used instead of
+:meth:`wx.TextEntry.SetValue` but the other functions, such as
+:meth:`wx.TextEntry.Replace` or :meth:`wx.TextCtrl.WriteText` don't
+have event-free equivalents.
 
 
 
@@ -293,20 +383,31 @@ or :meth:`TextCtrl.WriteText` don't have event-free equivalents.
 Window Identifiers
 ^^^^^^^^^^^^^^^^^^
 
-Window identifiers are integers, and are used to uniquely determine window identity in the event system (though you can use it 
-for other purposes). In fact, identifiers do not need to be unique across your entire application as long they are unique within 
-the particular context you're interested in, such as a frame and its children. You may use the ``ID_OK`` identifier, for example, 
-on any number of dialogs as long as you don't have several within the same dialog.
+Window identifiers are integers, and are used to uniquely determine
+window identity in the event system (though you can use it for other
+purposes). In fact, identifiers do not need to be unique across your
+entire application as long they are unique within the particular
+context you're interested in, such as a frame and its children. You
+may use the ``wx.ID_OK`` identifier, for example, on any number of
+dialogs as long as you don't have several within the same dialog.
 
-If you pass ``ID_ANY`` or -1 to a window constructor, an identifier will be generated for you automatically by wxPython. This is useful 
-when you don't care about the exact identifier either because you're not going to process the events from the control being created 
-or because you process the events from all controls in one place (in which case you should specify ``ID_ANY`` in the :meth:`EvtHandler.Bind`
-call as well). The automatically generated identifiers are always negative and so will never conflict with the user-specified 
-identifiers which must be always positive.
+If you pass ``wx.ID_ANY`` or -1 to a window constructor, an identifier
+will be generated for you automatically by wxPython. This is useful
+when you don't care about the exact identifier either because you're
+not going to process the events from the control being created or
+because you process the events from all controls in one place (in
+which case you should specify ``wx.ID_ANY`` in the
+:meth:`wx.EvtHandler.Bind` call as well). The automatically generated
+identifiers are always negative and so will never conflict with the
+user-specified identifiers which must be always positive.
 
-.. seealso:: See :ref:`Standard event identifiers <standard event identifiers>` for the list of standard identifiers available. 
+.. seealso:: See :ref:`Standard event identifiers <standard event identifiers>`
+   for the list of standard identifiers available.
 
 
-You can use ``ID_HIGHEST`` to determine the number above which it is safe to define your own identifiers. Or, you can use identifiers below ``ID_LOWEST``.
-Finally, you can allocate identifiers dynamically using :func:`NewId` () function too. If you use :func:`NewId` () consistently in your
-application, you can be sure that your identifiers don't conflict accidentally.
+You can use ``wx.ID_HIGHEST`` to determine the number above which it is
+safe to define your own identifiers. Or, you can use identifiers below
+``wx.ID_LOWEST``.  Finally, you can allocate identifiers dynamically
+using :func:`wx.NewId` function too. If you use :func:`wx.NewId`
+consistently in your application, you can be sure that your
+identifiers don't conflict accidentally.
diff --git a/docs/sphinx/rest_substitutions/overviews/filesystem_overview.rst b/docs/sphinx/rest_substitutions/overviews/filesystem_overview.rst
index a8249ec9..f7b4a463 100644
--- a/docs/sphinx/rest_substitutions/overviews/filesystem_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/filesystem_overview.rst
@@ -7,34 +7,59 @@
 |phoenix_title|  **FileSystem Overview**
 ========================================
 
-The wxHTML library uses a **virtual** file systems mechanism similar to the one used in Midnight Commander, Dos Navigator, FAR or almost any modern file manager.
+The wxHTML library uses a **virtual** file systems mechanism similar
+to the one used in Midnight Commander, Dos Navigator, FAR or almost
+any modern file manager.
 
-It allows the user to access data stored in archives as if they were ordinary files. On-the-fly generated files that exist only in memory are also supported.
+It allows the user to access data stored in archives as if they were
+ordinary files. On-the-fly generated files that exist only in memory
+are also supported.
 
 
 
 Classes
 -------
 
-Three classes are used in order to provide virtual file systems mechanism:
+Three classes are used in order to provide virtual file systems
+mechanism:
 
-* The :ref:`FSFile` class provides information about opened file (name, input stream, mime type and anchor).
-* The :ref:`FileSystem` class is the interface. Its main methods are :meth:`FileSystem.ChangePathTo` and :meth:`FileSystem.OpenFile`. This class is most often used by the end user.
-* The :ref:`FileSystemHandler` is the core of virtual file systems mechanism. You can derive your own handler and pass it to the VFS mechanism. You can derive your 
-  own handler and pass it to the :meth:`FileSystem.AddHandler` method. In the new handler you only need to override the :meth:`FileSystemHandler.OpenFile` and 
-  :meth:`FileSystemHandler.CanOpen` methods.
+* The :ref:`wx.FSFile` class provides information about opened file
+  (name, input stream, mime type and anchor).
+
+* The :ref:`wx.FileSystem` class is the interface. Its main methods are
+  :meth:`wx.FileSystem.ChangePathTo` and
+  :meth:`wx.FileSystem.OpenFile`. This class is most often used by the
+  end user.
+
+* The :ref:`wx.FileSystemHandler` is the core of virtual file systems
+  mechanism. You can derive your own handler and pass it to the VFS
+  mechanism. You can derive your own handler and pass it to the
+  :meth:`wx.FileSystem.AddHandler` method. In the new handler you only
+  need to override the :meth:`wx.FileSystemHandler.OpenFile` and
+  :meth:`wx.FileSystemHandler.CanOpen` methods.
 
 
 
 Locations
 ---------
 
-Locations (aka filenames aka addresses) are constructed from four parts:
+Locations (aka filenames aka addresses) are constructed from four
+parts:
 
-* **protocol** - handler can recognize if it is able to open a file by checking its protocol. Examples are ``"http"``, ``"file"`` or ``"ftp"``.
-* **right location** - is the name of file within the protocol. In ``"http://www.wxwidgets.org/index.html"`` the right location is ``"//www.wxwidgets.org/index.html"``.
-* **anchor** - an anchor is optional and is usually not present. In ``"index.htm#chapter2"`` the anchor is ``"chapter2"``.
-* **left location** - this is usually an empty string. It is used by 'local' protocols such as ZIP. See the :ref:`Combined Protocols <combined protocols>` paragraph for details.
+* **protocol** - handler can recognize if it is able to open a file by
+  checking its protocol. Examples are ``"http"``, ``"file"`` or
+  ``"ftp"``.
+
+* **right location** - is the name of file within the protocol. In
+  ``"http://www.wxwidgets.org/index.html"`` the right location is
+  ``"//www.wxwidgets.org/index.html"``.
+
+* **anchor** - an anchor is optional and is usually not present. In
+  ``"index.htm#chapter2"`` the anchor is ``"chapter2"``.
+
+* **left location** - this is usually an empty string. It is used by
+  'local' protocols such as ZIP. See the :ref:`Combined Protocols
+  <combined protocols>` paragraph for details.
 
 
 .. _combined protocols:
@@ -44,11 +69,15 @@ Combined Protocols
 
 The left location precedes the protocol in the URL string.
 
-It is not used by global protocols like HTTP but it becomes handy when nesting protocols - for example you may want to access files in a ZIP archive: 
+It is not used by global protocols like HTTP but it becomes handy when
+nesting protocols - for example you may want to access files in a ZIP
+archive:
 
 ``file:archives/cpp_doc.zip#zip:reference/fopen.htm#syntax`` 
 
-In this example, the protocol is ``"zip"``, right location is ``"reference/fopen.htm"``, anchor is ``"syntax"`` and left location is ``file:archives/cpp_doc.zip``.
+In this example, the protocol is ``"zip"``, right location is
+``"reference/fopen.htm"``, anchor is ``"syntax"`` and left location is
+``file:archives/cpp_doc.zip``.
 
 There are two protocols used in this example: "zip" and "file".
 
@@ -60,11 +89,20 @@ File Systems Included in wxHTML
 
 The following virtual file system handlers are part of wxPython so far:
 
-* :ref:`ArchiveFSHandler`: A handler for archives such as zip and tar. URLs examples: ``"archive.zip#zip:filename"``, ``"archive.tar.gz#gzip:#tar:filename"``.
-* :ref:`FilterFSHandler`: A handler for compression schemes such as gzip. URLs are in the form, e.g.: ``"document.ps.gz#gzip:"``.
-* :ref:`InternetFSHandler`: A handler for accessing documents via HTTP or FTP protocols.
-* :ref:`MemoryFSHandler`: This handler allows you to access data stored in memory (such as bitmaps) as if they were regular files. See :ref:`MemoryFSHandler` for details. 
-  URL is prefixed with memory:, e.g. ``"memory:myfile.htm"``.
+* :ref:`wx.ArchiveFSHandler`: A handler for archives such as zip and
+  tar. URLs examples: ``"archive.zip#zip:filename"``,
+  ``"archive.tar.gz#gzip:#tar:filename"``.
+
+* :ref:`wx.FilterFSHandler`: A handler for compression schemes such as
+  gzip. URLs are in the form, e.g.: ``"document.ps.gz#gzip:"``.
+
+* :ref:`wx.InternetFSHandler`: A handler for accessing documents via HTTP
+  or FTP protocols.
+
+* :ref:`wx.MemoryFSHandler`: This handler allows you to access data
+  stored in memory (such as bitmaps) as if they were regular
+  files. See :ref:`wx.MemoryFSHandler` for details.  URL is prefixed with
+  memory:, e.g. ``"memory:myfile.htm"``.
   
 
 In addition, :ref:`FileSystem` itself can access local files.
@@ -74,11 +112,10 @@ In addition, :ref:`FileSystem` itself can access local files.
 Initializing file system handlers
 ---------------------------------
 
-Use :meth:`FileSystem.AddHandler` to initialize a handler, for example::
-
+Use :meth:`wx.FileSystem.AddHandler` to initialize a handler, for
+example::
 
 	def OnInit(self):
-
 	    wx.FileSystem.AddHandler(wx.MemoryFSHandler())
 
 
diff --git a/docs/sphinx/rest_substitutions/overviews/font_encodings.rst b/docs/sphinx/rest_substitutions/overviews/font_encodings.rst
index b42a3d05..c547c967 100644
--- a/docs/sphinx/rest_substitutions/overviews/font_encodings.rst
+++ b/docs/sphinx/rest_substitutions/overviews/font_encodings.rst
@@ -10,48 +10,67 @@
 
 wxPython has support for multiple font encodings.
 
-By encoding we mean here the mapping between the character codes and the letters. Probably the most well-known encoding is 
-(7 bit) ASCII one which is used almost universally now to represent the letters of the English alphabet and some other
-common characters. However, it is not enough to represent the letters of foreign alphabets and here other encodings 
-come into play. Please note that we will only discuss 8-bit fonts here and not Unicode.
+By encoding we mean here the mapping between the character codes and
+the letters. Probably the most well-known encoding is (7 bit) ASCII
+one which is used almost universally now to represent the letters of
+the English alphabet and some other common characters. However, it is
+not enough to represent the letters of foreign alphabets and here
+other encodings come into play. Please note that we will only discuss
+8-bit fonts here and not Unicode.
 
-Font encoding support is ensured by several classes: :ref:`Font` itself, but also :ref:`FontEnumerator` and :ref:`FontMapper`. 
-:ref:`Font` encoding support is reflected by a (new) constructor parameter encoding which takes one of the following 
-values (elements of enumeration type :ref:`FontEncoding`):
+Font encoding support is ensured by several classes: :ref:`Font`
+itself, but also :ref:`wx.FontEnumerator`
+and :ref:`wx.FontMapper`. :ref:`wx.Font` encoding support is reflected by a
+(new) constructor parameter encoding which takes one of the following
+values (elements of enumeration type :ref:`wx.FontEncoding`):
 
 ======================================== =========================================================
-``FONTENCODING_SYSTEM``	                 The default encoding of the underlying operating system (notice that this might be a "foreign" encoding for foreign versions of Windows 9x/NT).
-``FONTENCODING_DEFAULT``	         The applications default encoding as returned by :meth:`Font.GetDefaultEncoding`. On program startup, the applications default encoding is the same as ``FONTENCODING_SYSTEM``, but may be changed to make all the fonts created later to use it (by default).
-``FONTENCODING_ISO8859_1..15``	         ISO8859 family encodings which are usually used by all non-Microsoft operating systems.
-``FONTENCODING_KOI8``	                 Standard Cyrillic encoding for the Internet (but see also ``FONTENCODING_ISO8859_5`` and ``FONTENCODING_CP1251``).
-``FONTENCODING_CP1250``	                 Microsoft analogue of ISO8859-2
-``FONTENCODING_CP1251``	                 Microsoft analogue of ISO8859-5
-``FONTENCODING_CP1252``	                 Microsoft analogue of ISO8859-1
+``wx.FONTENCODING_SYSTEM``               The default encoding of the underlying operating system (notice that this might be a "foreign" encoding for foreign versions of Windows 9x/NT).
+``wx.FONTENCODING_DEFAULT``              The applications default encoding as returned by :meth:`wx.Font.GetDefaultEncoding`. On program startup, the applications default encoding is the same as ``wx.FONTENCODING_SYSTEM``, but may be changed to make all the fonts created later to use it (by default).
+``wx.FONTENCODING_ISO8859_1..15``        ISO8859 family encodings which are usually used by all non-Microsoft operating systems.
+``wx.FONTENCODING_KOI8``                 Standard Cyrillic encoding for the Internet (but see also ``wx.FONTENCODING_ISO8859_5`` and ``wx.FONTENCODING_CP1251``).
+``wx.FONTENCODING_CP1250``               Microsoft analogue of ISO8859-2
+``wx.FONTENCODING_CP1251``               Microsoft analogue of ISO8859-5
+``wx.FONTENCODING_CP1252``               Microsoft analogue of ISO8859-1
 ======================================== =========================================================
 
 
-As you may see, Microsoft's encoding partly mirror the standard ISO8859 ones, but there are (minor) differences even between
-ISO8859-1 (Latin1, ISO encoding for Western Europe) and CP1251 (WinLatin1, standard code page for English versions of Windows) 
-and there are more of them for other encodings.
+As you may see, Microsoft's encoding partly mirror the standard
+ISO8859 ones, but there are (minor) differences even between ISO8859-1
+(Latin1, ISO encoding for Western Europe) and CP1251 (WinLatin1,
+standard code page for English versions of Windows) and there are more
+of them for other encodings.
 
-The situation is particularly complicated with Cyrillic encodings for which (more than) three incompatible encodings exist: 
-KOI8 (the old standard, widely used on the Internet), ISO8859-5 (ISO standard for Cyrillic) and CP1251 (WinCyrillic).
+The situation is particularly complicated with Cyrillic encodings for
+which (more than) three incompatible encodings exist: KOI8 (the old
+standard, widely used on the Internet), ISO8859-5 (ISO standard for
+Cyrillic) and CP1251 (WinCyrillic).
 
-This abundance of (incompatible) encodings should make it clear that using encodings is less easy than it might seem. 
-The problems arise both from the fact that the standard encodings for the given language (say Russian, which is written 
-in Cyrillic) are different on different platforms and because the fonts in the given encoding might just not be installed
-(this is especially a problem with Unix, or, in general, non-Win32 systems).
+This abundance of (incompatible) encodings should make it clear that
+using encodings is less easy than it might seem. The problems arise
+both from the fact that the standard encodings for the given language
+(say Russian, which is written in Cyrillic) are different on different
+platforms and because the fonts in the given encoding might just not
+be installed (this is especially a problem with Unix, or, in general,
+non-Win32 systems).
 
-To clarify, the :ref:`FontEnumerator` class may be used to enumerate both all available encodings and to find the facename(s)
-in which the given encoding exists. If you can find the font in the correct encoding with :ref:`FontEnumerator` then your 
-troubles are over, but, unfortunately, sometimes this is not enough. For example, there is no standard way (that I know of, 
-please tell me if you do!) to find a font on a Windows system for KOI8 encoding (only for WinCyrillic one which is quite different), 
-so :ref:`FontEnumerator` will never return one, even if the user has installed a KOI8 font on his system.
+To clarify, the :ref:`wx.FontEnumerator` class may be used to enumerate
+both all available encodings and to find the facename(s) in which the
+given encoding exists. If you can find the font in the correct
+encoding with :ref:`wx.FontEnumerator` then your troubles are over, but,
+unfortunately, sometimes this is not enough. For example, there is no
+standard way (that I know of, please tell me if you do!) to find a
+font on a Windows system for KOI8 encoding (only for WinCyrillic one
+which is quite different), so :ref:`wx.FontEnumerator` will never return
+one, even if the user has installed a KOI8 font on his system.
 
-To solve this problem, a :ref:`FontMapper` class is provided.
+To solve this problem, a :ref:`wx.FontMapper` class is provided.
 
-This class stores the mapping between the encodings and the font face names which support them in :ref:`ConfigBase` object. 
-Of course, it would be fairly useless if it tried to determine these mappings by itself, so, instead, it (optionally) asks 
-the user and remembers his answers so that the next time the program will automatically choose the correct font. 
+This class stores the mapping between the encodings and the font face
+names which support them in :ref:`wx.ConfigBase` object. Of course, it
+would be fairly useless if it tried to determine these mappings by
+itself, so, instead, it (optionally) asks the user and remembers his
+answers so that the next time the program will automatically choose
+the correct font.
 
 
diff --git a/docs/sphinx/rest_substitutions/overviews/font_overview.rst b/docs/sphinx/rest_substitutions/overviews/font_overview.rst
index ad31dac0..306884ac 100644
--- a/docs/sphinx/rest_substitutions/overviews/font_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/font_overview.rst
@@ -11,45 +11,63 @@
 Introduction
 ------------
 
-A font is an object which determines the appearance of text, primarily when drawing text to a window
-or device context. A font is determined by the following parameters (not all of them have to be specified, of course):
+A font is an object which determines the appearance of text, primarily
+when drawing text to a window or device context. A font is determined
+by the following parameters (not all of them have to be specified, of
+course):
 
 ======================== ==========================================
 **Point size**	         This is the standard way of referring to text size.
-**Family**	         Supported families are: ``DEFAULT``, ``DECORATIVE``, ``ROMAN``, ``SCRIPT``, ``SWISS``, ``MODERN``. ``MODERN`` is a fixed pitch font; the others are either fixed or variable pitch.
-**Style**	         The value can be ``NORMAL``, ``SLANT`` or ``ITALIC``.
-**Weight**	         The value can be ``NORMAL``, ``LIGHT`` or ``BOLD``.
+**Family**	         Supported families are: ``wx.DEFAULT``, ``wx.DECORATIVE``, ``wx.ROMAN``, ``wx.SCRIPT``, ``wx.SWISS``, ``wx.MODERN``. ``wx.MODERN`` is a fixed pitch font; the others are either fixed or variable pitch.
+**Style**	         The value can be ``wx.NORMAL``, ``wx.SLANT`` or ``wx.ITALIC``.
+**Weight**	         The value can be ``wx.NORMAL``, ``wx.LIGHT`` or ``wx.BOLD``.
 **Underlining**	         The value can be ``True`` or ``False``.
 **Face name**	         An optional string specifying the actual typeface to be used. If ``None``, a default typeface will chosen based on the family.
-**Encoding**	         The font encoding (see ``FONTENCODING_XXX`` constants and the :ref:`Font Encodings <font encodings>` for more details)
+**Encoding**	         The font encoding (see ``wx.FONTENCODING_XXX`` constants and the :ref:`Font Encodings <font encodings>` for more details)
 ======================== ==========================================
 
-Specifying a family, rather than a specific typeface name, ensures a degree of portability across platforms because a 
-suitable font will be chosen for the given font family, however it doesn't allow to choose a font precisely as the parameters
-above don't suffice, in general, to identify all the available fonts and this is where using the native font descriptions
-may be helpful - see below.
+Specifying a family, rather than a specific typeface name, ensures a
+degree of portability across platforms because a suitable font will be
+chosen for the given font family, however it doesn't allow to choose a
+font precisely as the parameters above don't suffice, in general, to
+identify all the available fonts and this is where using the native
+font descriptions may be helpful - see below.
 
-Under Windows, the face name can be one of the installed fonts on the user's system. Since the choice of fonts differs
-from system to system, either choose standard Windows fonts, or if allowing the user to specify a face name, store the
-family name with any file that might be transported to a different Windows machine or other platform.
+Under Windows, the face name can be one of the installed fonts on the
+user's system. Since the choice of fonts differs from system to
+system, either choose standard Windows fonts, or if allowing the user
+to specify a face name, store the family name with any file that might
+be transported to a different Windows machine or other platform.
 
-.. note:: There is currently a difference between the appearance of fonts on the two platforms, if the mapping mode is anything 
-   other than ``MM_TEXT``. Under X, font size is always specified in points. Under MS Windows, the unit for text is points but 
-   the text is scaled according to the current mapping mode. However, user scaling on a device context will also scale fonts under both environments.
+.. note:: There is currently a difference between the appearance of
+   fonts on the two platforms, if the mapping mode is anything
+   other than ``MM_TEXT``. Under X, font size is always specified in
+   points. Under MS Windows, the unit for text is points but 
+   the text is scaled according to the current mapping mode. However,
+   user scaling on a device context will also scale fonts under both
+   environments.
    
    
 Native font information
 -----------------------
 
-An alternative way of choosing fonts is to use the native font description. This is the only acceptable solution if the user 
-is allowed to choose the font using the :ref:`FontDialog` because the selected font cannot be described using only the family 
-name and so, if only family name is stored permanently, the user would almost surely see a different font in the program later.
+An alternative way of choosing fonts is to use the native font
+description. This is the only acceptable solution if the user is
+allowed to choose the font using the :ref:`wx.FontDialog` because the
+selected font cannot be described using only the family name and so,
+if only family name is stored permanently, the user would almost
+surely see a different font in the program later.
 
-Instead, you should store the value returned by :meth:`Font.GetNativeFontInfoDesc` and pass it to :meth:`Font.SetNativeFontInfo`
-later to recreate exactly the same font.
+Instead, you should store the value returned by
+:meth:`wx.Font.GetNativeFontInfoDesc` and pass it to
+:meth:`wx.Font.SetNativeFontInfo` later to recreate exactly the same
+font.
 
-.. note:: Note that the contents of this string depends on the platform and shouldn't be used for any other purpose (in particular, it is not 
-   meant to be shown to the user). Also please note that although the native font information is currently implemented for Windows and
-   Unix (GTK+ and Motif) ports only, all the methods are available for all the ports and should be used to make your program work correctly
-   when they are implemented later.
+.. note:: Note that the contents of this string depends on the
+   platform and shouldn't be used for any other purpose (in
+   particular, it is not meant to be shown to the user). Also please
+   note that although the native font information is currently
+   implemented for Windows and Unix (GTK+ and Motif) ports only, all
+   the methods are available for all the ports and should be used to
+   make your program work correctly when they are implemented later.
    
diff --git a/docs/sphinx/rest_substitutions/overviews/grid_overview.rst b/docs/sphinx/rest_substitutions/overviews/grid_overview.rst
index 3a2849dd..143efb9c 100644
--- a/docs/sphinx/rest_substitutions/overviews/grid_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/grid_overview.rst
@@ -1,138 +1,149 @@
-.. include:: headings.inc
-
-
-.. _grid overview:
-
-=================================================
-|phoenix_title|  **Grid Overview**
-=================================================
-
-
-:class:`~grid.Grid` and its related classes are used for displaying and editing tabular data.
-
-:class:`~grid.Grid` supports custom attributes for the table cells, allowing to completely 
-customize its appearance and uses a separate grid table (:class:`~grid.GridTableBase` -derived) 
-class for the data management meaning that it can be used to display arbitrary amounts of data.
-
-
-.. _grid getting started:
-
-Getting Started
----------------
-
-For simple applications you need only refer to the :class:`~grid.Grid` class in your code. 
-This example shows how you might create a grid in a frame or dialog constructor and illustrates
-some of the formatting functions::
-
-    import wx
-    import wx.grid
-
-    class GridFrame(wx.Frame):
-
-        def __init__(self, parent):
-
-            wx.Frame.__init__(self, parent)
-            
-            # Create a wxGrid object
-            grid = wx.grid.Grid(self, -1)
-
-            # Then we call CreateGrid to set the dimensions of the grid
-            # (100 rows and 10 columns in this example)
-            grid.CreateGrid(100, 10)
-
-            # We can set the sizes of individual rows and columns
-            # in pixels
-            grid.SetRowSize(0, 60)
-            grid.SetColSize(0, 120)
-
-            # And set grid cell contents as strings
-            grid.SetCellValue(0, 0, 'wxGrid is good')
-
-            # We can specify that some cells are read.only
-            grid.SetCellValue(0, 3, 'This is read.only')
-            grid.SetReadOnly(0, 3)
-
-            # Colours can be specified for grid cell contents
-            grid.SetCellValue(3, 3, 'green on grey')
-            grid.SetCellTextColour(3, 3, wx.GREEN)
-            grid.SetCellBackgroundColour(3, 3, wx.LIGHT_GREY)
-
-            # We can specify the some cells will store numeric
-            # values rather than strings. Here we set grid column 5
-            # to hold floating point values displayed with width of 6
-            # and precision of 2
-            grid.SetColFormatFloat(5, 6, 2)
-            grid.SetCellValue(0, 6, '3.1415')
-
-            self.Show()
-
-
-    if __name__ == '__main__':
-        
-        app = wx.App(0)
-        frame = GridFrame(None)
-        app.MainLoop()
-
-
-Here is a list of classes related to :class:`~grid.Grid`:
-
-- :class:`~grid.Grid`: The main grid control class itself.
-- :class:`~grid.GridTableBase`: The base class for grid data provider.
-- :class:`~grid.GridStringTable`: Simple :class:`~grid.GridTableBase` implementation 
-  supporting only string data items and storing them all in memory (hence suitable 
-  for not too large grids only).
-- :class:`~grid.GridCellAttr`: A cell attribute, allowing to customize its appearance 
-  as well as the renderer and editor used for displaying and editing it.
-- :class:`~grid.GridCellAttrProvider`: The object responsible for storing and retrieving the cell attributes.
-- :class:`~grid.GridColLabelWindow`: The window showing the grid columns labels.
-- :class:`~grid.GridRowLabelWindow`: The window showing the grid rows labels.
-- :class:`~grid.GridCornerLabelWindow`: The window used in the upper left grid corner.
-- :class:`~grid.GridWindow`: The window representing the main part of the grid.
-- :class:`~grid.GridCellRenderer`: Base class for objects used to display a cell value.
-- :class:`~grid.GridCellStringRenderer`: Renderer showing the cell as a text string.
-- :class:`~grid.GridCellNumberRenderer`: Renderer showing the cell as an integer number.
-- :class:`~grid.GridCellFloatRenderer`: Renderer showing the cell as a floating point number.
-- :class:`~grid.GridCellBoolRenderer`: Renderer showing the cell as checked or unchecked box.
-- :class:`~grid.GridCellEditor`: Base class for objects used to edit the cell value.
-- :class:`~grid.GridCellStringEditor`: Editor for cells containing text strings.
-- :class:`~grid.GridCellNumberEditor`: Editor for cells containing integer numbers.
-- :class:`~grid.GridCellFloatEditor`: Editor for cells containing floating point numbers.
-- :class:`~grid.GridCellBoolEditor`: Editor for boolean-valued cells.
-- :class:`~grid.GridCellChoiceEditor`: Editor allowing to choose one of the predefined strings (and possibly enter new one).
-- :class:`~grid.GridEvent`: The event sent by most of :class:`~grid.Grid` actions.
-- :class:`~grid.GridSizeEvent`: The special event sent when a grid column or row is resized.
-- :class:`~grid.GridRangeSelectEvent`: The special event sent when a range of cells is selected in the grid.
-- :class:`~grid.GridEditorCreatedEvent`: The special event sent when a cell editor is created.
-- :class:`~grid.GridSelection`: The object efficiently representing the grid selection.
-- :class:`~grid.GridTypeRegistry`: Contains information about the data types supported by the grid.
-
-
-
-.. _grid column and row sizes:
-
-Column and Row Sizes
---------------------
-
-.. note::
-
-   This section will discuss the resizing of :class:`~grid.Grid` rows only to avoid repetitions 
-   but everything in it also applies to grid columns, just replace Row in the method names with Col.
-
-
-Initially all :class:`~grid.Grid` rows have the same height, which can be modified for all of them 
-at once using :meth:`~grid.Grid.SetDefaultRowSize`. However, unlike simpler controls such as :class:`ListBox`
-or :class:`ListCtrl`, :class:`~grid.Grid` also allows its rows to be individually resized to have their
-own height using :meth:`~grid.Grid.SetRowSize` (as a special case, a row may be hidden entirely by 
-setting its size to 0, which is done by a helper :meth:`~grid.Grid.HideRow` method). It is also 
-possible to resize a row to fit its contents with :meth:`~grid.Grid.AutoSizeRow` or do it for all 
-rows at once with :meth:`~grid.Grid.AutoSizeRows`.
-
-Additionally, by default the user can also drag the row separator lines to resize the rows interactively. 
-This can be forbidden completely by calling :meth:`~grid.Grid.DisableDragRowSize` or just for the 
-individual rows using :meth:`~grid.Grid.DisableRowResize`.
-
-If you do allow the user to resize the grid rows, it may be a good idea to save their heights and 
-restore it when the grid is recreated the next time (possibly during a next program execution): 
-the functions :meth:`~grid.Grid.GetRowSizes` and :meth:`~grid.Grid.SetRowSizes` can help with this, 
-you will just need to serialize :class:`~grid.GridSizesInfo` structure returned by the former in 
-some way and deserialize it back before calling the latter.
\ No newline at end of file
+.. include:: headings.inc
+
+
+.. _grid overview:
+
+=================================================
+|phoenix_title|  **Grid Overview**
+=================================================
+
+
+:class:`~wx.grid.Grid` and its related classes are used for displaying
+and editing tabular data.
+
+:class:`~wx.grid.Grid` supports custom attributes for the table cells,
+allowing to completely customize its appearance and uses a separate
+grid table (:class:`~wx.grid.GridTableBase` -derived) class for the
+data management meaning that it can be used to display arbitrary
+amounts of data.
+
+
+.. _grid getting started:
+
+Getting Started
+---------------
+
+For simple applications you need only refer to the
+:class:`~wx.grid.Grid` class in your code.  This example shows how you
+might create a grid in a frame or dialog constructor and illustrates
+some of the formatting functions::
+
+    import wx
+    import wx.grid
+
+    class GridFrame(wx.Frame):
+        def __init__(self, parent):
+            wx.Frame.__init__(self, parent)
+            
+            # Create a wxGrid object
+            grid = wx.grid.Grid(self, -1)
+
+            # Then we call CreateGrid to set the dimensions of the grid
+            # (100 rows and 10 columns in this example)
+            grid.CreateGrid(100, 10)
+
+            # We can set the sizes of individual rows and columns
+            # in pixels
+            grid.SetRowSize(0, 60)
+            grid.SetColSize(0, 120)
+
+            # And set grid cell contents as strings
+            grid.SetCellValue(0, 0, 'wxGrid is good')
+
+            # We can specify that some cells are read.only
+            grid.SetCellValue(0, 3, 'This is read.only')
+            grid.SetReadOnly(0, 3)
+
+            # Colours can be specified for grid cell contents
+            grid.SetCellValue(3, 3, 'green on grey')
+            grid.SetCellTextColour(3, 3, wx.GREEN)
+            grid.SetCellBackgroundColour(3, 3, wx.LIGHT_GREY)
+
+            # We can specify the some cells will store numeric
+            # values rather than strings. Here we set grid column 5
+            # to hold floating point values displayed with width of 6
+            # and precision of 2
+            grid.SetColFormatFloat(5, 6, 2)
+            grid.SetCellValue(0, 6, '3.1415')
+
+            self.Show()
+
+
+    if __name__ == '__main__':
+        
+        app = wx.App(0)
+        frame = GridFrame(None)
+        app.MainLoop()
+
+
+Here is a list of classes related to :class:`~wx.grid.Grid`:
+
+- :class:`~wx.grid.Grid`: The main grid control class itself.
+- :class:`~wx.grid.GridTableBase`: The base class for grid data provider.
+- :class:`~wx.grid.GridStringTable`: Simple :class:`~wx.grid.GridTableBase` implementation 
+  supporting only string data items and storing them all in memory (hence suitable 
+  for not too large grids only).
+- :class:`~wx.grid.GridCellAttr`: A cell attribute, allowing to customize its appearance 
+  as well as the renderer and editor used for displaying and editing it.
+- :class:`~wx.grid.GridCellAttrProvider`: The object responsible for storing and retrieving the cell attributes.
+- :class:`~wx.grid.GridColLabelWindow`: The window showing the grid columns labels.
+- :class:`~wx.grid.GridRowLabelWindow`: The window showing the grid rows labels.
+- :class:`~wx.grid.GridCornerLabelWindow`: The window used in the upper left grid corner.
+- :class:`~wx.grid.GridWindow`: The window representing the main part of the grid.
+- :class:`~wx.grid.GridCellRenderer`: Base class for objects used to display a cell value.
+- :class:`~wx.grid.GridCellStringRenderer`: Renderer showing the cell as a text string.
+- :class:`~wx.grid.GridCellNumberRenderer`: Renderer showing the cell as an integer number.
+- :class:`~wx.grid.GridCellFloatRenderer`: Renderer showing the cell as a floating point number.
+- :class:`~wx.grid.GridCellBoolRenderer`: Renderer showing the cell as checked or unchecked box.
+- :class:`~wx.grid.GridCellEditor`: Base class for objects used to edit the cell value.
+- :class:`~wx.grid.GridCellStringEditor`: Editor for cells containing text strings.
+- :class:`~wx.grid.GridCellNumberEditor`: Editor for cells containing integer numbers.
+- :class:`~wx.grid.GridCellFloatEditor`: Editor for cells containing floating point numbers.
+- :class:`~wx.grid.GridCellBoolEditor`: Editor for boolean-valued cells.
+- :class:`~wx.grid.GridCellChoiceEditor`: Editor allowing to choose one of the predefined strings (and possibly enter new one).
+- :class:`~wx.grid.GridEvent`: The event sent by most of :class:`~wx.grid.Grid` actions.
+- :class:`~wx.grid.GridSizeEvent`: The special event sent when a grid column or row is resized.
+- :class:`~wx.grid.GridRangeSelectEvent`: The special event sent when a range of cells is selected in the grid.
+- :class:`~wx.grid.GridEditorCreatedEvent`: The special event sent when a cell editor is created.
+- :class:`~wx.grid.GridSelection`: The object efficiently representing the grid selection.
+- :class:`~wx.grid.GridTypeRegistry`: Contains information about the data types supported by the grid.
+
+
+
+.. _grid column and row sizes:
+
+Column and Row Sizes
+--------------------
+
+.. note::
+
+   This section will discuss the resizing of :class:`~wx.grid.Grid` rows
+   only to avoid repetitions but everything in it also applies to grid
+   columns, just replace Row in the method names with Col.
+
+
+Initially all :class:`~wx.grid.Grid` rows have the same height, which
+can be modified for all of them at once using
+:meth:`~wx.grid.Grid.SetDefaultRowSize`. However, unlike simpler
+controls such as :class:`wx.ListBox` or :class:`wx.ListCtrl`,
+:class:`~wx.grid.Grid` also allows its rows to be individually resized
+to have their own height using :meth:`~wx.grid.Grid.SetRowSize` (as a
+special case, a row may be hidden entirely by setting its size to 0,
+which is done by a helper :meth:`~wx.grid.Grid.HideRow` method). It is
+also possible to resize a row to fit its contents with
+:meth:`~wx.grid.Grid.AutoSizeRow` or do it for all rows at once with
+:meth:`~wx.grid.Grid.AutoSizeRows`.
+
+Additionally, by default the user can also drag the row separator
+lines to resize the rows interactively.  This can be forbidden
+completely by calling :meth:`~wx.grid.Grid.DisableDragRowSize` or just
+for the individual rows using :meth:`~wx.grid.Grid.DisableRowResize`.
+
+If you do allow the user to resize the grid rows, it may be a good
+idea to save their heights and restore it when the grid is recreated
+the next time (possibly during a next program execution): the
+functions :meth:`~wx.grid.Grid.GetRowSizes` and
+:meth:`~wx.grid.Grid.SetRowSizes` can help with this, you will just
+need to serialize :class:`~wx.grid.GridSizesInfo` structure returned
+by the former in some way and deserialize it back before calling the
+latter.
\ No newline at end of file
diff --git a/docs/sphinx/rest_substitutions/overviews/html_overview.rst b/docs/sphinx/rest_substitutions/overviews/html_overview.rst
index bd3d8bc6..525fb15e 100644
--- a/docs/sphinx/rest_substitutions/overviews/html_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/html_overview.rst
@@ -8,21 +8,23 @@
 ==================================
 
 
-The :mod:`html` library provides classes for parsing and displaying HTML.
+The :mod:`wx.html` library provides classes for parsing and displaying HTML.
 
-It is not intended to be a high-end HTML browser. If you are looking for
-something like that try http://www.mozilla.org/.
+It is not intended to be a high-end HTML browser. If you are looking
+for something like that try http://www.mozilla.org/.
 
-:mod:`html` can be used as a generic rich text viewer - for example to display a
-nice About Box (like those of GNOME apps) or to display the result of
-database searching. There is a :class:`FileSystem` class which allows you to use
-your own virtual file systems.
+:mod:`wxhtml` can be used as a generic rich text viewer - for example
+to display a nice About Box (like those of GNOME apps) or to display
+the result of database searching. There is a :class:`wx.FileSystem`
+class which allows you to use your own virtual file systems.
 
-:class:`~html.HtmlWindow` supports tag handlers. This means that you can easily extend
-:mod:`html` library with new, unsupported tags. Not only that, you can even use
-your own application-specific tags!
+:class:`~wx.html.HtmlWindow` supports tag handlers. This means that
+you can easily extend :mod:`html` library with new, unsupported
+tags. Not only that, you can even use your own application-specific
+tags!
 
-There is a generic :class:`~html.HtmlParser` class, independent of :class:`~html.HtmlWindow`.
+There is a generic :class:`~wx.html.HtmlParser` class, independent of
+:class:`~wx.html.HtmlWindow`.
 
 
 .. _html quick start:
@@ -34,12 +36,13 @@ HTML quick start
 Displaying HTML
 ~~~~~~~~~~~~~~~~
 
-Class :class:`~html.HtmlWindow` (derived from :class:`ScrolledWindow`) is used to display
-HTML documents.
+Class :class:`~wx.html.HtmlWindow` (derived from
+:class:`wx.ScrolledWindow`) is used to display HTML documents.
 
-It has two important methods: :meth:`~html.HtmlWindow.LoadPage` and
-:meth:`~html.HtmlWindow.SetPage`. LoadPage loads and displays HTML file while SetPage
-displays directly the passed **string**. See the example::
+It has two important methods: :meth:`~wx.html.HtmlWindow.LoadPage` and
+:meth:`~wxhtml.HtmlWindow.SetPage`. LoadPage loads and displays HTML
+file while SetPage displays directly the passed **string**. See the
+example::
 
     mywin.LoadPage("test.htm")
     mywin.SetPage("htmlbody" \
@@ -52,62 +55,67 @@ displays directly the passed **string**. See the example::
 Setting up HtmlWindow
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Because :class:`~html.HtmlWindow` is derived from :class:`ScrolledWindow` and not from
-:class:`Frame`, it doesn't have visible frame. But the user usually wants to see
-the title of HTML page displayed somewhere and the frame's titlebar is the
-ideal place for it.
+Because :class:`~wx.html.HtmlWindow` is derived from
+:class:`wx.ScrolledWindow` and not from :class:`wx.Frame`, it doesn't
+have visible frame. But the user usually wants to see the title of
+HTML page displayed somewhere and the frame's titlebar is the ideal
+place for it.
 
-:class:`~html.HtmlWindow` provides 2 methods in order to handle this:
-:meth:`~html.HtmlWindow.SetRelatedFrame` and :meth:`~html.HtmlWindow.SetRelatedStatusBar`.
-See the example::
+:class:`~wx.html.HtmlWindow` provides 2 methods in order to handle
+this: :meth:`~wx.html.HtmlWindow.SetRelatedFrame` and
+:meth:`~wx.html.HtmlWindow.SetRelatedStatusBar`.  See the example::
 
     html = wx.html.HtmlWindow(self)
     html.SetRelatedFrame(self, "HTML : %%s")
     html.SetRelatedStatusBar(0)
 
 
-The first command associates the HTML object with its parent frame (this
-points to :class:`Frame` object there) and sets the format of the title. Page
-title "Hello, world!" will be displayed as "HTML : Hello, world!" in this
-example.
+The first command associates the HTML object with its parent frame
+(this points to :class:`wx.Frame` object there) and sets the format of
+the title. Page title "Hello, world!" will be displayed as "HTML :
+Hello, world!" in this example.
 
-The second command sets which frame's status bar should be used to display
-browser's messages (such as "Loading..." or "Done" or hypertext links).
+The second command sets which frame's status bar should be used to
+display browser's messages (such as "Loading..." or "Done" or
+hypertext links).
 
 
 Customizing HtmlWindow
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-You can customize :class:`~html.HtmlWindow` by setting font size, font face and borders
-(space between border of window and displayed HTML). Related functions:
+You can customize :class:`~wx.html.HtmlWindow` by setting font size,
+font face and borders (space between border of window and displayed
+HTML). Related functions:
 
--   :meth:`~html.HtmlWindow.SetFonts`
--   :meth:`~html.HtmlWindow.SetBorders`
--   :meth:`~html.HtmlWindow.ReadCustomization`
--   :meth:`~html.HtmlWindow.WriteCustomization`
+-   :meth:`~wx.html.HtmlWindow.SetFonts`
+-   :meth:`~wx.html.HtmlWindow.SetBorders`
+-   :meth:`~wx.html.HtmlWindow.ReadCustomization`
+-   :meth:`~wx,html.HtmlWindow.WriteCustomization`
 
-The last two functions are used to store user customization info :class:`ConfigBase`
-stuff (for example in the registry under Windows, or in a dotfile under
-Unix).
+The last two functions are used to store user customization info
+:class:`wx.ConfigBase` stuff (for example in the registry under
+Windows, or in a dotfile under Unix).
 
 
 HTML Printing
 --------------
 
-The :mod:`html` library provides printing facilities with several levels of
-complexity. The easiest way to print an HTML document is to use the
-:class:`~html.HtmlEasyPrinting` class.
+The :mod:`wx.html` library provides printing facilities with several
+levels of complexity. The easiest way to print an HTML document is to
+use the :class:`~wx.html.HtmlEasyPrinting` class.
 
-It lets you print HTML documents with only one command and you don't have to
-worry about deriving from the :class:`Printout` class at all. It is only a simple
-wrapper around the :class:`~html.HtmlPrintout`, normal wxPython printout class.
+It lets you print HTML documents with only one command and you don't
+have to worry about deriving from the :class:`wx.Printout` class at
+all. It is only a simple wrapper around the
+:class:`~wx.html.HtmlPrintout`, normal wxPython printout class.
 
-And finally there is the low level class :class:`~html.HtmlDCRenderer` which you can
-use to render HTML into a rectangular area on any DC.
+And finally there is the low level class
+:class:`~wx.html.HtmlDCRenderer` which you can use to render HTML into
+a rectangular area on any DC.
 
-It supports rendering into multiple rectangles with the same width. (The most
-common use of this is placing one rectangle on each page or printing into two
-columns.)
+It supports rendering into multiple rectangles with the same
+width. (The most common use of this is placing one rectangle on each
+page or printing into two columns.)
 
 
 .. _help files format:
@@ -115,12 +123,12 @@ columns.)
 Help Files Format
 ------------------
 
-:mod:`html` library can be used to show an help manual to the user; in fact, it
-supports natively (through :class:`~html.HtmlHelpController`) a reduced version of MS
-HTML Workshop format.
+:mod:`wx.html` library can be used to show an help manual to the user; in
+fact, it supports natively (through :class:`~wx.html.HtmlHelpController`)
+a reduced version of MS HTML Workshop format.
 
-A **book** consists of three files: the header file, the contents file and
-the index file.
+A **book** consists of three files: the header file, the contents file
+and the index file.
 
 You can make a regular zip archive of these files, plus the HTML and any
 image files, for HTML (or helpview) to read; and the ``".zip"`` file can
@@ -136,8 +144,8 @@ Header file (.hhp)
 .. highlight:: rst
 
 
-The header file must contain these lines (and may contain additional lines
-which are ignored)::
+The header file must contain these lines (and may contain additional
+lines which are ignored)::
 
     Contents file=filename.hhc
     Index file=filename.hhk
@@ -186,7 +194,7 @@ contains exactly one list (``<ul>`` ... ``</ul>`` statement)::
 You can modify value attributes of param tags. The *topic name* is name of
 chapter/topic as is displayed in contents, *filename.htm* is the HTML page
 name (relative to the ``".hhp"`` file) and *numeric_id* is optional - it is
-used only when you use :meth:`~html.HtmlHelpController.Display`.
+used only when you use :meth:`~wx.html.HtmlHelpController.Display`.
 
 Items in the list may be nested - one ``<li>`` statement may contain a
 ``<ul>`` sub-statement::
@@ -228,11 +236,11 @@ ignored and sublists are **not** allowed.
 Input Filters
 --------------
 
-The :mod:`html` library provides a mechanism for reading and displaying files of
+The :mod:`wx.html` library provides a mechanism for reading and displaying files of
 many different file formats.
 
-:meth:`~html.HtmlWindow.LoadPage` can load not only HTML files but any known file. To
-make a file type known to :class:`~html.HtmlWindow` you must create a :class:`~html.HtmlFilter`
+:meth:`~wx.html.HtmlWindow.LoadPage` can load not only HTML files but any known file. To
+make a file type known to :class:`~wxzhtml.HtmlWindow` you must create a :class:`~wx.html.HtmlFilter`
 filter and register it using :meth:`~html.HtmlWindow.AddFilter`.
 
 
@@ -241,8 +249,8 @@ filter and register it using :meth:`~html.HtmlWindow.AddFilter`.
 Cells and Containers
 ---------------------
 
-This article describes mechanism used by :class:`~html.HtmlWinParser` and
-:class:`~html.HtmlWindow` to parse and display HTML documents.
+This article describes mechanism used by :class:`~wx.html.HtmlWinParser` and
+:class:`~wx.html.HtmlWindow` to parse and display HTML documents.
 
 
 Cells
@@ -252,7 +260,7 @@ You can divide any text (or HTML) into small fragments. Let's call these
 fragments **cells**. Cell is for example one word, horizontal line, image or
 any other part of document. Each cell has width and height (except special
 "magic" cells with zero dimensions - e.g. colour changers or font changers).
-See :class:`~html.HtmlCell`.
+See :class:`~wx.html.HtmlCell`.
 
 
 Containers
@@ -260,7 +268,7 @@ Containers
 
 Container is kind of cell that may contain sub-cells. Its size depends on
 number and sizes of its sub-cells (and also depends on width of window). See
-:class:`~html.HtmlContainerCell`, :meth:`~html.HtmlCell.Layout`. This image shows the cells and
+:class:`~wx.html.HtmlContainerCell`, :meth:`~wx.html.HtmlCell.Layout`. This image shows the cells and
 containers:
 
 .. image:: _static/images/overviews/overview_html_contbox.png
@@ -272,15 +280,15 @@ containers:
 Using Containers in Tag Handler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-:class:`~html.HtmlWinParser` provides a user-friendly way of managing containers. It is
+:class:`~wx.html.HtmlWinParser` provides a user-friendly way of managing containers. It is
 based on the idea of opening and closing containers.
 
-Use :meth:`~html.HtmlWinParser.OpenContainer` to open new a container *within* an
+Use :meth:`~wx.html.HtmlWinParser.OpenContainer` to open new a container *within* an
 already opened container. This new container is a *sub-container* of the old
 one. (If you want to create a new container with the same depth level you can
 call ``CloseContainer()``; ``OpenContainer()``; ).
 
-Use :meth:`~html.HtmlWinParser.CloseContainer` to close the container. This doesn't
+Use :meth:`~wx.html.HtmlWinParser.CloseContainer` to close the container. This doesn't
 create a new container with same depth level but it returns "control" to the
 parent container. See explanation:
 
@@ -323,13 +331,13 @@ new container.
 The result was that we had *same* depth level after executing. This is
 general rule that should be followed by tag handlers: leave depth level of
 containers unmodified (in other words, number of OpenContainer and
-CloseContainer calls should be same within :meth:`~html.HtmlTagHandler.HandleTag` 's
+CloseContainer calls should be same within :meth:`~wx.html.HtmlTagHandler.HandleTag` 's
 body).
 
 .. note:: 
 
    Notice that it would be usually better to use
-   :meth:`~html.HtmlContainerCell.InsertCell` instead of adding text to the parser
+   :meth:`~wx.html.HtmlContainerCell.InsertCell` instead of adding text to the parser
    directly.
 
 
@@ -338,12 +346,12 @@ body).
 Tag Handlers
 -------------
 
-The :mod:`html` library provides architecture of pluggable *tag* handlers. Tag
+The :mod:`wx.html` library provides architecture of pluggable *tag* handlers. Tag
 handler is class that understands particular HTML tag (or tags) and is able
 to interpret it.
 
-:class:`~html.HtmlWinParser` has a static table of **modules**. Each module contains
-one or more tag handlers. Each time a new :class:`~html.HtmlWinParser` object is
+:class:`~wx.html.HtmlWinParser` has a static table of **modules**. Each module contains
+one or more tag handlers. Each time a new :class:`~wx.html.HtmlWinParser` object is
 constructed all modules are scanned and handlers are added to HtmlParser's
 list of available handlers.
 
@@ -351,7 +359,7 @@ list of available handlers.
 How it works
 ~~~~~~~~~~~~~
 
-Common tag handler's :meth:`~html.HtmlTagHandler.HandleTag` method works in four
+Common tag handler's :meth:`~wx.html.HtmlTagHandler.HandleTag` method works in four
 steps:
 
 -   Save state of parent parser into local variables
@@ -359,21 +367,21 @@ steps:
 -   Parse text between the tag and paired ending tag (if present)
 -   Restore original parser state
 
-See :class:`~html.HtmlWinParser` for methods for modifying parser's state. In general
+See :class:`~wx.html.HtmlWinParser` for methods for modifying parser's state. In general
 you can do things like opening/closing containers, changing colors, fonts etc...
 
 
 Providing own tag handlers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-See the :mod:`lib.wxpTag` on how to provide your own tag handlers.
+See the :mod:`wx.lib.wxpTag` on how to provide your own tag handlers.
 
 
 Tag handlers
 ~~~~~~~~~~~~~
 
-The handler is derived from :class:`~html.HtmlWinTagHandler` (or directly from
-:class:`~html.HtmlTagHandler`).
+The handler is derived from :class:`~wx.html.HtmlWinTagHandler` (or directly from
+:class:`~wx.html.HtmlTagHandler`).
 
 
 .. _tags supported by wxhtml:
@@ -381,17 +389,17 @@ The handler is derived from :class:`~html.HtmlWinTagHandler` (or directly from
 Tags supported by :mod:`html`
 -----------------------------
 
-:mod:`html` is not a full implementation of HTML standard. Instead, it supports most
+:mod:`wx.html` is not a full implementation of HTML standard. Instead, it supports most
 common tags so that it is possible to display *simple* HTML documents with
 it. (For example it works fine with pages created in Netscape Composer or
 generated by tex2rtf).
 
-Following tables list all tags known to :mod:`html`, together with supported
+Following tables list all tags known to :mod:`wx.html`, together with supported
 parameters.
 
 A tag has general form of ``tagname`` param_1 param_2 ... param_n where
 param_i is either ``paramname="paramvalue"`` or ``paramname=paramvalue`` -
-these two are equivalent. Unless stated otherwise, :mod:`html` is case-
+these two are equivalent. Unless stated otherwise, :mod:`wx.html` is case-
 insensitive.
 
 
@@ -646,7 +654,7 @@ List of supported tags
 List of supported styles
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-:mod:`html` doesn't really have CSS support but it does support a few simple
+:mod:`wx.html` doesn't really have CSS support but it does support a few simple
 styles: you can use ``"text-align"``, ``"width"``, ``"vertical-align"`` and
 ``"background"`` with all elements and for ``SPAN`` elements a few other
 styles are additionally recognized:
diff --git a/docs/sphinx/rest_substitutions/overviews/index.rst b/docs/sphinx/rest_substitutions/overviews/index.rst
index 01340f05..658894d7 100644
--- a/docs/sphinx/rest_substitutions/overviews/index.rst
+++ b/docs/sphinx/rest_substitutions/overviews/index.rst
@@ -1,18 +1,19 @@
-.. wxPython (Phoenix) documentation master file, created by
-   sphinx-quickstart on Fri Dec 09 11:27:02 2011.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
+.. wxPython Phoenix documentation
+   Created:   9-Dec-2011
+   Copyright: (c) 2011-2016 by Total Control Software
+   License:   wxWindows License
 
-==============================================
-Welcome to wxPython (Phoenix)'s documentation!
-==============================================
+=======================================
+Welcome to the wxPython Phoenix Project
+=======================================
 
 
 wxPython
 ========
 
-wxPython is a **GUI toolkit** for the `Python <http://www.python.org/>`_ programming language. It allows Python programmers to 
-create programs with a robust, highly functional graphical user interface, simply and easily. 
+wxPython is a **GUI toolkit** for the `Python <http://www.python.org/>`_
+programming language. It allows Python programmers to create programs with a
+robust, highly functional graphical user interface, simply and easily.
 
 .. figure:: _static/images/sphinxdocs/central_bar.png
    :align: center
@@ -23,20 +24,24 @@ create programs with a robust, highly functional graphical user interface, simpl
 What is wxPython
 ----------------
 
-wxPython is a **GUI toolkit** for the `Python <http://www.python.org/>`_ programming language. It allows Python programmers to 
-create programs with a robust, highly functional graphical user interface, simply and easily. 
-It is implemented as a Python extension module (native code) that wraps the popular `wxWidgets <http://wxwidgets.org/>`_ cross 
-platform GUI library, which is written in C++. 
+wxPython is a **GUI toolkit** for the `Python <http://www.python.org/>`_
+programming language. It allows Python programmers to create programs with a
+robust, highly functional graphical user interface, simply and easily. It is
+implemented as a Python extension module (native code) that wraps the popular
+`wxWidgets <http://wxwidgets.org/>`_ cross platform GUI library, which is
+written in C++.
 
-Like Python and wxWidgets, wxPython is *Open Source* which means that it is free for anyone to use and 
-the source code is available for anyone to look at and modify. Or anyone can contribute fixes or 
-enhancements to the project. 
+Like Python and wxWidgets, wxPython is *Open Source* which means that it is
+free for anyone to use and the source code is available for anyone to look at
+and modify. Or anyone can contribute fixes or enhancements to the project.
 
-wxPython is a *cross-platform* toolkit. This means that the same program will run on multiple platforms 
-without modification. Currently supported platforms are 32-bit Microsoft Windows, most Unix or unix-like 
-systems, and Macintosh OS X+, in most cases the native widgets are used on each platform.
+wxPython is a *cross-platform* toolkit. This means that the same program will
+run on multiple platforms without modification. Currently supported platforms
+are 32-bit Microsoft Windows, most Unix or unix-like systems, and Macintosh OS
+X+, in most cases the native widgets are used on each platform.
 
-Since the language is Python, wxPython programs are **simple, easy** to write and easy to understand.
+Since the language is Python, wxPython programs are **simple, easy** to write
+and easy to understand.
 
 As an example, this is a simple "Hello World" program with wxPython::
 
@@ -50,85 +55,57 @@ As an example, this is a simple "Hello World" program with wxPython::
     app.MainLoop()
 
 
-The GUI layouts you can build with wxPython are almost infinite: it has an extremely rich set of widgets (derived from `wxWidgets`) and
-greatly extended by a huge set of pure-Python controls written over the years.
-
- 
-Prerequisites
--------------
-
-Like any other complex piece of software, wxPython requires other software in order to function properly. 
-Obviously you'll need `Python <http://www.python.org/>`_ itself, but if you're reading this you've probably already got 
-Python and are just here looking for the `best GUI toolkit <http://www.wxpython.org/quotes.php>`_ available for Python. 
-Check out the details for your platform of choice here: 
-
-Win32
-^^^^^
-
-* If you have a modern up to date version of Windows and use the binary installer for wxPython found below, you probably 
-  don't need anything else. 
-
-* If your tree controls have strange background colors, try loading this `MS Common Controls Update <http://download.microsoft.com/download/platformsdk/Comctl32/5.80.2614.3600/W9XNT4/EN-US/50comupd.exe>`_ 
-  as wxWidgets does something that causes a bug in one of the older versions to manifest itself. Another way to get this update 
-  is to install Internet Explorer or MS Office apps, so if the system has those already then you probably don't need to worry about this. 
-
-* wxPython's `wx.glcanvas.GLCanvas` class only provides the GL Context and a wx.Window to put it in, so if you want to use 
-  the wxGLCanvas you will also need the `PyOpenGL <http://pyopengl.sourceforge.net/>`_ Python extension modules as well. 
+The GUI layouts you can build with wxPython are almost infinite: it has an
+extremely rich set of widgets (derived from `wxWidgets`) and greatly extended
+by a huge set of pure-Python controls written over the years.
 
 
-Linux/Unix/Etc.
-^^^^^^^^^^^^^^^
+What is wxPython Phoenix?
+-------------------------
 
-* The first thing you'll need are the `glib and gtk+ <http://www.gtk.org/>`_ libraries. Before you run off and download the sources 
-  check your system, you probably already have it. Most distributions of Linux come with it and you'll start seeing it on many 
-  other systems too now that Sun and others have chosen GNOME as the desktop of choice. If you don't have glib and gtk+ already, 
-  you can get the sources `here <ftp://ftp.gtk.org/pub/gtk/>`_. Build and install them following the directions included. 
+**Phoenix** is the code name of a new implementation of wxPython.  The name comes
+from the `mythical bird <https://en.wikipedia.org/wiki/Phoenix_(mythology)>`_
+that bursts into flames at the end of its life and from the ashes is reborn as
+a new, stronger, and better phoenix.  Likewise the intent with the
+*wxPython Phoenix* project is throw almost everything from *wxPython Classic*
+into the fire to be built anew from the ashes of its former self, without all
+of the old crud that had built up over the long life of Classic.
 
-* In order to use the wxGLCanvas you'll need to have either OpenGL or the `Mesa3D <http://www.mesa3d.org/>`_ library on your system. 
-  wxPython's `wx.glcanvas.GLCanvas` only provides the GL Context and a :class:`Window` to put it in, so you will also need the PyOpenGL 
-  Python extension modules as well, if you want to use OpenGL. 
+Much of that crud were rather hacky things which had to be done to
+work around limitations of the technology available at the time.  Those are
+easy to get rid of.  Others are things that seemed good at the time, but in
+retrospect turned out to be bad ideas.  Some of those are a little more
+tricky, but still a good idea to change.  The end result will be a new
+wxPython that is better, stronger, and faster than he was before, and which is
+easier to maintain, extend and document.
 
-  If you are building wxPython yourself and don't care to use OpenGL/Mesa then you can easily skip building it and can ignore 
-  this step. See the `build instructions <http://www.wxpython.org/BUILD.html>`_ for details. 
+Although there hasn't been a formal release yet, Phoenix is already in a
+usable state with snapshot builds available after new commits are merged,
+and is in active use on a number of projects already.  Progress is still being
+made and an official release is on the way.  Stay tuned to the wxPython
+developer and user groups for more information and announcements.
+
+Meanwhile, here are some important links:
+
+  * The `MigrationGuide <MigrationGuide.html>`_ will help you understand the
+    differences between wxPython Phoenix and Classic.  In addition,
+    `classic_vs_phoenix <classic_vs_phoenix.html>`_ documents
+    some names that have been changed, or which haven't yet been ported to
+    Phoenix.
+
+  * The new wxPython API documentation is available `here <main.html>`_.
+
+  * The `Project Phoenix <http://wiki.wxpython.org/ProjectPhoenix>`_ section
+    of the wxPython wiki has information about the background of, and reasons
+    for this project, as well as information for developers who want to help
+    out.
+
+  * Source code and issue tracking are available at the
+    `Phoenix GitHub <https://github.com/wxWidgets/Phoenix>`_ repository. Be
+    sure to read the README.rst file there to learn how to build wxWidgets and
+    Phoenix for yourself.
 
 
-Mac OS X
-^^^^^^^^
-
-The wxPython binaries for OSX are mountable disk images. Simply double click to mount the image and then run the installer application
-in the image. Download the image that matches the version of Python that you want to use it with, and unless you know for sure that you
-need the ansi build please get the Unicode build. 
-
-These binaries should work on all versions of OSX from 10.3.9 onwards on either PPC or i386 architectures. Since they use the Carbon API
- they are limited to running in 32-bit mode.
-
-
-OK, I'm interested. What do I do next?
---------------------------------------
-
-You can download the `Prebuild binary of wxPython
-<http://www.wxpython.org/download.php#binaries>`_ which includes
-the source code for wxPython.
-
-Prebuilt binaries are available for Microsoft Windows, Linux and Mac OS X.
-
-Don't forget to download the wxPython demo and the documentation!
-
-
-Bleeding-edge source
---------------------
-
-If you are a very keen developer, you can get the source code and other
-project files from the `wxWidgets/Phoenix Github repository <https://github.com/wxWidgets/Phoenix>`_.
-Be sure to read the README.rst file there to learn how to build wxWidgets 
-and Phoenix for yourself.
-
-
-
-wxPython Documentation
-----------------------
-
-The new wxPython API documentation is available `here <main.html>`_.
 
 
 .. toctree::
@@ -139,8 +116,8 @@ The new wxPython API documentation is available `here <main.html>`_.
    MigrationGuide
    TODO
    DocstringsGuidelines
-   functions
-   1classindex
+   wx.functions
+   wx.1moduleindex
    app_overview
    bitmap_overview
    bookctrl_overview
@@ -178,30 +155,25 @@ The new wxPython API documentation is available `here <main.html>`_.
    window_ids_overview
    window_sizing_overview
    window_styles_overview
-   adv.1classindex
-   adv.functions
-   dataview.1classindex
-   glcanvas.1classindex
-   grid.1classindex
-   html.1classindex
-   html.functions
-   html2.1classindex
-   richtext.1classindex
-   richtext.functions
-   stc.1classindex
-   webkit.1classindex
-   xml.1classindex
-   xrc.1classindex
-   xrc.functions
-   lib
-   py
-   tools
+   wx.adv.1moduleindex
+   wx.adv.functions
+   wx.dataview.1moduleindex
+   wx.glcanvas.1moduleindex
+   wx.grid.1moduleindex
+   wx.html.1moduleindex
+   wx.html.functions
+   wx.html2.1moduleindex
+   wx.richtext.1moduleindex
+   wx.richtext.functions
+   wx.stc.1moduleindex
+   wx.webkit.1moduleindex
+   wx.xml.1moduleindex
+   wx.xrc.1moduleindex
+   wx.xrc.functions
+   wx.media.1moduleindex
+   wx.msw.1moduleindex
+   wx.lib
+   wx.py
+   wx.tools
 
 
-Indices and tables
-==================
-
-* `genindex`
-* `modindex`
-* `search`
-
diff --git a/docs/sphinx/rest_substitutions/overviews/internationalization.rst b/docs/sphinx/rest_substitutions/overviews/internationalization.rst
index eec7cfb2..f3be5fcb 100644
--- a/docs/sphinx/rest_substitutions/overviews/internationalization.rst
+++ b/docs/sphinx/rest_substitutions/overviews/internationalization.rst
@@ -26,8 +26,8 @@ Prepare the source code
 -----------------------
 
 Text translation in Python is done using gettext [1]_ , to ensure that all
-wxPython labels are also translated we will use :class:`Locale` and 
-:func:`GetTranslation` .
+wxPython labels are also translated we will use :class:`wx.Locale` and 
+:func:`wx.GetTranslation` .
 
 How to prepare your source code to enable translation of texts::
 
diff --git a/docs/sphinx/rest_substitutions/overviews/listctrl_overview.rst b/docs/sphinx/rest_substitutions/overviews/listctrl_overview.rst
index c4aaa1eb..44a2d987 100644
--- a/docs/sphinx/rest_substitutions/overviews/listctrl_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/listctrl_overview.rst
@@ -4,7 +4,7 @@
 .. _listctrl overview:
 
 ===============================================
-|phoenix_title|  **ListCtrl Overview**
+|phoenix_title|  **wx.ListCtrl Overview**
 ===============================================
 
 .. todo:: Write this section.
diff --git a/docs/sphinx/rest_substitutions/overviews/log_classes_overview.rst b/docs/sphinx/rest_substitutions/overviews/log_classes_overview.rst
index 8b3efcb8..2200f981 100644
--- a/docs/sphinx/rest_substitutions/overviews/log_classes_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/log_classes_overview.rst
@@ -12,56 +12,102 @@
 Introduction
 ------------
 
-This is a general overview of logging classes provided by wxPython. The word logging here has a broad sense, including all 
-of the program output, not only non-interactive messages. The logging facilities included in wxPython provide the base :ref:`Log` 
-class which defines the standard interface for a log target as well as several standard implementations of it and a family of
-functions to use with them.
+This is a general overview of logging classes provided by
+wxPython. The word logging here has a broad sense, including all of
+the program output, not only non-interactive messages. The logging
+facilities included in wxPython provide the base :ref:`wx.Log` class
+which defines the standard interface for a log target as well as
+several standard implementations of it and a family of functions to
+use with them.
 
-First of all, no knowledge of :ref:`Log` classes is needed to use them. For this, you should only know about :func:`LogDebug`, 
-:func:`LogError`, :func:`LogMessage` and similar functions. All of them have the same syntax as the Python 
-`logging <http://docs.python.org/library/logging.html>`_ module.
+First of all, no knowledge of :ref:`wx.Log` classes is needed to use
+them. For this, you should only know about :func:`wx.LogDebug`,
+:func:`wx.LogError`, :func:`wx.LogMessage` and similar functions. All of
+them have the same syntax as the Python `logging
+<http://docs.python.org/library/logging.html>`_ module.
 
 Here are all of them:
 
-- :func:`LogFatalError` which is like :func:`LogError`, but also terminates the program with the exit code 3 (using `abort()` 
-  standard function). Unlike for all the other logging functions, this function can't be overridden by a log target.
-- :func:`LogError` is the function to use for error messages, i.e. the messages that must be shown to the user. 
-  The default processing is to pop up a message box to inform the user about it.
-- :func:`LogWarning` for warnings. They are also normally shown to the user, but don't interrupt the program work.
-- :func:`LogMessage` is for all normal, informational messages. They also appear in a message box by default (but it can be changed, see below).
-- :func:`LogVerbose` is for verbose output. Normally, it is suppressed, but might be activated if the user wishes to know 
-  more details about the program progress (another, but possibly confusing name for the same function is :func:`LogInfo`).
-- :func:`LogStatus` is for status messages. They will go into the status bar of the active or specified (as the first argument)
-  :ref:`Frame` if it has one.
-- :func:`LogSysError` is mostly used by wxPython itself, but might be handy for logging errors after system call (API function) 
-  failure. It logs the specified message text as well as the last system error code (`errno` or Windows' `GetLastError()` depending 
-  on the platform) and the corresponding error message. The second form of this function takes the error code explicitly as the first argument.
-- :func:`LogDebug` is the right function for debug output. It only does anything at all in the debug mode (when the preprocessor
-  symbol ``__WXDEBUG__`` is defined) and expands to nothing in release mode (otherwise). Note that under Windows, you must either run
-  the program under debugger or use a 3rd party program such as **DebugView** (http://www.microsoft.com/technet/sysinternals/Miscellaneous/DebugView.mspx) 
+- :func:`wx.LogFatalError` which is like :func:`wx.LogError`, but also
+  terminates the program with the exit code 3 (using `abort()`
+  standard function). Unlike for all the other logging functions, this
+  function can't be overridden by a log target.
+
+- :func:`wx.LogError` is the function to use for error messages, i.e. the
+  messages that must be shown to the user.  The default processing is
+  to pop up a message box to inform the user about it.
+
+- :func:`wx.LogWarning` for warnings. They are also normally shown to the
+  user, but don't interrupt the program work.
+
+- :func:`wx.LogMessage` is for all normal, informational messages. They
+  also appear in a message box by default (but it can be changed, see
+  below).
+
+- :func:`wx.LogVerbose` is for verbose output. Normally, it is
+  suppressed, but might be activated if the user wishes to know more
+  details about the program progress (another, but possibly confusing
+  name for the same function is :func:`wx.LogInfo`).
+
+- :func:`wx.LogStatus` is for status messages. They will go into the
+  status bar of the active or specified (as the first argument)
+  :ref:`wx.Frame` if it has one.
+
+- :func:`wx.LogSysError` is mostly used by wxPython itself, but might be
+  handy for logging errors after system call (API function)
+  failure. It logs the specified message text as well as the last
+  system error code (`errno` or Windows' `GetLastError()` depending on
+  the platform) and the corresponding error message. The second form
+  of this function takes the error code explicitly as the first
+  argument.
+
+- :func:`wx.LogDebug` is the right function for debug output. It only
+  does anything at all in the debug mode (when the preprocessor symbol
+  ``__WXDEBUG__`` is defined) and expands to nothing in release mode
+  (otherwise). Note that under Windows, you must either run the
+  program under debugger or use a 3rd party program such as
+  **DebugView**
+  (http://www.microsoft.com/technet/sysinternals/Miscellaneous/DebugView.mspx)
   to actually see the debug output.
-- :func:`LogTrace` as :func:`LogDebug` only does something in debug build. The reason for making it a separate function from it is
-  that usually there are a lot of trace messages, so it might make sense to separate them from other debug messages which would be 
-  flooded in them. Moreover, the second version of this function takes a trace mask as the first argument which allows to further
-  restrict the amount of messages generated.
+
+- :func:`wx.LogTrace` as :func:`wx.LogDebug` only does something in debug
+  build. The reason for making it a separate function from it is that
+  usually there are a lot of trace messages, so it might make sense to
+  separate them from other debug messages which would be flooded in
+  them. Moreover, the second version of this function takes a trace
+  mask as the first argument which allows to further restrict the
+  amount of messages generated.
 
 
-The usage of these functions should be fairly straightforward, however it may be asked why not use the other logging facilities, 
-such as the Python `logging <http://docs.python.org/library/logging.html>`_ module. The short answer is that they're all very 
-good generic mechanisms, but are not really adapted for wxPython, while the log classes are. 
+The usage of these functions should be fairly straightforward, however
+it may be asked why not use the other logging facilities, such as the
+Python `logging <http://docs.python.org/library/logging.html>`_
+module. The short answer is that they're all very good generic
+mechanisms, but are not really adapted for wxPython, while the log
+classes are. However every project is different with different needs,
+so you are encouraged to investigate all options and use what works
+best for you
 
 Some of advantages in using wxPython log functions are:
 
 - Portability
-- Flexibility: The output of :ref:`Log` functions can be redirected or suppressed entirely based on their importance, which is 
-  either impossible or difficult to do with traditional methods. For example, only error messages, or only error messages and 
-  warnings might be logged, filtering out all informational messages.
-- Completeness: Usually, an error message should be presented to the user when some operation fails. Let's take a quite simple but 
-  common case of a file error: suppose that you're writing your data file on disk and there is not enough space. The actual error 
-  might have been detected inside wxPython code, so the calling function doesn't really know the exact reason of the failure, 
-  it only knows that the data file couldn't be written to the disk. However, as wxPython uses :func:`LogError` in this situation, 
-  the exact error code (and the corresponding error message) will be given to the user together with "high level" message about 
-  data file writing error.
+
+- Flexibility: The output of :ref:`wx.Log` functions can be redirected or
+  suppressed entirely based on their importance, which is either
+  impossible or difficult to do with traditional methods. For example,
+  only error messages, or only error messages and warnings might be
+  logged, filtering out all informational messages.
+
+- Completeness: Usually, an error message should be presented to the
+  user when some operation fails. Let's take a quite simple but common
+  case of a file error: suppose that you're writing your data file on
+  disk and there is not enough space. The actual error might have been
+  detected inside wxPython code, so the calling function doesn't
+  really know the exact reason of the failure, it only knows that the
+  data file couldn't be written to the disk. However, as wxPython uses
+  :func:`wx.LogError` in this situation, the exact error code (and the
+  corresponding error message) will be given to the user together with
+  "high level" message about data file writing error.
   
 
   
@@ -70,22 +116,37 @@ Some of advantages in using wxPython log functions are:
 Log Messages Selection
 ----------------------
 
-By default, most log messages are enabled. In particular, this means that errors logged by wxPython code itself (e.g. when it fails 
-to perform some operation) will be processed and shown to the user. To disable the logging entirely you can use :meth:`Log.EnableLogging` 
-method or, more usually, :ref:`LogNull` class which temporarily disables logging and restores it back to the original setting when it is destroyed.
+By default, most log messages are enabled. In particular, this means
+that errors logged by wxPython code itself (e.g. when it fails to
+perform some operation) will be processed and shown to the user. To
+disable the logging entirely you can use :meth:`wx.Log.EnableLogging`
+method or, more usually, :ref:`wx.LogNull` class which temporarily
+disables logging and restores it back to the original setting when it
+is destroyed.
 
-To limit logging to important messages only, you may use :meth:`Log.SetLogLevel` with e.g. ``LOG_Warning`` value -- this will completely 
-disable all logging messages with the severity less than warnings, so :func:`LogMessage` output won't be shown to the user any more.
+To limit logging to important messages only, you may use
+:meth:`wx.Log.SetLogLevel` with e.g. ``wx.LOG_Warning`` value -- this
+will completely disable all logging messages with the severity less
+than warnings, so :func:`wx.LogMessage` output won't be shown to the
+user any more.
 
-Moreover, the log level can be set separately for different log components. Before showing how this can be useful, let us explain what
-log components are: they are simply arbitrary strings identifying the component, or module, which generated the message. They are hierarchical
-in the sense that "foo/bar/baz" component is supposed to be a child of "foo". And all components are children of the unnamed root component.
+Moreover, the log level can be set separately for different log
+components. Before showing how this can be useful, let us explain what
+log components are: they are simply arbitrary strings identifying the
+component, or module, which generated the message. They are
+hierarchical in the sense that "foo/bar/baz" component is supposed to
+be a child of "foo". And all components are children of the unnamed
+root component.
 
-By default, all messages logged by wxPython originate from "wx" component or one of its subcomponents such as "wx/net/ftp", while the
-messages logged by your own code are assigned empty log component. To change this, you need to define ``LOG_COMPONENT`` to a string uniquely
-identifying each component, e.g. you could give it the value "MyProgram" by default and re-define it as "MyProgram/DB" in the module 
-working with the database and "MyProgram/DB/Trans" in its part managing the transactions. Then you could use :meth:`Log.SetComponentLevel`
-in the following ways::
+By default, all messages logged by wxPython originate from "wx"
+component or one of its subcomponents such as "wx/net/ftp", while the
+messages logged by your own code are assigned empty log component. To
+change this, you need to define ``wx.LOG_COMPONENT`` to a string uniquely
+identifying each component, e.g. you could give it the value
+"MyProgram" by default and re-define it as "MyProgram/DB" in the
+module working with the database and "MyProgram/DB/Trans" in its part
+managing the transactions. Then you could use
+:meth:`wx.Log.SetComponentLevel` in the following ways::
 
         # Disable all database error messages, everybody knows databases never
         # fail anyhow
@@ -98,11 +159,13 @@ in the following ways::
         # also enable tracing messages from wxPython dynamic module loading
         # mechanism
         wx.Log.SetComponentLevel("wx/base/module", wx.LOG_Trace)
-        
-        
-        
-Notice that the log level set explicitly for the transactions code overrides the log level of the parent component but that all other database
-code subcomponents inherit its setting by default and so won't generate any log messages at all.
+
+
+
+Notice that the log level set explicitly for the transactions code
+overrides the log level of the parent component but that all other
+database code subcomponents inherit its setting by default and so
+won't generate any log messages at all.
 
 
 
@@ -111,37 +174,60 @@ code subcomponents inherit its setting by default and so won't generate any log
 Log Targets
 -----------
 
-After having enumerated all the functions which are normally used to log the messages, and why would you want to use them, we now 
-describe how all this works.
+After having enumerated all the functions which are normally used to
+log the messages, and why would you want to use them, we now describe
+how all this works.
 
-wxPython has the notion of a `log target`: it is just a class deriving from :ref:`Log`. As such, it implements the virtual functions 
-of the base class which are called when a message is logged. Only one log target is active at any moment, this is the one used by 
-`LogXXX` functions. The normal usage of a log object (i.e. object of a class derived from :ref:`Log`) is to install it as the active
-target with a call to `SetActiveTarget()` and it will be used automatically by all subsequent calls to `LogXXX` functions.
+wxPython has the notion of a `log target`: it is just a class deriving
+from :ref:`wx.Log`. As such, it implements the virtual functions of the
+base class which are called when a message is logged. Only one log
+target is active at any moment, this is the one used by `LogXXX`
+functions. The normal usage of a log object (i.e. object of a class
+derived from :ref:`wx.Log`) is to install it as the active target with a
+call to `SetActiveTarget()` and it will be used automatically by all
+subsequent calls to `LogXXX` functions.
 
-To create a new log target class you only need to derive it from :ref:`Log` and override one or several of :meth:`Log.DoLogRecord`, 
-:meth:`Log.DoLogTextAtLevel` and :meth:`Log.DoLogText` in it. The first one is the most flexible and allows you to change the formatting
-of the messages, dynamically filter and redirect them and so on -- all log messages, except for those generated by :func:`LogFatalError`,
-pass by this function. :meth:`Log.DoLogTextAtLevel` should be overridden if you simply want to redirect the log messages somewhere else,
-without changing their formatting. Finally, it is enough to override :meth:`Log.DoLogText` if you only want to redirect the log 
+To create a new log target class you only need to derive it from
+:ref:`wx.Log` and override one or several of :meth:`wx.Log.DoLogRecord`,
+:meth:`wx.Log.DoLogTextAtLevel` and :meth:`wx.Log.DoLogText` in it. The
+first one is the most flexible and allows you to change the formatting
+of the messages, dynamically filter and redirect them and so on -- all
+log messages, except for those generated by :func:`wx.LogFatalError`,
+pass by this function. :meth:`wx.Log.DoLogTextAtLevel` should be
+overridden if you simply want to redirect the log messages somewhere
+else, without changing their formatting. Finally, it is enough to
+override :meth:`wx.Log.DoLogText` if you only want to redirect the log
 messages and the destination doesn't depend on the message log level.
 
-There are some predefined classes deriving from :ref:`Log` and which might be helpful to see how you can create a new log target 
-class and, of course, may also be used without any change. There are:
+There are some predefined classes deriving from :ref:`wx.Log` and which
+might be helpful to see how you can create a new log target class and,
+of course, may also be used without any change. There are:
 
-- :ref:`LogStderr`: This class logs messages to a ``FILE *``, using stderr by default as its name suggests.
-- `LogStream`: This class has the same functionality as :ref:`LogStderr`, but uses stdout.
-- :ref:`LogGui`: This is the standard log target for wxPython applications (it is used by default if you don't do anything) and provides
-  the most reasonable handling of all types of messages for given platform.
-- :ref:`LogWindow`: This log target provides a "log console" which collects all messages generated by the application and also passes 
-  them to the previous active log target. The log window frame has a menu allowing user to clear the log, close it completely or save all messages to file.
-- :ref:`LogBuffer`: This target collects all the logged messages in an internal buffer allowing to show them later to the user all at once.
-- :ref:`LogNull`: The last log class is quite particular: it doesn't do anything. The objects of this class may be instantiated to (temporarily)
-  suppress output of `LogXXX` functions. 
+- :ref:`wx.LogStderr`: This class logs messages to the ``C`` stderr stream.
+
+- :ref:`wx.LogGui`: This is the standard log target for wxPython
+  applications (it is used by default if you don't do anything) and
+  provides the most reasonable handling of all types of messages for
+  given platform.
+
+- :ref:`wx.LogWindow`: This log target provides a "log console" which
+  collects all messages generated by the application and also passes
+  them to the previous active log target. The log window frame has a
+  menu allowing user to clear the log, close it completely or save all
+  messages to file.
+
+- :ref:`wx.LogBuffer`: This target collects all the logged messages in an
+  internal buffer allowing to show them later to the user all at once.
+
+- :ref:`wx.LogNull`: The last log class is quite particular: it doesn't
+  do anything. The objects of this class may be instantiated to
+  (temporarily) suppress output of `LogXXX` functions.
   
   
-The log targets can also be combined: for example you may wish to redirect the messages somewhere else (for example, to a log file) 
-but also process them as normally. For this the :ref:`LogChain`, :ref:`LogInterposer`, and :ref:`LogInterposerTemp` can be used.
+The log targets can also be combined: for example you may wish to
+redirect the messages somewhere else (for example, to a log file) but
+also process them as normally. For this the :ref:`wx.LogChain`,
+:ref:`wx.LogInterposer`, and :ref:`wx.LogInterposerTemp` can be used.
 
 
 
@@ -150,16 +236,24 @@ but also process them as normally. For this the :ref:`LogChain`, :ref:`LogInterp
 Logging in Multi-Threaded Applications
 --------------------------------------
 
-Starting with wxPython 2.9.1, logging functions can be safely called from any thread. Messages logged from threads other than the main
-one will be buffered until :meth:`Log.Flush` is called in the main thread (which usually happens during idle time, i.e. after processing
-all pending events) and will be really output only then. Notice that the default GUI logger already only output the messages when it is 
-flushed, so by default messages from the other threads will be shown more or less at the same moment as usual. However if you define a
-custom log target, messages may be logged out of order, e.g. messages from the main thread with later timestamp may appear before messages
-with earlier timestamp logged from other threads. :ref:`Log` does however guarantee that messages logged by each thread will appear in 
+Starting with wxPython 2.9.1, logging functions can be safely called
+from any thread. Messages logged from threads other than the main one
+will be buffered until :meth:`wx.Log.Flush` is called in the main thread
+(which usually happens during idle time, i.e. after processing all
+pending events) and will be really output only then. Notice that the
+default GUI logger already only output the messages when it is
+flushed, so by default messages from the other threads will be shown
+more or less at the same moment as usual. However if you define a
+custom log target, messages may be logged out of order, e.g. messages
+from the main thread with later timestamp may appear before messages
+with earlier timestamp logged from other threads. :ref:`wx.Log` does
+however guarantee that messages logged by each thread will appear in
 order in which they were logged.
 
-Also notice that :meth:`Log.EnableLogging` and :ref:`LogNull` class which uses it only affect the current thread, i.e. logging messages 
-may still be generated by the other threads after a call to `EnableLogging(False)`.
+Also notice that :meth:`wx.Log.EnableLogging` and :ref:`wx.LogNull` class
+which uses it only affect the current thread, i.e. logging messages
+may still be generated by the other threads after a call to
+`EnableLogging(False)`.
 
 
 
@@ -168,33 +262,50 @@ may still be generated by the other threads after a call to `EnableLogging(False
 Logging Customization
 ---------------------
 
-To completely change the logging behaviour you may define a custom log target. For example, you could define a class inheriting from 
-:ref:`Log` which shows all the log messages in some part of your main application window reserved for the message output without
+To completely change the logging behaviour you may define a custom log
+target. For example, you could define a class inheriting from
+:ref:`wx.Log` which shows all the log messages in some part of your main
+application window reserved for the message output without
 interrupting the user work flow with modal message boxes.
 
-To use your custom log target you may either call :meth:`Log.SetActiveTarget` with your custom log object or create a :ref:`AppTraits` -derived
-class and override :meth:`AppTraits.CreateLogTarget` virtual method in it and also override :meth:`App.CreateTraits` to return an instance
-of your custom traits object. Notice that in the latter case you should be prepared for logging messages early during the program startup
-and also during program shutdown so you shouldn't rely on existence of the main application window, for example. You can however safely
-assume that GUI is (already/still) available when your log target as used as wxPython automatically switches to using :ref:`LogStderr` 
-if it isn't.
+To use your custom log target you may either call
+:meth:`wx.Log.SetActiveTarget` with your custom log object or create a
+:ref:`wx.AppTraits` -derived class and override
+:meth:`wx.AppTraits.CreateLogTarget` virtual method in it and also
+override :meth:`wx.App.CreateTraits` to return an instance of your custom
+traits object. Notice that in the latter case you should be prepared
+for logging messages early during the program startup and also during
+program shutdown so you shouldn't rely on existence of the main
+application window, for example. You can however safely assume that
+GUI is (already/still) available when your log target as used as
+wxPython automatically switches to using :ref:`wx.LogStderr` if it isn't.
 
-There are several methods which may be overridden in the derived class to customize log messages handling: :meth:`Log.DoLogRecord`, 
-:meth:`Log.DoLogTextAtLevel` and :meth:`Log.DoLogText`.
+There are several methods which may be overridden in the derived class
+to customize log messages handling: :meth:`wx.Log.DoLogRecord`,
+:meth:`wx.Log.DoLogTextAtLevel` and :meth:`wx.Log.DoLogText`.
 
-The last method is the simplest one: you should override it if you simply want to redirect the log output elsewhere, without taking 
-into account the level of the message. If you do want to handle messages of different levels differently, then you should override 
-:meth:`Log.DoLogTextAtLevel`.
+The last method is the simplest one: you should override it if you
+simply want to redirect the log output elsewhere, without taking into
+account the level of the message. If you do want to handle messages of
+different levels differently, then you should override
+:meth:`wx.Log.DoLogTextAtLevel`.
 
-Additionally, you can customize the way full log messages are constructed from the components (such as time stamp, source file information, 
-logging thread ID and so on). This task is performed by :ref:`LogFormatter` class so you need to derive a custom class from it and override
-its `Format()` method to build the log messages in desired way. Notice that if you just need to modify (or suppress) the time stamp display, 
-overriding `FormatTime()` is enough.
+Additionally, you can customize the way full log messages are
+constructed from the components (such as time stamp, source file
+information, logging thread ID and so on). This task is performed by
+:ref:`wx.LogFormatter` class so you need to derive a custom class from it
+and override its `Format()` method to build the log messages in
+desired way. Notice that if you just need to modify (or suppress) the
+time stamp display, overriding `FormatTime()` is enough.
 
-Finally, if even more control over the output format is needed, then `LogRecord()` can be overridden as it allows to construct custom 
-messages depending on the log level or even do completely different things depending on the message severity (for example, throw away all
-messages except warnings and errors, show warnings on the screen and forward the error messages to the user's (or programmer's) cell 
-phone -- maybe depending on whether the timestamp tells us if it is day or night in the current time zone).
+Finally, if even more control over the output format is needed, then
+`LogRecord()` can be overridden as it allows to construct custom
+messages depending on the log level or even do completely different
+things depending on the message severity (for example, throw away all
+messages except warnings and errors, show warnings on the screen and
+forward the error messages to the user's (or programmer's) cell phone
+-- maybe depending on whether the timestamp tells us if it is day or
+night in the current time zone).
 
 
 
@@ -203,17 +314,25 @@ phone -- maybe depending on whether the timestamp tells us if it is day or night
 Using trace masks
 -----------------
 
-Notice that the use of log trace masks is hardly necessary any longer in current wxPython version as the same effect can be achieved by 
-using different log components for different log statements of any level. Please see :ref:`Log Messages Selection <log messages selection>` 
-for more information about the log components.
+Notice that the use of log trace masks is hardly necessary any longer
+in current wxPython version as the same effect can be achieved by
+using different log components for different log statements of any
+level. Please see :ref:`Log Messages Selection <log messages
+selection>` for more information about the log components.
 
-The functions below allow some limited customization of :ref:`Log` behaviour without writing a new log target class (which, aside from 
-being a matter of several minutes, allows you to do anything you want). The verbose messages are the trace messages which are not disabled
-in the release mode and are generated by :func:`LogVerbose`. They are not normally shown to the user because they present little interest, 
-but may be activated, for example, in order to help the user find some program problem.
+The functions below allow some limited customization of :ref:`wx.Log`
+behaviour without writing a new log target class (which, aside from
+being a matter of several minutes, allows you to do anything you
+want). The verbose messages are the trace messages which are not
+disabled in the release mode and are generated by
+:func:`wx.LogVerbose`. They are not normally shown to the user because
+they present little interest, but may be activated, for example, in
+order to help the user find some program problem.
 
-As for the (real) trace messages, their handling depends on the currently enabled trace masks: if :meth:`Log.AddTraceMask` was called for 
-the mask of the given message, it will be logged, otherwise nothing happens.
+As for the (real) trace messages, their handling depends on the
+currently enabled trace masks: if :meth:`wx.Log.AddTraceMask` was called
+for the mask of the given message, it will be logged, otherwise
+nothing happens.
 
 
 For example::
@@ -226,5 +345,6 @@ will log the message if it was preceded by::
     wx.Log.AddTraceMask(wx.TRACE_OleCalls)
     
     
-The standard trace masks are given in the :func:`LogTrace` documentation.
+The standard trace masks are given in the :func:`wx.LogTrace`
+documentation.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/printing_framework_overview.rst b/docs/sphinx/rest_substitutions/overviews/printing_framework_overview.rst
index e8fd0ca4..0fa75aa3 100644
--- a/docs/sphinx/rest_substitutions/overviews/printing_framework_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/printing_framework_overview.rst
@@ -8,13 +8,16 @@
 =================================================
 
 
-The printing framework relies on the application to provide classes whose member functions can respond 
-to particular requests, such as 'print this page' or 'does this page exist in the document?'. This method
-allows wxPython to take over the housekeeping duties of turning preview pages, calling the print dialog box, 
-creating the printer device context, and so on: the application can concentrate on the rendering of the 
-information onto a device context.
+The printing framework relies on the application to provide classes
+whose member functions can respond to particular requests, such as
+'print this page' or 'does this page exist in the document?'. This
+method allows wxPython to take over the housekeeping duties of turning
+preview pages, calling the print dialog box, creating the printer
+device context, and so on: the application can concentrate on the
+rendering of the information onto a device context.
 
-In most cases, the only class you will need to derive from is :ref:`Printout`; all others will be used as-is.
+In most cases, the only class you will need to derive from is
+:ref:`wx.Printout`; all others will be used as-is.
 
 A brief description of each class's role and how they work together follows.
 
@@ -22,12 +25,15 @@ A brief description of each class's role and how they work together follows.
 Printout
 --------
 
-A document's printing ability is represented in an application by a derived :ref:`Printout` class. This class 
-prints a page on request, and can be passed to the Print function of a :ref:`Printer` object to actually print 
-the document, or can be passed to a :ref:`PrintPreview` object to initiate previewing. The following code 
-shows how easy it is to initiate printing, previewing and the print setup dialog, once the :ref:`Printout` 
-functionality has been defined. Notice the use of `MyPrintout` for both printing and previewing. All the preview
-user interface functionality is taken care of by wxPython::
+A document's printing ability is represented in an application by a
+derived :ref:`wx.Printout` class. This class prints a page on request,
+and can be passed to the Print function of a :ref:`wx.Printer` object to
+actually print the document, or can be passed to a :ref:`wx.PrintPreview`
+object to initiate previewing. The following code shows how easy it is
+to initiate printing, previewing and the print setup dialog, once the
+:ref:`wx.Printout` functionality has been defined. Notice the use of
+`MyPrintout` for both printing and previewing. All the preview user
+interface functionality is taken care of by wxPython::
 
 	if printing:
 	    printer = wx.Printer()
@@ -37,79 +43,107 @@ user interface functionality is taken care of by wxPython::
 	elif preview:
 	    # Pass two printout objects: for preview, and possible printing.
 	    preview = wx.PrintPreview(MyPrintout(), MyPrintout())
-	    frame = wx.PreviewFrame(preview, self, "Demo Print Preview", wx.Point(100, 100), wx.Size(600, 650))
+	    frame = wx.PreviewFrame(preview, self, "Demo Print Preview",
+	                            wx.Point(100, 100), wx.Size(600, 650))
 	    frame.Centre(wx.BOTH)
 	    frame.Initialize()
 	    frame.Show(True)
 
 
 
-:ref:`Printout` assembles the printed page and (using your subclass's overrides) writes requested pages to a :ref:`DC`
-that is passed to it. This :ref:`DC` could be a :ref:`MemoryDC` (for displaying the preview image on-screen), 
-a :ref:`PrinterDC` (for printing under MSW and Mac), or a :ref:`PostScriptDC` (for printing under GTK or generating PostScript output).
+:ref:`wx.Printout` assembles the printed page and (using your subclass's
+overrides) writes requested pages to a :ref:`wx.DC` that is passed to
+it. This :ref:`wx.DC` could be a :ref:`wx.MemoryDC` (for displaying the
+preview image on-screen), a :ref:`wx.PrinterDC` (for printing under MSW
+and Mac), or a :ref:`wx.PostScriptDC` (for printing under GTK or
+generating PostScript output).
 
-If your window classes have a `Draw(dc)` routine to do screen rendering, your :ref:`Printout` subclass will typically
-call those routines to create portions of the image on your printout. Your :ref:`Printout` subclass can also make its
-own calls to its :ref:`DC` to draw headers, footers, page numbers, etc.
+If your window classes have a `Draw(dc)` routine to do screen
+rendering, your :ref:`wx.Printout` subclass will typically call those
+routines to create portions of the image on your printout. Your
+:ref:`wx.Printout` subclass can also make its own calls to its :ref:`wx.DC`
+to draw headers, footers, page numbers, etc.
 
-The scaling of the drawn image typically differs from the screen to the preview and printed images. This class provides
-a set of routines named `FitThisSizeToXXX()`, `MapScreenSizeToXXX()`, and `GetLogicalXXXRect`, which can be used to set 
-the user scale and origin of the Printout's DC so that your class can easily map your image to the printout withouth 
-getting into the details of screen and printer PPI and scaling. 
+The scaling of the drawn image typically differs from the screen to
+the preview and printed images. This class provides a set of routines
+named `FitThisSizeToXXX()`, `MapScreenSizeToXXX()`, and
+`GetLogicalXXXRect`, which can be used to set the user scale and
+origin of the Printout's DC so that your class can easily map your
+image to the printout withouth getting into the details of screen and
+printer PPI and scaling.
 
 
 Printer
 -------
 
-Class :ref:`Printer` encapsulates the platform-dependent print function with a common interface. In most cases, you will
-not need to derive a class from :ref:`Printer`; simply create a :ref:`Printer` object in your `Print` function as in the example above.
+Class :ref:`wx.Printer` encapsulates the platform-dependent print
+function with a common interface. In most cases, you will not need to
+derive a class from :ref:`wx.Printer`; simply create a :ref:`wx.Printer`
+object in your `Print` function as in the example above.
 
 
 PrintPreview
 ------------
 
-Class :ref:`PrintPreview` manages the print preview process. Among other things, it constructs the DCs that get passed to your 
-:ref:`Printout` subclass for printing and manages the display of multiple pages, a zoomable preview image, and so forth. 
-In most cases you will use this class as-is, but you can create your own subclass, for example, to change the layout or 
-contents of the preview window.
+Class :ref:`wx.PrintPreview` manages the print preview process. Among
+other things, it constructs the DCs that get passed to your
+:ref:`wx.Printout` subclass for printing and manages the display of
+multiple pages, a zoomable preview image, and so forth.  In most cases
+you will use this class as-is, but you can create your own subclass,
+for example, to change the layout or contents of the preview window.
 
 
 PrinterDC
 ---------
 
-Class :ref:`PrinterDC` is the :ref:`DC` that represents the actual printed page under MSW and Mac. During printing, an object
-of this class will be passed to your derived :ref:`Printout` object to draw upon. The size of the :ref:`PrinterDC` will depend 
-on the paper orientation and the resolution of the printer.
+Class :ref:`wx.PrinterDC` is the :ref:`wx.DC` that represents the actual
+printed page under MSW and Mac. During printing, an object of this
+class will be passed to your derived :ref:`wx.Printout` object to draw
+upon. The size of the :ref:`wx.PrinterDC` will depend on the paper
+orientation and the resolution of the printer.
 
-There are two important rectangles in printing: the page rectangle defines the printable area seen by the application, and under
-MSW and Mac, it is the printable area specified by the printer. (For PostScript printing, the page rectangle is the entire page.) 
-The inherited function :meth:`DC.GetSize` returns the page size in device pixels. The point (0,0) on the :ref:`PrinterDC`
-represents the top left corner of the page rectangle; that is, the page rect is given by `Rect(0, 0, w, h)`, where (w,h) are the values 
-returned by `GetSize`.
+There are two important rectangles in printing: the page rectangle
+defines the printable area seen by the application, and under MSW and
+Mac, it is the printable area specified by the printer. (For
+PostScript printing, the page rectangle is the entire page.)  The
+inherited function :meth:`wx.DC.GetSize` returns the page size in device
+pixels. The point (0,0) on the :ref:`wx.PrinterDC` represents the top
+left corner of the page rectangle; that is, the page rect is given by
+`Rect(0, 0, w, h)`, where (w,h) are the values returned by `GetSize`.
 
-The paper rectangle, on the other hand, represents the entire paper area including the non-printable border. Thus, the coordinates 
-of the top left corner of the paper rectangle will have small negative values, while the width and height will be somewhat larger
-than that of the page rectangle. The :ref:`PrinterDC` -specific function :meth:`PrinterDC.GetPaperRect` returns the paper 
-rectangle of the given :ref:`PrinterDC`.
+The paper rectangle, on the other hand, represents the entire paper
+area including the non-printable border. Thus, the coordinates of the
+top left corner of the paper rectangle will have small negative
+values, while the width and height will be somewhat larger than that
+of the page rectangle. The :ref:`wx.PrinterDC` -specific function
+:meth:`wx.PrinterDC.GetPaperRect` returns the paper rectangle of the
+given :ref:`wx.PrinterDC`.
 
 
 PostScriptDC
 ------------
 
-Class :ref:`PostScriptDC` is the :ref:`DC` that represents the actual printed page under GTK and other PostScript printing. 
-During printing, an object of this class will be passed to your derived :ref:`Printout` object to draw upon. The size of 
-the :ref:`PostScriptDC` will depend upon the :ref:`PrintData` used to construct it.
+Class :ref:`wx.PostScriptDC` is the :ref:`wx.DC` that represents the actual
+printed page under GTK and other PostScript printing.  During
+printing, an object of this class will be passed to your derived
+:ref:`wx.Printout` object to draw upon. The size of the
+:ref:`wx.PostScriptDC` will depend upon the :ref:`wx.PrintData` used to
+construct it.
 
-Unlike a :ref:`PrinterDC`, there is no distinction between the page rectangle and the paper rectangle in a :ref:`PostScriptDC`; 
-both rectangles are taken to represent the entire sheet of paper.
+Unlike a :ref:`wx.PrinterDC`, there is no distinction between the page
+rectangle and the paper rectangle in a :ref:`wx.PostScriptDC`; both
+rectangles are taken to represent the entire sheet of paper.
 
 
 PrintDialog
 -----------
 
-Class :ref:`PrintDialog` puts up the standard print dialog, which allows you to select the page range for printing (as well
-as many other print settings, which may vary from platform to platform). You provide an object of type :ref:`PrintDialogData` to 
-the :ref:`PrintDialog` at construction, which is used to populate the dialog.
+Class :ref:`wx.PrintDialog` puts up the standard print dialog, which
+allows you to select the page range for printing (as well as many
+other print settings, which may vary from platform to platform). You
+provide an object of type :ref:`wx.PrintDialogData` to the
+:ref:`wx.PrintDialog` at construction, which is used to populate the
+dialog.
 
 
 .. _print data:
@@ -117,11 +151,15 @@ the :ref:`PrintDialog` at construction, which is used to populate the dialog.
 PrintData
 ---------
 
-Class :ref:`PrintData` is a subset of :ref:`PrintDialogData` that is used (internally) to initialize a :ref:`PrinterDC` or 
-:ref:`PostScriptDC`. (In fact, a :ref:`PrintData` is a data member of a :ref:`PrintDialogData` and a :ref:`PageSetupDialogData`). 
-Essentially, :ref:`PrintData` contains those bits of information from the two dialogs necessary to configure the :ref:`PrinterDC` or 
-:ref:`PostScriptDC` (e.g., size, orientation, etc.). You might wish to create a global instance of this object to provide 
-call-to-call persistence to your application's print settings.
+Class :ref:`wx.PrintData` is a subset of :ref:`wx.PrintDialogData` that is
+used (internally) to initialize a :ref:`wx.PrinterDC` or
+:ref:`wx.PostScriptDC`. (In fact, a :ref:`wx.PrintData` is a data member of
+a :ref:`wx.PrintDialogData` and a :ref:`wx.PageSetupDialogData`).
+Essentially, :ref:`wx.PrintData` contains those bits of information from
+the two dialogs necessary to configure the :ref:`wx.PrinterDC` or
+:ref:`wx.PostScriptDC` (e.g., size, orientation, etc.). You might wish to
+create a global instance of this object to provide call-to-call
+persistence to your application's print settings.
 
 
 .. _print dialog data:
@@ -129,31 +167,44 @@ call-to-call persistence to your application's print settings.
 PrintDialogData
 ---------------
 
-Class :ref:`PrintDialogData` contains the settings entered by the user in the print dialog. It contains such things as page range,
-number of copies, and so forth. In most cases, you won't need to access this information; the framework takes care of asking your
-:ref:`Printout` derived object for the pages requested by the user.
+Class :ref:`wx.PrintDialogData` contains the settings entered by the user
+in the print dialog. It contains such things as page range, number of
+copies, and so forth. In most cases, you won't need to access this
+information; the framework takes care of asking your :ref:`wx.Printout`
+derived object for the pages requested by the user.
 
 
 PageSetupDialog
 ---------------
 
-Class :ref:`PageSetupDialog` puts up the standard page setup dialog, which allows you to specify the orientation, paper size, 
-and related settings. You provide it with a :ref:`PageSetupDialogData` object at intialization, which is used to populate the dialog; 
-when the dialog is dismissed, this object contains the settings chosen by the user, including orientation and/or page margins.
+Class :ref:`wx.PageSetupDialog` puts up the standard page setup dialog,
+which allows you to specify the orientation, paper size, and related
+settings. You provide it with a :ref:`wx.PageSetupDialogData` object at
+intialization, which is used to populate the dialog; when the dialog
+is dismissed, this object contains the settings chosen by the user,
+including orientation and/or page margins.
 
 
-.. note:: Note that on Macintosh, the native page setup dialog does not contain entries that allow you to change the page margins. 
+.. note:: Note that on Macintosh, the native page setup dialog does
+   not contain entries that allow you to change the page margins.
 
 
 
 PageSetupDialogData
 -------------------
 
-Class :ref:`PageSetupDialogData` contains settings affecting the page size (paper size), orientation, margins, and so forth. Note 
-that not all platforms populate all fields; for example, the MSW page setup dialog lets you set the page margins while the Mac setup dialog does not.
+Class :ref:`wx.PageSetupDialogData` contains settings affecting the page
+size (paper size), orientation, margins, and so forth. Note that not
+all platforms populate all fields; for example, the MSW page setup
+dialog lets you set the page margins while the Mac setup dialog does
+not.
 
-You will typically create a global instance of each of a :ref:`PrintData` and :ref:`PageSetupDialogData` at program initiation, 
-which will contain the default settings provided by the system. Each time the user calls up either the :ref:`PrintDialog` or the 
-:ref:`PageSetupDialog`, you pass these data structures to initialize the dialog values and to be updated by the dialog. 
-The framework then queries these data structures to get information like the printed page range (from the :ref:`PrintDialogData`) or 
-the paper size and/or page orientation (from the :ref:`PageSetupDialogData`).
+You will typically create a global instance of each of a
+:ref:`wx.PrintData` and :ref:`wx.PageSetupDialogData` at program initiation,
+which will contain the default settings provided by the system. Each
+time the user calls up either the :ref:`wx.PrintDialog` or the
+:ref:`wx.PageSetupDialog`, you pass these data structures to initialize
+the dialog values and to be updated by the dialog.  The framework then
+queries these data structures to get information like the printed page
+range (from the :ref:`wx.PrintDialogData`) or the paper size and/or page
+orientation (from the :ref:`wx.PageSetupDialogData`).
diff --git a/docs/sphinx/rest_substitutions/overviews/refcount_overview.rst b/docs/sphinx/rest_substitutions/overviews/refcount_overview.rst
index 5d83846a..3173e275 100644
--- a/docs/sphinx/rest_substitutions/overviews/refcount_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/refcount_overview.rst
@@ -11,62 +11,81 @@
 Why You Shouldn't Care About It
 -------------------------------
 
-Many wxPython objects use a technique known as `reference counting`, also known as `copy on write` (COW). This means that when an 
-object is assigned to another, no copying really takes place. Only the reference count on the shared object data is incremented
-and both objects share the same data (a very fast operation).
+Many of the C++ objects wrapped by wxPython use a technique known as
+`reference counting`, also known as `copy on write` (COW). This means
+that when an object is assigned to another, no copying really takes
+place. Only the reference count on the shared object data is
+incremented and both objects share the same data (a very fast
+operation).
 
-But as soon as one of the two (or more) objects is modified, the data has to be copied because the changes to one of the objects 
-shouldn't be seen in the others. As data copying only happens when the object is written to, this is known as COW.
+But as soon as one of the two (or more) objects is modified, the data
+has to be copied because the changes to one of the objects shouldn't
+be seen in the others. As data copying only happens when the object is
+written to, this is known as COW.
 
-What is important to understand is that all this happens absolutely transparently to the class users and that whether an object 
-is shared or not is not seen from the outside of the class - in any case, the result of any operation on it is the same.
+What is important to understand is that all this happens absolutely
+transparently to the class users and that whether an object is shared
+or not is not seen from the outside of the class - in any case, the
+result of any operation on it is the same.
 
 
 Object Comparison
 -----------------
 
-The ``==`` and ``!=`` operators of the reference counted classes always do a `deep comparison`. This means that the equality operator
-will return true if two objects are identical and not only if they share the same data.
+The ``==`` and ``!=`` operators of the reference counted classes
+always do a `deep comparison`. This means that the equality operator
+will return true if two objects are identical and not only if they
+share the same data.
 
 
-Note that wxPython follows the STL philosophy: when a comparison operator cannot be implemented efficiently (like for e.g. 
-:ref:`Image` 's ``==`` operator which would need to compare the entire image's data, pixel-by-pixel), it's not implemented at all. 
-That's why not all reference counted classes provide comparison operators.
+Note that wxPython follows the STL philosophy: when a comparison
+operator cannot be implemented efficiently (like for e.g.
+:ref:`wx.Image`\ 's ``==`` operator which would need to compare the entire
+image's data, pixel-by-pixel), it's not implemented at all.  That's
+why not all reference counted classes provide comparison operators.
 
 
-Also note that if you only need to do a shallow comparison between two :ref:`Object` derived classes, you should not use the ``==`` 
-and ``!=`` operators but rather the :meth:`Object.IsSameAs` () function.
+Also note that if you only need to do a shallow comparison between two
+:ref:`wx.Object` derived classes, you should not use the ``==`` and
+``!=`` operators but rather the :meth:`wx.Object.IsSameAs`\ () function.
 
 
 Object Destruction
 ------------------
 
-When a COW object destructor is called, it may not delete the data: if it's shared, the destructor will just decrement the shared 
-data's reference count without destroying it. Only when the destructor of the last object owning the data is called, the data is 
-really destroyed. Just like all other COW-things, this happens transparently to the class users so that you shouldn't care about it.
+When a COW object destructor is called, it may not delete the data: if
+it's shared, the destructor will just decrement the shared data's
+reference count without destroying it. Only when the destructor of the
+last object owning the data is called, the data is really
+destroyed. Just like all other COW-things, this happens transparently
+to the class users so that you shouldn't care about it.
 
 
 List of Reference Counted Classes
 ---------------------------------
 
-The following classes in wxPython have efficient (i.e. fast) assignment operators and copy constructors since they are reference-counted:
+The following classes in wxPython have efficient (i.e. fast)
+assignment operators and copy constructors since they are
+reference-counted:
 
-- :ref:`AcceleratorTable`
-- :ref:`adv.Animation`
-- :ref:`Bitmap`
-- :ref:`Brush`
-- :ref:`Cursor`
-- :ref:`Font`
-- :ref:`GraphicsBrush`
-- :ref:`GraphicsContext`
-- :ref:`GraphicsFont`
-- :ref:`GraphicsMatrix`
-- :ref:`GraphicsPath`
-- :ref:`GraphicsPen`
-- :ref:`Icon`
-- :ref:`Image`
-- :ref:`Metafile`
-- :ref:`Palette`
+- :ref:`wx.AcceleratorTable`
+- :ref:`wx.adv.Animation`
+- :ref:`wx.Bitmap`
+- :ref:`wx.Brush`
+- :ref:`wx.Cursor`
+- :ref:`wx.Font`
+- :ref:`wx.GraphicsBrush`
+- :ref:`wx.GraphicsContext`
+- :ref:`wx.GraphicsFont`
+- :ref:`wx.GraphicsMatrix`
+- :ref:`wx.GraphicsPath`
+- :ref:`wx.GraphicsPen`
+- :ref:`wx.Icon`
+- :ref:`wx.Image`
+- :ref:`wx.msw.Metafile`
+- :ref:`wx.Palette`
 
 
-Note that the list above reports the objects which are reference counted in all ports of wxPython; some ports may use this technique also for other classes.
+Note that the list above reports the objects which are reference
+counted in all ports of wxPython; some ports may use this technique
+also for other classes.
diff --git a/docs/sphinx/rest_substitutions/overviews/richtextctrl_overview.rst b/docs/sphinx/rest_substitutions/overviews/richtextctrl_overview.rst
index 137a7f0b..2c3cb836 100644
--- a/docs/sphinx/rest_substitutions/overviews/richtextctrl_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/richtextctrl_overview.rst
@@ -1,1098 +1,1140 @@
-.. include:: headings.inc
-
-
-.. _richtextctrl overview:
-
-==========================================
-|phoenix_title|  **RichTextCtrl Overview**
-==========================================
-
-
-Introduction
-------------
-
-:class:`~richtext.RichTextCtrl` provides a generic implementation of a rich text
-editor that can handle different character styles, paragraph
-formatting, and images.
-
-It's aimed at editing 'natural' language text - if you need an editor
-that supports code editing, :class:`~stc.StyledTextCtrl` is a better choice.
-
-Despite its name, it cannot currently read or write RTF (rich text
-format) files. Instead, it uses its own XML format, and can also read
-and write plain text. In future we expect to provide RTF or
-OpenDocument file capabilities. Custom file formats can be supported
-by creating additional file handlers and registering them with the
-control.
-
-:class:`~richtext.RichTextCtrl` is largely compatible with the :class:`TextCtrl` API,
-but extends it where necessary. The control can be used where the
-native rich text capabilities of :class:`TextCtrl` are not adequate (this
-is particularly true on Windows) and where more direct access to the
-content representation is required. It is difficult and inefficient to
-read the style information in a :class:`TextCtrl`, whereas this
-information is readily available in :class:`~richtext.RichTextCtrl`. Since it's
-written in pure wxWidgets, any customizations you make to
-:class:`~richtext.RichTextCtrl` will be reflected on all platforms.
-
-:class:`~richtext.RichTextCtrl` supports basic printing via the easy-to-use
-:class:`~richtext.RichTextPrinting` class. Creating applications with simple word
-processing features is simplified with the inclusion of
-:class:`~richtext.RichTextFormattingDialog`, a tabbed dialog allowing interactive
-tailoring of paragraph and character styling. Also provided is the
-multi-purpose dialog :class:`~richtext.RichTextStyleOrganiserDialog` that can be
-used for managing style definitions, browsing styles and applying
-them, or selecting list styles with a renumber option.
-
-There are a few disadvantages to using :class:`~richtext.RichTextCtrl`. It is not
-native, so does not behave exactly as a native :class:`TextCtrl`, although
-common editing conventions are followed. Users may miss the built-in
-spelling correction on Mac OS X, or any special character input that
-may be provided by the native control. It would also be a poor choice
-if intended users rely on screen readers that would be not work well
-with non-native text input implementation. You might mitigate this by
-providing the choice between :class:`TextCtrl` and :class:`~richtext.RichTextCtrl`, with
-fewer features in the former case.
-
-A good way to understand :class:`~richtext.RichTextCtrl`'s capabilities is to
-run the sample in the wxPython demo, and browse the code.
-
-
-Related Classes
-===============
-
-**Major classes:** :class:`~richtext.RichTextCtrl`, :class:`~richtext.RichTextBuffer`,
-:class:`~richtext.RichTextEvent`
-
-**Helper classes:** :class:`~richtext.TextAttr`, :class:`~richtext.RichTextRange`
-
-**File handler classes:** :class:`~richtext.RichTextFileHandler`,
-:class:`~richtext.RichTextHTMLHandler`, :class:`~richtext.RichTextXMLHandler`
-
-**Style classes:** :class:`~richtext.RichTextCharacterStyleDefinition`,
-:class:`~richtext.RichTextParagraphStyleDefinition`,
-:class:`~richtext.RichTextListStyleDefinition`, :class:`~richtext.RichTextStyleSheet`
-
-**Additional controls:** :class:`~richtext.RichTextStyleComboCtrl`,
-:class:`~richtext.RichTextStyleListBox`, :class:`~richtext.RichTextStyleListCtrl`
-
-**Printing classes:** :class:`~richtext.RichTextPrinting`, :class:`~richtext.RichTextPrintout`,
-:class:`~richtext.RichTextHeaderFooterData`
-
-**Dialog classes:** :class:`~richtext.RichTextStyleOrganiserDialog`,
-:class:`~richtext.RichTextFormattingDialog`, :class:`~richtext.SymbolPickerDialog`
-
-
-Code Example
-============
-
-This is taken from the wxPython demo::
-
-    import wx
-    import wx.richtext as rt
-    import images
-    
-    #----------------------------------------------------------------------
-    
-    class RichTextFrame(wx.Frame):
-    
-        def __init__(self, *args, **kw):
-    
-            wx.Frame.__init__(self, *args, **kw)
-    
-            self.MakeMenuBar()
-            self.MakeToolBar()
-            self.CreateStatusBar()
-            self.SetStatusText("Welcome to wx.richtext.RichTextCtrl!")
-    
-            self.rtc = rt.RichTextCtrl(self, style=wx.VSCROLL|wx.HSCROLL|wx.NO_BORDER);
-            wx.CallAfter(self.rtc.SetFocus)
-    
-            self.rtc.Freeze()
-            self.rtc.BeginSuppressUndo()
-    
-            self.rtc.BeginParagraphSpacing(0, 20)
-    
-            self.rtc.BeginAlignment(rt.TEXT_ALIGNMENT_CENTRE)
-            self.rtc.BeginBold()
-    
-            self.rtc.BeginFontSize(14)
-            self.rtc.WriteText("Welcome to wxRichTextCtrl, a wxWidgets control for editing and presenting " \
-                               "styled text and images")
-            self.rtc.EndFontSize()
-            self.rtc.Newline()
-    
-            self.rtc.BeginItalic()
-            self.rtc.WriteText("by Julian Smart")
-            self.rtc.EndItalic()
-    
-            self.rtc.EndBold()
-    
-            self.rtc.Newline()
-            self.rtc.WriteImage(images._rt_zebra.GetImage())
-    
-            self.rtc.EndAlignment()
-    
-            self.rtc.Newline()
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("What can you do with this thing? ")
-            self.rtc.WriteImage(images._rt_smiley.GetImage())
-            self.rtc.WriteText(" Well, you can change text ")
-    
-            self.rtc.BeginTextColour((255, 0, 0))
-            self.rtc.WriteText("colour, like this red bit.")
-            self.rtc.EndTextColour()
-    
-            self.rtc.BeginTextColour((0, 0, 255))
-            self.rtc.WriteText(" And this blue bit.")
-            self.rtc.EndTextColour()
-    
-            self.rtc.WriteText(" Naturally you can make things ")
-            self.rtc.BeginBold()
-            self.rtc.WriteText("bold ")
-            self.rtc.EndBold()
-            self.rtc.BeginItalic()
-            self.rtc.WriteText("or italic ")
-            self.rtc.EndItalic()
-            self.rtc.BeginUnderline()
-            self.rtc.WriteText("or underlined.")
-            self.rtc.EndUnderline()
-    
-            self.rtc.BeginFontSize(14)
-            self.rtc.WriteText(" Different font sizes on the same line is allowed, too.")
-            self.rtc.EndFontSize()
-    
-            self.rtc.WriteText(" Next we'll show an indented paragraph.")
-    
-            self.rtc.BeginLeftIndent(60)
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
-                               "An attractive woman came into the cafe, which is nothing remarkable.")
-            self.rtc.EndLeftIndent()
-    
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("Next, we'll show a first-line indent, achieved using BeginLeftIndent(100, -40).")
-    
-            self.rtc.BeginLeftIndent(100, -40)
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
-                               "An attractive woman came into the cafe, which is nothing remarkable.")
-            self.rtc.EndLeftIndent()
-    
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("Numbered bullets are possible, again using sub-indents:")
-    
-            self.rtc.BeginNumberedBullet(1, 100, 60)
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("This is my first item. Note that wxRichTextCtrl doesn't automatically do numbering, " \
-                               "but this will be added later.")
-    
-            self.rtc.EndNumberedBullet()
-    
-            self.rtc.BeginNumberedBullet(2, 100, 60)
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("This is my second item.")
-            self.rtc.EndNumberedBullet()
-    
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("The following paragraph is right-indented:")
-    
-            self.rtc.BeginRightIndent(200)
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
-                               "An attractive woman came into the cafe, which is nothing remarkable.")
-            self.rtc.EndRightIndent()
-    
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("The following paragraph is right-aligned with 1.5 line spacing:")
-    
-            self.rtc.BeginAlignment(rt.TEXT_ALIGNMENT_RIGHT)
-            self.rtc.BeginLineSpacing(rt.TEXT_ATTR_LINE_SPACING_HALF)
-            self.rtc.Newline()
-    
-            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
-                               "An attractive woman came into the cafe, which is nothing remarkable.")
-            self.rtc.EndLineSpacing()
-            self.rtc.EndAlignment()
-    
-            self.rtc.Newline()
-            self.rtc.WriteText("Other notable features of wxRichTextCtrl include:")
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("Compatibility with wxTextCtrl API")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("Easy stack-based BeginXXX()...EndXXX() style setting in addition to SetStyle()")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("XML loading and saving")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("Undo/Redo, with batching option and Undo suppressing")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("Clipboard copy and paste")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("wxRichTextStyleSheet with named character and paragraph styles, and control for " \
-                               "applying named styles")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-            self.rtc.WriteText("A design that can easily be extended to other content types, ultimately with text " \
-                               "boxes, tables, controls, and so on")
-            self.rtc.EndSymbolBullet()
-    
-            self.rtc.BeginSymbolBullet('*', 100, 60)
-            self.rtc.Newline()
-    
-            # Make a style suitable for showing a URL
-            urlStyle = rt.TextAttrEx()
-            urlStyle.SetTextColour(wx.BLUE)
-            urlStyle.SetFontUnderlined(True)
-    
-            self.rtc.WriteText("RichTextCtrl can also display URLs, such as this one: ")
-            self.rtc.BeginStyle(urlStyle)
-            self.rtc.BeginURL("http://wxPython.org/")
-            self.rtc.WriteText("The wxPython Web Site")
-            self.rtc.EndURL();
-            self.rtc.EndStyle();
-            self.rtc.WriteText(". Click on the URL to generate an event.")
-    
-            self.rtc.Bind(wx.EVT_TEXT_URL, self.OnURL)
-    
-            self.rtc.Newline()
-            self.rtc.WriteText("Note: this sample content was generated programmatically from within the " \
-                               "MyFrame constructor " \
-                               "in the demo. The images were loaded from inline XPMs. Enjoy wxRichTextCtrl!")
-    
-            self.rtc.EndParagraphSpacing()
-    
-            self.rtc.EndSuppressUndo()
-            self.rtc.Thaw()
-    
-    
-        def OnURL(self, evt):
-    
-            wx.MessageBox(evt.GetString(), "URL Clicked")
-    
-    
-        def OnFileOpen(self, evt):
-    
-            # This gives us a string suitable for the file dialog based on
-            # the file handlers that are loaded
-            wildcard, types = rt.RichTextBuffer.GetExtWildcard(save=False)
-            dlg = wx.FileDialog(self, "Choose a filename",
-                                wildcard=wildcard,
-                                style=wx.OPEN)
-            if dlg.ShowModal() == wx.ID_OK:
-                path = dlg.GetPath()
-                if path:
-                    fileType = types[dlg.GetFilterIndex()]
-                    self.rtc.LoadFile(path, fileType)
-            dlg.Destroy()
-    
-    
-        def OnFileSave(self, evt):
-    
-            if not self.rtc.GetFilename():
-                self.OnFileSaveAs(evt)
-                return
-    
-            self.rtc.SaveFile()
-    
-    
-        def OnFileSaveAs(self, evt):
-    
-            wildcard, types = rt.RichTextBuffer.GetExtWildcard(save=True)
-    
-            dlg = wx.FileDialog(self, "Choose a filename",
-                                wildcard=wildcard,
-                                style=wx.SAVE)
-    
-            if dlg.ShowModal() == wx.ID_OK:
-                path = dlg.GetPath()
-                if path:
-                    fileType = types[dlg.GetFilterIndex()]
-                    ext = rt.RichTextBuffer.FindHandlerByType(fileType).GetExtension()
-                    if not path.endswith(ext):
-                        path += '.' + ext
-                    self.rtc.SaveFile(path, fileType)
-    
-            dlg.Destroy()
-    
-    
-        def OnFileViewHTML(self, evt):
-    
-            # Get an instance of the html file handler, use it to save the
-            # document to a StringIO stream, and then display the
-            # resulting html text in a dialog with a HtmlWindow.
-            handler = rt.RichTextHTMLHandler()
-            handler.SetFlags(rt.RICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
-            handler.SetFontSizeMapping([7,9,11,12,14,22,100])
-    
-            import cStringIO
-            stream = cStringIO.StringIO()
-            if not handler.SaveStream(self.rtc.GetBuffer(), stream):
-                return
-    
-            import wx.html
-            dlg = wx.Dialog(self, title="HTML", style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
-            html = wx.html.HtmlWindow(dlg, size=(500,400), style=wx.BORDER_SUNKEN)
-            html.SetPage(stream.getvalue())
-            btn = wx.Button(dlg, wx.ID_CANCEL)
-            sizer = wx.BoxSizer(wx.VERTICAL)
-            sizer.Add(html, 1, wx.ALL|wx.EXPAND, 5)
-            sizer.Add(btn, 0, wx.ALL|wx.CENTER, 10)
-            dlg.SetSizer(sizer)
-            sizer.Fit(dlg)
-    
-            dlg.ShowModal()
-    
-            handler.DeleteTemporaryImages()
-    
-    
-        def OnFileExit(self, evt):
-    
-            self.Close(True)
-    
-    
-        def OnBold(self, evt):
-    
-            self.rtc.ApplyBoldToSelection()
-    
-    
-        def OnItalic(self, evt):
-    
-            self.rtc.ApplyItalicToSelection()
-    
-    
-        def OnUnderline(self, evt):
-    
-            self.rtc.ApplyUnderlineToSelection()
-    
-    
-        def OnAlignLeft(self, evt):
-    
-            self.rtc.ApplyAlignmentToSelection(rt.TEXT_ALIGNMENT_LEFT)
-    
-    
-        def OnAlignRight(self, evt):
-    
-            self.rtc.ApplyAlignmentToSelection(rt.TEXT_ALIGNMENT_RIGHT)
-    
-    
-        def OnAlignCenter(self, evt):
-    
-            self.rtc.ApplyAlignmentToSelection(rt.TEXT_ALIGNMENT_CENTRE)
-    
-    
-        def OnIndentMore(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-                attr.SetLeftIndent(attr.GetLeftIndent() + 100)
-                attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
-                self.rtc.SetStyle(r, attr)
-    
-    
-        def OnIndentLess(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-            if attr.GetLeftIndent() >= 100:
-                attr.SetLeftIndent(attr.GetLeftIndent() - 100)
-                attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
-                self.rtc.SetStyle(r, attr)
-    
-    
-        def OnParagraphSpacingMore(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-                attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() + 20);
-                attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
-                self.rtc.SetStyle(r, attr)
-    
-    
-        def OnParagraphSpacingLess(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-                if attr.GetParagraphSpacingAfter() >= 20:
-                    attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() - 20);
-                    attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
-                    self.rtc.SetStyle(r, attr)
-    
-    
-        def OnLineSpacingSingle(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-                attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
-                attr.SetLineSpacing(10)
-                self.rtc.SetStyle(r, attr)
-    
-    
-        def OnLineSpacingHalf(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-                attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
-                attr.SetLineSpacing(15)
-                self.rtc.SetStyle(r, attr)
-    
-    
-        def OnLineSpacingDouble(self, evt):
-    
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
-            ip = self.rtc.GetInsertionPoint()
-            if self.rtc.GetStyle(ip, attr):
-                r = rt.RichTextRange(ip, ip)
-                if self.rtc.HasSelection():
-                    r = self.rtc.GetSelectionRange()
-    
-                attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
-                attr.SetLineSpacing(20)
-                self.rtc.SetStyle(r, attr)
-    
-    
-        def OnFont(self, evt):
-    
-            if not self.rtc.HasSelection():
-                return
-    
-            r = self.rtc.GetSelectionRange()
-            fontData = wx.FontData()
-            fontData.EnableEffects(False)
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_FONT)
-            if self.rtc.GetStyle(self.rtc.GetInsertionPoint(), attr):
-                fontData.SetInitialFont(attr.GetFont())
-    
-            dlg = wx.FontDialog(self, fontData)
-            if dlg.ShowModal() == wx.ID_OK:
-                fontData = dlg.GetFontData()
-                font = fontData.GetChosenFont()
-                if font:
-                    attr.SetFlags(rt.TEXT_ATTR_FONT)
-                    attr.SetFont(font)
-                    self.rtc.SetStyle(r, attr)
-            dlg.Destroy()
-    
-    
-        def OnColour(self, evt):
-    
-            colourData = wx.ColourData()
-            attr = rt.TextAttrEx()
-            attr.SetFlags(rt.TEXT_ATTR_TEXT_COLOUR)
-            if self.rtc.GetStyle(self.rtc.GetInsertionPoint(), attr):
-                colourData.SetColour(attr.GetTextColour())
-    
-            dlg = wx.ColourDialog(self, colourData)
-            if dlg.ShowModal() == wx.ID_OK:
-                colourData = dlg.GetColourData()
-                colour = colourData.GetColour()
-                if colour:
-                    if not self.rtc.HasSelection():
-                        self.rtc.BeginTextColour(colour)
-                    else:
-                        r = self.rtc.GetSelectionRange()
-                        attr.SetFlags(rt.TEXT_ATTR_TEXT_COLOUR)
-                        attr.SetTextColour(colour)
-                        self.rtc.SetStyle(r, attr)
-            dlg.Destroy()
-    
-    
-    
-        def OnUpdateBold(self, evt):
-    
-            evt.Check(self.rtc.IsSelectionBold())
-    
-    
-        def OnUpdateItalic(self, evt):
-    
-            evt.Check(self.rtc.IsSelectionItalics())
-    
-    
-        def OnUpdateUnderline(self, evt):
-    
-            evt.Check(self.rtc.IsSelectionUnderlined())
-    
-    
-        def OnUpdateAlignLeft(self, evt):
-    
-            evt.Check(self.rtc.IsSelectionAligned(rt.TEXT_ALIGNMENT_LEFT))
-    
-    
-        def OnUpdateAlignCenter(self, evt):
-    
-            evt.Check(self.rtc.IsSelectionAligned(rt.TEXT_ALIGNMENT_CENTRE))
-    
-    
-        def OnUpdateAlignRight(self, evt):
-    
-            evt.Check(self.rtc.IsSelectionAligned(rt.TEXT_ALIGNMENT_RIGHT))
-    
-    
-        def ForwardEvent(self, evt):
-    
-            # The RichTextCtrl can handle menu and update events for undo,
-            # redo, cut, copy, paste, delete, and select all, so just
-            # forward the event to it.
-            self.rtc.ProcessEvent(evt)
-    
-    
-        def MakeMenuBar(self):
-    
-            def doBind(item, handler, updateUI=None):
-    
-                self.Bind(wx.EVT_MENU, handler, item)
-                if updateUI is not None:
-                    self.Bind(wx.EVT_UPDATE_UI, updateUI, item)
-    
-            fileMenu = wx.Menu()
-            doBind( fileMenu.Append(-1, "&Open\tCtrl+O", "Open a file"),
-                    self.OnFileOpen )
-            doBind( fileMenu.Append(-1, "&Save\tCtrl+S", "Save a file"),
-                    self.OnFileSave )
-            doBind( fileMenu.Append(-1, "&Save As...\tF12", "Save to a new file"),
-                    self.OnFileSaveAs )
-            fileMenu.AppendSeparator()
-            doBind( fileMenu.Append(-1, "&View as HTML", "View HTML"),
-                    self.OnFileViewHTML)
-            fileMenu.AppendSeparator()
-            doBind( fileMenu.Append(-1, "E&xit\tCtrl+Q", "Quit this program"),
-                    self.OnFileExit )
-    
-            editMenu = wx.Menu()
-            doBind( editMenu.Append(wx.ID_UNDO, "&Undo\tCtrl+Z"),
-                    self.ForwardEvent, self.ForwardEvent)
-            doBind( editMenu.Append(wx.ID_REDO, "&Redo\tCtrl+Y"),
-                    self.ForwardEvent, self.ForwardEvent )
-            editMenu.AppendSeparator()
-            doBind( editMenu.Append(wx.ID_CUT, "Cu&t\tCtrl+X"),
-                    self.ForwardEvent, self.ForwardEvent )
-            doBind( editMenu.Append(wx.ID_COPY, "&Copy\tCtrl+C"),
-                    self.ForwardEvent, self.ForwardEvent)
-            doBind( editMenu.Append(wx.ID_PASTE, "&Paste\tCtrl+V"),
-                    self.ForwardEvent, self.ForwardEvent)
-            doBind( editMenu.Append(wx.ID_CLEAR, "&Delete\tDel"),
-                    self.ForwardEvent, self.ForwardEvent)
-            editMenu.AppendSeparator()
-            doBind( editMenu.Append(wx.ID_SELECTALL, "Select A&ll\tCtrl+A"),
-                    self.ForwardEvent, self.ForwardEvent )
-    
-            formatMenu = wx.Menu()
-            doBind( formatMenu.AppendCheckItem(-1, "&Bold\tCtrl+B"),
-                    self.OnBold, self.OnUpdateBold)
-            doBind( formatMenu.AppendCheckItem(-1, "&Italic\tCtrl+I"),
-                    self.OnItalic, self.OnUpdateItalic)
-            doBind( formatMenu.AppendCheckItem(-1, "&Underline\tCtrl+U"),
-                    self.OnUnderline, self.OnUpdateUnderline)
-            formatMenu.AppendSeparator()
-            doBind( formatMenu.AppendCheckItem(-1, "L&eft Align"),
-                    self.OnAlignLeft, self.OnUpdateAlignLeft)
-            doBind( formatMenu.AppendCheckItem(-1, "&Centre"),
-                    self.OnAlignCenter, self.OnUpdateAlignCenter)
-            doBind( formatMenu.AppendCheckItem(-1, "&Right Align"),
-                    self.OnAlignRight, self.OnUpdateAlignRight)
-            formatMenu.AppendSeparator()
-            doBind( formatMenu.Append(-1, "Indent &More"), self.OnIndentMore)
-            doBind( formatMenu.Append(-1, "Indent &Less"), self.OnIndentLess)
-            formatMenu.AppendSeparator()
-            doBind( formatMenu.Append(-1, "Increase Paragraph &Spacing"), self.OnParagraphSpacingMore)
-            doBind( formatMenu.Append(-1, "Decrease &Paragraph Spacing"), self.OnParagraphSpacingLess)
-            formatMenu.AppendSeparator()
-            doBind( formatMenu.Append(-1, "Normal Line Spacing"), self.OnLineSpacingSingle)
-            doBind( formatMenu.Append(-1, "1.5 Line Spacing"), self.OnLineSpacingHalf)
-            doBind( formatMenu.Append(-1, "Double Line Spacing"), self.OnLineSpacingDouble)
-            formatMenu.AppendSeparator()
-            doBind( formatMenu.Append(-1, "&Font..."), self.OnFont)
-    
-            mb = wx.MenuBar()
-            mb.Append(fileMenu, "&File")
-            mb.Append(editMenu, "&Edit")
-            mb.Append(formatMenu, "F&ormat")
-            self.SetMenuBar(mb)
-    
-    
-        def MakeToolBar(self):
-    
-            def doBind(item, handler, updateUI=None):
-    
-                self.Bind(wx.EVT_TOOL, handler, item)
-                if updateUI is not None:
-                    self.Bind(wx.EVT_UPDATE_UI, updateUI, item)
-    
-            tbar = self.CreateToolBar()
-            doBind( tbar.AddTool(-1, images._rt_open.GetBitmap(),
-                                shortHelpString="Open"), self.OnFileOpen)
-            doBind( tbar.AddTool(-1, images._rt_save.GetBitmap(),
-                                shortHelpString="Save"), self.OnFileSave)
-            tbar.AddSeparator()
-            doBind( tbar.AddTool(wx.ID_CUT, images._rt_cut.GetBitmap(),
-                                shortHelpString="Cut"), self.ForwardEvent, self.ForwardEvent)
-            doBind( tbar.AddTool(wx.ID_COPY, images._rt_copy.GetBitmap(),
-                                shortHelpString="Copy"), self.ForwardEvent, self.ForwardEvent)
-            doBind( tbar.AddTool(wx.ID_PASTE, images._rt_paste.GetBitmap(),
-                                shortHelpString="Paste"), self.ForwardEvent, self.ForwardEvent)
-            tbar.AddSeparator()
-            doBind( tbar.AddTool(wx.ID_UNDO, images._rt_undo.GetBitmap(),
-                                shortHelpString="Undo"), self.ForwardEvent, self.ForwardEvent)
-            doBind( tbar.AddTool(wx.ID_REDO, images._rt_redo.GetBitmap(),
-                                shortHelpString="Redo"), self.ForwardEvent, self.ForwardEvent)
-            tbar.AddSeparator()
-            doBind( tbar.AddTool(-1, images._rt_bold.GetBitmap(), isToggle=True,
-                                shortHelpString="Bold"), self.OnBold, self.OnUpdateBold)
-            doBind( tbar.AddTool(-1, images._rt_italic.GetBitmap(), isToggle=True,
-                                shortHelpString="Italic"), self.OnItalic, self.OnUpdateItalic)
-            doBind( tbar.AddTool(-1, images._rt_underline.GetBitmap(), isToggle=True,
-                                shortHelpString="Underline"), self.OnUnderline, self.OnUpdateUnderline)
-            tbar.AddSeparator()
-            doBind( tbar.AddTool(-1, images._rt_alignleft.GetBitmap(), isToggle=True,
-                                shortHelpString="Align Left"), self.OnAlignLeft, self.OnUpdateAlignLeft)
-            doBind( tbar.AddTool(-1, images._rt_centre.GetBitmap(), isToggle=True,
-                                shortHelpString="Center"), self.OnAlignCenter, self.OnUpdateAlignCenter)
-            doBind( tbar.AddTool(-1, images._rt_alignright.GetBitmap(), isToggle=True,
-                                shortHelpString="Align Right"), self.OnAlignRight, self.OnUpdateAlignRight)
-            tbar.AddSeparator()
-            doBind( tbar.AddTool(-1, images._rt_indentless.GetBitmap(),
-                                shortHelpString="Indent Less"), self.OnIndentLess)
-            doBind( tbar.AddTool(-1, images._rt_indentmore.GetBitmap(),
-                                shortHelpString="Indent More"), self.OnIndentMore)
-            tbar.AddSeparator()
-            doBind( tbar.AddTool(-1, images._rt_font.GetBitmap(),
-                                shortHelpString="Font"), self.OnFont)
-            doBind( tbar.AddTool(-1, images._rt_colour.GetBitmap(),
-                                shortHelpString="Font Colour"), self.OnColour)
-    
-            tbar.Realize()
-    
-    
-    #----------------------------------------------------------------------
-    
-    class TestPanel(wx.Panel):
-    
-        def __init__(self, parent):
-    
-            wx.Panel.__init__(self, parent, -1)
-    
-            b = wx.Button(self, -1, "Show the RichTextCtrl sample", (50,50))
-            self.Bind(wx.EVT_BUTTON, self.OnButton, b)
-    
-            self.AddRTCHandlers()
-    
-    
-        def AddRTCHandlers(self):
-    
-            # make sure we haven't already added them.
-            if rt.RichTextBuffer.FindHandlerByType(rt.RICHTEXT_TYPE_HTML) is not None:
-                return
-    
-            # This would normally go in your app's OnInit method.  I'm
-            # not sure why these file handlers are not loaded by
-            # default by the C++ richtext code, I guess it's so you
-            # can change the name or extension if you wanted...
-            rt.RichTextBuffer.AddHandler(rt.RichTextHTMLHandler())
-            rt.RichTextBuffer.AddHandler(rt.RichTextXMLHandler())
-    
-            # ...like this
-            rt.RichTextBuffer.AddHandler(rt.RichTextXMLHandler(name="Other XML",
-                                                               ext="ox",
-                                                               type=99))
-    
-            # This is needed for the view as HTML option since we tell it
-            # to store the images in the memory file system.
-            wx.FileSystem.AddHandler(wx.MemoryFSHandler())
-    
-    
-        def OnButton(self, evt):
-    
-            win = RichTextFrame(self, -1, "wx.richtext.RichTextCtrl",
-                                size=(700, 500),
-                                style = wx.DEFAULT_FRAME_STYLE)
-            win.Show(True)
-    
-            # give easy access to the demo's PyShell if it's running
-            self.rtfrm = win
-            self.rtc = win.rtc
-    
-    
-    app = wx.App(0)
-    
-    frame = wx.Frame(None)
-    panel = TestPanel(frame)
-    frame.Show()
-    
-    app.MainLoop()
-
-
-
-Text Styles
-===========
-
-Styling attributes are represented by :class:`TextAttr`, or for more
-control over attributes such as margins and size, the derived class
-:class:`~richtext.RichTextAttr`.
-
-When setting a style, the flags of the attribute object determine
-which attributes are applied. When querying a style, the passed flags
-are ignored except (optionally) to determine whether attributes should
-be retrieved from character content or from the paragraph object.
-
-:class:`~richtext.RichTextCtrl` takes a layered approach to styles, so that
-different parts of the content may be responsible for contributing
-different attributes to the final style you see on the screen.
-
-There are four main notions of style within a control:
-
-
-+ **Basic style**: The fundamental style of a control, onto which any
-  other styles are layered. It provides default attributes, and changing
-  the basic style may immediately change the look of the content
-  depending on what other styles the content uses. Calling
-  :meth:`~richtext.RichTextCtrl.SetFont` changes the font for the basic style. The
-  basic style is set with :meth:`~richtext.RichTextCtrl.SetBasicStyle`.
-+ **Paragraph style**: Each paragraph has attributes that are set
-  independently from other paragraphs and independently from the content
-  within the paragraph. Normally, these attributes are paragraph-
-  related, such as alignment and indentation, but it is possible to set
-  character attributes too. The paragraph style can be set independently
-  of its content by passing ``RICHTEXT_SETSTYLE_PARAGRAPHS_ONLY`` to
-  :meth:`~richtext.RichTextCtrl.SetStyleEx`.
-+ **Character style**: Characters within each paragraph can have
-  attributes. A single character, or a run of characters, can have a
-  particular set of attributes. The character style can be with
-  :meth:`~richtext.RichTextCtrl.SetStyle` or :meth:`~richtext.RichTextCtrl.SetStyleEx`.
-+ **Default style**: This is the 'current' style that determines the
-  style of content that is subsequently typed, pasted or
-  programmatically inserted. The default style is set with
-  :meth:`~richtext.RichTextCtrl.SetDefaultStyle`.
-
-
-What you see on the screen is the dynamically *combined* style, found
-by merging the first three of the above style types (the fourth is
-only a guide for future content insertion and therefore does not
-affect the currently displayed content).
-
-To make all this more concrete, here are examples of where you might
-set these different styles:
-
-
-+ You might set the *basic style* to have a Times Roman font in 12
-  point, left-aligned, with two millimetres of spacing after each
-  paragraph.
-+ You might set the *paragraph style* (for one particular paragraph)
-  to be centred.
-+ You might set the *character style* of one particular word to bold.
-+ You might set the *default style* to be underlined, for subsequent
-  inserted text.
-
-
-Naturally you can do any of these things either using your own UI, or
-programmatically.
-
-The basic :class:`TextCtrl` doesn't make the same distinctions as
-:class:`~richtext.RichTextCtrl` regarding attribute storage. So we need finer
-control when setting and retrieving attributes.
-:meth:`~richtext.RichTextCtrl.SetStyleEx` takes a *flags* parameter:
-
-
-+ ``RICHTEXT_SETSTYLE_OPTIMIZE`` specifies that the style should be
-  changed only if the combined attributes are different from the
-  attributes for the current object. This is important when applying
-  styling that has been edited by the user, because he has just edited
-  the *combined* (visible) style, and :class:`~richtext.RichTextCtrl` wants to leave
-  unchanged attributes associated with their original objects instead of
-  applying them to both paragraph and content objects.
-+ ``RICHTEXT_SETSTYLE_PARAGRAPHS_ONLY`` specifies that only paragraph
-  objects within the given range should take on the attributes.
-+ ``RICHTEXT_SETSTYLE_CHARACTERS_ONLY`` specifies that only content
-  objects (text or images) within the given range should take on the
-  attributes.
-+ ``RICHTEXT_SETSTYLE_WITH_UNDO`` specifies that the operation should be
-  undoable.
-
-
-It's great to be able to change arbitrary attributes in a
-:class:`~richtext.RichTextCtrl`, but it can be unwieldy for the user or programmer
-to set attributes separately. Word processors have collections of
-styles that you can tailor or use as-is, and this means that you can
-set a heading with one click instead of marking text in bold,
-specifying a large font size, and applying a certain paragraph spacing
-and alignment for every such heading. Similarly, wxPython provides a
-class called :class:`~richtext.RichTextStyleSheet` which manages style definitions
-(:class:`~richtext.RichTextParagraphStyleDefinition`,
-:class:`~richtext.RichTextListStyleDefinition` and
-:class:`~richtext.RichTextCharacterStyleDefinition`). Once you have added
-definitions to a style sheet and associated it with a
-:class:`~richtext.RichTextCtrl`, you can apply a named definition to a range of
-text. The classes :class:`~richtext.RichTextStyleComboCtrl` and
-:class:`~richtext.RichTextStyleListBox` can be used to present the user with a list
-of styles in a sheet, and apply them to the selected text.
-
-You can reapply a style sheet to the contents of the control, by
-calling :meth:`~richtext.RichTextCtrl.ApplyStyleSheet`. This is useful if the
-style definitions have changed, and you want the content to reflect
-this. It relies on the fact that when you apply a named style, the
-style definition name is recorded in the content. So ApplyStyleSheet
-works by finding the paragraph attributes with style names and re-
-applying the definition's attributes to the paragraph. Currently, this
-works with paragraph and list style definitions only.
-
-
-Included Dialogs
-================
-
-:class:`~richtext.RichTextCtrl` comes with standard dialogs to make it easier to
-implement text editing functionality.
-
-:class:`~richtext.RichTextFormattingDialog` can be used for character or paragraph
-formatting, or a combination of both. It's a `PropertySheetDialog`
-with the following available tabs: Font, Indents & Spacing, Tabs,
-Bullets, Style, Borders, Margins, Background, Size, and List Style.
-You can select which pages will be shown by supplying flags to the
-dialog constructor. In a character formatting dialog, typically only
-the Font page will be shown. In a paragraph formatting dialog, you'll
-show the Indents & Spacing, Tabs and Bullets pages. The Style tab is
-useful when editing a style definition.
-
-You can customize this dialog by providing your own
-:class:`~richtext.RichTextFormattingDialogFactory` object, which tells the
-formatting dialog how many pages are supported, what their identifiers
-are, and how to creates the pages.
-
-:class:`~richtext.RichTextStyleOrganiserDialog` is a multi-purpose dialog that can
-be used for managing style definitions, browsing styles and applying
-them, or selecting list styles with a renumber option. See the sample
-for usage - it is used for the "Manage Styles" and "Bullets and
-Numbering" menu commands.
-
-:class:`~richtext.SymbolPickerDialog` lets the user insert a symbol from a specified
-font. It has no :class:`~richtext.RichTextCtrl` dependencies besides being included
-in the rich text library.
-
-
-How RichTextCtrl is Implemented
-===============================
-
-Data representation is handled by :class:`~richtext.RichTextBuffer`, and a
-:class:`~richtext.RichTextCtrl` always has one such buffer.
-
-The content is represented by a hierarchy of objects, all derived from
-:class:`~richtext.RichTextObject`. An object might be an image, a fragment of text,
-a paragraph, or a further composite object. Objects store a
-:class:`~richtext.RichTextAttr` containing style information; a paragraph object can
-contain both paragraph and character information, but content objects
-such as text can only store character information. The final style
-displayed in the control or in a printout is a combination of base
-style, paragraph style and content (character) style.
-
-The top of the hierarchy is the buffer, a kind of
-:class:`~richtext.RichTextParagraphLayoutBox`, containing further
-:class:`~richtext.RichTextParagraph` objects, each of which can include text, images
-and potentially other types of object.
-
-Each object maintains a range (start and end position) measured from
-the start of the main parent object.
-
-When Layout is called on an object, it is given a size which the
-object must limit itself to, or one or more flexible directions
-(vertical or horizontal). So, for example, a centred paragraph is
-given the page width to play with (minus any margins), but can extend
-indefinitely in the vertical direction. The implementation of Layout
-caches the calculated size and position.
-
-When the buffer is modified, a range is invalidated (marked as
-requiring layout), so that only the minimum amount of layout is
-performed.
-
-A paragraph of pure text with the same style contains just one further
-object, a :class:`~richtext.RichTextPlainText` object. When styling is applied to
-part of this object, the object is decomposed into separate objects,
-one object for each different character style. So each object within a
-paragraph always has just one :class:`TextAttr` object to denote its
-character style. Of course, this can lead to fragmentation after a lot
-of edit operations, potentially leading to several objects with the
-same style where just one would do. So a Defragment function is called
-when updating the control's display, to ensure that the minimum number
-of objects is used.
-
-
-Nested Objects
-==============
-
-:class:`~richtext.RichTextCtrl` supports nested objects such as text boxes and
-tables. To achieve compatibility with the existing API, there is the
-concept of *object* *focus*. When the user clicks on a nested text
-box, the object focus is set to that container object so all keyboard
-input and API functions apply to that container. The application can
-change the focus using :meth:`~richtext.RichTextCtrl.SetObjectFocus`. Call this
-function with a ``None`` parameter to set the focus back to the top-level object.
-
-An event will be sent to the control when the focus changes.
-
-When the user clicks on the control, :class:`~richtext.RichTextCtrl` determines
-which container to set as the current object focus by calling the
-found container's overrided :meth:`~richtext.RichTextObject.AcceptsFocus`
-function. For example, although a table is a container, it must not
-itself be the object focus because there is no text editing at the
-table level. Instead, a cell within the table must accept the focus.
-
-Since with nested objects it is not possible to represent a section
-with merely a start position and an end position, the class
-:class:`~richtext.RichTextSelection` is provided which stores multiple ranges (for
-non-contiguous selections such as table cells) and a pointer to the
-container object in question. You can pass :class:`~richtext.RichTextSelection` to
-:meth:`~richtext.RichTextCtrl.SetSelection` or get an instance of it from
-:meth:`~richtext.RichTextCtrl.GetSelection`.
-
-When selecting multiple objects, such as cell tables, the
-:class:`~richtext.RichTextCtrl` dragging handler code calls the function
-:meth:`~richtext.RichTextObject.HandlesChildSelections` to determine whether the
-children can be individual selections. Currently only table cells can
-be multiply-selected in this way.
-
-
-Context Menus and Property Dialogs
-==================================
-
-There are three ways you can make use of context menus: you can let
-:class:`~richtext.RichTextCtrl` handle everything and provide a basic menu; you can
-set your own context menu using :meth:`~richtext.RichTextCtrl.SetContextMenu` but
-let :class:`~richtext.RichTextCtrl` handle showing it and adding property items; or
-you can override the default context menu behaviour by adding a
-context menu event handler to your class in the normal way.
-
-If you right-click over a text box in cell in a table, you may want to
-edit the properties of one of these objects - but which properties
-will you be editing?
-
-Well, the default behaviour allows up to three property-editing menu
-items simultaneously - for the object clicked on, the container of
-that object, and the container's parent (depending on whether any of
-these objects return true from their
-:meth:`~richtext.RichTextObject.CanEditProperties` functions). If you supply a
-context menu, add a property command item using the
-``ID_RICHTEXT_PROPERTIES1`` identifier, so that :class:`~richtext.RichTextCtrl` can
-find the position to add command items. The object should tell the
-control what label to use by returning a string from
-:meth:`~richtext.RichTextObject.GetPropertiesMenuLabel`.
-
-Since there may be several property-editing commands showing, it is
-recommended that you don't include the word Properties - just the name
-of the object, such as Text Box or Table.
-
-
-Development Roadmap
-===================
-
-
-Bugs
-----
-
-This is an incomplete list of bugs.
-
-
-+ Moving the caret up at the beginning of a line sometimes incorrectly
-  positions the caret.
-+ As the selection is expanded, the text jumps slightly due to kerning
-  differences between drawing a single text string versus drawing
-  several fragments separately. This could be improved by using
-  :meth:`DC.GetPartialTextExtents` to calculate exactly where the separate
-  fragments should be drawn. Note that this problem also applies to
-  separation of text fragments due to difference in their attributes.
-
-
-
-Features
---------
-
-This is a list of some of the features that have yet to be
-implemented. Help with them will be appreciated.
-
-
-+ Support for composite objects in some functions where it's not yet
-  implemented, for example ApplyStyleSheet
-+ Table API enhancements and dialogs; improved table layout especially
-  row spans and fitting
-+ Conversion from HTML, and a rewrite of the HTML output handler that
-  includes CSS, tables, text boxes, and floating images, in addition to
-  a simplified-HTML mode for wxHTML compatibility
-+ Open Office input and output
-+ RTF input and output
-+ A ruler control
-+ Standard editing toolbars
-+ Bitmap bullets
-+ Justified text, in print/preview at least
-+ Scaling: either everything scaled, or rendering using a custom
-  reference point size and an optional dimension scale
-
-
-There are also things that could be done to take advantage of the
-underlying text capabilities of the platform; higher-level text
-formatting APIs are available on some platforms, such as Mac OS X, and
-some of translation from high level to low level :class:`DC` API is
-unnecessary. However this would require additions to the wxPython API.
-
-
+.. include:: headings.inc
+
+
+.. _richtextctrl overview:
+
+==========================================
+|phoenix_title|  **RichTextCtrl Overview**
+==========================================
+
+
+Introduction
+------------
+
+:class:`~wx.richtext.RichTextCtrl` provides a generic implementation of a
+rich text editor that can handle different character styles, paragraph
+formatting, and images.
+
+It's aimed at editing 'natural' language text - if you need an editor
+that supports code editing, :class:`wx.stc.StyledTextCtrl` is a better choice.
+
+Despite its name, it cannot currently read or write RTF (rich text
+format) files. Instead, it uses its own XML format, and can also read
+and write plain text. In future we expect to provide RTF or
+OpenDocument file capabilities. Custom file formats can be supported
+by creating additional file handlers and registering them with the
+control.
+
+:class:`~wx.richtext.RichTextCtrl` is largely compatible with the
+:class:`wx.TextCtrl` API, but extends it where necessary. The control can
+be used where the native rich text capabilities of :class:`wx.TextCtrl`
+are not adequate (this is particularly true on Windows) and where more
+direct access to the content representation is required. It is
+difficult and inefficient to read the style information in a
+:class:`wx.TextCtrl`, whereas this information is readily available in
+:class:`~wx.richtext.RichTextCtrl`. Since it's written in pure wxWidgets,
+any customizations you make to :class:`~wx.richtext.RichTextCtrl` will be
+reflected on all platforms.
+
+:class:`~wx.richtext.RichTextCtrl` supports basic printing via the
+easy-to-use :class:`~wx.richtext.RichTextPrinting` class. Creating
+applications with simple word processing features is simplified with
+the inclusion of :class:`~wx.richtext.RichTextFormattingDialog`, a tabbed
+dialog allowing interactive tailoring of paragraph and character
+styling. Also provided is the multi-purpose dialog
+:class:`~wx.richtext.RichTextStyleOrganiserDialog` that can be used for
+managing style definitions, browsing styles and applying them, or
+selecting list styles with a renumber option.
+
+There are a few disadvantages to using
+:class:`~wx.richtext.RichTextCtrl`. It is not native, so does not behave
+exactly as a native :class:`wx.TextCtrl`, although common editing
+conventions are followed. Users may miss the built-in spelling
+correction on Mac OS X, or any special character input that may be
+provided by the native control. It would also be a poor choice if
+intended users rely on screen readers that would be not work well with
+non-native text input implementation. You might mitigate this by
+providing the choice between :class:`wx.TextCtrl` and
+:class:`~wx.richtext.RichTextCtrl`, with fewer features in the former
+case.
+
+A good way to understand :class:`~wx.richtext.RichTextCtrl`\ 's
+capabilities is to run the sample in the wxPython demo, and browse the
+code.
+
+
+Related Classes
+===============
+
+**Major classes:** :class:`~wx.richtext.RichTextCtrl`,
+:class:`~wx.richtext.RichTextBuffer`, :class:`~wx.richtext.RichTextEvent`
+
+**Helper classes:** :class:`wx.TextAttr`,
+  :class:`~wx.richtext.RichTextRange`
+
+**File handler classes:** :class:`~wx.richtext.RichTextFileHandler`,
+:class:`~wx.richtext.RichTextHTMLHandler`,
+:class:`~wx.richtext.RichTextXMLHandler`
+
+**Style classes:**
+:class:`~wx.richtext.RichTextCharacterStyleDefinition`,
+:class:`~wx.richtext.RichTextParagraphStyleDefinition`,
+:class:`~wx.richtext.RichTextListStyleDefinition`,
+:class:`~wx.richtext.RichTextStyleSheet`
+
+**Additional controls:** :class:`~wx.richtext.RichTextStyleComboCtrl`,
+:class:`~wx.richtext.RichTextStyleListBox`,
+:class:`~wx.richtext.RichTextStyleListCtrl`
+
+**Printing classes:** :class:`~wx.richtext.RichTextPrinting`,
+:class:`~wx.richtext.RichTextPrintout`,
+:class:`~wx.richtext.RichTextHeaderFooterData`
+
+**Dialog classes:** :class:`~wx.richtext.RichTextStyleOrganiserDialog`,
+:class:`~wx.richtext.RichTextFormattingDialog`,
+:class:`~wx.richtext.SymbolPickerDialog`
+
+
+Code Example
+============
+
+This is taken from the wxPython demo::
+
+    import wx
+    import wx.richtext as rt
+    import images
+    
+    #----------------------------------------------------------------------
+    
+    class RichTextFrame(wx.Frame):
+    
+        def __init__(self, *args, **kw):
+    
+            wx.Frame.__init__(self, *args, **kw)
+    
+            self.MakeMenuBar()
+            self.MakeToolBar()
+            self.CreateStatusBar()
+            self.SetStatusText("Welcome to wx.richtext.RichTextCtrl!")
+    
+            self.rtc = rt.RichTextCtrl(self, style=wx.VSCROLL|wx.HSCROLL|wx.NO_BORDER);
+            wx.CallAfter(self.rtc.SetFocus)
+    
+            self.rtc.Freeze()
+            self.rtc.BeginSuppressUndo()
+    
+            self.rtc.BeginParagraphSpacing(0, 20)
+    
+            self.rtc.BeginAlignment(rt.TEXT_ALIGNMENT_CENTRE)
+            self.rtc.BeginBold()
+    
+            self.rtc.BeginFontSize(14)
+            self.rtc.WriteText("Welcome to wxRichTextCtrl, a wxWidgets control for editing and presenting " \
+                               "styled text and images")
+            self.rtc.EndFontSize()
+            self.rtc.Newline()
+    
+            self.rtc.BeginItalic()
+            self.rtc.WriteText("by Julian Smart")
+            self.rtc.EndItalic()
+    
+            self.rtc.EndBold()
+    
+            self.rtc.Newline()
+            self.rtc.WriteImage(images._rt_zebra.GetImage())
+    
+            self.rtc.EndAlignment()
+    
+            self.rtc.Newline()
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("What can you do with this thing? ")
+            self.rtc.WriteImage(images._rt_smiley.GetImage())
+            self.rtc.WriteText(" Well, you can change text ")
+    
+            self.rtc.BeginTextColour((255, 0, 0))
+            self.rtc.WriteText("colour, like this red bit.")
+            self.rtc.EndTextColour()
+    
+            self.rtc.BeginTextColour((0, 0, 255))
+            self.rtc.WriteText(" And this blue bit.")
+            self.rtc.EndTextColour()
+    
+            self.rtc.WriteText(" Naturally you can make things ")
+            self.rtc.BeginBold()
+            self.rtc.WriteText("bold ")
+            self.rtc.EndBold()
+            self.rtc.BeginItalic()
+            self.rtc.WriteText("or italic ")
+            self.rtc.EndItalic()
+            self.rtc.BeginUnderline()
+            self.rtc.WriteText("or underlined.")
+            self.rtc.EndUnderline()
+    
+            self.rtc.BeginFontSize(14)
+            self.rtc.WriteText(" Different font sizes on the same line is allowed, too.")
+            self.rtc.EndFontSize()
+    
+            self.rtc.WriteText(" Next we'll show an indented paragraph.")
+    
+            self.rtc.BeginLeftIndent(60)
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
+                               "An attractive woman came into the cafe, which is nothing remarkable.")
+            self.rtc.EndLeftIndent()
+    
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("Next, we'll show a first-line indent, achieved using BeginLeftIndent(100, -40).")
+    
+            self.rtc.BeginLeftIndent(100, -40)
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
+                               "An attractive woman came into the cafe, which is nothing remarkable.")
+            self.rtc.EndLeftIndent()
+    
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("Numbered bullets are possible, again using sub-indents:")
+    
+            self.rtc.BeginNumberedBullet(1, 100, 60)
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("This is my first item. Note that wxRichTextCtrl doesn't automatically do numbering, " \
+                               "but this will be added later.")
+    
+            self.rtc.EndNumberedBullet()
+    
+            self.rtc.BeginNumberedBullet(2, 100, 60)
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("This is my second item.")
+            self.rtc.EndNumberedBullet()
+    
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("The following paragraph is right-indented:")
+    
+            self.rtc.BeginRightIndent(200)
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
+                               "An attractive woman came into the cafe, which is nothing remarkable.")
+            self.rtc.EndRightIndent()
+    
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("The following paragraph is right-aligned with 1.5 line spacing:")
+    
+            self.rtc.BeginAlignment(rt.TEXT_ALIGNMENT_RIGHT)
+            self.rtc.BeginLineSpacing(rt.TEXT_ATTR_LINE_SPACING_HALF)
+            self.rtc.Newline()
+    
+            self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. " \
+                               "An attractive woman came into the cafe, which is nothing remarkable.")
+            self.rtc.EndLineSpacing()
+            self.rtc.EndAlignment()
+    
+            self.rtc.Newline()
+            self.rtc.WriteText("Other notable features of wxRichTextCtrl include:")
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("Compatibility with wxTextCtrl API")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("Easy stack-based BeginXXX()...EndXXX() style setting in addition to SetStyle()")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("XML loading and saving")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("Undo/Redo, with batching option and Undo suppressing")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("Clipboard copy and paste")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("wxRichTextStyleSheet with named character and paragraph styles, and control for " \
+                               "applying named styles")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+            self.rtc.WriteText("A design that can easily be extended to other content types, ultimately with text " \
+                               "boxes, tables, controls, and so on")
+            self.rtc.EndSymbolBullet()
+    
+            self.rtc.BeginSymbolBullet('*', 100, 60)
+            self.rtc.Newline()
+    
+            # Make a style suitable for showing a URL
+            urlStyle = rt.TextAttrEx()
+            urlStyle.SetTextColour(wx.BLUE)
+            urlStyle.SetFontUnderlined(True)
+    
+            self.rtc.WriteText("RichTextCtrl can also display URLs, such as this one: ")
+            self.rtc.BeginStyle(urlStyle)
+            self.rtc.BeginURL("http://wxPython.org/")
+            self.rtc.WriteText("The wxPython Web Site")
+            self.rtc.EndURL();
+            self.rtc.EndStyle();
+            self.rtc.WriteText(". Click on the URL to generate an event.")
+    
+            self.rtc.Bind(wx.EVT_TEXT_URL, self.OnURL)
+    
+            self.rtc.Newline()
+            self.rtc.WriteText("Note: this sample content was generated programmatically from within the " \
+                               "MyFrame constructor " \
+                               "in the demo. The images were loaded from inline XPMs. Enjoy wxRichTextCtrl!")
+    
+            self.rtc.EndParagraphSpacing()
+    
+            self.rtc.EndSuppressUndo()
+            self.rtc.Thaw()
+    
+    
+        def OnURL(self, evt):
+    
+            wx.MessageBox(evt.GetString(), "URL Clicked")
+    
+    
+        def OnFileOpen(self, evt):
+    
+            # This gives us a string suitable for the file dialog based on
+            # the file handlers that are loaded
+            wildcard, types = rt.RichTextBuffer.GetExtWildcard(save=False)
+            dlg = wx.FileDialog(self, "Choose a filename",
+                                wildcard=wildcard,
+                                style=wx.OPEN)
+            if dlg.ShowModal() == wx.ID_OK:
+                path = dlg.GetPath()
+                if path:
+                    fileType = types[dlg.GetFilterIndex()]
+                    self.rtc.LoadFile(path, fileType)
+            dlg.Destroy()
+    
+    
+        def OnFileSave(self, evt):
+    
+            if not self.rtc.GetFilename():
+                self.OnFileSaveAs(evt)
+                return
+    
+            self.rtc.SaveFile()
+    
+    
+        def OnFileSaveAs(self, evt):
+    
+            wildcard, types = rt.RichTextBuffer.GetExtWildcard(save=True)
+    
+            dlg = wx.FileDialog(self, "Choose a filename",
+                                wildcard=wildcard,
+                                style=wx.SAVE)
+    
+            if dlg.ShowModal() == wx.ID_OK:
+                path = dlg.GetPath()
+                if path:
+                    fileType = types[dlg.GetFilterIndex()]
+                    ext = rt.RichTextBuffer.FindHandlerByType(fileType).GetExtension()
+                    if not path.endswith(ext):
+                        path += '.' + ext
+                    self.rtc.SaveFile(path, fileType)
+    
+            dlg.Destroy()
+    
+    
+        def OnFileViewHTML(self, evt):
+    
+            # Get an instance of the html file handler, use it to save the
+            # document to a StringIO stream, and then display the
+            # resulting html text in a dialog with a HtmlWindow.
+            handler = rt.RichTextHTMLHandler()
+            handler.SetFlags(rt.RICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
+            handler.SetFontSizeMapping([7,9,11,12,14,22,100])
+    
+            import cStringIO
+            stream = cStringIO.StringIO()
+            if not handler.SaveStream(self.rtc.GetBuffer(), stream):
+                return
+    
+            import wx.html
+            dlg = wx.Dialog(self, title="HTML", style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
+            html = wx.html.HtmlWindow(dlg, size=(500,400), style=wx.BORDER_SUNKEN)
+            html.SetPage(stream.getvalue())
+            btn = wx.Button(dlg, wx.ID_CANCEL)
+            sizer = wx.BoxSizer(wx.VERTICAL)
+            sizer.Add(html, 1, wx.ALL|wx.EXPAND, 5)
+            sizer.Add(btn, 0, wx.ALL|wx.CENTER, 10)
+            dlg.SetSizer(sizer)
+            sizer.Fit(dlg)
+    
+            dlg.ShowModal()
+    
+            handler.DeleteTemporaryImages()
+    
+    
+        def OnFileExit(self, evt):
+    
+            self.Close(True)
+    
+    
+        def OnBold(self, evt):
+    
+            self.rtc.ApplyBoldToSelection()
+    
+    
+        def OnItalic(self, evt):
+    
+            self.rtc.ApplyItalicToSelection()
+    
+    
+        def OnUnderline(self, evt):
+    
+            self.rtc.ApplyUnderlineToSelection()
+    
+    
+        def OnAlignLeft(self, evt):
+    
+            self.rtc.ApplyAlignmentToSelection(rt.TEXT_ALIGNMENT_LEFT)
+    
+    
+        def OnAlignRight(self, evt):
+    
+            self.rtc.ApplyAlignmentToSelection(rt.TEXT_ALIGNMENT_RIGHT)
+    
+    
+        def OnAlignCenter(self, evt):
+    
+            self.rtc.ApplyAlignmentToSelection(rt.TEXT_ALIGNMENT_CENTRE)
+    
+    
+        def OnIndentMore(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+                attr.SetLeftIndent(attr.GetLeftIndent() + 100)
+                attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
+                self.rtc.SetStyle(r, attr)
+    
+    
+        def OnIndentLess(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+            if attr.GetLeftIndent() >= 100:
+                attr.SetLeftIndent(attr.GetLeftIndent() - 100)
+                attr.SetFlags(rt.TEXT_ATTR_LEFT_INDENT)
+                self.rtc.SetStyle(r, attr)
+    
+    
+        def OnParagraphSpacingMore(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+                attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() + 20);
+                attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
+                self.rtc.SetStyle(r, attr)
+    
+    
+        def OnParagraphSpacingLess(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+                if attr.GetParagraphSpacingAfter() >= 20:
+                    attr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter() - 20);
+                    attr.SetFlags(rt.TEXT_ATTR_PARA_SPACING_AFTER)
+                    self.rtc.SetStyle(r, attr)
+    
+    
+        def OnLineSpacingSingle(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+                attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
+                attr.SetLineSpacing(10)
+                self.rtc.SetStyle(r, attr)
+    
+    
+        def OnLineSpacingHalf(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+                attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
+                attr.SetLineSpacing(15)
+                self.rtc.SetStyle(r, attr)
+    
+    
+        def OnLineSpacingDouble(self, evt):
+    
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
+            ip = self.rtc.GetInsertionPoint()
+            if self.rtc.GetStyle(ip, attr):
+                r = rt.RichTextRange(ip, ip)
+                if self.rtc.HasSelection():
+                    r = self.rtc.GetSelectionRange()
+    
+                attr.SetFlags(rt.TEXT_ATTR_LINE_SPACING)
+                attr.SetLineSpacing(20)
+                self.rtc.SetStyle(r, attr)
+    
+    
+        def OnFont(self, evt):
+    
+            if not self.rtc.HasSelection():
+                return
+    
+            r = self.rtc.GetSelectionRange()
+            fontData = wx.FontData()
+            fontData.EnableEffects(False)
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_FONT)
+            if self.rtc.GetStyle(self.rtc.GetInsertionPoint(), attr):
+                fontData.SetInitialFont(attr.GetFont())
+    
+            dlg = wx.FontDialog(self, fontData)
+            if dlg.ShowModal() == wx.ID_OK:
+                fontData = dlg.GetFontData()
+                font = fontData.GetChosenFont()
+                if font:
+                    attr.SetFlags(rt.TEXT_ATTR_FONT)
+                    attr.SetFont(font)
+                    self.rtc.SetStyle(r, attr)
+            dlg.Destroy()
+    
+    
+        def OnColour(self, evt):
+    
+            colourData = wx.ColourData()
+            attr = rt.TextAttrEx()
+            attr.SetFlags(rt.TEXT_ATTR_TEXT_COLOUR)
+            if self.rtc.GetStyle(self.rtc.GetInsertionPoint(), attr):
+                colourData.SetColour(attr.GetTextColour())
+    
+            dlg = wx.ColourDialog(self, colourData)
+            if dlg.ShowModal() == wx.ID_OK:
+                colourData = dlg.GetColourData()
+                colour = colourData.GetColour()
+                if colour:
+                    if not self.rtc.HasSelection():
+                        self.rtc.BeginTextColour(colour)
+                    else:
+                        r = self.rtc.GetSelectionRange()
+                        attr.SetFlags(rt.TEXT_ATTR_TEXT_COLOUR)
+                        attr.SetTextColour(colour)
+                        self.rtc.SetStyle(r, attr)
+            dlg.Destroy()
+    
+    
+    
+        def OnUpdateBold(self, evt):
+    
+            evt.Check(self.rtc.IsSelectionBold())
+    
+    
+        def OnUpdateItalic(self, evt):
+    
+            evt.Check(self.rtc.IsSelectionItalics())
+    
+    
+        def OnUpdateUnderline(self, evt):
+    
+            evt.Check(self.rtc.IsSelectionUnderlined())
+    
+    
+        def OnUpdateAlignLeft(self, evt):
+    
+            evt.Check(self.rtc.IsSelectionAligned(rt.TEXT_ALIGNMENT_LEFT))
+    
+    
+        def OnUpdateAlignCenter(self, evt):
+    
+            evt.Check(self.rtc.IsSelectionAligned(rt.TEXT_ALIGNMENT_CENTRE))
+    
+    
+        def OnUpdateAlignRight(self, evt):
+    
+            evt.Check(self.rtc.IsSelectionAligned(rt.TEXT_ALIGNMENT_RIGHT))
+    
+    
+        def ForwardEvent(self, evt):
+    
+            # The RichTextCtrl can handle menu and update events for undo,
+            # redo, cut, copy, paste, delete, and select all, so just
+            # forward the event to it.
+            self.rtc.ProcessEvent(evt)
+    
+    
+        def MakeMenuBar(self):
+    
+            def doBind(item, handler, updateUI=None):
+    
+                self.Bind(wx.EVT_MENU, handler, item)
+                if updateUI is not None:
+                    self.Bind(wx.EVT_UPDATE_UI, updateUI, item)
+    
+            fileMenu = wx.Menu()
+            doBind( fileMenu.Append(-1, "&Open\tCtrl+O", "Open a file"),
+                    self.OnFileOpen )
+            doBind( fileMenu.Append(-1, "&Save\tCtrl+S", "Save a file"),
+                    self.OnFileSave )
+            doBind( fileMenu.Append(-1, "&Save As...\tF12", "Save to a new file"),
+                    self.OnFileSaveAs )
+            fileMenu.AppendSeparator()
+            doBind( fileMenu.Append(-1, "&View as HTML", "View HTML"),
+                    self.OnFileViewHTML)
+            fileMenu.AppendSeparator()
+            doBind( fileMenu.Append(-1, "E&xit\tCtrl+Q", "Quit this program"),
+                    self.OnFileExit )
+    
+            editMenu = wx.Menu()
+            doBind( editMenu.Append(wx.ID_UNDO, "&Undo\tCtrl+Z"),
+                    self.ForwardEvent, self.ForwardEvent)
+            doBind( editMenu.Append(wx.ID_REDO, "&Redo\tCtrl+Y"),
+                    self.ForwardEvent, self.ForwardEvent )
+            editMenu.AppendSeparator()
+            doBind( editMenu.Append(wx.ID_CUT, "Cu&t\tCtrl+X"),
+                    self.ForwardEvent, self.ForwardEvent )
+            doBind( editMenu.Append(wx.ID_COPY, "&Copy\tCtrl+C"),
+                    self.ForwardEvent, self.ForwardEvent)
+            doBind( editMenu.Append(wx.ID_PASTE, "&Paste\tCtrl+V"),
+                    self.ForwardEvent, self.ForwardEvent)
+            doBind( editMenu.Append(wx.ID_CLEAR, "&Delete\tDel"),
+                    self.ForwardEvent, self.ForwardEvent)
+            editMenu.AppendSeparator()
+            doBind( editMenu.Append(wx.ID_SELECTALL, "Select A&ll\tCtrl+A"),
+                    self.ForwardEvent, self.ForwardEvent )
+    
+            formatMenu = wx.Menu()
+            doBind( formatMenu.AppendCheckItem(-1, "&Bold\tCtrl+B"),
+                    self.OnBold, self.OnUpdateBold)
+            doBind( formatMenu.AppendCheckItem(-1, "&Italic\tCtrl+I"),
+                    self.OnItalic, self.OnUpdateItalic)
+            doBind( formatMenu.AppendCheckItem(-1, "&Underline\tCtrl+U"),
+                    self.OnUnderline, self.OnUpdateUnderline)
+            formatMenu.AppendSeparator()
+            doBind( formatMenu.AppendCheckItem(-1, "L&eft Align"),
+                    self.OnAlignLeft, self.OnUpdateAlignLeft)
+            doBind( formatMenu.AppendCheckItem(-1, "&Centre"),
+                    self.OnAlignCenter, self.OnUpdateAlignCenter)
+            doBind( formatMenu.AppendCheckItem(-1, "&Right Align"),
+                    self.OnAlignRight, self.OnUpdateAlignRight)
+            formatMenu.AppendSeparator()
+            doBind( formatMenu.Append(-1, "Indent &More"), self.OnIndentMore)
+            doBind( formatMenu.Append(-1, "Indent &Less"), self.OnIndentLess)
+            formatMenu.AppendSeparator()
+            doBind( formatMenu.Append(-1, "Increase Paragraph &Spacing"), self.OnParagraphSpacingMore)
+            doBind( formatMenu.Append(-1, "Decrease &Paragraph Spacing"), self.OnParagraphSpacingLess)
+            formatMenu.AppendSeparator()
+            doBind( formatMenu.Append(-1, "Normal Line Spacing"), self.OnLineSpacingSingle)
+            doBind( formatMenu.Append(-1, "1.5 Line Spacing"), self.OnLineSpacingHalf)
+            doBind( formatMenu.Append(-1, "Double Line Spacing"), self.OnLineSpacingDouble)
+            formatMenu.AppendSeparator()
+            doBind( formatMenu.Append(-1, "&Font..."), self.OnFont)
+    
+            mb = wx.MenuBar()
+            mb.Append(fileMenu, "&File")
+            mb.Append(editMenu, "&Edit")
+            mb.Append(formatMenu, "F&ormat")
+            self.SetMenuBar(mb)
+    
+    
+        def MakeToolBar(self):
+    
+            def doBind(item, handler, updateUI=None):
+    
+                self.Bind(wx.EVT_TOOL, handler, item)
+                if updateUI is not None:
+                    self.Bind(wx.EVT_UPDATE_UI, updateUI, item)
+    
+            tbar = self.CreateToolBar()
+            doBind( tbar.AddTool(-1, images._rt_open.GetBitmap(),
+                                shortHelpString="Open"), self.OnFileOpen)
+            doBind( tbar.AddTool(-1, images._rt_save.GetBitmap(),
+                                shortHelpString="Save"), self.OnFileSave)
+            tbar.AddSeparator()
+            doBind( tbar.AddTool(wx.ID_CUT, images._rt_cut.GetBitmap(),
+                                shortHelpString="Cut"), self.ForwardEvent, self.ForwardEvent)
+            doBind( tbar.AddTool(wx.ID_COPY, images._rt_copy.GetBitmap(),
+                                shortHelpString="Copy"), self.ForwardEvent, self.ForwardEvent)
+            doBind( tbar.AddTool(wx.ID_PASTE, images._rt_paste.GetBitmap(),
+                                shortHelpString="Paste"), self.ForwardEvent, self.ForwardEvent)
+            tbar.AddSeparator()
+            doBind( tbar.AddTool(wx.ID_UNDO, images._rt_undo.GetBitmap(),
+                                shortHelpString="Undo"), self.ForwardEvent, self.ForwardEvent)
+            doBind( tbar.AddTool(wx.ID_REDO, images._rt_redo.GetBitmap(),
+                                shortHelpString="Redo"), self.ForwardEvent, self.ForwardEvent)
+            tbar.AddSeparator()
+            doBind( tbar.AddTool(-1, images._rt_bold.GetBitmap(), isToggle=True,
+                                shortHelpString="Bold"), self.OnBold, self.OnUpdateBold)
+            doBind( tbar.AddTool(-1, images._rt_italic.GetBitmap(), isToggle=True,
+                                shortHelpString="Italic"), self.OnItalic, self.OnUpdateItalic)
+            doBind( tbar.AddTool(-1, images._rt_underline.GetBitmap(), isToggle=True,
+                                shortHelpString="Underline"), self.OnUnderline, self.OnUpdateUnderline)
+            tbar.AddSeparator()
+            doBind( tbar.AddTool(-1, images._rt_alignleft.GetBitmap(), isToggle=True,
+                                shortHelpString="Align Left"), self.OnAlignLeft, self.OnUpdateAlignLeft)
+            doBind( tbar.AddTool(-1, images._rt_centre.GetBitmap(), isToggle=True,
+                                shortHelpString="Center"), self.OnAlignCenter, self.OnUpdateAlignCenter)
+            doBind( tbar.AddTool(-1, images._rt_alignright.GetBitmap(), isToggle=True,
+                                shortHelpString="Align Right"), self.OnAlignRight, self.OnUpdateAlignRight)
+            tbar.AddSeparator()
+            doBind( tbar.AddTool(-1, images._rt_indentless.GetBitmap(),
+                                shortHelpString="Indent Less"), self.OnIndentLess)
+            doBind( tbar.AddTool(-1, images._rt_indentmore.GetBitmap(),
+                                shortHelpString="Indent More"), self.OnIndentMore)
+            tbar.AddSeparator()
+            doBind( tbar.AddTool(-1, images._rt_font.GetBitmap(),
+                                shortHelpString="Font"), self.OnFont)
+            doBind( tbar.AddTool(-1, images._rt_colour.GetBitmap(),
+                                shortHelpString="Font Colour"), self.OnColour)
+    
+            tbar.Realize()
+    
+    
+    #----------------------------------------------------------------------
+    
+    class TestPanel(wx.Panel):
+    
+        def __init__(self, parent):
+    
+            wx.Panel.__init__(self, parent, -1)
+    
+            b = wx.Button(self, -1, "Show the RichTextCtrl sample", (50,50))
+            self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+    
+            self.AddRTCHandlers()
+    
+    
+        def AddRTCHandlers(self):
+    
+            # make sure we haven't already added them.
+            if rt.RichTextBuffer.FindHandlerByType(rt.RICHTEXT_TYPE_HTML) is not None:
+                return
+    
+            # This would normally go in your app's OnInit method.  I'm
+            # not sure why these file handlers are not loaded by
+            # default by the C++ richtext code, I guess it's so you
+            # can change the name or extension if you wanted...
+            rt.RichTextBuffer.AddHandler(rt.RichTextHTMLHandler())
+            rt.RichTextBuffer.AddHandler(rt.RichTextXMLHandler())
+    
+            # ...like this
+            rt.RichTextBuffer.AddHandler(rt.RichTextXMLHandler(name="Other XML",
+                                                               ext="ox",
+                                                               type=99))
+    
+            # This is needed for the view as HTML option since we tell it
+            # to store the images in the memory file system.
+            wx.FileSystem.AddHandler(wx.MemoryFSHandler())
+    
+    
+        def OnButton(self, evt):
+    
+            win = RichTextFrame(self, -1, "wx.richtext.RichTextCtrl",
+                                size=(700, 500),
+                                style = wx.DEFAULT_FRAME_STYLE)
+            win.Show(True)
+    
+            # give easy access to the demo's PyShell if it's running
+            self.rtfrm = win
+            self.rtc = win.rtc
+    
+    
+    app = wx.App(0)
+    
+    frame = wx.Frame(None)
+    panel = TestPanel(frame)
+    frame.Show()
+    
+    app.MainLoop()
+
+
+
+Text Styles
+===========
+
+Styling attributes are represented by :class:`wx.TextAttr`, or for more
+control over attributes such as margins and size, the derived class
+:class:`~wx.richtext.RichTextAttr`.
+
+When setting a style, the flags of the attribute object determine
+which attributes are applied. When querying a style, the passed flags
+are ignored except (optionally) to determine whether attributes should
+be retrieved from character content or from the paragraph object.
+
+:class:`~wx.richtext.RichTextCtrl` takes a layered approach to styles, so that
+different parts of the content may be responsible for contributing
+different attributes to the final style you see on the screen.
+
+There are four main notions of style within a control:
+
+
++ **Basic style**: The fundamental style of a control, onto which any
+  other styles are layered. It provides default attributes, and
+  changing the basic style may immediately change the look of the
+  content depending on what other styles the content uses. Calling
+  :meth:`~wx.richtext.RichTextCtrl.SetFont` changes the font for the
+  basic style. The basic style is set with
+  :meth:`~wx.richtext.RichTextCtrl.SetBasicStyle`.
+  
++ **Paragraph style**: Each paragraph has attributes that are set
+  independently from other paragraphs and independently from the
+  content within the paragraph. Normally, these attributes are
+  paragraph- related, such as alignment and indentation, but it is
+  possible to set character attributes too. The paragraph style can be
+  set independently of its content by passing
+  ``RICHTEXT_SETSTYLE_PARAGRAPHS_ONLY`` to
+  :meth:`~wx.richtext.RichTextCtrl.SetStyleEx`.
+
++ **Character style**: Characters within each paragraph can have
+  attributes. A single character, or a run of characters, can have a
+  particular set of attributes. The character style can be with
+  :meth:`~wx.richtext.RichTextCtrl.SetStyle` or
+  :meth:`~wx.richtext.RichTextCtrl.SetStyleEx`.
+
++ **Default style**: This is the 'current' style that determines the
+  style of content that is subsequently typed, pasted or
+  programmatically inserted. The default style is set with
+  :meth:`~wx.richtext.RichTextCtrl.SetDefaultStyle`.
+
+
+What you see on the screen is the dynamically *combined* style, found
+by merging the first three of the above style types (the fourth is
+only a guide for future content insertion and therefore does not
+affect the currently displayed content).
+
+To make all this more concrete, here are examples of where you might
+set these different styles:
+
+
++ You might set the *basic style* to have a Times Roman font in 12
+  point, left-aligned, with two millimetres of spacing after each
+  paragraph.
+
++ You might set the *paragraph style* (for one particular paragraph)
+  to be centred.
+
++ You might set the *character style* of one particular word to bold.
+
++ You might set the *default style* to be underlined, for subsequent
+  inserted text.
+
+
+Naturally you can do any of these things either using your own UI, or
+programmatically.
+
+The basic :class:`wx.TextCtrl` doesn't make the same distinctions as
+:class:`~wx.richtext.RichTextCtrl` regarding attribute storage. So we need finer
+control when setting and retrieving attributes.
+:meth:`~wx.richtext.RichTextCtrl.SetStyleEx` takes a *flags* parameter:
+
+
++ ``RICHTEXT_SETSTYLE_OPTIMIZE`` specifies that the style should be
+  changed only if the combined attributes are different from the
+  attributes for the current object. This is important when applying
+  styling that has been edited by the user, because he has just edited
+  the *combined* (visible) style, and :class:`~wx.richtext.RichTextCtrl` wants to leave
+  unchanged attributes associated with their original objects instead of
+  applying them to both paragraph and content objects.
++ ``RICHTEXT_SETSTYLE_PARAGRAPHS_ONLY`` specifies that only paragraph
+  objects within the given range should take on the attributes.
++ ``RICHTEXT_SETSTYLE_CHARACTERS_ONLY`` specifies that only content
+  objects (text or images) within the given range should take on the
+  attributes.
++ ``RICHTEXT_SETSTYLE_WITH_UNDO`` specifies that the operation should be
+  undoable.
+
+
+It's great to be able to change arbitrary attributes in a
+:class:`~wx.richtext.RichTextCtrl`, but it can be unwieldy for the
+user or programmer to set attributes separately. Word processors have
+collections of styles that you can tailor or use as-is, and this means
+that you can set a heading with one click instead of marking text in
+bold, specifying a large font size, and applying a certain paragraph
+spacing and alignment for every such heading. Similarly, wxPython
+provides a class called :class:`~wx.richtext.RichTextStyleSheet` which
+manages style definitions
+(:class:`~wx.richtext.RichTextParagraphStyleDefinition`,
+:class:`~wx.richtext.RichTextListStyleDefinition` and
+:class:`~wx.richtext.RichTextCharacterStyleDefinition`). Once you have
+added definitions to a style sheet and associated it with a
+:class:`~wx.richtext.RichTextCtrl`, you can apply a named definition
+to a range of text. The classes
+:class:`~wx.richtext.RichTextStyleComboCtrl` and
+:class:`~wx.richtext.RichTextStyleListBox` can be used to present the
+user with a list of styles in a sheet, and apply them to the selected
+text.
+
+You can reapply a style sheet to the contents of the control, by
+calling :meth:`~wx.richtext.RichTextCtrl.ApplyStyleSheet`. This is
+useful if the style definitions have changed, and you want the content
+to reflect this. It relies on the fact that when you apply a named
+style, the style definition name is recorded in the content. So
+ApplyStyleSheet works by finding the paragraph attributes with style
+names and re- applying the definition's attributes to the
+paragraph. Currently, this works with paragraph and list style
+definitions only.
+
+
+Included Dialogs
+================
+
+:class:`~wx.richtext.RichTextCtrl` comes with standard dialogs to make
+it easier to implement text editing functionality.
+
+:class:`~wx.richtext.RichTextFormattingDialog` can be used for
+character or paragraph formatting, or a combination of both. It's a
+`PropertySheetDialog` with the following available tabs: Font, Indents
+& Spacing, Tabs, Bullets, Style, Borders, Margins, Background, Size,
+and List Style.  You can select which pages will be shown by supplying
+flags to the dialog constructor. In a character formatting dialog,
+typically only the Font page will be shown. In a paragraph formatting
+dialog, you'll show the Indents & Spacing, Tabs and Bullets pages. The
+Style tab is useful when editing a style definition.
+
+You can customize this dialog by providing your own
+:class:`~wx.richtext.RichTextFormattingDialogFactory` object, which
+tells the formatting dialog how many pages are supported, what their
+identifiers are, and how to creates the pages.
+
+:class:`~wx.richtext.RichTextStyleOrganiserDialog` is a multi-purpose
+dialog that can be used for managing style definitions, browsing
+styles and applying them, or selecting list styles with a renumber
+option. See the sample for usage - it is used for the "Manage Styles"
+and "Bullets and Numbering" menu commands.
+
+:class:`~wx.richtext.SymbolPickerDialog` lets the user insert a symbol
+from a specified font. It has no :class:`~wx.richtext.RichTextCtrl`
+dependencies besides being included in the rich text library.
+
+
+How RichTextCtrl is Implemented
+===============================
+
+Data representation is handled by
+:class:`~wx.richtext.RichTextBuffer`, and a
+:class:`~wx.richtext.RichTextCtrl` always has one such buffer.
+
+The content is represented by a hierarchy of objects, all derived from
+:class:`~wx.richtext.RichTextObject`. An object might be an image, a
+fragment of text, a paragraph, or a further composite object. Objects
+store a :class:`~wx.richtext.RichTextAttr` containing style
+information; a paragraph object can contain both paragraph and
+character information, but content objects such as text can only store
+character information. The final style displayed in the control or in
+a printout is a combination of base style, paragraph style and content
+(character) style.
+
+The top of the hierarchy is the buffer, a kind of
+:class:`~wx.richtext.RichTextParagraphLayoutBox`, containing further
+:class:`~wx.richtext.RichTextParagraph` objects, each of which can
+include text, images and potentially other types of object.
+
+Each object maintains a range (start and end position) measured from
+the start of the main parent object.
+
+When Layout is called on an object, it is given a size which the
+object must limit itself to, or one or more flexible directions
+(vertical or horizontal). So, for example, a centred paragraph is
+given the page width to play with (minus any margins), but can extend
+indefinitely in the vertical direction. The implementation of Layout
+caches the calculated size and position.
+
+When the buffer is modified, a range is invalidated (marked as
+requiring layout), so that only the minimum amount of layout is
+performed.
+
+A paragraph of pure text with the same style contains just one further
+object, a :class:`~wx.richtext.RichTextPlainText` object. When styling
+is applied to part of this object, the object is decomposed into
+separate objects, one object for each different character style. So
+each object within a paragraph always has just one :class:`wx.TextAttr`
+object to denote its character style. Of course, this can lead to
+fragmentation after a lot of edit operations, potentially leading to
+several objects with the same style where just one would do. So a
+Defragment function is called when updating the control's display, to
+ensure that the minimum number of objects is used.
+
+
+Nested Objects
+==============
+
+:class:`~wx.richtext.RichTextCtrl` supports nested objects such as
+text boxes and tables. To achieve compatibility with the existing API,
+there is the concept of *object* *focus*. When the user clicks on a
+nested text box, the object focus is set to that container object so
+all keyboard input and API functions apply to that container. The
+application can change the focus using
+:meth:`~wx.richtext.RichTextCtrl.SetObjectFocus`. Call this function
+with a ``None`` parameter to set the focus back to the top-level
+object.
+
+An event will be sent to the control when the focus changes.
+
+When the user clicks on the control,
+:class:`~wx.richtext.RichTextCtrl` determines which container to set
+as the current object focus by calling the found container's overrided
+:meth:`~wx.richtext.RichTextObject.AcceptsFocus` function. For
+example, although a table is a container, it must not itself be the
+object focus because there is no text editing at the table
+level. Instead, a cell within the table must accept the focus.
+
+Since with nested objects it is not possible to represent a section
+with merely a start position and an end position, the class
+:class:`~wx.richtext.RichTextSelection` is provided which stores
+multiple ranges (for non-contiguous selections such as table cells)
+and a pointer to the container object in question. You can pass
+:class:`~wx.richtext.RichTextSelection` to
+:meth:`~wx.richtext.RichTextCtrl.SetSelection` or get an instance of
+it from :meth:`~wx.richtext.RichTextCtrl.GetSelection`.
+
+When selecting multiple objects, such as cell tables, the
+:class:`~wx.richtext.RichTextCtrl` dragging handler code calls the
+function :meth:`~wx.richtext.RichTextObject.HandlesChildSelections` to
+determine whether the children can be individual selections. Currently
+only table cells can be multiply-selected in this way.
+
+
+Context Menus and Property Dialogs
+==================================
+
+There are three ways you can make use of context menus: you can let
+:class:`~wx.richtext.RichTextCtrl` handle everything and provide a basic
+menu; you can set your own context menu using
+:meth:`~wx.richtext.RichTextCtrl.SetContextMenu` but let
+:class:`~wx.richtext.RichTextCtrl` handle showing it and adding property
+items; or you can override the default context menu behaviour by
+adding a context menu event handler to your class in the normal way.
+
+If you right-click over a text box in cell in a table, you may want to
+edit the properties of one of these objects - but which properties
+will you be editing?
+
+Well, the default behaviour allows up to three property-editing menu
+items simultaneously - for the object clicked on, the container of
+that object, and the container's parent (depending on whether any of
+these objects return true from their
+:meth:`~wx.richtext.RichTextObject.CanEditProperties` functions). If
+you supply a context menu, add a property command item using the
+``ID_RICHTEXT_PROPERTIES1`` identifier, so that
+:class:`~wx.richtext.RichTextCtrl` can find the position to add
+command items. The object should tell the control what label to use by
+returning a string from
+:meth:`~wx.richtext.RichTextObject.GetPropertiesMenuLabel`.
+
+Since there may be several property-editing commands showing, it is
+recommended that you don't include the word Properties - just the name
+of the object, such as Text Box or Table.
+
+
+Development Roadmap
+===================
+
+
+Bugs
+----
+
+This is an incomplete list of bugs.
+
+
++ Moving the caret up at the beginning of a line sometimes incorrectly
+  positions the caret.
++ As the selection is expanded, the text jumps slightly due to kerning
+  differences between drawing a single text string versus drawing
+  several fragments separately. This could be improved by using
+  :meth:`wx.DC.GetPartialTextExtents` to calculate exactly where the separate
+  fragments should be drawn. Note that this problem also applies to
+  separation of text fragments due to difference in their attributes.
+
+
+
+Features
+--------
+
+This is a list of some of the features that have yet to be
+implemented. Help with them will be appreciated.
+
+
++ Support for composite objects in some functions where it's not yet
+  implemented, for example ApplyStyleSheet
+
++ Table API enhancements and dialogs; improved table layout especially
+  row spans and fitting
+
++ Conversion from HTML, and a rewrite of the HTML output handler that
+  includes CSS, tables, text boxes, and floating images, in addition to
+  a simplified-HTML mode for wxHTML compatibility
+
++ Open Office input and output
+
++ RTF input and output
+
++ A ruler control
+
++ Standard editing toolbars
+
++ Bitmap bullets
+
++ Justified text, in print/preview at least
+
++ Scaling: either everything scaled, or rendering using a custom
+  reference point size and an optional dimension scale
+
+
+There are also things that could be done to take advantage of the
+underlying text capabilities of the platform; higher-level text
+formatting APIs are available on some platforms, such as Mac OS X, and
+some of translation from high level to low level :class:`wx.DC` API is
+unnecessary. However this would require additions to the wxPython API.
+
+
diff --git a/docs/sphinx/rest_substitutions/overviews/scrolling_overview.rst b/docs/sphinx/rest_substitutions/overviews/scrolling_overview.rst
index d4a4a0bf..441d1c44 100644
--- a/docs/sphinx/rest_substitutions/overviews/scrolling_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/scrolling_overview.rst
@@ -8,61 +8,88 @@
 =================================================
 
 
-Scrollbars come in various guises in wxWidgets. All windows have the potential to show a vertical scrollbar and/or a horizontal
-scrollbar: it is a basic capability of a window. However, in practice, not all windows do make use of scrollbars, such as a 
-single-line :ref:`TextCtrl`.
+Scrollbars come in various guises in wxWidgets. All windows have the
+potential to show a vertical scrollbar and/or a horizontal scrollbar:
+it is a basic capability of a window. However, in practice, not all
+windows do make use of scrollbars, such as a single-line
+:ref:`wx.TextCtrl`.
 
-Because any class derived from :ref:`Window` may have scrollbars, there are functions to manipulate the scrollbars and event
-handlers to intercept scroll events. But just because a window generates a scroll event, doesn't mean that the window necessarily
-handles it and physically scrolls the window. The base class :ref:`Window` in fact doesn't have any default functionality to 
-handle scroll events. If you created a :ref:`Window` object with scrollbars, and then clicked on the scrollbars, nothing at 
-all would happen. This is deliberate, because the interpretation of scroll events varies from one window class to another.
+Because any class derived from :ref:`wx.Window` may have scrollbars,
+there are functions to manipulate the scrollbars and event handlers to
+intercept scroll events. But just because a window generates a scroll
+event, doesn't mean that the window necessarily handles it and
+physically scrolls the window. The base class :ref:`wx.Window` in fact
+doesn't have any default functionality to handle scroll events. If you
+created a :ref:`wx.Window` object with scrollbars, and then clicked on
+the scrollbars, nothing at all would happen. This is deliberate,
+because the interpretation of scroll events varies from one window
+class to another.
 
-:ref:`ScrolledWindow` is an example of a window that adds functionality to make scrolling really work. It assumes that scrolling
-happens in consistent units, not different-sized jumps, and that page size is represented by the visible portion of the window. 
-It is suited to drawing applications, but perhaps not so suitable for a sophisticated editor in which the amount scrolled may
-vary according to the size of text on a given line. For this, you would derive from :ref:`Window` and implement scrolling yourself. 
-:ref:`grid.Grid` is an example of a class that implements its own scrolling, largely because columns and rows can vary in size.
+:ref:`wx.ScrolledWindow` is an example of a window that adds
+functionality to make scrolling really work. It assumes that scrolling
+happens in consistent units, not different-sized jumps, and that page
+size is represented by the visible portion of the window.  It is
+suited to drawing applications, but perhaps not so suitable for a
+sophisticated editor in which the amount scrolled may vary according
+to the size of text on a given line. For this, you would derive from
+:ref:`wx.Window` and implement scrolling yourself.
+:ref:`wx.grid.Grid` is an example of a class that implements its own
+scrolling, largely because columns and rows can vary in size.
 
 
 The Scrollbar Model
 -------------------
 
-The function :meth:`Window.SetScrollbar` gives a clue about the way a scrollbar is modeled. This function takes the following arguments:
+The function :meth:`wx.Window.SetScrollbar` gives a clue about the way
+a scrollbar is modeled. This function takes the following arguments:
 
 =================== ===================================
-`orientation`	    Which scrollbar: ``VERTICAL`` or ``HORIZONTAL``.
+`orientation`	    Which scrollbar: ``wx.VERTICAL`` or ``wx.HORIZONTAL``.
 `position`	    The position of the scrollbar in scroll units.
 `visible`	    The size of the visible portion of the scrollbar, in scroll units.
 `range`	            The maximum position of the scrollbar.
 `refresh`	    Whether the scrollbar should be repainted.
 =================== ===================================
 
-`orientation` determines whether we're talking about the built-in horizontal or vertical scrollbar.
+`orientation` determines whether we're talking about the built-in
+horizontal or vertical scrollbar.
 
-`position` is simply the position of the 'thumb' (the bit you drag to scroll around). It is given in scroll units, and so is 
-relative to the total range of the scrollbar.
+`position` is simply the position of the 'thumb' (the bit you drag to
+scroll around). It is given in scroll units, and so is relative to the
+total range of the scrollbar.
 
-`visible` gives the number of scroll units that represents the portion of the window currently visible. Normally, a scrollbar is
-capable of indicating this visually by showing a different length of thumb.
+`visible` gives the number of scroll units that represents the portion
+of the window currently visible. Normally, a scrollbar is capable of
+indicating this visually by showing a different length of thumb.
 
-`range` is the maximum value of the scrollbar, where zero is the start position. You choose the units that suit you, so if you wanted to display text that has 100 lines, you would set this to 100. Note that this doesn't have to correspond to the number of pixels scrolled - it is up to you how you actually show the contents of the window.
+`range` is the maximum value of the scrollbar, where zero is the start
+position. You choose the units that suit you, so if you wanted to
+display text that has 100 lines, you would set this to 100. Note that
+this doesn't have to correspond to the number of pixels scrolled - it
+is up to you how you actually show the contents of the window.
 
-`refresh` just indicates whether the scrollbar should be repainted immediately or not.
+`refresh` just indicates whether the scrollbar should be repainted
+immediately or not.
 
 
 An Example
 ----------
 
-Let's say you wish to display 50 lines of text, using the same font. The window is sized so that you can only see 16 lines at a time. You would use::
+Let's say you wish to display 50 lines of text, using the same
+font. The window is sized so that you can only see 16 lines at a
+time. You would use::
 
     SetScrollbar(wx.VERTICAL, 0, 16, 50)
     
     
-.. note:: Note that with the window at this size, the thumb position can never go above 50 minus 16, or 34. You can determine how many lines
-   are currently visible by dividing the current view size by the character height in pixels.
+.. note:: Note that with the window at this size, the thumb position
+   can never go above 50 minus 16, or 34. You can determine how many
+   lines are currently visible by dividing the current view size by
+   the character height in pixels.
 
-When defining your own scrollbar behaviour, you will always need to recalculate the scrollbar settings when the window size changes. You
-could therefore put your scrollbar calculations and `SetScrollbar` call into a function named `AdjustScrollbars`, which can be called 
-initially and also from your :ref:`SizeEvent` handler function.
+When defining your own scrollbar behaviour, you will always need to
+recalculate the scrollbar settings when the window size changes. You
+could therefore put your scrollbar calculations and `SetScrollbar`
+call into a function named `AdjustScrollbars`, which can be called
+initially and also from your :ref:`wx.SizeEvent` handler function.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/sizers_overview.rst b/docs/sphinx/rest_substitutions/overviews/sizers_overview.rst
index 3a42de3c..9e842596 100644
--- a/docs/sphinx/rest_substitutions/overviews/sizers_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/sizers_overview.rst
@@ -8,50 +8,73 @@
 =============================================
 
 
-Sizers, as represented by the :ref:`Sizer` class and its descendants in the wxPython class hierarchy, have become the method of 
-choice to define the layout of controls in dialogs in wxPython because of their ability to create visually appealing dialogs 
-independent of the platform, taking into account the differences in size and style of the individual controls. 
-Editors such as wxDesigner, DialogBlocks, XRCed and wxWorkshop create dialogs based exclusively on sizers, practically forcing
-the user to create platform independent layouts without compromises.
+Sizers, as represented by the :ref:`wx.Sizer` class and its
+descendants in the wxPython class hierarchy, have become the method of
+choice to define the layout of controls in dialogs in wxPython because
+of their ability to create visually appealing dialogs independent of
+the platform, taking into account the differences in size and style of
+the individual controls.  Editors such as wxDesigner, DialogBlocks,
+XRCed and wxWorkshop create dialogs based exclusively on sizers,
+practically forcing the user to create platform independent layouts
+without compromises.
 
-The next section describes and shows what can be done with sizers. The following sections briefly describe how to program with
-individual sizer classes.
+The next section describes and shows what can be done with sizers. The
+following sections briefly describe how to program with individual
+sizer classes.
 
 
 The Idea Behind Sizers
 ----------------------
 
-The layout algorithm used by sizers in wxPython is closely related to layout systems in other GUI toolkits, such as Java's AWT, 
-the GTK toolkit or the Qt toolkit. It is based upon the idea of individual subwindows reporting their minimal required size and
-their ability to get stretched if the size of the parent window has changed. This will most often mean that the programmer does
-not set the start-up size of a dialog, the dialog will rather be assigned a sizer and this sizer will be queried about the 
-recommended size. This sizer in turn will query its children (which can be normal windows, empty space or other sizers) so 
-that a hierarchy of sizers can be constructed. Note that :ref:`Sizer` does not derive from :ref:`Window` and thus does not 
-interfere with tab ordering and requires very few resources compared to a real window on screen.
+The layout algorithm used by sizers in wxPython is closely related to
+layout systems in other GUI toolkits, such as Java's AWT, the GTK
+toolkit or the Qt toolkit. It is based upon the idea of individual
+subwindows reporting their minimal required size and their ability to
+get stretched if the size of the parent window has changed. This will
+most often mean that the programmer does not set the start-up size of
+a dialog, the dialog will rather be assigned a sizer and this sizer
+will be queried about the recommended size. This sizer in turn will
+query its children (which can be normal windows, empty space or other
+sizers) so that a hierarchy of sizers can be constructed. Note that
+:ref:`wx.Sizer` does not derive from :ref:`wx.Window` and thus does
+not interfere with tab ordering and requires very few resources
+compared to a real window on screen.
 
-What makes sizers so well fitted for use in wxPython is the fact that every control reports its own minimal size and the algorithm
-can handle differences in font sizes or different window (dialog item) sizes on different platforms without problems. For example,
-if the standard font as well as the overall design of Linux/GTK widgets requires more space than on Windows, the initial dialog
-size will automatically be bigger on Linux/GTK than on Windows.
+What makes sizers so well fitted for use in wxPython is the fact that
+every control reports its own minimal size and the algorithm can
+handle differences in font sizes or different window (dialog item)
+sizes on different platforms without problems. For example, if the
+standard font as well as the overall design of Linux/GTK widgets
+requires more space than on Windows, the initial dialog size will
+automatically be bigger on Linux/GTK than on Windows.
 
-There are currently five different kinds of sizers available in wxPython. Each represents either a certain way to lay out dialog
-items in a dialog or it fulfills a special task such as wrapping a static box around a dialog item (or another sizer). These sizers 
-will be discussed one by one in the text below. For more detailed information on how to use sizers programmatically, please refer
-to the section :ref:`Programming with BoxSizer <programming with boxsizer>`.
+There are currently five different kinds of sizers available in
+wxPython. Each represents either a certain way to lay out dialog items
+in a dialog or it fulfills a special task such as wrapping a static
+box around a dialog item (or another sizer). These sizers will be
+discussed one by one in the text below. For more detailed information
+on how to use sizers programmatically, please refer to the section
+:ref:`Programming with BoxSizer <programming with boxsizer>`.
 
 
 Common Features
 ---------------
 
-All sizers are containers, that is, they are used to lay out one dialog item (or several dialog items), which they contain. Such
-items are sometimes referred to as the children of the sizer. Independent of how the individual sizers lay out their children,
-all children have certain features in common:
+All sizers are containers, that is, they are used to lay out one
+dialog item (or several dialog items), which they contain. Such items
+are sometimes referred to as the children of the sizer. Independent of
+how the individual sizers lay out their children, all children have
+certain features in common:
 
-**A minimal size**: This minimal size is usually identical to the initial size of the controls and may either be set explicitly in 
-the :ref:`Size` field of the control constructor or may be calculated by wxPython, typically by setting the height and/or the width
-of the item to -1. Note that only some controls can calculate their size (such as a checkbox) whereas others (such as a listbox)
-don't have any natural width or height and thus require an explicit size. Some controls can calculate their height, but not their
-width (e.g. a single line text control):
+**A minimal size**: This minimal size is usually identical to the
+initial size of the controls and may either be set explicitly in the
+:ref:`wx.Size` field of the control constructor or may be calculated
+by wxPython, typically by setting the height and/or the width of the
+item to -1. Note that only some controls can calculate their size
+(such as a checkbox) whereas others (such as a listbox) don't have any
+natural width or height and thus require an explicit size. Some
+controls can calculate their height, but not their width (e.g. a
+single line text control):
 
 
 .. figure:: _static/images/overviews/overview_sizer_04.png
@@ -61,9 +84,12 @@ width (e.g. a single line text control):
 |
 
 
-**A border**: The border is just empty space and is used to separate dialog items in a dialog. This border can either be all around,
-or at any combination of sides such as only above and below the control. The thickness of this border must be set explicitly, typically
-5 points. The following samples show dialogs with only one dialog item (a button) and a border of 0, 5, and 10 pixels around the button:
+**A border**: The border is just empty space and is used to separate
+dialog items in a dialog. This border can either be all around, or at
+any combination of sides such as only above and below the control. The
+thickness of this border must be set explicitly, typically 5
+points. The following samples show dialogs with only one dialog item
+(a button) and a border of 0, 5, and 10 pixels around the button:
 
 
 .. figure:: _static/images/overviews/overview_sizer_02.png
@@ -73,11 +99,15 @@ or at any combination of sides such as only above and below the control. The thi
 |
 
 
-**An alignment**: Often, a dialog item is given more space than its minimal size plus its border. Depending on what flags are used 
-for the respective dialog item, the dialog item can be made to fill out the available space entirely, i.e. it will grow to a size 
-larger than the minimal size, or it will be moved to either the centre of the available space or to either side of the space. The
-following sample shows a listbox and three buttons in a horizontal box sizer; one button is centred, one is aligned at the top, one is 
-aligned at the bottom:
+**An alignment**: Often, a dialog item is given more space than its
+minimal size plus its border. Depending on what flags are used for the
+respective dialog item, the dialog item can be made to fill out the
+available space entirely, i.e. it will grow to a size larger than the
+minimal size, or it will be moved to either the centre of the
+available space or to either side of the space. The following sample
+shows a listbox and three buttons in a horizontal box sizer; one
+button is centred, one is aligned at the top, one is aligned at the
+bottom:
 
 
 .. figure:: _static/images/overviews/overview_sizer_06.png
@@ -87,13 +117,20 @@ aligned at the bottom:
 |
 
 
-**A stretch factor**: If a sizer contains more than one child and it is offered more space than its children and their borders need, the 
-question arises how to distribute the surplus space among the children. For this purpose, a stretch factor may be assigned to each child,
-where the default value of 0 indicates that the child will not get more space than its requested minimum size. A value of more than zero 
-is interpreted in relation to the sum of all stretch factors in the children of the respective sizer, i.e. if two children get a stretch 
-factor of 1, they will get half the extra space each independent of whether one control has a minimal sizer inferior to the other or not.
-The following sample shows a dialog with three buttons, the first one has a stretch factor of 1 and thus gets stretched, whereas the other
-two buttons have a stretch factor of zero and keep their initial width:
+**A stretch factor**: If a sizer contains more than one child and it
+is offered more space than its children and their borders need, the
+question arises how to distribute the surplus space among the
+children. For this purpose, a stretch factor may be assigned to each
+child, where the default value of 0 indicates that the child will not
+get more space than its requested minimum size. A value of more than
+zero is interpreted in relation to the sum of all stretch factors in
+the children of the respective sizer, i.e. if two children get a
+stretch factor of 1, they will get half the extra space each
+independent of whether one control has a minimal sizer inferior to the
+other or not.  The following sample shows a dialog with three buttons,
+the first one has a stretch factor of 1 and thus gets stretched,
+whereas the other two buttons have a stretch factor of zero and keep
+their initial width:
 
 
 .. figure:: _static/images/overviews/overview_sizer_07.png
@@ -103,7 +140,8 @@ two buttons have a stretch factor of zero and keep their initial width:
 |
 
 
-Within wxDesigner, this stretch factor gets set from the `Option` menu.
+Within wxDesigner, this stretch factor gets set from the `Option`
+menu.
 
 
 `wx.Sizers` - the visual approach
@@ -114,25 +152,21 @@ Within wxDesigner, this stretch factor gets set from the `Option` menu.
 Basic way of adding a window
 ----------------------------
 
-Let's take a look at :class:`BoxSizer`.
-This is the most simple type of box sizer, and the way we add widgets to it is explained by looking
-at the :meth:`BoxSizer.Add` signature:
+Let's take a look at :class:`wx.BoxSizer`.  This is the most simple
+type of box sizer, and the way we add widgets to it is explained by
+looking at the :meth:`wx.BoxSizer.Add` signature:
 
-.. raw:: html
-
-   <hr color="#A9A9A9">
-
-.. method:: Add(window, proportion=0, flag=0, border=0, userData=None)
+.. function:: Add(window, proportion=0, flag=0, border=0, userData=None)
 
    Appends a child to the sizer.
 
    :param `window`: a window, a spacer or another sizer to be added to the sizer. Its initial size 
     (either set explicitly by the user or calculated internally) is interpreted as the minimal and 
     in many cases also the initial size.
-   :param int proportion: this parameter is used in :class:`BoxSizer` to indicate if a child of a sizer 
-    can change its size in the main orientation of the :class:`BoxSizer` - where 0 stands for not changeable 
+   :param int proportion: this parameter is used in :class:`wx.BoxSizer` to indicate if a child of a sizer 
+    can change its size in the main orientation of the :class:`wx.BoxSizer` - where 0 stands for not changeable 
     and a value of more than zero is interpreted relative to the value of other children of the same 
-    :class:`BoxSizer`. For example, you might have a horizontal :class:`BoxSizer` with three children, two 
+    :class:`wx.BoxSizer`. For example, you might have a horizontal :class:`wx.BoxSizer` with three children, two 
     of which are supposed to change their size with the sizer. Then the two stretchable windows would 
     get a value of 1 each to make them grow and shrink equally with the sizer's horizontal dimension.
    :param int flag: OR-combination of flags affecting sizer's behaviour.
@@ -140,15 +174,13 @@ at the :meth:`BoxSizer.Add` signature:
    :param object userData: allows an extra object to be attached to the sizer item, for use in derived 
     classes when sizing information is more complex than the proportion and flag will allow for.
     
-   :rtype: :class:`SizerItem`
-
-.. raw:: html
-
-   <hr color="#A9A9A9">
+   :rtype: :class:`wx.SizerItem`
 
 
-Let's create a vertical sizer (children will be placed on top of each other) and place two buttons in it.
-All the "extra" parameters are set to 0; we'll worry about them later.
+
+Let's create a vertical sizer (children will be placed on top of each
+other) and place two buttons in it.  All the "extra" parameters are
+set to 0; we'll worry about them later.
 
 .. figure:: _static/images/overviews/boxsizer1.png
    :class: floatright
@@ -163,9 +195,12 @@ All the "extra" parameters are set to 0; we'll worry about them later.
 
 You'll notice a couple of things about this:
 
-* The buttons are just big enough to accommodate the text in them. In fact, any control placed
-  into a sizer this way will appear at its minimum size unless we change the parameters.
-* The window size is not changed to fit the sizer. This results in a lot of ugly empty space.
+* The buttons are just big enough to accommodate the text in them. In
+  fact, any control placed into a sizer this way will appear at its
+  minimum size unless we change the parameters.
+  
+* The window size is not changed to fit the sizer. This results in a
+  lot of ugly empty space.
 
 
 Let's worry about the second issue first. To make the window size more appropriate, we can set 
@@ -183,17 +218,20 @@ the size hints to tell the enclosing window to adjust to the size of the sizer:
     sizer.SetSizeHints(self)
     self.SetSizer(sizer)
 
-This is particularly useful in circumstances like this one, in which the :class:`Frame`'s default size 
-would otherwise be much too big or small to show most layouts in an aesthetically pleasing manner.
+This is particularly useful in circumstances like this one, in which
+the :class:`wx.Frame`\ 's default size would otherwise be much too big
+or small to show most layouts in an aesthetically pleasing manner.
 
 --------------------------
 The `proportion` parameter
 --------------------------
 
-The first parameter to :meth:`BoxSizer.Add`
-is obviously the :class:`Window` or :class:`Sizer` that you are adding. The second one (the `proportion`)
-defines how large the sizer's children are in relation to each other. In a vertical sizer, this changes
-the height; in a horizontal sizer, this changes the width. Here are some examples:
+The first parameter to :meth:`wx.BoxSizer.Add` is obviously the
+:class:`wx.Window` or :class:`wx.Sizer` that you are adding. The
+second one (the `proportion`) defines how large the sizer's children
+are in relation to each other. In a vertical sizer, this changes the
+height; in a horizontal sizer, this changes the width. Here are some
+examples:
 
 .. list-table:: 
    :header-rows: 1
@@ -207,17 +245,18 @@ the height; in a horizontal sizer, this changes the width. Here are some example
    * - .. code-block:: python
           :emphasize-lines: 3,4
 
-		  sizer = wx.BoxSizer(wx.VERTICAL)
-		  # Second button is three times as tall as first button
-		  sizer.Add(wx.Button(self, -1, 'An extremely long button text'), 1, 0, 0)
-		  sizer.Add(wx.Button(self, -1, 'Small button'), 3, 0, 0)
-		  sizer.SetSizeHints(self)
-		  self.SetSizer(sizer)
+          sizer = wx.BoxSizer(wx.VERTICAL)
+          # Second button is three times as tall as first button
+          sizer.Add(wx.Button(self, -1, 'An extremely long button text'), 1, 0, 0)
+          sizer.Add(wx.Button(self, -1, 'Small button'), 3, 0, 0)
+          sizer.SetSizeHints(self)
+          self.SetSizer(sizer)
 
      - .. figure:: _static/images/overviews/boxsizer3.png
           :align: left
 
-   * - Same code as above, with window resized. Notice that the bottom button is still three times as tall as the top button.
+   * - Same code as above, with window resized. Notice that the bottom
+       button is still three times as tall as the top button.
 
      - .. figure:: _static/images/overviews/boxsizer31.png
           :align: left
@@ -234,12 +273,12 @@ the height; in a horizontal sizer, this changes the width. Here are some example
 
      - .. figure:: _static/images/overviews/boxsizer32.png
           :align: left
-		  
+                  
 
 |
 
-If one of the `proportion` parameters is 0, that :class:`Window` will be the minimum size, and the others 
-will resize proportionally:
+If one of the `proportion` parameters is 0, that :class:`wx.Window`
+will be the minimum size, and the others will resize proportionally:
 
 .. list-table:: 
    :header-rows: 1
@@ -271,69 +310,33 @@ will resize proportionally:
           :align: left
 
 
-This is especially useful when you want, for example, a button at the bottom which is only
-as big as necessary, and some other control that occupies the rest of the frame. To do so, 
-give the button proportion 0 and the other control a number greater than 0. Mac users in 
-particular will appreciate you for not creating huge aqua-styled buttons.
+This is especially useful when you want, for example, a button at the
+bottom which is only as big as necessary, and some other control that
+occupies the rest of the frame. To do so, give the button proportion 0
+and the other control a number greater than 0. Mac users in particular
+will appreciate you for not creating huge aqua-styled buttons.
 
 
 -----------------------------------
 The `flags` and `border` parameters
 -----------------------------------
 
-The `flag` argument accepted by :meth:`Sizer.Add`
-is a ``OR``-combination of the following flags. Two main behaviours are defined using these flags. One is 
-the border around a window: the `border` parameter determines the border width whereas the flags given here 
-determine which side(s) of the item that the border will be added. The other flags determine how the sizer 
-item behaves when the space allotted to the sizer changes, and is somewhat dependent on the specific kind 
-of sizer used.
+The `flag` argument accepted by :meth:`wx.Sizer.Add` is a
+``OR``-combination of the following flags. Two main behaviours are
+defined using these flags. One is the border around a window: the
+`border` parameter determines the border width whereas the flags given
+here determine which side(s) of the item that the border will be
+added. The other flags determine how the sizer item behaves when the
+space allotted to the sizer changes, and is somewhat dependent on the
+specific kind of sizer used.
 
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| Sizer Flag                                                          | Description                                                                 |
-+=====================================================================+=============================================================================+
-| ``TOP``                                                             | These flags are used to specify which side(s) of the sizer                  |
-+---------------------------------------------------------------------+ item the border width will apply to.                                        | 
-| ``BOTTOM``                                                          |                                                                             |
-+---------------------------------------------------------------------+                                                                             |
-| ``LEFT``                                                            |                                                                             |
-+---------------------------------------------------------------------+                                                                             |
-| ``RIGHT``                                                           |                                                                             |
-+---------------------------------------------------------------------+                                                                             |
-| ``ALL``                                                             |                                                                             |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``EXPAND``                                                          | The item will be expanded to fill the space assigned to                     |
-|                                                                     | the item.                                                                   |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``SHAPED``                                                          | The item will be expanded as much as possible while also                    |
-|                                                                     | maintaining its aspect ratio                                                |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``FIXED_MINSIZE``                                                   | If you would rather have a window item stay the size it started with then   |
-|                                                                     | use ``FIXED_MINSIZE``                                                       |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``RESERVE_SPACE_EVEN_IF_HIDDEN``                                    | Normally `Sizers` don't allocate space for hidden windows or other items.   | 
-|                                                                     | This flag overrides this behavior so that sufficient space is allocated for |
-|                                                                     | the window even if it isn't visible. This makes it possible to dynamically  |
-|                                                                     | show and hide controls without resizing parent dialog, for example.         |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``ALIGN_CENTER`` **or** ``ALIGN_CENTRE``                            | The ``ALIGN*`` flags allow you to specify the alignment of the item         |
-+---------------------------------------------------------------------+ within the space allotted to it by the sizer, adjusted for the border if    |
-| ``ALIGN_LEFT``                                                      | any.                                                                        |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_RIGHT``                                                     |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_TOP``                                                       |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_BOTTOM``                                                    |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_CENTER_VERTICAL`` **or** ``ALIGN_CENTRE_VERTICAL``          |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_CENTER_HORIZONTAL`` **or** ``ALIGN_CENTRE_HORIZONTAL``      |                                                                             |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
+.. include:: rest_substitutions/tables/wx.Sizer.1.rst
 
 |
 
 
-Let's start with the simplest case: the alignment flags. These are pretty self-explanatory.
+Let's start with the simplest case: the alignment flags. These are
+pretty self-explanatory.
 
 .. list-table:: 
    :header-rows: 1
@@ -375,7 +378,7 @@ Let's start with the simplest case: the alignment flags. These are pretty self-e
 
 
 
-Next is the ``EXPAND`` flag. This is synonymous with ``GROW``.
+Next is the ``wx.EXPAND`` flag. This is synonymous with ``wx.GROW``.
 
 .. list-table:: 
    :header-rows: 1
@@ -403,10 +406,10 @@ Next is the ``EXPAND`` flag. This is synonymous with ``GROW``.
 
 
 You can see that the first button takes its minimum size, and the second one grows to match it. This affects 
-controls in the opposite manner of the second parameter; ``EXPAND`` in a vertical sizer causes horizontal 
+controls in the opposite manner of the second parameter; ``wx.EXPAND`` in a vertical sizer causes horizontal 
 expansion, and in a horizontal sizer it causes vertical expansion.
 
-Next is ``SHAPED``. This flag ensures that the width and height of the object stay proportional to each other. 
+Next is ``wx.SHAPED``. This flag ensures that the width and height of the object stay proportional to each other. 
 It doesn't make much sense for buttons, but can be excellent for bitmaps, which would be contorted or clipped 
 if not scaled proportionally.
 
@@ -434,16 +437,19 @@ if not scaled proportionally.
      - .. figure:: _static/images/overviews/boxsizer51.png
           :align: left
 
-   * - Same code as above, with window resized. The width grew dramatically with the height. In fact, it didn't 
-       quite grow vertically the whole way because it couldn't maintain the correct ratio while doing so.
+   * - Same code as above, with window resized. The width grew
+       dramatically with the height. In fact, it didn't quite grow
+       vertically the whole way because it couldn't maintain the
+       correct ratio while doing so.
 
      - .. figure:: _static/images/overviews/boxsizer52.png
           :align: left
 
 
-Finally, we have the border flags. These only make sense when the `border` parameter is greater than 0, and describe 
-the sides of the control on which the border should appear. In order to demonstrate this most clearly, we'll keep 
-the ``EXPAND`` flag.
+Finally, we have the border flags. These only make sense when the
+`border` parameter is greater than 0, and describe the sides of the
+control on which the border should appear. In order to demonstrate
+this most clearly, we'll keep the ``wx.EXPAND`` flag.
 
 
 .. list-table:: 
@@ -514,31 +520,42 @@ the ``EXPAND`` flag.
           :align: left
 
 
-You can see that the button is offset from the specified edges of the sizer by the number of pixels that we
-specified in the `border` parameter.
+You can see that the button is offset from the specified edges of the
+sizer by the number of pixels that we specified in the `border`
+parameter.
 
 
 Hiding Controls Using Sizers
 ----------------------------
 
-You can hide controls contained in sizers the same way you would hide any control, using the :meth:`Window.Show` method. However, :ref:`Sizer`
-also offers a separate method which can tell the sizer not to consider that control in its size calculations. To hide a window using the
-sizer, call :meth:`Sizer.Show`. You must then call `Layout` on the sizer to force an update.
+You can hide controls contained in sizers the same way you would hide
+any control, using the :meth:`wx.Window.Show` method. However,
+:ref:`wx.Sizer` also offers a separate method which can tell the sizer
+not to consider that control in its size calculations. To hide a
+window using the sizer, call :meth:`wx.Sizer.Show`. You must then call
+`Layout` on the sizer to force an update.
 
-This is useful when hiding parts of the interface, since you can avoid removing the controls from the sizer and having to add them back later.
+This is useful when hiding parts of the interface, since you can avoid
+removing the controls from the sizer and having to add them back
+later.
 
-.. note:: This is supported only by :ref:`BoxSizer` and :ref:`FlexGridSizer`.
+.. note:: This is supported only by :ref:`wx.BoxSizer` and :ref:`wx.FlexGridSizer`.
 
 
 --------
 BoxSizer
 --------
 
-:ref:`BoxSizer` can lay out its children either vertically or horizontally, depending on what flag is being used in its constructor. 
-When using a vertical sizer, each child can be centered, aligned to the right or aligned to the left. Correspondingly, when using a 
-horizontal sizer, each child can be centered, aligned at the bottom or aligned at the top. The stretch factor described in the last 
-paragraph is used for the main orientation, i.e. when using a horizontal box sizer, the stretch factor determines how much the child can
-be stretched horizontally. The following sample shows the same dialog as in the last sample, only the box sizer is a vertical box sizer now:
+:ref:`wx.BoxSizer` can lay out its children either vertically or
+horizontally, depending on what flag is being used in its constructor.
+When using a vertical sizer, each child can be centered, aligned to
+the right or aligned to the left. Correspondingly, when using a
+horizontal sizer, each child can be centered, aligned at the bottom or
+aligned at the top. The stretch factor described in the last paragraph
+is used for the main orientation, i.e. when using a horizontal box
+sizer, the stretch factor determines how much the child can be
+stretched horizontally. The following sample shows the same dialog as
+in the last sample, only the box sizer is a vertical box sizer now:
 
 .. figure:: _static/images/overviews/overview_sizer_08.png
    :align: center
@@ -548,7 +565,8 @@ be stretched horizontally. The following sample shows the same dialog as in the
 StaticBoxSizer
 --------------
 
-:class:`StaticBoxSixer` is the same as a :class:`BoxSizer`, but surrounded by a static box. Here is a sample:
+:class:`wx.StaticBoxSixer` is the same as a :class:`wx.BoxSizer`, but
+surrounded by a static box. Here is a sample:
 
 
 .. figure:: _static/images/overviews/overview_sizer_09.png
@@ -559,25 +577,31 @@ StaticBoxSizer
 GridSizer
 ---------
 
-:ref:`GridSizer` is a two-dimensional sizer. All children are given the same size, which is the minimal size required by the biggest
-child, in this case the text control in the left bottom border. Either the number of columns or the number or rows is fixed and the grid
-sizer will grow in the respectively other orientation if new children are added:
+:ref:`wx.GridSizer` is a two-dimensional sizer. All children are given
+the same size, which is the minimal size required by the biggest
+child, in this case the text control in the left bottom border. Either
+the number of columns or the number or rows is fixed and the grid
+sizer will grow in the respectively other orientation if new children
+are added:
 
 
 .. figure:: _static/images/overviews/overview_sizer_10.png
    :align: center
 
 
-For programming information, see :ref:`GridSizer`.
+For programming information, see :ref:`wx.GridSizer`.
 
 -------------
 FlexGridSizer
 -------------
 
-Another two-dimensional sizer derived from :ref:`GridSizer`. The width of each column and the height of each row are calculated individually
-according to the minimal requirements from the respectively biggest child. Additionally, columns and rows can be declared to be stretchable 
-if the sizer is assigned a size different from the one it requested. The following sample shows the same dialog as the one above, but using
-a flex grid sizer:
+Another two-dimensional sizer derived from :ref:`wx.GridSizer`. The
+width of each column and the height of each row are calculated
+individually according to the minimal requirements from the
+respectively biggest child. Additionally, columns and rows can be
+declared to be stretchable if the sizer is assigned a size different
+from the one it requested. The following sample shows the same dialog
+as the one above, but using a flex grid sizer:
 
 
 .. figure:: _static/images/overviews/overview_sizer_11.png
@@ -590,154 +614,189 @@ a flex grid sizer:
 Programming with BoxSizer
 ---------------------------
 
-The basic idea behind a :ref:`BoxSizer` is that windows will most often be laid out in rather simple basic geometry, typically in a row or a
-column or several hierarchies of either.
+The basic idea behind a :ref:`wx.BoxSizer` is that windows will most
+often be laid out in rather simple basic geometry, typically in a row
+or a column or several hierarchies of either.
 
-As an example, we will construct a dialog that will contain a text field at the top and two buttons at the bottom. This can be seen as a 
-top-hierarchy column with the text at the top and buttons at the bottom and a low-hierarchy row with an ``OK`` button to the left and a ``Cancel``
-button to the right. In many cases (particularly dialogs under Unix and normal frames) the main window will be resizable by the user and this
-change of size will have to get propagated to its children. In our case, we want the text area to grow with the dialog, whereas the button 
-shall have a fixed size. In addition, there will be a thin border around all controls to make the dialog look nice and - to make matter worse - the
-buttons shall be centred as the width of the dialog changes.
+As an example, we will construct a dialog that will contain a text
+field at the top and two buttons at the bottom. This can be seen as a
+top-hierarchy column with the text at the top and buttons at the
+bottom and a low-hierarchy row with an ``OK`` button to the left and a
+``Cancel`` button to the right. In many cases (particularly dialogs
+under Unix and normal frames) the main window will be resizable by the
+user and this change of size will have to get propagated to its
+children. In our case, we want the text area to grow with the dialog,
+whereas the button shall have a fixed size. In addition, there will be
+a thin border around all controls to make the dialog look nice and -
+to make matter worse - the buttons shall be centred as the width of
+the dialog changes.
 
-It is the unique feature of a box sizer, that it can grow in both directions (height and width) but can distribute its growth in the 
-main direction (horizontal for a row) `unevenly` among its children. In our example case, the vertical sizer is supposed to propagate all its 
-height changes to only the text area, not to the button area. This is determined by the `proportion` parameter when adding a window (or 
-another sizer) to a sizer. It is interpreted as a weight factor, i.e. it can be zero, indicating that the window may not be resized at all,
-or above zero. If several windows have a value above zero, the value is interpreted relative to the sum of all weight factors of the sizer, 
-so when adding two windows with a value of 1, they will both get resized equally much and each half as much as the sizer owning them. 
-Then what do we do when a column sizer changes its width? This behaviour is controlled by `flags` (the second parameter of the `Add()` function): 
-Zero or no flag indicates that the window will preserve it is original size, ``GROW`` flag (same as ``EXPAND``) forces the window to grow with
-the sizer, and ``SHAPED`` flag tells the window to change it is size proportionally, preserving original aspect ratio. When ``GROW`` flag is 
-not used, the item can be aligned within available space. ``ALIGN_LEFT``, ``ALIGN_TOP``, ``ALIGN_RIGHT``, ``ALIGN_BOTTOM``, ``ALIGN_CENTER_HORIZONTAL``
-and ``ALIGN_CENTER_VERTICAL`` do what they say. ``ALIGN_CENTRE`` (same as ``ALIGN_CENTER``) is defined as 
-(``ALIGN_CENTER_HORIZONTAL`` | ``ALIGN_CENTER_VERTICAL``). Default alignment is ``ALIGN_LEFT`` | ``ALIGN_TOP``.
+It is the unique feature of a box sizer, that it can grow in both
+directions (height and width) but can distribute its growth in the
+main direction (horizontal for a row) `unevenly` among its
+children. In our example case, the vertical sizer is supposed to
+propagate all its height changes to only the text area, not to the
+button area. This is determined by the `proportion` parameter when
+adding a window (or another sizer) to a sizer. It is interpreted as a
+weight factor, i.e. it can be zero, indicating that the window may not
+be resized at all, or above zero. If several windows have a value
+above zero, the value is interpreted relative to the sum of all weight
+factors of the sizer, so when adding two windows with a value of 1,
+they will both get resized equally much and each half as much as the
+sizer owning them.  Then what do we do when a column sizer changes its
+width? This behaviour is controlled by `flags` (the second parameter
+of the `Add()` function): Zero or no flag indicates that the window
+will preserve it is original size, ``wx.GROW`` flag (same as ``wx.EXPAND``)
+forces the window to grow with the sizer, and ``wx.SHAPED`` flag tells
+the window to change it is size proportionally, preserving original
+aspect ratio. When ``wx.GROW`` flag is not used, the item can be aligned
+within available space. ``wx.ALIGN_LEFT``, ``wx.ALIGN_TOP``,
+``wx.ALIGN_RIGHT``, ``wx.ALIGN_BOTTOM``, ``wx.ALIGN_CENTER_HORIZONTAL`` and
+``wx.ALIGN_CENTER_VERTICAL`` do what they say. ``wx.ALIGN_CENTRE`` (same as
+``wx.ALIGN_CENTER``) is defined as (``wx.ALIGN_CENTER_HORIZONTAL`` |
+``wx.ALIGN_CENTER_VERTICAL``). Default alignment is ``wx.ALIGN_LEFT`` |
+``wx.ALIGN_TOP``.
 
-As mentioned above, any window belonging to a sizer may have a border, and it can be specified which of the four sides may have this border, 
-using the ``TOP``, ``LEFT``, ``RIGHT`` and ``BOTTOM`` constants or ``ALL`` for all directions (and you may also use ``NORTH``, ``WEST`` etc instead). 
-These flags can be used in combination with the alignment flags above as the second parameter of the `Add()` method using the binary or operator ``|``.
-The sizer of the border also must be made known, and it is the third parameter in the `Add()` method. This means, that the entire behaviour of a 
-sizer and its children can be controlled by the three parameters of the `Add()` method.
+As mentioned above, any window belonging to a sizer may have a border,
+and it can be specified which of the four sides may have this border,
+using the ``wx.TOP``, ``wx.LEFT``, ``wx.RIGHT`` and ``wx.BOTTOM``
+constants or ``wx.ALL`` for all directions (and you may also use
+``wx.NORTH``, ``wx.WEST`` etc. instead).  These flags can be used in
+combination with the alignment flags above as the second parameter of
+the `Add()` method using the binary or operator ``|``.  The sizer of
+the border also must be made known, and it is the third parameter in
+the `Add()` method. This means, that the entire behaviour of a sizer
+and its children can be controlled by the three parameters of the
+`Add()` method.
 
 Example::
 
-	# We want to get a dialog that is stretchable because it
-	# has a text ctrl at the top and two buttons at the bottom.
+        # We want to get a dialog that is stretchable because it
+        # has a text ctrl at the top and two buttons at the bottom.
 
-	class MyDialog(wx.Dialog):
-	
-	    def __init__(self, parent, id, title):
-		
-	        wx.Dialog(parent, id, title, wx.DefaultPosition, wx.DefaultSize,
-			  wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+        class MyDialog(wx.Dialog):
+        
+            def __init__(self, parent, id, title):
+                
+                wx.Dialog(parent, id, title, wx.DefaultPosition, wx.DefaultSize,
+                          wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 
-		topsizer = wx.BoxSizer(wx.VERTICAL)
+                topsizer = wx.BoxSizer(wx.VERTICAL)
 
-		# create text ctrl with minimal size 100x60
-		topsizer.Add(
-		        wx.TextCtrl(self, -1, "My text.", wx.DefaultPosition, wx.Size(100,60), wx.TE_MULTILINE),
-			1,           # make vertically stretchable
-			wx.EXPAND |  # make horizontally stretchable
-			wx.ALL,      # and make border all around
-			10)          # set border width to 10
+                # create text ctrl with minimal size 100x60
+                topsizer.Add(
+                        wx.TextCtrl(self, -1, "My text.", wx.DefaultPosition, wx.Size(100,60), wx.TE_MULTILINE),
+                        1,           # make vertically stretchable
+                        wx.EXPAND |  # make horizontally stretchable
+                        wx.ALL,      # and make border all around
+                        10)          # set border width to 10
 
-    	        button_sizer = wx.BoxSizer(wx.HORIZONTAL)
-		button_sizer.Add(
-		 	wx.Button(self, wx.ID_OK, "OK"),
-			0,           # make horizontally unstretchable
-			wx.ALL,      # make border all around (implicit top alignment)
-			10)          # set border width to 10
-		button_sizer.Add(
-			wx.Button(self, wx.ID_CANCEL, "Cancel"),
-			0,           # make horizontally unstretchable
-			wx.ALL,      # make border all around (implicit top alignment)
-			10)          # set border width to 10
+                button_sizer = wx.BoxSizer(wx.HORIZONTAL)
+                button_sizer.Add(
+                        wx.Button(self, wx.ID_OK, "OK"),
+                        0,           # make horizontally unstretchable
+                        wx.ALL,      # make border all around (implicit top alignment)
+                        10)          # set border width to 10
+                button_sizer.Add(
+                        wx.Button(self, wx.ID_CANCEL, "Cancel"),
+                        0,           # make horizontally unstretchable
+                        wx.ALL,      # make border all around (implicit top alignment)
+                        10)          # set border width to 10
 
-		topsizer.Add(
-			button_sizer,
-			0,                # make vertically unstretchable
-			wx.ALIGN_CENTER)  # no border and centre horizontally
+                topsizer.Add(
+                        button_sizer,
+                        0,                # make vertically unstretchable
+                        wx.ALIGN_CENTER)  # no border and centre horizontally
 
-		self.SetSizerAndFit(topsizer) # use the sizer for layout and size window
-					      # accordingly and prevent it from being resized
-					      # to smaller size
-		
+                self.SetSizerAndFit(topsizer) # use the sizer for layout and size window
+                                              # accordingly and prevent it from being resized
+                                              # to smaller size
+                
 
 
-Note that the new way of specifying flags to :ref:`Sizer` is via :ref:`SizerFlags`. This class greatly eases the burden of passing flags to a :ref:`Sizer`.
+Note that the new way of specifying flags to :ref:`wx.Sizer` is via
+:ref:`wx.SizerFlags`. This class greatly eases the burden of passing
+flags to a :ref:`wx.Sizer`.
 
-Here's how you'd do the previous example with :ref:`SizerFlags`::
+Here's how you'd do the previous example with :ref:`wx.SizerFlags`::
 
 
-	# We want to get a dialog that is stretchable because it
-	# has a text ctrl at the top and two buttons at the bottom.
+        # We want to get a dialog that is stretchable because it
+        # has a text ctrl at the top and two buttons at the bottom.
 
-	class MyDialog(wx.Dialog):
-	
-	    def __init__(self, parent, id, title):
-		
-	        wx.Dialog(parent, id, title, wx.DefaultPosition, wx.DefaultSize,
-			  wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
+        class MyDialog(wx.Dialog):
+        
+            def __init__(self, parent, id, title):
+                
+                wx.Dialog(parent, id, title, wx.DefaultPosition, wx.DefaultSize,
+                          wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 
-		topsizer = wx.BoxSizer(wx.VERTICAL)
+                topsizer = wx.BoxSizer(wx.VERTICAL)
 
-		# create text ctrl with minimal size 100x60
-		topsizer.Add(
-		        wx.TextCtrl(self, -1, "My text.", wx.DefaultPosition, wx.Size(100,60), wx.TE_MULTILINE),
-			wx.SizerFlags(1).Align().Expand().Border(wx.ALL, 10))
+                # create text ctrl with minimal size 100x60
+                topsizer.Add(
+                        wx.TextCtrl(self, -1, "My text.", wx.DefaultPosition, wx.Size(100,60), wx.TE_MULTILINE),
+                        wx.SizerFlags(1).Align().Expand().Border(wx.ALL, 10))
 
-    	        button_sizer = wx.BoxSizer(wx.HORIZONTAL)
-		button_sizer.Add(
-		 	wx.Button(self, wx.ID_OK, "OK"),
-			wx.SizerFlags(0).Align().Border(wx.ALL, 10))
-			
-		button_sizer.Add(
-			wx.Button(self, wx.ID_CANCEL, "Cancel"),
-			wx.SizerFlags(0).Align().Border(wx.ALL, 10))
+                button_sizer = wx.BoxSizer(wx.HORIZONTAL)
+                button_sizer.Add(
+                        wx.Button(self, wx.ID_OK, "OK"),
+                        wx.SizerFlags(0).Align().Border(wx.ALL, 10))
+                        
+                button_sizer.Add(
+                        wx.Button(self, wx.ID_CANCEL, "Cancel"),
+                        wx.SizerFlags(0).Align().Border(wx.ALL, 10))
 
-		topsizer.Add(
-			button_sizer,
-			wx.SizerFlags(0).Center())
+                topsizer.Add(
+                        button_sizer,
+                        wx.SizerFlags(0).Center())
 
-		self.SetSizerAndFit(topsizer) # use the sizer for layout and set size and hints
+                self.SetSizerAndFit(topsizer) # use the sizer for layout and set size and hints
 
 
 
 Other Types of Sizers
 ---------------------
 
-:ref:`GridSizer` is a sizer which lays out its children in a two-dimensional table with all table fields having the same size, i.e. 
-the width of each field is the width of the widest child, the height of each field is the height of the tallest child.
+:ref:`wx.GridSizer` is a sizer which lays out its children in a
+two-dimensional table with all table fields having the same size, i.e.
+the width of each field is the width of the widest child, the height
+of each field is the height of the tallest child.
 
-:ref:`FlexGridSizer` is a sizer which lays out its children in a two-dimensional table with all table fields in one row having the
-same height and all fields in one column having the same width, but all rows or all columns are not necessarily the same height or 
-width as in the :ref:`GridSizer`.
+:ref:`wx.FlexGridSizer` is a sizer which lays out its children in a
+two-dimensional table with all table fields in one row having the same
+height and all fields in one column having the same width, but all
+rows or all columns are not necessarily the same height or width as in
+the :ref:`wx.GridSizer`.
 
-:class:`StaticBoxSizer` is a sizer derived from :ref:`BoxSizer` but adds a static box around the sizer. Note that this static box
-has to be created separately.
+:class:`wx.StaticBoxSizer` is a sizer derived from :ref:`wx.BoxSizer`
+but adds a static box around the sizer. Note that this static box has
+to be created separately.
 
-:ref:`GridBagSizer` is a rather special kind of sizer which, unlike the other classes, allows to directly put the elements at the 
-given position in the sizer. Please see its documentation for more details.
+:ref:`wx.GridBagSizer` is a rather special kind of sizer which, unlike
+the other classes, allows to directly put the elements at the given
+position in the sizer. Please see its documentation for more details.
 
 
 CreateButtonSizer
 -----------------
 
-As a convenience, :meth:`Dialog.CreateButtonSizer` (flags) can be used to create a standard button sizer in which standard buttons 
-are displayed. The following flags can be passed to this method::
+As a convenience, :meth:`wx.Dialog.CreateButtonSizer`\ (flags) can be
+used to create a standard button sizer in which standard buttons are
+displayed. The following flags can be passed to this method::
 
-	wx.YES_NO     # Add Yes/No subpanel
-	wx.YES        # return wx.ID_YES
-	wx.NO         # return wx.ID_NO
-	wx.NO_DEFAULT # make the wx.NO button the default,
-		      # otherwise wx.YES or wx.OK button will be default
+        wx.YES_NO     # Add Yes/No subpanel
+        wx.YES        # return wx.ID_YES
+        wx.NO         # return wx.ID_NO
+        wx.NO_DEFAULT # make the wx.NO button the default,
+                      # otherwise wx.YES or wx.OK button will be default
 
-	wx.OK         # return wx.ID_OK
-	wx.CANCEL     # return wx.ID_CANCEL
-	wx.HELP       # return wx.ID_HELP
+        wx.OK         # return wx.ID_OK
+        wx.CANCEL     # return wx.ID_CANCEL
+        wx.HELP       # return wx.ID_HELP
 
-	wx.FORWARD    # return wx.ID_FORWARD
-	wx.BACKWARD   # return wx.ID_BACKWARD
-	wx.SETUP      # return wx.ID_SETUP
-	wx.MORE       # return wx.ID_MORE
+        wx.FORWARD    # return wx.ID_FORWARD
+        wx.BACKWARD   # return wx.ID_BACKWARD
+        wx.SETUP      # return wx.ID_SETUP
+        wx.MORE       # return wx.ID_MORE
 
diff --git a/docs/sphinx/rest_substitutions/overviews/splitterwindow_overview.rst b/docs/sphinx/rest_substitutions/overviews/splitterwindow_overview.rst
index 65d46503..ee22fd6e 100644
--- a/docs/sphinx/rest_substitutions/overviews/splitterwindow_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/splitterwindow_overview.rst
@@ -8,9 +8,10 @@
 =================================================
 
 
-The following screenshot shows the appearance of a splitter window with a horizontal split.
+The following screenshot shows the appearance of a splitter window
+with a horizontal split.
 
-The style ``SP_3D`` has been used to show a 3D border and 3D sash.
+The style ``wx.SP_3D`` has been used to show a 3D border and 3D sash.
 
 .. figure:: _static/images/overviews/overview_splitter_3d.png
    :align: center
@@ -20,7 +21,8 @@ The style ``SP_3D`` has been used to show a 3D border and 3D sash.
 Example
 -------
 
-The following fragment shows how to create a splitter window, creating two subwindows and hiding one of them::
+The following fragment shows how to create a splitter window, creating
+two subwindows and hiding one of them::
 
 	splitter = wx.SplitterWindow(self, -1, wx.Point(0, 0),
 				     wx.Size(400, 400), wx.SP_3D)
@@ -38,7 +40,8 @@ The following fragment shows how to create a splitter window, creating two subwi
 	# splitter.SetMinimumPaneSize(20)
 
 
-The next fragment shows how the splitter window can be manipulated after creation::
+The next fragment shows how the splitter window can be manipulated
+after creation::
 
 	def OnSplitVertical(self, event):
 
diff --git a/docs/sphinx/rest_substitutions/overviews/standard_event_identifiers.rst b/docs/sphinx/rest_substitutions/overviews/standard_event_identifiers.rst
index 10114e17..65ad800f 100644
--- a/docs/sphinx/rest_substitutions/overviews/standard_event_identifiers.rst
+++ b/docs/sphinx/rest_substitutions/overviews/standard_event_identifiers.rst
@@ -7,18 +7,27 @@
 |phoenix_title|  **Standard event identifiers**
 ===============================================
 
-wxPython defines a special identifier value ``ID_ANY`` (-1) which is used in the following two situations:
+wxPython defines a special identifier value ``wx.ID_ANY`` (-1) which is
+used in the following two situations:
 
-- When creating a new window you may specify ``ID_ANY`` to let wxPython assign an unused identifier to it automatically
-- When installing an event handler using :meth:`EvtHandler.Bind`, you may use it to indicate that you want to handle 
-  the events coming from any control, regardless of its identifier
+- When creating a new window you may specify ``wx.ID_ANY`` to let
+  wxPython assign an unused identifier to it automatically
+  
+- When installing an event handler using :meth:`EvtHandler.Bind`, you
+  may use it to indicate that you want to handle the events coming
+  from any control, regardless of its identifier
   
   
-Another standard special identifier value is ``ID_NONE``: this is a value which is not matched by any other id.
+Another standard special identifier value is ``wx.ID_NONE``: this is a
+value which is not matched by any other id.
 
-wxPython also defines a few standard command identifiers which may be used by the user code and also are sometimes 
-used by wxPython itself. These reserved identifiers are all in the range between ``ID_LOWEST`` and ``ID_HIGHEST`` and, 
-accordingly, the user code should avoid defining its own constants in this range (e.g. by using :func:`NewId` ()).
+wxPython also defines a few standard command identifiers which may be
+used by the user code and also are sometimes used by wxPython
+itself. These reserved identifiers are all in the range between
+``wx.ID_LOWEST`` and ``wx.ID_HIGHEST`` and, accordingly, the user code
+should avoid defining its own constants in this range (e.g. by using
+:func:`wx.NewId` ()).
 
-Refer to :ref:`the list of stock items <stock items>` for the subset of standard IDs which are stock IDs as well.
+Refer to :ref:`the list of stock items <stock items>` for the subset
+of standard IDs which are stock IDs as well.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/stock_items.rst b/docs/sphinx/rest_substitutions/overviews/stock_items.rst
index 5761e0d5..eb690b8f 100644
--- a/docs/sphinx/rest_substitutions/overviews/stock_items.rst
+++ b/docs/sphinx/rest_substitutions/overviews/stock_items.rst
@@ -8,231 +8,234 @@
 |phoenix_title|  **Stock items**
 ===============================================
 
-The following is the list of the window IDs for which stock buttons and menu items are created.
+The following is the list of the window IDs for which stock buttons
+and menu items are created.
 
-See the :ref:`Button` constructor and the :ref:`MenuItem` constructor for classes which automatically 
-add stock bitmaps when using stock IDs. Also note that you can retrieve stock bitmaps using :ref:`ArtProvider`.
+See the :ref:`wx.Button` constructor and the :ref:`wx.MenuItem`
+constructor for classes which automatically add stock bitmaps when
+using stock IDs. Also note that you can retrieve stock bitmaps
+using :ref:`wx.ArtProvider`.
 
 
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| Stock ID                             | GTK Icon                                                             | Stock label              |
-+======================================+======================================================================+==========================+
-| ``ID_ABOUT``                         | .. figure:: _static/images/stock/gtk-about.png                       | &About...                |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_ADD``                           | .. figure:: _static/images/stock/gtk-add.png                         | Add                      |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_APPLY``                         | .. figure:: _static/images/stock/gtk-apply.png                       | &Apply                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_BACKWARD``                      | .. figure:: _static/images/stock/gtk-go-back-ltr.png                 | &Back                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_BOLD``                          | .. figure:: _static/images/stock/gtk-bold.png                        | &Bold                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_BOTTOM``                        | .. figure:: _static/images/stock/gtk-goto-bottom.png                 | &Bottom                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_CANCEL``                        | .. figure:: _static/images/stock/gtk-cancel.png                      | &Cancel                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_CDROM``                         | .. figure:: _static/images/stock/gtk-cdrom.png                       | &CD-Rom                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_CLEAR``                         | .. figure:: _static/images/stock/gtk-clear.png                       | &Clear                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_CLOSE``                         | .. figure:: _static/images/stock/gtk-close.png                       | &Close                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_CONVERT``                       | .. figure:: _static/images/stock/gtk-convert.png                     | &Convert                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_COPY``                          | .. figure:: _static/images/stock/gtk-copy.png                        | &Copy                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_CUT``                           | .. figure:: _static/images/stock/gtk-cut.png                         | Cu&t                     |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_DELETE``                        | .. figure:: _static/images/stock/gtk-delete.png                      | &Delete                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_DOWN``                          | .. figure:: _static/images/stock/gtk-go-down.png                     | &Down                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_EDIT``                          | .. figure:: _static/images/stock/gtk-edit.png                        | &Edit                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_EXECUTE``                       | .. figure:: _static/images/stock/gtk-execute.png                     | &Execute                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_EXIT``                          | .. figure:: _static/images/stock/gtk-quit.png                        | &Quit                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_FILE``                          | .. figure:: _static/images/stock/gtk-file.png                        | &File                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_FIND``                          | .. figure:: _static/images/stock/gtk-find.png                        | &Find                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_FIRST``                         | .. figure:: _static/images/stock/gtk-goto-first-ltr.png              | &First                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_FLOPPY``                        | .. figure:: _static/images/stock/gtk-floppy.png                      | &Floppy                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_FORWARD``                       | .. figure:: _static/images/stock/gtk-go-forward-ltr.png              | &Forward                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_HARDDISK``                      | .. figure:: _static/images/stock/gtk-harddisk.png                    | &Harddisk                |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_HELP``                          | .. figure:: _static/images/stock/gtk-help.png                        | &Help                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_HOME``                          | .. figure:: _static/images/stock/gtk-home.png                        | &Home                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_INDENT``                        | .. figure:: _static/images/stock/gtk-indent-ltr.png                  | Indent                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_INDEX``                         | .. figure:: _static/images/stock/gtk-index.png                       | &Index                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_INFO``                          | .. figure:: _static/images/stock/gtk-info.png                        | &Info                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_ITALIC``                        | .. figure:: _static/images/stock/gtk-italic.png                      | &Italic                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_JUMP_TO``                       | .. figure:: _static/images/stock/gtk-jump-to-ltr.png                 | &Jump to                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_JUSTIFY_CENTER``                | .. figure:: _static/images/stock/gtk-justify-center.png              | Centered                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_JUSTIFY_FILL``                  | .. figure:: _static/images/stock/gtk-justify-fill.png                | Justified                |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_JUSTIFY_LEFT``                  | .. figure:: _static/images/stock/gtk-justify-left.png                | Align Left               |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_JUSTIFY_RIGHT``                 | .. figure:: _static/images/stock/gtk-justify-right.png               | Align Right              |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_LAST``                          | .. figure:: _static/images/stock/gtk-goto-last-ltr.png               | &Last                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_NETWORK``                       | .. figure:: _static/images/stock/gtk-network.png                     | &Network                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_NEW``                           | .. figure:: _static/images/stock/gtk-new.png                         | &New                     |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_NO``                            | .. figure:: _static/images/stock/gtk-no.png                          | &No                      |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_OK``                            | .. figure:: _static/images/stock/gtk-ok.png                          | &OK                      |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_OPEN``                          | .. figure:: _static/images/stock/gtk-open.png                        | &Open...                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_PASTE``                         | .. figure:: _static/images/stock/gtk-paste.png                       | &Paste                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_PREFERENCES``                   | .. figure:: _static/images/stock/gtk-preferences.png                 | &Preferences             |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_PREVIEW``                       | .. figure:: _static/images/stock/gtk-print-preview.png               | Print previe&w           |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_PRINT``                         | .. figure:: _static/images/stock/gtk-print.png                       | &Print...                |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_PROPERTIES``                    | .. figure:: _static/images/stock/gtk-properties.png                  | &Properties              |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_REDO``                          | .. figure:: _static/images/stock/gtk-redo-ltr.png                    | &Redo                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_REFRESH``                       | .. figure:: _static/images/stock/gtk-refresh.png                     | Refresh                  |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_REMOVE``                        | .. figure:: _static/images/stock/gtk-remove.png                      | Remove                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_REPLACE``                       | .. figure:: _static/images/stock/gtk-find-and-replace.png            | Rep&lace                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_REVERT_TO_SAVED``               | .. figure:: _static/images/stock/gtk-revert-to-saved-ltr.png         | Revert to Saved          |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SAVE``                          | .. figure:: _static/images/stock/gtk-save.png                        | &Save                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SAVEAS``                        | .. figure:: _static/images/stock/gtk-save-as.png                     | Save &As...              |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SELECTALL``                     | .. figure:: _static/images/stock/gtk-select-all.png                  | Select &All              |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SELECT_COLOR``                  | .. figure:: _static/images/stock/gtk-select-color.png                | &Color                   |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SELECT_FONT``                   | .. figure:: _static/images/stock/gtk-select-font.png                 | &Font                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SORT_ASCENDING``                | .. figure:: _static/images/stock/gtk-sort-ascending.png              | &Ascending               |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SORT_DESCENDING``               | .. figure:: _static/images/stock/gtk-sort-descending.png             | &Descending              |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_SPELL_CHECK``                   | .. figure:: _static/images/stock/gtk-spell-check.png                 | &Spell Check             |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_STOP``                          | .. figure:: _static/images/stock/gtk-stop.png                        | &Stop                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_STRIKETHROUGH``                 | .. figure:: _static/images/stock/gtk-strikethrough.png               | &Strikethrough           |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_TOP``                           | .. figure:: _static/images/stock/gtk-goto-top.png                    | &Top                     |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_UNDELETE``                      | .. figure:: _static/images/stock/gtk-undelete-ltr.png                | Undelete                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_UNDERLINE``                     | .. figure:: _static/images/stock/gtk-underline.png                   | &Underline               |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_UNDO``                          | .. figure:: _static/images/stock/gtk-undo-ltr.png                    | &Undo                    |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_UNINDENT``                      | .. figure:: _static/images/stock/gtk-unindent-ltr.png                | &Unindent                |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_UP``                            | .. figure:: _static/images/stock/gtk-go-up.png                       | &Up                      |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_YES``                           | .. figure:: _static/images/stock/gtk-yes.png                         | &Yes                     |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_ZOOM_100``                      | .. figure:: _static/images/stock/gtk-zoom-100.png                    | &Actual Size             |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_ZOOM_FIT``                      | .. figure:: _static/images/stock/gtk-zoom-fit.png                    | Zoom to &Fit             |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_ZOOM_IN``                       | .. figure:: _static/images/stock/gtk-zoom-in.png                     | Zoom &In                 |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
-| ``ID_ZOOM_OUT``                      | .. figure:: _static/images/stock/gtk-zoom-out.png                    | Zoom &Out                |
-|                                      |    :align: left                                                      |                          |
-+--------------------------------------+----------------------------------------------------------------------+--------------------------+
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| Stock ID                      | GTK Icon                                                             | Stock label              |
++===============================+======================================================================+==========================+
+| ``wx.ID_ABOUT``               | .. figure:: _static/images/stock/gtk-about.png                       | &About...                |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_ADD``                 | .. figure:: _static/images/stock/gtk-add.png                         | Add                      |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_APPLY``               | .. figure:: _static/images/stock/gtk-apply.png                       | &Apply                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_BACKWARD``            | .. figure:: _static/images/stock/gtk-go-back-ltr.png                 | &Back                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_BOLD``                | .. figure:: _static/images/stock/gtk-bold.png                        | &Bold                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_BOTTOM``              | .. figure:: _static/images/stock/gtk-goto-bottom.png                 | &Bottom                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_CANCEL``              | .. figure:: _static/images/stock/gtk-cancel.png                      | &Cancel                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_CDROM``               | .. figure:: _static/images/stock/gtk-cdrom.png                       | &CD-Rom                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_CLEAR``               | .. figure:: _static/images/stock/gtk-clear.png                       | &Clear                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_CLOSE``               | .. figure:: _static/images/stock/gtk-close.png                       | &Close                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_CONVERT``             | .. figure:: _static/images/stock/gtk-convert.png                     | &Convert                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_COPY``                | .. figure:: _static/images/stock/gtk-copy.png                        | &Copy                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_CUT``                 | .. figure:: _static/images/stock/gtk-cut.png                         | Cu&t                     |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_DELETE``              | .. figure:: _static/images/stock/gtk-delete.png                      | &Delete                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_DOWN``                | .. figure:: _static/images/stock/gtk-go-down.png                     | &Down                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_EDIT``                | .. figure:: _static/images/stock/gtk-edit.png                        | &Edit                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_EXECUTE``             | .. figure:: _static/images/stock/gtk-execute.png                     | &Execute                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_EXIT``                | .. figure:: _static/images/stock/gtk-quit.png                        | &Quit                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_FILE``                | .. figure:: _static/images/stock/gtk-file.png                        | &File                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_FIND``                | .. figure:: _static/images/stock/gtk-find.png                        | &Find                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_FIRST``               | .. figure:: _static/images/stock/gtk-goto-first-ltr.png              | &First                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_FLOPPY``              | .. figure:: _static/images/stock/gtk-floppy.png                      | &Floppy                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_FORWARD``             | .. figure:: _static/images/stock/gtk-go-forward-ltr.png              | &Forward                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_HARDDISK``            | .. figure:: _static/images/stock/gtk-harddisk.png                    | &Harddisk                |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_HELP``                | .. figure:: _static/images/stock/gtk-help.png                        | &Help                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_HOME``                | .. figure:: _static/images/stock/gtk-home.png                        | &Home                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_INDENT``              | .. figure:: _static/images/stock/gtk-indent-ltr.png                  | Indent                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_INDEX``               | .. figure:: _static/images/stock/gtk-index.png                       | &Index                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_INFO``                | .. figure:: _static/images/stock/gtk-info.png                        | &Info                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_ITALIC``              | .. figure:: _static/images/stock/gtk-italic.png                      | &Italic                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_JUMP_TO``             | .. figure:: _static/images/stock/gtk-jump-to-ltr.png                 | &Jump to                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_JUSTIFY_CENTER``      | .. figure:: _static/images/stock/gtk-justify-center.png              | Centered                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_JUSTIFY_FILL``        | .. figure:: _static/images/stock/gtk-justify-fill.png                | Justified                |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_JUSTIFY_LEFT``        | .. figure:: _static/images/stock/gtk-justify-left.png                | Align Left               |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_JUSTIFY_RIGHT``       | .. figure:: _static/images/stock/gtk-justify-right.png               | Align Right              |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_LAST``                | .. figure:: _static/images/stock/gtk-goto-last-ltr.png               | &Last                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_NETWORK``             | .. figure:: _static/images/stock/gtk-network.png                     | &Network                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_NEW``                 | .. figure:: _static/images/stock/gtk-new.png                         | &New                     |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_NO``                  | .. figure:: _static/images/stock/gtk-no.png                          | &No                      |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_OK``                  | .. figure:: _static/images/stock/gtk-ok.png                          | &OK                      |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_OPEN``                | .. figure:: _static/images/stock/gtk-open.png                        | &Open...                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_PASTE``               | .. figure:: _static/images/stock/gtk-paste.png                       | &Paste                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_PREFERENCES``         | .. figure:: _static/images/stock/gtk-preferences.png                 | &Preferences             |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_PREVIEW``             | .. figure:: _static/images/stock/gtk-print-preview.png               | Print previe&w           |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_PRINT``               | .. figure:: _static/images/stock/gtk-print.png                       | &Print...                |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_PROPERTIES``          | .. figure:: _static/images/stock/gtk-properties.png                  | &Properties              |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_REDO``                | .. figure:: _static/images/stock/gtk-redo-ltr.png                    | &Redo                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_REFRESH``             | .. figure:: _static/images/stock/gtk-refresh.png                     | Refresh                  |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_REMOVE``              | .. figure:: _static/images/stock/gtk-remove.png                      | Remove                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_REPLACE``             | .. figure:: _static/images/stock/gtk-find-and-replace.png            | Rep&lace                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_REVERT_TO_SAVED``     | .. figure:: _static/images/stock/gtk-revert-to-saved-ltr.png         | Revert to Saved          |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SAVE``                | .. figure:: _static/images/stock/gtk-save.png                        | &Save                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SAVEAS``              | .. figure:: _static/images/stock/gtk-save-as.png                     | Save &As...              |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SELECTALL``           | .. figure:: _static/images/stock/gtk-select-all.png                  | Select &All              |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SELECT_COLOR``        | .. figure:: _static/images/stock/gtk-select-color.png                | &Color                   |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SELECT_FONT``         | .. figure:: _static/images/stock/gtk-select-font.png                 | &Font                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SORT_ASCENDING``      | .. figure:: _static/images/stock/gtk-sort-ascending.png              | &Ascending               |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SORT_DESCENDING``     | .. figure:: _static/images/stock/gtk-sort-descending.png             | &Descending              |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_SPELL_CHECK``         | .. figure:: _static/images/stock/gtk-spell-check.png                 | &Spell Check             |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_STOP``                | .. figure:: _static/images/stock/gtk-stop.png                        | &Stop                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_STRIKETHROUGH``       | .. figure:: _static/images/stock/gtk-strikethrough.png               | &Strikethrough           |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_TOP``                 | .. figure:: _static/images/stock/gtk-goto-top.png                    | &Top                     |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_UNDELETE``            | .. figure:: _static/images/stock/gtk-undelete-ltr.png                | Undelete                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_UNDERLINE``           | .. figure:: _static/images/stock/gtk-underline.png                   | &Underline               |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_UNDO``                | .. figure:: _static/images/stock/gtk-undo-ltr.png                    | &Undo                    |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_UNINDENT``            | .. figure:: _static/images/stock/gtk-unindent-ltr.png                | &Unindent                |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_UP``                  | .. figure:: _static/images/stock/gtk-go-up.png                       | &Up                      |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_YES``                 | .. figure:: _static/images/stock/gtk-yes.png                         | &Yes                     |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_ZOOM_100``            | .. figure:: _static/images/stock/gtk-zoom-100.png                    | &Actual Size             |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_ZOOM_FIT``            | .. figure:: _static/images/stock/gtk-zoom-fit.png                    | Zoom to &Fit             |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_ZOOM_IN``             | .. figure:: _static/images/stock/gtk-zoom-in.png                     | Zoom &In                 |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
+| ``wx.ID_ZOOM_OUT``            | .. figure:: _static/images/stock/gtk-zoom-out.png                    | Zoom &Out                |
+|                               |    :align: left                                                      |                          |
++-------------------------------+----------------------------------------------------------------------+--------------------------+
 
 
 |
diff --git a/docs/sphinx/rest_substitutions/overviews/tipprovider_overview.rst b/docs/sphinx/rest_substitutions/overviews/tipprovider_overview.rst
index 636998f7..031e2a08 100644
--- a/docs/sphinx/rest_substitutions/overviews/tipprovider_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/tipprovider_overview.rst
@@ -7,11 +7,14 @@
 |phoenix_title|  **TipProvider Overview**
 ==========================================
 
-Many "modern" Windows programs have a feature (some would say annoyance) of presenting the user tips at program startup.
+Many "modern" Windows programs have a feature (some would say
+annoyance) of presenting the user tips at program startup.
 
-While this is probably useless to the advanced users of the program, the experience shows that the tips may be 
-quite helpful for the novices and so more and more programs now do this. For a wxPython programmer, implementing this 
-feature is extremely easy. To show a tip, it is enough to just call :func:`ShowTip` function like this::
+While this is probably useless to the advanced users of the program,
+the experience shows that the tips may be quite helpful for the
+novices and so more and more programs now do this. For a wxPython
+programmer, implementing this feature is extremely easy. To show a
+tip, it is enough to just call :func:`wx.ShowTip` function like this::
 
     if showTipsAtStartup:
 
@@ -20,36 +23,52 @@ feature is extremely easy. To show a tip, it is enough to just call :func:`ShowT
         del tipProvider
 
 
-Of course, you need to get the text of the tips from somewhere - in the example above, the text is supposed to be in the
-file `tips.txt` from where it is read by the tip provider. The tip provider is just an object of a class deriving from :class:`~adv.TipProvider`. 
-It has to implement one pure virtual function of the base class, `GetTip`. In the case of the tip provider created by 
-:func:`CreateFileTipProvider`, the tips are just the lines of the text file.
+Of course, you need to get the text of the tips from somewhere - in
+the example above, the text is supposed to be in the file `tips.txt`
+from where it is read by the tip provider. The tip provider is just an
+object of a class deriving from :class:`~wx.adv.TipProvider`.  It has
+to implement one pure virtual function of the base class, `GetTip`. In
+the case of the tip provider created by
+:func:`wx.CreateFileTipProvider`, the tips are just the lines of the
+text file.
 
-If you want to implement your own tip provider (for example, if you wish to hardcode the tips inside your program), you 
-just have to derive another class from :class:`~adv.TipProvider` and pass a pointer to the object of this class to func:`ShowTip` - then 
-you don't need :func:`CreateFileTipProvider` at all.
+If you want to implement your own tip provider (for example, if you
+wish to hardcode the tips inside your program), you just have to
+derive another class from :class:`~wx.adv.TipProvider` and pass a
+pointer to the object of this class to func:`wx.ShowTip` - then you
+don't need :func:`wx.CreateFileTipProvider` at all.
 
-You will probably want to save somewhere the index of the tip last shown - so that the program doesn't always show the same 
-tip on startup. As you also need to remember whether to show tips or not (you shouldn't do it if the user unchecked 
-"Show tips on startup" checkbox in the dialog), you will probably want to store both the index of the last shown tip 
-(as returned by :meth:`~adv.TipProvider.GetCurrentTip` and the flag telling whether to show the tips at startup at all.
+You will probably want to save somewhere the index of the tip last
+shown - so that the program doesn't always show the same tip on
+startup. As you also need to remember whether to show tips or not (you
+shouldn't do it if the user unchecked "Show tips on startup" checkbox
+in the dialog), you will probably want to store both the index of the
+last shown tip (as returned by
+:meth:`~wx.adv.TipProvider.GetCurrentTip` and the flag telling whether
+to show the tips at startup at all.
 
-In a `tips.txt` file, lines that begin with a ``#`` character are considered comments and are automatically skipped. Blank 
-lines and lines only having spaces are also skipped.
+In a `tips.txt` file, lines that begin with a ``#`` character are
+considered comments and are automatically skipped. Blank lines and
+lines only having spaces are also skipped.
 
-You can easily add runtime-translation capacity by placing each line of the `tips.txt` file inside the usual translation 
-function. For example, your `tips.txt` file would look like this::
+You can easily add runtime-translation capacity by placing each line
+of the `tips.txt` file inside the usual translation function. For
+example, your `tips.txt` file would look like this::
 
     _("This is my first tip")
     _("This is my second tip")
 
 
-Now add your `tips.txt` file into the list of files that gettext searches for translatable strings. The tips will thus get 
-included into your generated .po file catalog and be translated at runtime along with the rest of your application's translatable strings.
+Now add your `tips.txt` file into the list of files that gettext
+searches for translatable strings. The tips will thus get included
+into your generated .po file catalog and be translated at runtime
+along with the rest of your application's translatable strings.
 
 .. note:: 
    
-   Each line in the `tips.txt` file needs to strictly begin with exactly the 3 characters of underscore-parenthesis-doublequote, 
-   and end with doublequote-parenthesis, as shown above. Also, remember to escape any doublequote characters within the tip 
-   string with a backslash-doublequote.
+   Each line in the `tips.txt` file needs to strictly begin with
+   exactly the 3 characters of underscore-parenthesis-doublequote, and
+   end with doublequote-parenthesis, as shown above. Also, remember to
+   escape any doublequote characters within the tip string with a
+   backslash-doublequote.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/toolbar_overview.rst b/docs/sphinx/rest_substitutions/overviews/toolbar_overview.rst
index 3e122cb5..d19889ac 100644
--- a/docs/sphinx/rest_substitutions/overviews/toolbar_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/toolbar_overview.rst
@@ -10,25 +10,37 @@
 Introduction
 ------------
 
-The toolbar family of classes allows an application to use toolbars in a variety of configurations and styles.
+The toolbar family of classes allows an application to use toolbars in
+a variety of configurations and styles.
 
-The toolbar is a popular user interface component and contains a set of bitmap buttons or toggles. 
-A toolbar gives faster access to an application's facilities than menus, which have to be popped up and 
+The toolbar is a popular user interface component and contains a set
+of bitmap buttons or toggles.  A toolbar gives faster access to an
+application's facilities than menus, which have to be popped up and
 selected rather laboriously.
 
-Instead of supplying one toolbar class with a number of different implementations depending on platform, wxPython
-separates out the classes. This is because there are a number of different toolbar styles that you may wish to use 
-simultaneously, and also, future toolbar implementations will emerge which cannot all be shoe-horned into the one class.
+Instead of supplying one toolbar class with a number of different
+implementations depending on platform, wxPython separates out the
+classes. This is because there are a number of different toolbar
+styles that you may wish to use simultaneously, and also, future
+toolbar implementations will emerge which cannot all be shoe-horned
+into the one class.
 
-A toolbar might appear as a single row of images under the menubar, or it might be in a separate frame layout 
-in several rows and columns. The class handles the layout of the images, unless explicit positioning is requested.
+A toolbar might appear as a single row of images under the menubar, or
+it might be in a separate frame layout in several rows and
+columns. The class handles the layout of the images, unless explicit
+positioning is requested.
 
-A tool is a bitmap which can either be a button (there is no 'state', it just generates an event when clicked) or it 
-can be a toggle. If a toggle, a second bitmap can be provided to depict the 'on' state; if the second bitmap is omitted, 
-either the inverse of the first bitmap will be used (for monochrome displays) or a thick border is drawn around the 
-bitmap (for colour displays where inverting will not have the desired result).
+A tool is a bitmap which can either be a button (there is no 'state',
+it just generates an event when clicked) or it can be a toggle. If a
+toggle, a second bitmap can be provided to depict the 'on' state; if
+the second bitmap is omitted, either the inverse of the first bitmap
+will be used (for monochrome displays) or a thick border is drawn
+around the bitmap (for colour displays where inverting will not have
+the desired result).
 
-The Windows-specific toolbar classes expect 16-colour bitmaps that are 16 pixels wide and 15 pixels high. If you want 
-to use a different size, call :meth:`ToolBar.SetToolBitmapSize` as the demo shows, before adding tools to the button bar. 
-Don't supply more than one bitmap for each tool, because the toolbar generates all three images (normal, depressed, 
-and checked) from the single bitmap you give it.
\ No newline at end of file
+The Windows-specific toolbar classes expect 16-colour bitmaps that are
+16 pixels wide and 15 pixels high. If you want to use a different
+size, call :meth:`wx.ToolBar.SetToolBitmapSize` as the demo shows, before
+adding tools to the button bar.  Don't supply more than one bitmap for
+each tool, because the toolbar generates all three images (normal,
+depressed, and checked) from the single bitmap you give it.
\ No newline at end of file
diff --git a/docs/sphinx/rest_substitutions/overviews/treectrl_overview.rst b/docs/sphinx/rest_substitutions/overviews/treectrl_overview.rst
index 7b5702b0..5ea54f36 100644
--- a/docs/sphinx/rest_substitutions/overviews/treectrl_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/treectrl_overview.rst
@@ -7,63 +7,90 @@
 |phoenix_title|  **TreeCtrl Overview**
 ===============================================
 
-The tree control displays its items in a tree like structure. Each item has its own (optional) icon 
-and a label. An item may be either collapsed (meaning that its children are not visible) or expanded 
-(meaning that its children are shown). Each item in the tree is identified by its itemId which is of 
-opaque data type :ref:`TreeItemId`. You can test whether an item is valid by calling :meth:`TreeItemId.IsOk`.
+The tree control displays its items in a tree like structure. Each
+item has its own (optional) icon and a label. An item may be either
+collapsed (meaning that its children are not visible) or expanded
+(meaning that its children are shown). Each item in the tree is
+identified by its itemId which is of opaque data type
+:ref:`wx.TreeItemId`. You can test whether an item is valid by calling
+:meth:`wx.TreeItemId.IsOk`.
 
-The items text and image may be retrieved and changed with `(Get|Set)ItemText` and `(Get|Set)ItemImage`. 
-In fact, an item may even have two images associated with it: the normal one and another one for selected 
-state which is set/retrieved with `(Get|Set)ItemSelectedImage` functions, but this functionality might 
+The items text and image may be retrieved and changed with
+`(Get|Set)ItemText` and `(Get|Set)ItemImage`.  In fact, an item may
+even have two images associated with it: the normal one and another
+one for selected state which is set/retrieved with
+`(Get|Set)ItemSelectedImage` functions, but this functionality might
 be unavailable on some platforms.
 
-Tree items have several attributes: an item may be selected or not, visible or not, bold or not. It may 
-also be expanded or collapsed. All these attributes may be retrieved with the corresponding functions: 
-:meth:`TreeCtrl.IsSelected`, :meth:`TreeCtrl.IsVisible`, :meth:`TreeCtrl.IsBold` and :meth:`TreeCtrl.IsExpanded`. 
-Only one item at a time may be selected, selecting another one (with :meth:`TreeCtrl.SelectItem`) automatically 
-unselects the previously selected one.
+Tree items have several attributes: an item may be selected or not,
+visible or not, bold or not. It may also be expanded or collapsed. All
+these attributes may be retrieved with the corresponding functions:
+:meth:`wx.TreeCtrl.IsSelected`, :meth:`wx.TreeCtrl.IsVisible`,
+:meth:`wx.TreeCtrl.IsBold` and :meth:`wx.TreeCtrl.IsExpanded`.  Only
+one item at a time may be selected, selecting another one (with
+:meth:`wx.TreeCtrl.SelectItem`) automatically unselects the previously
+selected one.
 
-In addition to its icon and label, a user-specific data structure may be associated with all tree items. 
-If you wish to do it, you should derive a class from :ref:`TreeItemData` which is a very simple class 
-having only one function `GetId()` which returns the id of the item this data is associated with. This data 
-will be freed by the control itself when the associated item is deleted (all items are deleted when the 
-control is destroyed), so you shouldn't delete it yourself (if you do it, you should call `SetItemData(None)` 
-to prevent the tree from deleting the pointer second time). The associated data may be retrieved with 
-:meth:`TreeCtrl.GetItemData` function.
+In addition to its icon and label, a user-specific data structure may
+be associated with all tree items.  If you wish to do it, you should
+derive a class from :ref:`wx.TreeItemData` which is a very simple
+class having only one function `GetId()` which returns the id of the
+item this data is associated with. This data will be freed by the
+control itself when the associated item is deleted (all items are
+deleted when the control is destroyed), so you shouldn't delete it
+yourself (if you do it, you should call `SetItemData(None)` to prevent
+the tree from deleting the pointer second time). The associated data
+may be retrieved with :meth:`wx.TreeCtrl.GetItemData` function.
 
-Working with trees is relatively straightforward if all the items are added to the tree at the moment of 
-its creation. However, for large trees it may be very inefficient. To improve the performance you may want 
-to delay adding the items to the tree until the branch containing the items is expanded: so, in the 
-beginning, only the root item is created (with :meth:`TreeCtrl.AddRoot`). Other items are added when 
-``EVT_TREE_ITEM_EXPANDING`` event is received: then all items lying immediately under the item being expanded 
-should be added, but, of course, only when this event is received for the first time for this item - otherwise, 
-the items would be added twice if the user expands/collapses/re-expands the branch.
+Working with trees is relatively straightforward if all the items are
+added to the tree at the moment of its creation. However, for large
+trees it may be very inefficient. To improve the performance you may
+want to delay adding the items to the tree until the branch containing
+the items is expanded: so, in the beginning, only the root item is
+created (with :meth:`wx.TreeCtrl.AddRoot`). Other items are added when
+``wx.EVT_TREE_ITEM_EXPANDING`` event is received: then all items lying
+immediately under the item being expanded should be added, but, of
+course, only when this event is received for the first time for this
+item - otherwise, the items would be added twice if the user
+expands/collapses/re-expands the branch.
 
-The tree control provides functions for enumerating its items. There are 3 groups of enumeration functions: for 
-the children of a given item, for the sibling of the given item and for the visible items (those which are 
-currently shown to the user: an item may be invisible either because its branch is collapsed or because it 
-is scrolled out of view). Child enumeration functions require the caller to give them a `cookie` parameter: it 
-is a number which is opaque to the caller but is used by the tree control itself to allow multiple enumerations 
-to run simultaneously (this is explicitly allowed). The only thing to remember is that the `cookie` passed 
-to :meth:`TreeCtrl.GetFirstChild` and to :meth:`TreeCtrl.GetNextChild` should be the same variable (and that 
+The tree control provides functions for enumerating its items. There
+are 3 groups of enumeration functions: for the children of a given
+item, for the sibling of the given item and for the visible items
+(those which are currently shown to the user: an item may be invisible
+either because its branch is collapsed or because it is scrolled out
+of view). Child enumeration functions require the caller to give them
+a `cookie` parameter: it is a number which is opaque to the caller but
+is used by the tree control itself to allow multiple enumerations to
+run simultaneously (this is explicitly allowed). The only thing to
+remember is that the `cookie` passed to
+:meth:`wx.TreeCtrl.GetFirstChild` and to
+:meth:`wx.TreeCtrl.GetNextChild` should be the same variable (and that
 nothing should be done with it by the user code).
 
 Among other features of the tree control are: 
 
-* Item Sorting with :meth:`TreeCtrl.SortChildren` which uses the user-defined comparison function `OnCompareItems` 
-  (by default the comparison is the alphabetic comparison of tree labels);
-* Hit Testing (determining to which portion of the control the given point belongs, useful for implementing 
-  drag-and-drop in the tree) with :meth:`TreeCtrl.HitTest`;
-* Editing of the tree item labels in place (see :meth:`TreeCtrl.EditLabel`).
+* Item Sorting with :meth:`wx.TreeCtrl.SortChildren` which uses the
+  user-defined comparison function `OnCompareItems` (by default the
+  comparison is the alphabetic comparison of tree labels);
 
-Finally, the tree control has a keyboard interface: the cursor navigation (arrow) keys may be used to change 
-the current selection. ``HOME`` and ``END`` are used to go to the first/last sibling of the current item. ``+``, 
-``-`` and ``*`` expand, collapse and toggle the current branch. Note, however, that ``DEL`` and ``INS`` keys 
-do nothing by default, but it is common to associate them with deleting an item from a tree and inserting 
-a new one into it.
+* Hit Testing (determining to which portion of the control the given
+  point belongs, useful for implementing drag-and-drop in the tree)
+  with :meth:`wx.TreeCtrl.HitTest`;
+
+* Editing of the tree item labels in place (see
+  :meth:`wx.TreeCtrl.EditLabel`).
+
+Finally, the tree control has a keyboard interface: the cursor
+navigation (arrow) keys may be used to change the current
+selection. ``HOME`` and ``END`` are used to go to the first/last
+sibling of the current item. ``+``, ``-`` and ``*`` expand, collapse
+and toggle the current branch. Note, however, that ``DEL`` and ``INS``
+keys do nothing by default, but it is common to associate them with
+deleting an item from a tree and inserting a new one into it.
 
 
-.. seealso:: :ref:`TreeCtrl`, :ref:`ImageList`
+.. seealso:: :ref:`wx.TreeCtrl`, :ref:`wx.ImageList`
 
 
 
diff --git a/docs/sphinx/rest_substitutions/overviews/validator_overview.rst b/docs/sphinx/rest_substitutions/overviews/validator_overview.rst
index a9b84570..b976a58e 100644
--- a/docs/sphinx/rest_substitutions/overviews/validator_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/validator_overview.rst
@@ -13,25 +13,33 @@
 Validator basic concepts
 ------------------------
 
-The aim of the validator concept is to make dialogs very much easier to write. A validator is an object that can be 
-plugged into a control (such as a :ref:`TextCtrl`), and mediates between Python data and the control, transferring 
-the data in either direction and validating it. It also is able to intercept events generated by the control, providing
-filtering behaviour without the need to derive a new control class.
+The aim of the validator concept is to make dialogs very much easier
+to write. A validator is an object that can be plugged into a control
+(such as a :ref:`wx.TextCtrl`), and mediates between Python data and
+the control, transferring the data in either direction and validating
+it. It also is able to intercept events generated by the control,
+providing filtering behaviour without the need to derive a new control
+class.
 
-:ref:`Validator` can also be used to intercept keystrokes and other events within an input field. To use a validator, 
-you have to create your own sub-class of :ref:`Validator` (neither `TextValidator` nor `GenericValidator` are implemented 
-in wxPython). This sub-class is then associated with your input field by calling::
+:ref:`wx.Validator` can also be used to intercept keystrokes and other
+events within an input field. To use a validator, you have to create
+your own sub-class of :ref:`wx.Validator` (neither `TextValidator` nor
+`GenericValidator` are implemented in wxPython). This sub-class is
+then associated with your input field by calling::
 
      myInputField.SetValidator(myValidator)
      
      
-.. note:: Your :ref:`Validator` sub-class must implement the :meth:`Validator.Clone` method.
+.. note:: Your :ref:`wx.Validator` sub-class must implement the
+   :meth:`wx.Validator.Clone` method.
 
 
 .. note:: 
 
-   Note that any :ref:`Window` may have a validator; using the ``WS_EX_VALIDATE_RECURSIVELY`` style (see 
-   :ref:`Window extended styles <window-extra-styles>`) you can also implement recursive validation.
+   Note that any :ref:`wx.Window` may have a validator; using the
+   ``WS_EX_VALIDATE_RECURSIVELY`` style (see :ref:`Window extended
+   styles <window-extra-styles>`) you can also implement recursive
+   validation.
    
 
 
@@ -40,26 +48,36 @@ in wxPython). This sub-class is then associated with your input field by calling
 Anatomy of a Validator
 ----------------------
 
-A programmer creating a new validator class should provide the following functionality.
+A programmer creating a new validator class should provide the
+following functionality.
 
-A validator constructor is responsible for allowing the programmer to specify the kind of validation required, and perhaps 
-a pointer to a Python variable that is used for storing the data for the control. If such a variable address is not supplied 
-by the user, then the validator should store the data internally.
+A validator constructor is responsible for allowing the programmer to
+specify the kind of validation required, and perhaps a pointer to a
+Python variable that is used for storing the data for the control. If
+such a variable address is not supplied by the user, then the
+validator should store the data internally.
 
-The :meth:`Validator.Validate` method should return true if the data in the control (not the Python variable) is valid. 
-It should also show an appropriate message if data was not valid.
+The :meth:`wx.Validator.Validate` method should return true if the
+data in the control (not the Python variable) is valid.  It should
+also show an appropriate message if data was not valid.
 
-The :meth:`Validator.TransferToWindow` member function should transfer the data from the validator or associated Python
-variable to the control.
+The :meth:`wx.Validator.TransferToWindow` member function should
+transfer the data from the validator or associated Python variable to
+the control.
 
-The :meth:`Validator.TransferFromWindow` member function should transfer the data from the control to the validator or 
-associated Python variable.
+The :meth:`wx.Validator.TransferFromWindow` member function should
+transfer the data from the control to the validator or associated
+Python variable.
 
-There should be a copy constructor, and a :meth:`Validator.Clone` function which returns a copy of the validator object. 
-This is important because validators are passed by reference to window constructors, and must therefore be cloned internally.
+There should be a copy constructor, and a :meth:`wx.Validator.Clone`
+function which returns a copy of the validator object.  This is
+important because validators are passed by reference to window
+constructors, and must therefore be cloned internally.
 
-You can optionally define event handlers for the validator, to implement filtering. These handlers will capture events before 
-the control itself does (see :ref:`How Events are Processed <how events are processed>`). 
+You can optionally define event handlers for the validator, to
+implement filtering. These handlers will capture events before the
+control itself does (see :ref:`How Events are Processed <how events
+are processed>`).
 
 
 
@@ -69,25 +87,38 @@ How Validators Interact with Dialogs
 ------------------------------------
 
 
-For validators to work correctly, validator functions must be called at the right times during dialog initialisation and dismissal.
+For validators to work correctly, validator functions must be called
+at the right times during dialog initialisation and dismissal.
 
-When a :meth:`Dialog.Show` is called (for a modeless dialog) or :meth:`Dialog.ShowModal` is called (for a modal dialog), 
-the function :meth:`Window.InitDialog` is automatically called. This in turn sends an initialisation event to the dialog. The 
-default handler for the ``wxEVT_INIT_DIALOG`` event is defined in the :ref:`Window` class to simply call the function 
-:meth:`Window.TransferDataToWindow`. This function finds all the validators in the window's children and calls the 
-:meth:`Validator.TransferToWindow` function for each. Thus, data is transferred from Python variables to the dialog just as the
-dialog is being shown.
+When a :meth:`wx.Dialog.Show` is called (for a modeless dialog) or
+:meth:`wx.Dialog.ShowModal` is called (for a modal dialog), the
+function :meth:`wx.Window.InitDialog` is automatically called. This in
+turn sends an initialisation event to the dialog. The default handler
+for the ``wxEVT_INIT_DIALOG`` event is defined in the :ref:`wx.Window`
+class to simply call the function
+:meth:`wx.Window.TransferDataToWindow`. This function finds all the
+validators in the window's children and calls the
+:meth:`wx.Validator.TransferToWindow` function for each. Thus, data is
+transferred from Python variables to the dialog just as the dialog is
+being shown.
 
-.. note:: If you are using a window or panel instead of a dialog, you will need to call :meth:`Window.InitDialog` explicitly before
-   showing the window.
+.. note:: If you are using a window or panel instead of a dialog, you
+    will need to call :meth:`wx.Window.InitDialog` explicitly before
+    showing the window.
    
 
-When the user clicks on a button, for example the ``OK`` button, the application should first call :meth:`Window.Validate`, which 
-returns ``False`` if any of the child window validators failed to validate the window data. The button handler should return 
-immediately if validation failed. Secondly, the application should call :meth:`Window.TransferDataFromWindow` and return if this failed. 
-It is then safe to end the dialog by calling :meth:`Dialog.EndModal` (if modal) or :meth:`Dialog.Show` (if modeless).
+When the user clicks on a button, for example the ``OK`` button, the
+application should first call :meth:`wx.Window.Validate`, which
+returns ``False`` if any of the child window validators failed to
+validate the window data. The button handler should return immediately
+if validation failed. Secondly, the application should call
+:meth:`wx.Window.TransferDataFromWindow` and return if this failed.
+It is then safe to end the dialog by calling
+:meth:`wx.Dialog.EndModal` (if modal) or :meth:`wx.Dialog.Show` (if
+modeless).
 
-In fact, :ref:`Dialog` contains a default command event handler for the ``ID_OK`` button. It goes like this::
+In fact, :ref:`wx.Dialog` contains a default command event handler for
+the ``ID_OK`` button. It goes like this::
 
 	def OnOK(self, event):
 
@@ -101,8 +132,10 @@ In fact, :ref:`Dialog` contains a default command event handler for the ``ID_OK`
 
 
 
-So if using validators and a normal ``OK`` button, you may not even need to write any code for handling dialog dismissal.
+So if using validators and a normal ``OK`` button, you may not even
+need to write any code for handling dialog dismissal.
 
-If you load your dialog from a resource file, you will need to iterate through the controls setting validators, since validators 
-can't be specified in a dialog resource.
+If you load your dialog from a resource file, you will need to iterate
+through the controls setting validators, since validators can't be
+specified in a dialog resource.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/window_deletion_overview.rst b/docs/sphinx/rest_substitutions/overviews/window_deletion_overview.rst
index aa6ffe93..dd3d7b17 100644
--- a/docs/sphinx/rest_substitutions/overviews/window_deletion_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/window_deletion_overview.rst
@@ -8,88 +8,120 @@
 =============================================
 
 
-Window deletion can be a confusing subject, so this overview is provided to help make it clear when and
-how you delete windows, or respond to user requests to close windows.
+Window deletion can be a confusing subject, so this overview is
+provided to help make it clear when and how you delete windows, or
+respond to user requests to close windows.
 
 
 
 Sequence of Events During Window Deletion
 -----------------------------------------
 
-When the user clicks on the system close button or system close command, in a frame or a dialog, wxPython calls :meth:`Window.Close`. 
-This in turn generates an ``EVT_CLOSE`` event: see :ref:`CloseEvent`.
+When the user clicks on the system close button or system close
+command, in a frame or a dialog, wxPython calls
+:meth:`wx.Window.Close`.  This in turn generates an ``wx.EVT_CLOSE``
+event: see :ref:`wx.CloseEvent`.
 
-It is the duty of the application to define a suitable event handler, and decide whether or not to destroy the window. If the
-application is for some reason forcing the application to close (:meth:`CloseEvent.CanVeto` returns ``False``), the window should 
-always be destroyed, otherwise there is the option to ignore the request, or maybe wait until the user has answered a question
-before deciding whether it is safe to close. The handler for ``EVT_CLOSE`` should signal to the calling code if it does not destroy
-the window, by calling :meth:`CloseEvent.Veto`. Calling this provides useful information to the calling code.
+It is the duty of the application to define a suitable event handler,
+and decide whether or not to destroy the window. If the application is
+for some reason forcing the application to close
+(:meth:`wx.CloseEvent.CanVeto` returns ``False``), the window should
+always be destroyed, otherwise there is the option to ignore the
+request, or maybe wait until the user has answered a question before
+deciding whether it is safe to close. The handler for ``wx.EVT_CLOSE``
+should signal to the calling code if it does not destroy the window,
+by calling :meth:`wx.CloseEvent.Veto`. Calling this provides useful
+information to the calling code.
 
-The :ref:`CloseEvent` handler should only call :meth:`Window.Destroy` to delete the window, and not use the `del` operator. This 
-is because for some window classes, wxPython delays actual deletion of the window until all events have been processed, since otherwise
-there is the danger that events will be sent to a non-existent window.
+The :ref:`wx.CloseEvent` handler should only call
+:meth:`wx.Window.Destroy` to delete the window, and not use the `del`
+operator. This is because for some window classes, wxPython delays
+actual deletion of the window until all events have been processed,
+since otherwise there is the danger that events will be sent to a
+non-existent window.
 
-As reinforced in the next section, calling `Close` does not guarantee that the window will be destroyed. Call :meth:`Window.Destroy`
-if you want to be certain that the window is destroyed.
+As reinforced in the next section, calling `Close` does not guarantee
+that the window will be destroyed. Call :meth:`wx.Window.Destroy` if
+you want to be certain that the window is destroyed.
 
 
 
 Closing Windows
 ---------------
 
-Your application can either use :meth:`Window.Close` event just as the framework does, or it can call :meth:`Window.Destroy` directly. 
-If using `Close()`, you can pass a ``True`` argument to this function to tell the event handler that we definitely want to delete 
-the frame and it cannot be vetoed.
+Your application can either use :meth:`wx.Window.Close` event just as
+the framework does, or it can call :meth:`wx.Window.Destroy` directly.
+If using `Close()`, you can pass a ``True`` argument to this function
+to tell the event handler that we definitely want to delete the frame
+and it cannot be vetoed.
 
-The advantage of using `Close` instead of `Destroy` is that it will call any clean-up code defined by the ``EVT_CLOSE`` handler; for 
-example it may close a document contained in a window after first asking the user whether the work should be saved. `Close` can be 
-vetoed by this process (return ``False``), whereas `Destroy` definitely destroys the window.
+The advantage of using `Close` instead of `Destroy` is that it will
+call any clean-up code defined by the ``wx.EVT_CLOSE`` handler; for
+example it may close a document contained in a window after first
+asking the user whether the work should be saved. `Close` can be
+vetoed by this process (return ``False``), whereas `Destroy`
+definitely destroys the window.
 
 
 
 Default Window Close Behaviour
 ------------------------------
 
-The default close event handler for :ref:`Dialog` simulates a ``Cancel`` command, generating a ``ID_CANCEL`` event. Since the handler 
-for this cancel event might itself call `Close`, there is a check for infinite looping. The default handler for ``ID_CANCEL`` hides 
-the dialog (if modeless) or calls `EndModal(ID_CANCEL)` (if modal). In other words, by default, the dialog is not destroyed.
+The default close event handler for :ref:`wx.Dialog` simulates a
+``Cancel`` command, generating a ``wx.ID_CANCEL`` event. Since the
+handler for this cancel event might itself call `Close`, there is a
+check for infinite looping. The default handler for ``wx.ID_CANCEL``
+hides the dialog (if modeless) or calls `EndModal(wx.ID_CANCEL)` (if
+modal). In other words, by default, the dialog is not destroyed.
 
-The default close event handler for :ref:`Frame` destroys the frame using `Destroy()`.
+The default close event handler for :ref:`wx.Frame` destroys the frame
+using `Destroy()`.
 
 
 
 User Calls to Exit From a Menu
 ------------------------------
 
-What should I do when the user calls up `Exit` from a menu? You can simply call :meth:`Window.Close` on the frame. This will invoke 
+What should I do when the user calls up `Exit` from a menu? You can
+simply call :meth:`wx.Window.Close` on the frame. This will invoke
 your own close event handler which may destroy the frame.
 
-You can do checking to see if your application can be safely exited at this point, either from within your close event handler, or
-from within your exit menu command handler. For example, you may wish to check that all files have been saved. Give the user a chance 
-to save and quit, to not save but quit anyway, or to cancel the exit command altogether.
+You can do checking to see if your application can be safely exited at
+this point, either from within your close event handler, or from
+within your exit menu command handler. For example, you may wish to
+check that all files have been saved. Give the user a chance to save
+and quit, to not save but quit anyway, or to cancel the exit command
+altogether.
 
 
 
 Exiting the Application Gracefully
 ----------------------------------
 
-A wxPython application automatically exits when the last top level window (:ref:`Frame` or :ref:`Dialog`), is destroyed. Put any 
-application-wide cleanup code in :meth:`AppConsole.OnExit` (this is a method, not an event handler).
+A wxPython application automatically exits when the last top level
+window (:ref:`wx.Frame` or :ref:`wx.Dialog`), is destroyed. Put any
+application-wide cleanup code in :meth:`wx.AppConsole.OnExit` (this is
+a method, not an event handler).
 
 
 
 Automatic Deletion of Child Windows
 -----------------------------------
 
-Child windows are deleted from within the parent destructor. This includes any children that are themselves frames or dialogs, so you
-may wish to close these child frame or dialog windows explicitly from within the parent close handler.
+Child windows are deleted from within the parent destructor. This
+includes any children that are themselves frames or dialogs, so you
+may wish to close these child frame or dialog windows explicitly from
+within the parent close handler.
 
 
 
 Other Kinds of Windows
 ----------------------
 
-So far we've been talking about 'managed' windows, i.e. frames and dialogs. Windows with parents, such as controls, don't have delayed
-destruction and don't usually have close event handlers, though you can implement them if you wish. For consistency, continue to use
-the :meth:`Window.Destroy` method instead of the `del` operator when deleting these kinds of windows explicitly.
+So far we've been talking about 'managed' windows, i.e. frames and
+dialogs. Windows with parents, such as controls, don't have delayed
+destruction and don't usually have close event handlers, though you
+can implement them if you wish. For consistency, continue to use the
+:meth:`wx.Window.Destroy` method instead of the `del` operator when
+deleting these kinds of windows explicitly.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/window_ids_overview.rst b/docs/sphinx/rest_substitutions/overviews/window_ids_overview.rst
index 56935bbc..4838c283 100644
--- a/docs/sphinx/rest_substitutions/overviews/window_ids_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/window_ids_overview.rst
@@ -8,23 +8,26 @@
 =================================================
 
 
-Various controls and other parts of wxPython need an ID. Sometimes the ID may be directly provided by the user or 
-have a predefined value, such as ``ID_OPEN``. Often, however, the value of the ID is unimportant and is created 
-automatically by calling :meth:`Window.NewControlId` or by passing ``ID_ANY`` as the ID of an object.
+Various controls and other parts of wxPython need an ID. Sometimes the
+ID may be directly provided by the user or have a predefined value,
+such as ``wx.ID_OPEN``. Often, however, the value of the ID is
+unimportant and is created automatically by calling
+:meth:`wx.Window.NewControlId` or by passing ``wx.ID_ANY`` as the ID of an
+object.
 
 There are two ways to generate an ID. One way is to start at a negative number, and for each new ID, return the 
 next smallest number. This is fine for systems that can use the full range of negative numbers for IDs, as 
 this provides more than enough IDs and it would take a very very long time to run out and wrap around. 
 However, some systems cannot use the full range of the ID value. Windows, for example, can only use 16 bit
-IDs, and only has about 32000 possible automatic IDs that can be generated by :meth:`Window.NewControlId`. 
+IDs, and only has about 32000 possible automatic IDs that can be generated by :meth:`wx.Window.NewControlId`. 
 If the program runs long enough, depending on the program itself, using this first method would cause the IDs
 to wrap around into the positive ID range and cause possible clashes with any directly specified ID values.
 
-The other way is to keep track of the IDs returned by :meth:`Window.NewControlId` and don't return them again
+The other way is to keep track of the IDs returned by :meth:`wx.Window.NewControlId` and don't return them again
 until the ID is completely free and not being used by any other objects. This will make sure that the ID values 
 do not clash with one another. This is accomplished by keeping a reference count for each of the IDs that can 
-possibly be returned by :meth:`Window.NewControlId`. Other IDs are not reference counted.
+possibly be returned by :meth:`wx.Window.NewControlId`. Other IDs are not reference counted.
 
 
-.. seealso:: :ref:`IdManager`, :meth:`Window.NewControlId`, :meth:`Window.UnreserveControlId`
+.. seealso:: :ref:`wx.IdManager`, :meth:`wx.Window.NewControlId`, :meth:`wx.Window.UnreserveControlId`
 
diff --git a/docs/sphinx/rest_substitutions/overviews/window_sizing_overview.rst b/docs/sphinx/rest_substitutions/overviews/window_sizing_overview.rst
index 3c0af732..89734364 100644
--- a/docs/sphinx/rest_substitutions/overviews/window_sizing_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/window_sizing_overview.rst
@@ -8,63 +8,103 @@
 ===========================================
 
 
-It can sometimes be confusing to keep track of the various size-related attributes of a :ref:`Window`, how they 
-relate to each other, and how they interact with sizers.
+It can sometimes be confusing to keep track of the various
+size-related attributes of a :ref:`wx.Window`, how they relate to each
+other, and how they interact with sizers.
 
-This document will attempt to clear the fog a little, and give some simple explanations of things.
+This document will attempt to clear the fog a little, and give some
+simple explanations of things.
 
 Glossary
 --------
 
-- **"Best Size"**: the best size of a widget depends on what kind of widget it is, and usually also on the contents of
-  the widget. For example a :ref:`ListBox` 's best size will be calculated based on how many items it has, up to a 
-  certain limit, or a :ref:`Button` 's best size will be calculated based on its label size, but normally won't be smaller
-  than the platform default button size (unless a style flag overrides that). There is a special method in the wxPython
-  window classes called :meth:`Window.DoGetBestSize` that a class needs to override if it wants to calculate its own best
-  size based on its content.
-- **"Minimal Size"**: the minimal size of a widget is a size that is normally explicitly set by the programmer either
-  with the :meth:`Window.SetMinSize` method or with the :meth:`Window.SetSizeHints` method. Most controls will also set
-  the minimal size to the size given in the control's constructor if a non-default value is passed. Top-level windows 
-  such as :ref:`Frame` will not allow the user to resize the frame below the minimal size.
-- **"Maximum Size"**: just like for the minimal size, the maximum size is normally explicitly set by the programmer with
-  the :meth:`Window.SetMaxSize` method or with :meth:`Window.SetSizeHints`. Top-level windows such as :ref:`Frame` will 
-  not allow the user to resize the frame above the maximum size.
-- **"Size"**: the size of a widget can be explicitly set or fetched with the :meth:`Window.SetSize` or :meth:`Window.GetSize`
-  methods. This size value is the size that the widget is currently using on screen and is the way to change the size of 
-  something that is not being managed by a sizer.
-- **"Client Size"**: the client size represents the widget's area inside of any borders belonging to the widget and is the
-  area that can be drawn upon in a ``EVT_PAINT`` event. If a widget doesn't have a border then its client size is the 
-  same as its size.
-- **"Initial Size"**: the initial size of a widget is the size given to the constructor of the widget, if any. As mentioned
-  above most controls will also set this size value as the control's minimal size. If the size passed to the constructor is
-  the default ``DefaultSize``, or if the size is not fully specified (such as `wx.Size(150, -1)`) then most controls will 
-  fill in the missing size components using the best size and will set the initial size of the control to the resulting size.
-- **"Virtual Size"**: the virtual size is the size of the potentially viewable area of the widget. The virtual size of a
-  widget may be larger than its actual size and in this case scrollbars will appear to the let the user 'explore' the full
-  contents of the widget. See :ref:`Scrolled` for more info.
+- **"Best Size"**: the best size of a widget depends on what kind of widget it
+  is, and usually also on the contents of the widget. For example a
+  :ref:`wx.ListBox` 's best size will be calculated based on how many items it
+  has, up to a certain limit, or a :ref:`wx.Button` 's best size will be
+  calculated based on its label size, but normally won't be smaller than the
+  platform default button size (unless a style flag overrides that). There is
+  a special method in the wxPython window classes called
+  :meth:`wx.Window.DoGetBestSize` that a class needs to override if it wants
+  to calculate its own best size based on its content.
+
+- **"Minimal Size"**: the minimal size of a widget is a size that is
+  normally explicitly set by the programmer either
+  with the :meth:`wx.Window.SetMinSize` method or with
+  the :meth:`wx.Window.SetSizeHints` method. Most controls will also set
+  the minimal size to the size given in the control's constructor if a
+  non-default value is passed. Top-level windows
+  such as :ref:`wx.Frame` will not allow the user to resize the frame
+  below the minimal size.
+
+- **"Maximum Size"**: just like for the minimal size, the maximum size is
+  normally explicitly set by the programmer with the
+  :meth:`wx.Window.SetMaxSize` method or with :meth:`wx.Window.SetSizeHints`.
+  Top-level windows such as :ref:`wx.Frame` will not allow the user to resize
+  the frame above the maximum size.
+
+- **"Size"**: the size of a widget can be explicitly set or fetched with the
+  :meth:`wx.Window.SetSize` or :meth:`wx.Window.GetSize` methods. This size
+  value is the size that the widget is currently using on screen and is the
+  way to change the size of something that is not being managed by a sizer.
+
+- **"Client Size"**: the client size represents the widget's area inside of
+  any borders belonging to the widget and is the area that can be drawn upon
+  in a ``wx.EVT_PAINT`` event. If a widget doesn't have a border then its
+  client size is the same as its size.
+
+- **"Initial Size"**: the initial size of a widget is the size given to the
+  constructor of the widget, if any. As mentioned above most controls will
+  also set this size value as the control's minimal size. If the size passed
+  to the constructor is the default ``wx.DefaultSize``, or if the size is not
+  fully specified (such as `wx.Size(150, -1)`) then most controls will fill in
+  the missing size components using the best size and will set the initial
+  size of the control to the resulting size.
+
+- **"Virtual Size"**: the virtual size is the size of the potentially viewable
+  area of the widget. The virtual size of a widget may be larger than its
+  actual size and in this case scrollbars will appear to the let the user
+  'explore' the full contents of the widget. See :ref:`wx.Scrolled` for more
+  info.
 
 
 
 Functions related to sizing
 ---------------------------
 
-- :meth:`Window.GetEffectiveMinSize`: returns a blending of the widget's minimal size and best size, giving precedence to
-  the minimal size. For example, if a widget's min size is set to (150, -1) and the best size is (80, 22) then the best 
-  fitting size is (150, 22). If the min size is (50, 20) then the best fitting size is (50, 20). This method is what is
-  called by the sizers when determining what the requirements of each item in the sizer is, and is used for calculating
-  the overall minimum needs of the sizer.
-- :meth:`Window.SetInitialSize`: this is a little different than the typical size setters. Rather than just setting an 
-  "initial size" attribute it actually sets the minimal size to the value passed in, blends that value with the best size,
-  and then sets the size of the widget to be the result. So you can consider this method to be a "Smart SetSize". This 
-  method is what is called by the constructor of most controls to set the minimal size and the initial size of the control.
-- :meth:`Window.Fit`: this method sets the size of a window to fit around its children. If it has no children then nothing 
-  is done, if it does have children then the size of the window is set to the window's best size.
-- :meth:`Sizer.Fit`: this sets the size of the window to be large enough to accommodate the minimum size needed by the sizer,
-  (along with a few other constraints...). If the sizer is the one that is assigned to the window then this should be 
-  equivalent to :meth:`Window.Fit`.
-- :meth:`Sizer.Layout`: recalculates the minimum space needed by each item in the sizer, and then lays out the items 
-  within the space currently allotted to the sizer.
-- :meth:`Window.Layout`: if the window has a sizer then it sets the space given to the sizer to the current size of the window,
-  which results in a call to :meth:`Sizer.Layout`. If the window has layout constraints instead of a sizer then the constraints
-  algorithm is run. The `Layout()` method is what is called by the default ``EVT_SIZE`` handler for container windows.
+- :meth:`wx.Window.GetEffectiveMinSize`: returns a blending of the widget's
+  minimal size and best size, giving precedence to the minimal size. For
+  example, if a widget's min size is set to (150, -1) and the best size is
+  (80, 22) then the best fitting size is (150, 22). If the min size is (50,
+  20) then the best fitting size is (50, 20). This method is what is called by
+  the sizers when determining what the requirements of each item in the sizer
+  is, and is used for calculating the overall minimum needs of the sizer.
+
+- :meth:`wx.Window.SetInitialSize`: this is a little different than the
+  typical size setters. Rather than just setting an "initial size" attribute
+  it actually sets the minimal size to the value passed in, blends that value
+  with the best size, and then sets the size of the widget to be the result.
+  So you can consider this method to be a "Smart SetSize". This method is what
+  is called by the constructor of most controls to set the minimal size and
+  the initial size of the control.
+
+- :meth:`wx.Window.Fit`: this method sets the size of a window to fit around
+  its children. If it has no children then nothing is done, if it does have
+  children then the size of the window is set to the window's best size.
+
+- :meth:`wx.Sizer.Fit`: this sets the size of the window to be large enough to
+  accommodate the minimum size needed by the sizer, (along with a few other
+  constraints...). If the sizer is the one that is assigned to the window then
+  this should be equivalent to :meth:`wx.Window.Fit`.
+
+- :meth:`wx.Sizer.Layout`: recalculates the minimum space needed by each item
+  in the sizer, and then lays out the items within the space currently allotted
+  to the sizer.
+
+- :meth:`wx.Window.Layout`: if the window has a sizer then it sets the space
+  given to the sizer to the current size of the window, which results in a
+  call to :meth:`wx.Sizer.Layout`. If the window has layout constraints
+  instead of a sizer then the constraints algorithm is run. The `Layout()`
+  method is what is called by the default ``wx.EVT_SIZE`` handler for
+  container windows.
 
diff --git a/docs/sphinx/rest_substitutions/overviews/window_styles_overview.rst b/docs/sphinx/rest_substitutions/overviews/window_styles_overview.rst
index 5e2d70be..dda68d9b 100644
--- a/docs/sphinx/rest_substitutions/overviews/window_styles_overview.rst
+++ b/docs/sphinx/rest_substitutions/overviews/window_styles_overview.rst
@@ -8,15 +8,19 @@
 =================================================
 
 
-Window styles are used to specify alternative behaviour and appearances for windows, when they are created.
+Window styles are used to specify alternative behaviour and
+appearances for windows, when they are created.
 
-The symbols are defined in such a way that they can be combined in a 'bit-list' using the Python `bitwise-or` operator (``|``).
+The symbols are defined in such a way that they can be combined in a
+'bit-list' using the Python `bitwise-or` operator (``|``).
 
 For example::
 
     style = wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER
     
     
-For the window styles specific to each window class, please see the documentation for the window.
+For the window styles specific to each window class, please see the
+documentation for the window.
 
-Most windows can use the generic styles listed for :ref:`Window` in addition to their own styles.
+Most windows can use the generic styles listed for :ref:`wx.Window` in
+addition to their own styles.
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AcceleratorTable.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AcceleratorTable.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AcceleratorTable.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AcceleratorTable.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Concat.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Concat.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Concat.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Concat.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Invert.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Invert.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Invert.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Invert.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Rotate.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Rotate.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Rotate.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Rotate.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Scale.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Scale.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Scale.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Scale.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformDistance.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformDistance.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformDistance.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformDistance.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformDistance.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformDistance.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformDistance.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformDistance.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformPoint.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformPoint.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformPoint.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformPoint.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformPoint.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformPoint.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.TransformPoint.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.TransformPoint.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Translate.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Translate.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2D.Translate.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2D.Translate.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Concat.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2DBase.Concat.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Concat.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2DBase.Concat.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Invert.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2DBase.Invert.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AffineMatrix2DBase.Invert.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AffineMatrix2DBase.Invert.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/App.SetTopWindow.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.App.SetTopWindow.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/App.SetTopWindow.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.App.SetTopWindow.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/AppConsole.SetCLocale.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.AppConsole.SetCLocale.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/AppConsole.SetCLocale.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.AppConsole.SetCLocale.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ArtProvider.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ArtProvider.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ArtProvider.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ArtProvider.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ArtProvider.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ArtProvider.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ArtProvider.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ArtProvider.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Bitmap.NewFromPNGData.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Bitmap.NewFromPNGData.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Bitmap.NewFromPNGData.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Bitmap.NewFromPNGData.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Bitmap.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Bitmap.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Bitmap.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Bitmap.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/BoxSizer.AddSpacer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.BoxSizer.AddSpacer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/BoxSizer.AddSpacer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.BoxSizer.AddSpacer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/BusyCursor.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.BusyCursor.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/BusyCursor.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.BusyCursor.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/BusyInfo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.BusyInfo.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/BusyInfo.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.BusyInfo.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/BusyInfo.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.BusyInfo.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/BusyInfo.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.BusyInfo.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Clipboard.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Clipboard.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Clipboard.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Clipboard.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/CloseEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.CloseEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/CloseEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.CloseEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/CollapsiblePane.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.CollapsiblePane.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/CollapsiblePane.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.CollapsiblePane.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ComboCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ComboCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ComboCtrl.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ComboCtrl.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.SetTextCtrlStyle.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ComboCtrl.SetTextCtrlStyle.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.SetTextCtrlStyle.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ComboCtrl.SetTextCtrlStyle.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.4.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.4.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.4.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.4.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.5.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.5.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigBase.5.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigBase.5.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigPathChanger.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigPathChanger.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigPathChanger.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigPathChanger.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigPathChanger.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigPathChanger.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigPathChanger.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigPathChanger.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ConfigPathChanger.__init__.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigPathChanger.__init__.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ConfigPathChanger.__init__.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ConfigPathChanger.__init__.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ContextHelp.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ContextHelp.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ContextHelp.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ContextHelp.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Control.GetSizeFromTextSize.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Control.GetSizeFromTextSize.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Control.GetSizeFromTextSize.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Control.GetSizeFromTextSize.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Control.GetSizeFromTextSize.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Control.GetSizeFromTextSize.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Control.GetSizeFromTextSize.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Control.GetSizeFromTextSize.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Control.SetLabelMarkup.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Control.SetLabelMarkup.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Control.SetLabelMarkup.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Control.SetLabelMarkup.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Cursor.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Cursor.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Cursor.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Cursor.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Cursor.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Cursor.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Cursor.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Cursor.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DCClipper.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DCClipper.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DCClipper.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DCClipper.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DataObjectComposite.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DataObjectComposite.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DataObjectComposite.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DataObjectComposite.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.ConvertYearToBC.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.ConvertYearToBC.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.ConvertYearToBC.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.ConvertYearToBC.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.Now.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.Now.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.Now.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.Now.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.ParseFormat.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.ParseFormat.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.ParseFormat.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.ParseFormat.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.ParseFormat.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.ParseFormat.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DateTime.ParseFormat.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DateTime.ParseFormat.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Dialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Dialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Dialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Dialog.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Dialog.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Dialog.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Dialog.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Dialog.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/DirDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.DirDialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/DirDialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.DirDialog.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Event.Clone.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Event.Clone.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Event.Clone.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Event.Clone.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EventBlocker.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventBlocker.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EventBlocker.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventBlocker.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EventFilter.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventFilter.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EventFilter.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventFilter.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EventLoopActivator.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventLoopActivator.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EventLoopActivator.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventLoopActivator.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EventLoopBase.Dispatch.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventLoopBase.Dispatch.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EventLoopBase.Dispatch.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EventLoopBase.Dispatch.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EvtHandler.QueueEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EvtHandler.QueueEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EvtHandler.QueueEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EvtHandler.QueueEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EvtHandler.QueueEvent.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EvtHandler.QueueEvent.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EvtHandler.QueueEvent.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EvtHandler.QueueEvent.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/EvtHandler.SetNextHandler.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.EvtHandler.SetNextHandler.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/EvtHandler.SetNextHandler.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.EvtHandler.SetNextHandler.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FSFile.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FSFile.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FSFile.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FSFile.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileDialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileDialog.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileDialog.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileDialog.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileDialog.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileDialog.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystem.AddHandler.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystem.AddHandler.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystem.AddHandler.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystem.AddHandler.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystem.ChangePathTo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystem.ChangePathTo.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystem.ChangePathTo.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystem.ChangePathTo.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystem.ChangePathTo.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystem.ChangePathTo.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystem.ChangePathTo.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystem.ChangePathTo.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.CanOpen.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.CanOpen.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.CanOpen.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.CanOpen.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetAnchor.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetAnchor.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetAnchor.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetAnchor.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetLeftLocation.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetLeftLocation.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetLeftLocation.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetLeftLocation.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetMimeTypeFromExt.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetMimeTypeFromExt.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetMimeTypeFromExt.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetMimeTypeFromExt.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetProtocol.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetProtocol.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetProtocol.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetProtocol.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetRightLocation.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetRightLocation.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileSystemHandler.GetRightLocation.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileSystemHandler.GetRightLocation.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileType.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileType.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileType.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileType.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileType.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileType.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FileType.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FileType.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Font.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Font.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Font.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Font.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Font.__init__.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Font.__init__.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Font.__init__.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Font.__init__.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FontInfo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FontInfo.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FontInfo.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FontInfo.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FontMapper.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.FontMapper.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/FontMapper.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.FontMapper.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Frame.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Frame.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Frame.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Frame.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/GraphicsContext.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.GraphicsContext.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/GraphicsContext.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.GraphicsContext.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/GraphicsRenderer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.GraphicsRenderer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/GraphicsRenderer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.GraphicsRenderer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/HeaderColumnSimple.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderColumnSimple.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/HeaderColumnSimple.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderColumnSimple.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrl.AddColumnsItems.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrl.AddColumnsItems.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrl.AddColumnsItems.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrl.AddColumnsItems.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrl.Create.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrl.Create.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrl.Create.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrl.Create.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrl.UpdateColumnWidthToFit.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrl.UpdateColumnWidthToFit.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrl.UpdateColumnWidthToFit.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrl.UpdateColumnWidthToFit.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrlSimple.HideColumn.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrlSimple.HideColumn.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/HeaderCtrlSimple.HideColumn.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.HeaderCtrlSimple.HideColumn.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/HelpControllerBase.SetViewer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.HelpControllerBase.SetViewer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/HelpControllerBase.SetViewer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.HelpControllerBase.SetViewer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/IconBundle.GetIcon.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.IconBundle.GetIcon.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/IconBundle.GetIcon.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.IconBundle.GetIcon.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.AddHandler.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.AddHandler.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.AddHandler.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.AddHandler.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.ComputeHistogram.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.ComputeHistogram.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.ComputeHistogram.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.ComputeHistogram.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.GetImageExtWildcard.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.GetImageExtWildcard.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.GetImageExtWildcard.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.GetImageExtWildcard.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.LoadFile.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.LoadFile.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.LoadFile.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.LoadFile.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.LoadFile.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.LoadFile.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.LoadFile.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.LoadFile.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.SaveFile.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.SaveFile.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.SaveFile.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.SaveFile.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.SaveFile.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.SaveFile.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.SaveFile.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.SaveFile.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.Scale.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.Scale.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.Scale.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.Scale.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Image.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Image.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Image.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/InfoBar.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.InfoBar.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/InfoBar.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.InfoBar.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/KeyEvent.GetKeyCode.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.KeyEvent.GetKeyCode.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/KeyEvent.GetKeyCode.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.KeyEvent.GetKeyCode.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/KeyboardState.GetModifiers.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.KeyboardState.GetModifiers.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/KeyboardState.GetModifiers.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.KeyboardState.GetModifiers.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/KeyboardState.GetModifiers.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.KeyboardState.GetModifiers.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/KeyboardState.GetModifiers.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.KeyboardState.GetModifiers.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.GetNextItem.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.GetNextItem.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.GetNextItem.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.GetNextItem.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SetColumnsOrder.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SetColumnsOrder.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SetColumnsOrder.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SetColumnsOrder.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SetItemState.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SetItemState.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SetItemState.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SetItemState.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SetItemState.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SetItemState.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SetItemState.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SetItemState.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SortItems.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SortItems.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ListCtrl.SortItems.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ListCtrl.SortItems.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Locale.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Locale.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Locale.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Locale.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Locale.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Locale.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Locale.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Locale.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Log.LogRecord.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Log.LogRecord.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Log.LogRecord.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Log.LogRecord.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Log.SetComponentLevel.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Log.SetComponentLevel.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Log.SetComponentLevel.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Log.SetComponentLevel.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/LogChain.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogChain.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/LogChain.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogChain.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/LogFormatter.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogFormatter.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/LogFormatter.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogFormatter.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/LogFormatter.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogFormatter.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/LogFormatter.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogFormatter.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/LogNull.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogNull.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/LogNull.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogNull.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/LogNull.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogNull.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/LogNull.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.LogNull.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MDIParentFrame.OnCreateClient.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MDIParentFrame.OnCreateClient.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MDIParentFrame.OnCreateClient.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MDIParentFrame.OnCreateClient.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MemoryDC.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MemoryDC.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MemoryDC.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MemoryDC.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MemoryDC.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MemoryFSHandler.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MemoryFSHandler.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MemoryFSHandler.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MemoryFSHandler.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.4.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.4.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Menu.Append.4.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Menu.Append.4.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MenuItem.GetLabelText.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MenuItem.GetLabelText.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MenuItem.GetLabelText.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MenuItem.GetLabelText.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MenuItem.SetItemLabel.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MenuItem.SetItemLabel.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MenuItem.SetItemLabel.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MenuItem.SetItemLabel.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MenuItem.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MenuItem.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MenuItem.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MenuItem.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MessageDialog.SetYesNoLabels.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MessageDialog.SetYesNoLabels.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MessageDialog.SetYesNoLabels.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MessageDialog.SetYesNoLabels.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/MessageDialog.SetYesNoLabels.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.MessageDialog.SetYesNoLabels.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/MessageDialog.SetYesNoLabels.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.MessageDialog.SetYesNoLabels.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ModalDialogHook.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ModalDialogHook.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ModalDialogHook.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ModalDialogHook.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/NonOwnedWindow.SetShape.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.NonOwnedWindow.SetShape.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/NonOwnedWindow.SetShape.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.NonOwnedWindow.SetShape.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Notebook.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Notebook.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Notebook.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Notebook.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Notebook.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Notebook.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Notebook.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Notebook.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/PaintEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.PaintEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/PaintEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.PaintEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/PaintEvent.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.PaintEvent.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/PaintEvent.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.PaintEvent.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/PickerBase.GetPickerCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.PickerBase.GetPickerCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/PickerBase.GetPickerCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.PickerBase.GetPickerCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/PlatformInfo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.PlatformInformation.1.py
similarity index 53%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/PlatformInfo.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.PlatformInformation.1.py
index 56240d59..aeb3a15f 100644
--- a/docs/sphinx/rest_substitutions/snippets/python/converted/PlatformInfo.1.py
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.PlatformInformation.1.py
@@ -1,2 +1,2 @@
     
-            wx.LogMessage("This application is running under %s." % wx.PlatformInfo.Get().GetOperatingSystemIdName())
+            wx.LogMessage("This application is running under %s." % wx.PlatformInformation.Get().GetOperatingSystemIdName())
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Point.SetDefaults.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Point.SetDefaults.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Point.SetDefaults.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Point.SetDefaults.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Point.__init__.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Point.__init__.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Point.__init__.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Point.__init__.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/RearrangeDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.RearrangeDialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/RearrangeDialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.RearrangeDialog.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/RearrangeDialog.AddExtraControls.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.RearrangeDialog.AddExtraControls.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/RearrangeDialog.AddExtraControls.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.RearrangeDialog.AddExtraControls.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/RearrangeList.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.RearrangeList.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/RearrangeList.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.RearrangeList.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/RichMessageDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.RichMessageDialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/RichMessageDialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.RichMessageDialog.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ScrollBar.SetScrollbar.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ScrollBar.SetScrollbar.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ScrollBar.SetScrollbar.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ScrollBar.SetScrollbar.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Scrolled.DoPrepareDC.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Scrolled.DoPrepareDC.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Scrolled.DoPrepareDC.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Scrolled.DoPrepareDC.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Scrolled.SetScrollbars.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Scrolled.SetScrollbars.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Scrolled.SetScrollbars.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Scrolled.SetScrollbars.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/SearchCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.SearchCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/SearchCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.SearchCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/SingleInstanceChecker.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.SingleInstanceChecker.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/SingleInstanceChecker.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.SingleInstanceChecker.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Size.SetDefaults.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Size.SetDefaults.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Size.SetDefaults.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Size.SetDefaults.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Sizer.AddSpacer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Sizer.AddSpacer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Sizer.AddSpacer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Sizer.AddSpacer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Sizer.AddStretchSpacer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Sizer.AddStretchSpacer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Sizer.AddStretchSpacer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Sizer.AddStretchSpacer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/SizerFlags.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.SizerFlags.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/SizerFlags.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.SizerFlags.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/SizerFlags.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.SizerFlags.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/SizerFlags.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.SizerFlags.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/SizerFlags.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.SizerFlags.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/SizerFlags.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.SizerFlags.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/StandardPaths.MSWGetShellDir.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.StandardPaths.MSWGetShellDir.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/StandardPaths.MSWGetShellDir.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.StandardPaths.MSWGetShellDir.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/StandardPaths.UseAppInfo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.StandardPaths.UseAppInfo.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/StandardPaths.UseAppInfo.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.StandardPaths.UseAppInfo.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/StaticBox.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.StaticBox.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/StaticBox.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.StaticBox.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/StaticBox.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.StaticBox.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/StaticBox.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.StaticBox.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/StaticBoxSizer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.StaticBoxSizer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/StaticBoxSizer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.StaticBoxSizer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/StopWatch.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.StopWatch.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/StopWatch.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.StopWatch.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextCompleterSimple.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCompleterSimple.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextCompleterSimple.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCompleterSimple.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.4.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.4.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.4.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.4.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.5.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.5.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextCtrl.5.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextCtrl.5.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextEntry.GetInsertionPoint.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextEntry.GetInsertionPoint.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextEntry.GetInsertionPoint.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextEntry.GetInsertionPoint.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TextUrlEvent.Clone.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextUrlEvent.Clone.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TextUrlEvent.Clone.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TextUrlEvent.Clone.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/TimerEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.TimerEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/TimerEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.TimerEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ToolBar.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ToolBar.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ToolBar.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ToolBar.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ToolBar.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ToolBar.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ToolBar.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ToolBar.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ToolBar.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.ToolBar.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/ToolBar.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.ToolBar.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Trackable.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Trackable.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Trackable.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Trackable.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/URLDataObject.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.URLDataObject.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/URLDataObject.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.URLDataObject.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/VListBox.GetFirstSelected.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.VListBox.GetFirstSelected.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/VListBox.GetFirstSelected.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.VListBox.GetFirstSelected.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Validator.SetWindow.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Validator.SetWindow.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Validator.SetWindow.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Validator.SetWindow.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.ConvertDialogToPixels.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.ConvertDialogToPixels.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.ConvertDialogToPixels.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.ConvertDialogToPixels.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.DoUpdateWindowUI.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.DoUpdateWindowUI.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.DoUpdateWindowUI.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.DoUpdateWindowUI.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.Fit.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Fit.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.Fit.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Fit.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.HandleWindowEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.HandleWindowEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.HandleWindowEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.HandleWindowEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.Move.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Move.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.Move.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Move.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.Move.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Move.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.Move.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Move.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.Move.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Move.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.Move.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.Move.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.ProcessEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.ProcessEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.ProcessEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.ProcessEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.ProcessWindowEvent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.ProcessWindowEvent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.ProcessWindowEvent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.ProcessWindowEvent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.PushEventHandler.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.PushEventHandler.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.PushEventHandler.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.PushEventHandler.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetBackgroundStyle.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetBackgroundStyle.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetBackgroundStyle.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetBackgroundStyle.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetMaxClientSize.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetMaxClientSize.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetMaxClientSize.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetMaxClientSize.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetMinClientSize.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetMinClientSize.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetMinClientSize.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetMinClientSize.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetScrollbar.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetScrollbar.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.SetScrollbar.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.SetScrollbar.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/Window.UpdateWindowUI.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.UpdateWindowUI.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/Window.UpdateWindowUI.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.Window.UpdateWindowUI.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/WindowModalDialogEvent.Clone.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.WindowModalDialogEvent.Clone.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/WindowModalDialogEvent.Clone.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.WindowModalDialogEvent.Clone.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.AboutDialogInfo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.AboutDialogInfo.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.AboutDialogInfo.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.AboutDialogInfo.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.BannerWindow.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.BannerWindow.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.BannerWindow.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.BannerWindow.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.RichToolTip.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.RichToolTip.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.RichToolTip.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.RichToolTip.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.Play.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.Sound.Play.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.Play.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.Sound.Play.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.PlaySound.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.Sound.PlaySound.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.PlaySound.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.Sound.PlaySound.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.SplashScreen.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.SplashScreen.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.SplashScreen.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.SplashScreen.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.TreeListCtrl.GetNextItem.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.TreeListCtrl.GetNextItem.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.TreeListCtrl.GetNextItem.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.TreeListCtrl.GetNextItem.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.WizardPageSimple.Chain.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.WizardPageSimple.Chain.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.WizardPageSimple.Chain.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.WizardPageSimple.Chain.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.WizardPageSimple.Chain.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.WizardPageSimple.Chain.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.functions.AboutBox.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.functions.AboutBox.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/adv.functions.AboutBox.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.adv.functions.AboutBox.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewCustomRenderer.CreateEditorCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewCustomRenderer.CreateEditorCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewCustomRenderer.CreateEditorCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewCustomRenderer.CreateEditorCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewCustomRenderer.GetValueFromEditorCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewCustomRenderer.GetValueFromEditorCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewCustomRenderer.GetValueFromEditorCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewCustomRenderer.GetValueFromEditorCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewListCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewListCtrl.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewListCtrl.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewListCtrl.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewModel.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewModel.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewModel.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewModel.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewModel.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewModel.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewModel.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewModel.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewRenderer.DisableEllipsize.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewRenderer.DisableEllipsize.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.DataViewRenderer.DisableEllipsize.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.DataViewRenderer.DisableEllipsize.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/dataview.TreeListCtrl.GetNextItem.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.TreeListCtrl.GetNextItem.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/dataview.TreeListCtrl.GetNextItem.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.dataview.TreeListCtrl.GetNextItem.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/functions.DirSelector.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.DirSelector.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/functions.DirSelector.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.DirSelector.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/functions.FileSelector.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.FileSelector.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/functions.FileSelector.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.FileSelector.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/functions.FileSelector.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.FileSelector.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/functions.FileSelector.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.FileSelector.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/functions.Kill.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.Kill.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/functions.Kill.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.Kill.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/functions.Kill.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.Kill.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/functions.Kill.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.Kill.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/functions.MessageBox.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.MessageBox.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/functions.MessageBox.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.functions.MessageBox.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/grid.Grid.GetCellSize.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.Grid.GetCellSize.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/grid.Grid.GetCellSize.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.Grid.GetCellSize.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/grid.Grid.GetCellSize.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.Grid.GetCellSize.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/grid.Grid.GetCellSize.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.Grid.GetCellSize.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/grid.Grid.GetRowGridLinePen.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.Grid.GetRowGridLinePen.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/grid.Grid.GetRowGridLinePen.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.Grid.GetRowGridLinePen.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/grid.GridCellAttr.GetNonDefaultAlignment.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.GridCellAttr.GetNonDefaultAlignment.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/grid.GridCellAttr.GetNonDefaultAlignment.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.GridCellAttr.GetNonDefaultAlignment.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/grid.GridUpdateLocker.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.GridUpdateLocker.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/grid.GridUpdateLocker.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.grid.GridUpdateLocker.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlCell.AdjustPagebreak.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlCell.AdjustPagebreak.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlCell.AdjustPagebreak.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlCell.AdjustPagebreak.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlCell.Draw.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlCell.Draw.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlCell.Draw.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlCell.Draw.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlCell.DrawInvisible.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlCell.DrawInvisible.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlCell.DrawInvisible.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlCell.DrawInvisible.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlContainerCell.SetWidthFloat.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlContainerCell.SetWidthFloat.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlContainerCell.SetWidthFloat.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlContainerCell.SetWidthFloat.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlContainerCell.SetWidthFloat.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlContainerCell.SetWidthFloat.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlContainerCell.SetWidthFloat.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlContainerCell.SetWidthFloat.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlFilter.CanRead.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlFilter.CanRead.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlFilter.CanRead.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlFilter.CanRead.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlFilter.ReadFile.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlFilter.ReadFile.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlFilter.ReadFile.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlFilter.ReadFile.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlHelpController.AddBook.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlHelpController.AddBook.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlHelpController.AddBook.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlHelpController.AddBook.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlHelpController.AddBook.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlHelpController.AddBook.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlHelpController.AddBook.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlHelpController.AddBook.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlHelpWindow.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlHelpWindow.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlHelpWindow.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlHelpWindow.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlModalHelp.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlModalHelp.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlModalHelp.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlModalHelp.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlParser.GetFS.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlParser.GetFS.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlParser.GetFS.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlParser.GetFS.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlParser.PushTagHandler.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlParser.PushTagHandler.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlParser.PushTagHandler.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlParser.PushTagHandler.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetBeginPos.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetBeginPos.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetBeginPos.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetBeginPos.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetEndPos1.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetEndPos1.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetEndPos1.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetEndPos1.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetEndPos2.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetEndPos2.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetEndPos2.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetEndPos2.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetParam.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetParam.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.GetParam.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.GetParam.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.HasEnding.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.HasEnding.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTag.HasEnding.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTag.HasEnding.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTagHandler.HandleTag.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTagHandler.HandleTag.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTagHandler.HandleTag.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTagHandler.HandleTag.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTagHandler.ParseInner.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTagHandler.ParseInner.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlTagHandler.ParseInner.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlTagHandler.ParseInner.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlWinParser.GetContainer.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlWinParser.GetContainer.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlWinParser.GetContainer.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlWinParser.GetContainer.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlWindow.SetPage.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlWindow.SetPage.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/html.HtmlWindow.SetPage.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.html.HtmlWindow.SetPage.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/richtext.RichTextEvent.Clone.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.richtext.RichTextEvent.Clone.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/richtext.RichTextEvent.Clone.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.richtext.RichTextEvent.Clone.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/richtext.RichTextHTMLHandler.SetFontSizeMapping.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.richtext.RichTextHTMLHandler.SetFontSizeMapping.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/richtext.RichTextHTMLHandler.SetFontSizeMapping.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.richtext.RichTextHTMLHandler.SetFontSizeMapping.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/richtext.SymbolPickerDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.richtext.SymbolPickerDialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/richtext.SymbolPickerDialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.richtext.SymbolPickerDialog.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/stc.StyledTextCtrl.GetInsertionPoint.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.stc.StyledTextCtrl.GetInsertionPoint.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/stc.StyledTextCtrl.GetInsertionPoint.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.stc.StyledTextCtrl.GetInsertionPoint.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlDocument.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlDocument.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlDocument.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlDocument.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlDocument.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlDocument.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlDocument.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlDocument.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlDocument.3.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlDocument.3.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlDocument.3.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlDocument.3.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlNode.GetNodeContent.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlNode.GetNodeContent.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlNode.GetNodeContent.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlNode.GetNodeContent.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlNode.GetNodeContent.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlNode.GetNodeContent.2.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xml.XmlNode.GetNodeContent.2.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xml.XmlNode.GetNodeContent.2.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xrc.XmlResource.Load.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xrc.XmlResource.Load.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xrc.XmlResource.Load.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xrc.XmlResource.Load.1.py
diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/xrc.XmlResource.LoadDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/wx.xrc.XmlResource.LoadDialog.1.py
similarity index 100%
rename from docs/sphinx/rest_substitutions/snippets/python/converted/xrc.XmlResource.LoadDialog.1.py
rename to docs/sphinx/rest_substitutions/snippets/python/converted/wx.xrc.XmlResource.LoadDialog.1.py
diff --git a/docs/sphinx/rest_substitutions/tables/ArtProvider.1.rst b/docs/sphinx/rest_substitutions/tables/ArtProvider.1.rst
deleted file mode 100644
index 827b4d0c..00000000
--- a/docs/sphinx/rest_substitutions/tables/ArtProvider.1.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-============================================   =======================================   ==================================
--  ``ART_ERROR``                               -  ``ART_GOTO_LAST``   (since 2.9.2)      -  ``ART_FILE_SAVE_AS``
--  ``ART_QUESTION``                            -  ``ART_PRINT``                          -  ``ART_DELETE``                
--  ``ART_WARNING``                             -  ``ART_HELP``                           -  ``ART_COPY``                  
--  ``ART_INFORMATION``                         -  ``ART_TIP``                            -  ``ART_CUT``                   
--  ``ART_ADD_BOOKMARK``                        -  ``ART_REPORT_VIEW``                    -  ``ART_PASTE``                 
--  ``ART_DEL_BOOKMARK``                        -  ``ART_LIST_VIEW``                      -  ``ART_UNDO``                  
--  ``ART_HELP_SIDE_PANEL``                     -  ``ART_NEW_DIR``                        -  ``ART_REDO``                  
--  ``ART_HELP_SETTINGS``                       -  ``ART_FOLDER``                         -  ``ART_PLUS``   (since 2.9.2)  
--  ``ART_HELP_BOOK``                           -  ``ART_FOLDER_OPEN``                    -  ``ART_MINUS``   (since 2.9.2) 
--  ``ART_HELP_FOLDER``                         -  ``ART_GO_DIR_UP``                      -  ``ART_CLOSE``                 
--  ``ART_HELP_PAGE``                           -  ``ART_EXECUTABLE_FILE``                -  ``ART_QUIT``                  
--  ``ART_GO_BACK``                             -  ``ART_NORMAL_FILE``                    -  ``ART_FIND``                  
--  ``ART_GO_FORWARD``                          -  ``ART_TICK_MARK``                      -  ``ART_FIND_AND_REPLACE``      
--  ``ART_GO_UP``                               -  ``ART_CROSS_MARK``                     -  ``ART_HARDDISK``              
--  ``ART_GO_DOWN``                             -  ``ART_MISSING_IMAGE``                  -  ``ART_FLOPPY``                
--  ``ART_GO_TO_PARENT``                        -  ``ART_NEW``                            -  ``ART_CDROM``                 
--  ``ART_GO_HOME``                             -  ``ART_FILE_OPEN``           
--  ``ART_GOTO_FIRST``   (since 2.9.2)          -  ``ART_FILE_SAVE``           
-============================================   =======================================   ==================================
-
-|
-
diff --git a/docs/sphinx/rest_substitutions/tables/Sizer.1.rst b/docs/sphinx/rest_substitutions/tables/Sizer.1.rst
deleted file mode 100644
index c559085f..00000000
--- a/docs/sphinx/rest_substitutions/tables/Sizer.1.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| Sizer Flag                                                          | Description                                                                 |
-+=====================================================================+=============================================================================+
-| ``TOP``                                                             | These flags are used to specify which side(s) of the sizer                  |
-+---------------------------------------------------------------------+ item the border width will apply to.                                        | 
-| ``BOTTOM``                                                          |                                                                             |
-+---------------------------------------------------------------------+                                                                             |
-| ``LEFT``                                                            |                                                                             |
-+---------------------------------------------------------------------+                                                                             |
-| ``RIGHT``                                                           |                                                                             |
-+---------------------------------------------------------------------+                                                                             |
-| ``ALL``                                                             |                                                                             |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``EXPAND``                                                          | The item will be expanded to fill the space assigned to                     |
-|                                                                     | the item.                                                                   |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``SHAPED``                                                          | The item will be expanded as much as possible while also                    |
-|                                                                     | maintaining its aspect ratio                                                |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``FIXED_MINSIZE``                                                   | Normally `Sizers` will use                                                  |
-|                                                                     | :meth:`Window.GetEffectiveMinSize` to                                       |
-|                                                                     | determine what the minimal size of window items should be, and will use that| 
-|                                                                     | size to calculate the layout. This allows layouts to adjust when an item    |
-|                                                                     | changes and its best size becomes different. If you would rather have a     |
-|                                                                     | window item stay the size it started with then use ``FIXED_MINSIZE``.       |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``RESERVE_SPACE_EVEN_IF_HIDDEN``                                    | Normally `Sizers` don't allocate space for hidden windows or other items.   | 
-|                                                                     | This flag overrides this behavior so that sufficient space is allocated for |
-| .. versionadded:: 2.8.8                                             | the window even if it isn't visible. This makes it possible to dynamically  |
-|                                                                     | show and hide controls without resizing parent dialog, for example.         |
-|                                                                     | Available since version 2.8.8                                               |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| ``ALIGN_CENTER`` **or** ``ALIGN_CENTRE``                            | The ``ALIGN*`` flags allow you to specify the alignment of the item         |
-+---------------------------------------------------------------------+ within the space allotted to it by the sizer, adjusted for the border if    |
-| ``ALIGN_LEFT``                                                      | any.                                                                        |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_RIGHT``                                                     |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_TOP``                                                       |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_BOTTOM``                                                    |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_CENTER_VERTICAL`` **or** ``ALIGN_CENTRE_VERTICAL``          |                                                                             |
-+---------------------------------------------------------------------+                                                                             | 
-| ``ALIGN_CENTER_HORIZONTAL`` **or** ``ALIGN_CENTRE_HORIZONTAL``      |                                                                             |
-+---------------------------------------------------------------------+-----------------------------------------------------------------------------+
-
-|
-
diff --git a/docs/sphinx/rest_substitutions/tables/VScrolledWindow.1.rst b/docs/sphinx/rest_substitutions/tables/VScrolledWindow.1.rst
deleted file mode 100644
index 06aa8565..00000000
--- a/docs/sphinx/rest_substitutions/tables/VScrolledWindow.1.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-======================================= ============================================================================================================================================================================================================================================================================== 
-`GetFirstVisibleLine()`                 Deprecated for :meth:`~VarVScrollHelper.GetVisibleRowsBegin`                                                                                                                                                                                                                   
-`GetLastVisibleLine()`                  Deprecated for :meth:`~VarVScrollHelper.GetVisibleRowsEnd` This function originally had a slight design flaw in that it was possible to return ``sys.maxint-1``   (ie: a large positive number) if the scroll position was 0 and the first line wasn't completely visible.       
-`GetLineCount()`                        Deprecated for :meth:`~VarVScrollHelper.GetRowCount`                                                                                                                                                                                                                           
-`HitTest(x, y)`
-`HitTest(pt)`                           Deprecated for :meth:`~VarScrollHelperBase.VirtualHitTest`.                                                                                                                                                                                                                        
-`OnGetLineHeight(line)`                 Deprecated for :meth:`~VarVScrollHelper.OnGetRowHeight`                                                                                                                                                                                                                        
-`OnGetLinesHint(lineMin, lineMax)`      Deprecated for :meth:`~VarVScrollHelper.OnGetRowsHeightHint`                                                                                                                                                                                                                   
-`RefreshLine(line)`                     Deprecated for :meth:`~VarVScrollHelper.RefreshRow`                                                                                                                                                                                                                            
-`RefreshLines(from_, to_)`              Deprecated for :meth:`~VarVScrollHelper.RefreshRows`                                                                                                                                                                                                                           
-`ScrollLines(lines)`                    Deprecated for :meth:`~VarVScrollHelper.ScrollRows`                                                                                                                                                                                                                            
-`ScrollPages(pages)`                    Deprecated for :meth:`~VarVScrollHelper.ScrollRowPages`                                                                                                                                                                                                                        
-`ScrollToLine(line)`                    Deprecated for :meth:`~VarVScrollHelper.ScrollToRow`                                                                                                                                                                                                                           
-`SetLineCount(count)`                   Deprecated for :meth:`~VarVScrollHelper.SetRowCount`                                                                                                                                                                                                                           
-======================================= ============================================================================================================================================================================================================================================================================== 
-
-|
-
diff --git a/docs/sphinx/rest_substitutions/tables/wx.ArtProvider.1.rst b/docs/sphinx/rest_substitutions/tables/wx.ArtProvider.1.rst
new file mode 100644
index 00000000..3377758c
--- /dev/null
+++ b/docs/sphinx/rest_substitutions/tables/wx.ArtProvider.1.rst
@@ -0,0 +1,23 @@
+=========================================   ========================================   ==================================
+-  ``wx.ART_ERROR``                         -  ``wx.ART_GOTO_LAST``   (since 2.9.2)    -  ``wx.ART_FILE_SAVE_AS``
+-  ``wx.ART_QUESTION``                      -  ``wx.ART_PRINT``                        -  ``wx.ART_DELETE``                
+-  ``wx.ART_WARNING``                       -  ``wx.ART_HELP``                         -  ``wx.ART_COPY``                  
+-  ``wx.ART_INFORMATION``                   -  ``wx.ART_TIP``                          -  ``wx.ART_CUT``                   
+-  ``wx.ART_ADD_BOOKMARK``                  -  ``wx.ART_REPORT_VIEW``                  -  ``wx.ART_PASTE``                 
+-  ``wx.ART_DEL_BOOKMARK``                  -  ``wx.ART_LIST_VIEW``                    -  ``wx.ART_UNDO``                  
+-  ``wx.ART_HELP_SIDE_PANEL``               -  ``wx.ART_NEW_DIR``                      -  ``wx.ART_REDO``                  
+-  ``wx.ART_HELP_SETTINGS``                 -  ``wx.ART_FOLDER``                       -  ``wx.ART_PLUS``   (since 2.9.2)  
+-  ``wx.ART_HELP_BOOK``                     -  ``wx.ART_FOLDER_OPEN``                  -  ``wx.ART_MINUS``   (since 2.9.2) 
+-  ``wx.ART_HELP_FOLDER``                   -  ``wx.ART_GO_DIR_UP``                    -  ``wx.ART_CLOSE``                 
+-  ``wx.ART_HELP_PAGE``                     -  ``wx.ART_EXECUTABLE_FILE``              -  ``wx.ART_QUIT``                  
+-  ``wx.ART_GO_BACK``                       -  ``wx.ART_NORMAL_FILE``                  -  ``wx.ART_FIND``                  
+-  ``wx.ART_GO_FORWARD``                    -  ``wx.ART_TICK_MARK``                    -  ``wx.ART_FIND_AND_REPLACE``      
+-  ``wx.ART_GO_UP``                         -  ``wx.ART_CROSS_MARK``                   -  ``wx.ART_HARDDISK``              
+-  ``wx.ART_GO_DOWN``                       -  ``wx.ART_MISSING_IMAGE``                -  ``wx.ART_FLOPPY``                
+-  ``wx.ART_GO_TO_PARENT``                  -  ``wx.ART_NEW``                          -  ``wx.ART_CDROM``                 
+-  ``wx.ART_GO_HOME``                       -  ``wx.ART_FILE_OPEN``           
+-  ``wx.ART_GOTO_FIRST``   (since 2.9.2)    -  ``wx.ART_FILE_SAVE``           
+=========================================   ========================================   ==================================
+
+|
+
diff --git a/docs/sphinx/rest_substitutions/tables/ColourDatabase.1.rst b/docs/sphinx/rest_substitutions/tables/wx.ColourDatabase.1.rst
similarity index 100%
rename from docs/sphinx/rest_substitutions/tables/ColourDatabase.1.rst
rename to docs/sphinx/rest_substitutions/tables/wx.ColourDatabase.1.rst
diff --git a/docs/sphinx/rest_substitutions/tables/wx.Sizer.1.rst b/docs/sphinx/rest_substitutions/tables/wx.Sizer.1.rst
new file mode 100644
index 00000000..636492d3
--- /dev/null
+++ b/docs/sphinx/rest_substitutions/tables/wx.Sizer.1.rst
@@ -0,0 +1,39 @@
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+| Sizer Flag                                                             | Description                                                                 |
++========================================================================+=============================================================================+
+| | ``wx.TOP``                                                           | These flags are used to specify which side(s) of the sizer                  |
+| | ``wx.BOTTOM``                                                        | item the border width will apply to.                                        |
+| | ``wx.LEFT``                                                          |                                                                             |
+| | ``wx.RIGHT``                                                         |                                                                             |
+| | ``wx.ALL``                                                           |                                                                             |
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+| ``wx.EXPAND``                                                          | The item will be expanded to fill the space assigned to                     |
+|                                                                        | the item.                                                                   |
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+| ``wx.SHAPED``                                                          | The item will be expanded as much as possible while also                    |
+|                                                                        | maintaining its aspect ratio                                                |
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+| ``wx.FIXED_MINSIZE``                                                   | Normally `wx.Sizers` will use                                               |
+|                                                                        | :meth:`wx.Window.GetEffectiveMinSize` to                                    |
+|                                                                        | determine what the minimal size of window items should be, and will use that|
+|                                                                        | size to calculate the layout. This allows layouts to adjust when an item    |
+|                                                                        | changes and its best size becomes different. If you would rather have a     |
+|                                                                        | window item stay the size it started with then use ``wx.FIXED_MINSIZE``.    |
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+| ``wx.RESERVE_SPACE_EVEN_IF_HIDDEN``                                    | Normally `wx.Sizers` don't allocate space for hidden windows or other items.|
+|                                                                        | This flag overrides this behavior so that sufficient space is allocated for |
+|                                                                        | the window even if it isn't visible. This makes it possible to dynamically  |
+|                                                                        | show and hide controls without resizing parent dialog, for example.         |
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+| | ``wx.ALIGN_CENTER`` **or** ``wx.ALIGN_CENTRE``                       | The ``wx.ALIGN*`` flags allow you to specify the alignment of the item      |
+| | ``wx.ALIGN_LEFT``                                                    | within the space allotted to it by the sizer, adjusted for the border if    |
+| | ``wx.ALIGN_RIGHT``                                                   | any.                                                                        |
+| | ``wx.ALIGN_RIGHT``                                                   |                                                                             |
+| | ``wx.ALIGN_TOP``                                                     |                                                                             |
+| | ``wx.ALIGN_BOTTOM``                                                  |                                                                             |
+| | ``wx.ALIGN_CENTER_VERTICAL`` **or** ``wx.ALIGN_CENTRE_VERTICAL``     |                                                                             |
+| | ``wx.ALIGN_CENTER_HORIZONTAL`` **or** ``wx.ALIGN_CENTRE_HORIZONTAL`` |                                                                             |
++------------------------------------------------------------------------+-----------------------------------------------------------------------------+
+
+|
+
diff --git a/docs/sphinx/rest_substitutions/tables/wx.VScrolledWindow.1.rst b/docs/sphinx/rest_substitutions/tables/wx.VScrolledWindow.1.rst
new file mode 100644
index 00000000..071fd6b3
--- /dev/null
+++ b/docs/sphinx/rest_substitutions/tables/wx.VScrolledWindow.1.rst
@@ -0,0 +1,18 @@
+======================================= ============================================================================================================================================================================================================================================================================== 
+`GetFirstVisibleLine()`                 Deprecated for :meth:`~wx.VarVScrollHelper.GetVisibleRowsBegin`                                                                                                                                                                                                                   
+`GetLastVisibleLine()`                  Deprecated for :meth:`~wx.VarVScrollHelper.GetVisibleRowsEnd` This function originally had a slight design flaw in that it was possible to return ``sys.maxint-1``   (ie: a large positive number) if the scroll position was 0 and the first line wasn't completely visible.       
+`GetLineCount()`                        Deprecated for :meth:`~wx.VarVScrollHelper.GetRowCount`                                                                                                                                                                                                                           
+`HitTest(x, y)`
+`HitTest(pt)`                           Deprecated for :meth:`~wx.VarScrollHelperBase.VirtualHitTest`.                                                                                                                                                                                                                        
+`OnGetLineHeight(line)`                 Deprecated for :meth:`~wx.VarVScrollHelper.OnGetRowHeight`                                                                                                                                                                                                                        
+`OnGetLinesHint(lineMin, lineMax)`      Deprecated for :meth:`~wx.VarVScrollHelper.OnGetRowsHeightHint`                                                                                                                                                                                                                   
+`RefreshLine(line)`                     Deprecated for :meth:`~wx.VarVScrollHelper.RefreshRow`                                                                                                                                                                                                                            
+`RefreshLines(from_, to_)`              Deprecated for :meth:`~wx.VarVScrollHelper.RefreshRows`                                                                                                                                                                                                                           
+`ScrollLines(lines)`                    Deprecated for :meth:`~wx.VarVScrollHelper.ScrollRows`                                                                                                                                                                                                                            
+`ScrollPages(pages)`                    Deprecated for :meth:`~wx.VarVScrollHelper.ScrollRowPages`                                                                                                                                                                                                                        
+`ScrollToLine(line)`                    Deprecated for :meth:`~wx.VarVScrollHelper.ScrollToRow`                                                                                                                                                                                                                           
+`SetLineCount(count)`                   Deprecated for :meth:`~wx.VarVScrollHelper.SetRowCount`                                                                                                                                                                                                                           
+======================================= ============================================================================================================================================================================================================================================================================== 
+
+|
+
diff --git a/etg/_adv.py b/etg/_adv.py
index d4836bcd..4ffc5b33 100644
--- a/etg/_adv.py
+++ b/etg/_adv.py
@@ -3,18 +3,22 @@
 # Author:      Robin Dunn
 #
 # Created:     22-Mar-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_adv"
 NAME      = "_adv"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The ``wx.adv`` module contains classes which are more advanced and/or less
+commonly used than those in the core namespace. They are provided in a
+separate module to help reduce overhead and dependencies for those
+applications which do not need any of these classes.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_core.py b/etg/_core.py
index 4a570dfe..dcc1ffed 100644
--- a/etg/_core.py
+++ b/etg/_core.py
@@ -3,7 +3,7 @@
 # Author:      Robin Dunn
 #
 # Created:     8-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -14,7 +14,11 @@ from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 PACKAGE   = "wx" 
 MODULE    = "_core"
 NAME      = "_core"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The classes in this module are the most commonly used classes for wxPython,
+which is why they have been made visible in the core `wx` namespace.
+Everything you need for building typical GUI applications is here.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
@@ -284,7 +288,7 @@ def run():
             :param kw: keywords to be passed to the callable object
             
             .. seealso::
-                :class:`CallLater`
+                :ref:`wx.CallLater`
             
             """,
         body="""\
@@ -306,31 +310,29 @@ def run():
 
     module.addPyClass('CallLater', ['object'], 
         doc="""\
-            A convenience class for :class:`Timer`, that calls the given callable
+            A convenience class for :class:`wx.Timer`, that calls the given callable
             object once after the given amount of milliseconds, passing any
             positional or keyword args.  The return value of the callable is
-            availbale after it has been run with the :meth:`~CallLater.GetResult` method.
+            available after it has been run with the :meth:`~wx.CallLater.GetResult`
+            method.
             
             If you don't need to get the return value or restart the timer
             then there is no need to hold a reference to this object.  It will
             hold a reference to itself while the timer is running (the timer
-            has a reference to :meth:`~CallLater.Notify`) but the cycle will be broken when
-            the timer completes, automatically cleaning up the :class:`CallLater`
-            object.
+            has a reference to :meth:`~wx.CallLater.Notify`) but the cycle will be
+            broken when the timer completes, automatically cleaning up the
+            :class:`wx.CallLater` object.
                         
             .. seealso::
-                :func:`CallAfter`
+                :func:`wx.CallAfter`
                 
             """,
         items = [
             PyFunctionDef('__init__', '(self, millis, callableObj, *args, **kwargs)',
                 doc="""\
-                    A convenience class for :class:`Timer`, that calls the given callable
-                    object once after the given amount of milliseconds, passing any
-                    positional or keyword args.  The return value of the callable is
-                    availbale after it has been run with the :meth:`~CallLater.GetResult` method.
+                    Constructs a new :class:`wx.CallLater` object.
 
-                    :param int millis: number of milli seconds
+                    :param int millis: number of milliseconds to delay until calling the callable object
                     :param PyObject callableObj: the callable object
                     :param args: arguments to be passed to the callable object
                     :param kw: keywords to be passed to the callable object
@@ -390,9 +392,9 @@ def run():
             PyFunctionDef('SetArgs', '(self, *args, **kwargs)', 
                 doc="""\
                     (Re)set the args passed to the callable object.  This is
-                    useful in conjunction with :meth:`Restart` if you want to schedule a
-                    new call to the same callable object but with different
-                    parameters.
+                    useful in conjunction with :meth:`Start` if
+                    you want to schedule a new call to the same callable
+                    object but with different parameters.
 
                     :param args: arguments to be passed to the callable object
                     :param kw: keywords to be passed to the callable object
diff --git a/etg/_dataview.py b/etg/_dataview.py
index c7cf6e8e..a70c41b2 100644
--- a/etg/_dataview.py
+++ b/etg/_dataview.py
@@ -3,7 +3,7 @@
 # Author:      Kevin Ollivier
 #
 # Created:     12-Sept-2011
-# Copyright:   (c) 2013 by Kevin Ollivier
+# Copyright:   (c) 2011-2016 by Kevin Ollivier
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -13,7 +13,11 @@ import etgtools.tweaker_tools as tools
 PACKAGE   = "wx" 
 MODULE    = "_dataview"
 NAME      = "_dataview"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The classes in this module provide views and data models for viewing tabular
+or hierarchical data in a more advanced way than what is provided by classes
+such as :ref:`wx.ListCtrl`, :ref:`wx.TreeCtrl`, etc.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_glcanvas.py b/etg/_glcanvas.py
index 54b113b9..b85c82d4 100644
--- a/etg/_glcanvas.py
+++ b/etg/_glcanvas.py
@@ -3,18 +3,19 @@
 # Author:      Robin Dunn
 #
 # Created:     3-Nov-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_glcanvas"
 NAME      = "_glcanvas"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+These classes enable viewing and interacting with an OpenGL context in a wx.Window.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_grid.py b/etg/_grid.py
index 0e9af160..0ba3e7b6 100644
--- a/etg/_grid.py
+++ b/etg/_grid.py
@@ -3,7 +3,7 @@
 # Author:      Robin Dunn
 #
 # Created:     20-Dec-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -13,7 +13,11 @@ import etgtools.tweaker_tools as tools
 PACKAGE   = "wx" 
 MODULE    = "_grid"
 NAME      = "_grid"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The Grid and related classes in this module provide functionality similar to a
+spreadsheet, where the application can display rows and columns of data of
+various types, which the user can edit and otherwise interact with.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_html.py b/etg/_html.py
index 65f65ab5..bbffe08a 100644
--- a/etg/_html.py
+++ b/etg/_html.py
@@ -3,18 +3,23 @@
 # Author:      Robin Dunn
 #
 # Created:     27-Oct-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_html"
 NAME      = "_html"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+This module contains a widget class and supporting classes for a generic HTML
+renderer.  It supports only a subset of the HTML standards, and no Javascript
+or CSS, but it is relatively lightweight and has no platform dependencies.  It
+is suitable for displaying simple HTML documents, such as the application's
+documentation or built-in help pages.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_html2.py b/etg/_html2.py
index 27934fcd..99ec310b 100644
--- a/etg/_html2.py
+++ b/etg/_html2.py
@@ -3,18 +3,25 @@
 # Author:      Robin Dunn
 #
 # Created:     20-Nov-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
+
 
 PACKAGE   = "wx" 
 MODULE    = "_html2"
 NAME      = "_html2"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The ``wx.html2`` module includes a widget class and supporting classes that
+wraps native browser components on the system, therefore providing a fully
+featured HTML rendering component including the latest HTML, Javascript and
+CSS standards. Since platform-specific back-ends are used (Microsoft Trident,
+WebKit webView, etc.) there will be some difference in ability and behaviors,
+but these classes will minimize those differences as much as possible.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_media.py b/etg/_media.py
index fa99aa57..2e763bff 100644
--- a/etg/_media.py
+++ b/etg/_media.py
@@ -3,19 +3,23 @@
 # Author:      Dietmar Schwertberger
 #
 # Created:     13-Nov-2015
-# Copyright:   (c) 2015 by Total Control Software
+# Copyright:   (c) 2015-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_media"
 NAME      = "_media"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The ``wx.media`` module provides a widget class that allows displaying various
+types of media, such as video and audio files and streaming, using native
+system components.  The wxWidgets media classes are an optional part of the
+build so it may not always be available on your build of wxPython.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_msw.py b/etg/_msw.py
index 6fee7bd6..794ccb16 100644
--- a/etg/_msw.py
+++ b/etg/_msw.py
@@ -13,7 +13,9 @@ import etgtools.tweaker_tools as tools
 PACKAGE   = "wx"
 MODULE    = "_msw"
 NAME      = "_msw"  # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+This module contains a few classes that are only available on Windows.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
diff --git a/etg/_richtext.py b/etg/_richtext.py
index 72e960c1..33e8760e 100644
--- a/etg/_richtext.py
+++ b/etg/_richtext.py
@@ -3,18 +3,22 @@
 # Author:      Robin Dunn
 #
 # Created:     27-Oct-2012
-# Copyright:   (c) 2015 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_richtext"
 NAME      = "_richtext"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The :class:`RichTextCtrl` is a generic, ground-up implementation of a rich
+text control capable of showing multiple text styles and images.  This module
+contains the control and many supporting classes needed for using the features
+of the :class:`RichTextCtrl`.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_stc.py b/etg/_stc.py
index c0544ece..9343cefe 100644
--- a/etg/_stc.py
+++ b/etg/_stc.py
@@ -3,18 +3,21 @@
 # Author:      Robin Dunn
 #
 # Created:     24-Oct-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_stc"
 NAME      = "_stc"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The :ref:`wx.stc.StyledTextCrtl` class provided by this module is a text widget
+primarily intended for use as a syntax highlighting source code editor.  It is
+based on the popular Scintilla widget.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
@@ -65,6 +68,7 @@ def run():
     
     c = module.find('wxStyledTextCtrl')
     assert isinstance(c, etgtools.ClassDef)
+    c.bases = ['wxControl']  # wxTextCtrlIface is also a base...
     c.piBases = ['wx.Control', 'wx.TextEntry']
     tools.fixWindowClass(c, False)
     module.addGlobalStr('wxSTCNameStr', c)
@@ -128,6 +132,37 @@ def run():
     # forcibly mashed into an int in the C code
     module.find('wxSTC_MASK_FOLDERS').forcedInt = True
 
+
+    # Make sure that all the methods from wxTextEntry and wxTextCtrl are
+    # included. This is needed because we are pretending that this class only
+    # derives from wxControl but the real C++ class also derives from
+    # wxTextCtrlIface which derives from wxTextEntryBase.
+    import textentry
+    mod = textentry.parseAndTweakModule()
+    klass = mod.find('wxTextEntry')
+    items = [item for item in klass.items if isinstance(item, etgtools.MethodDef) and
+                                             not item.isCtor and
+                                             not item.isDtor and
+                                             not c.findItem(item.name)]
+    c.items.extend(items)
+
+    import textctrl
+    mod = textctrl.parseAndTweakModule()
+    klass = mod.find('wxTextCtrl')
+    items = [item for item in klass.items if isinstance(item, etgtools.MethodDef) and
+                                             not item.isCtor and
+                                             not item.isDtor and
+                                             not c.findItem(item.name)]
+    c.items.extend(items)
+
+    c.find('EmulateKeyPress').ignore()
+    c.find('IsMultiLine').ignore()
+    c.find('IsSingleLine').ignore()
+    c.find('MacCheckSpelling').ignore()
+    c.find('ShowNativeCaret').ignore()
+    c.find('HideNativeCaret').ignore()
+
+
     # TODO:  Add the UTF8 PyMethods from classic (see _stc_utf8_methods.py)
     
 
diff --git a/etg/_webkit.py b/etg/_webkit.py
index 8d4d5383..3f1481c0 100644
--- a/etg/_webkit.py
+++ b/etg/_webkit.py
@@ -3,18 +3,22 @@
 # Author:      Robin Dunn
 #
 # Created:     22-Aug-2013
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2013-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_webkit"
 NAME      = "_webkit"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The :ref:`wx.webkit.wxWebKitCtrl` and related classes are provided mainly for
+backwards compatibility only. New code would be more future-proof by using the
+``wx.html2`` module.  The classes in this module are light wrappers around
+the OSX WebKit control and is not implemented on any other platform.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/_xml.py b/etg/_xml.py
index 009b8189..771f91fa 100644
--- a/etg/_xml.py
+++ b/etg/_xml.py
@@ -3,18 +3,19 @@
 # Author:      Robin Dunn
 #
 # Created:     28-Nov-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
 
 PACKAGE   = "wx" 
 MODULE    = "_xml"
 NAME      = "_xml"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+Some simple XML classes for use with XRC.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
@@ -86,6 +87,12 @@ def run():
     c.piBases = ['wx.Object']
     c.find('GetEncoding').ignore()
     c.find('SetEncoding').ignore()
+
+    c.find('AppendToProlog.node').transfer = True
+    c.find('DetachDocumentNode').transferBack = True
+    c.find('DetachRoot').transferBack = True
+    c.find('SetDocumentNode.node').transfer = True
+    c.find('SetRoot.node').transfer = True
     
     
     #-----------------------------------------------------------------
diff --git a/etg/_xrc.py b/etg/_xrc.py
index ad0f1e05..ff12fbe3 100644
--- a/etg/_xrc.py
+++ b/etg/_xrc.py
@@ -3,19 +3,20 @@
 # Author:      Robin Dunn
 #
 # Created:     28-Nov-2012
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2012-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 import etgtools
 import etgtools.tweaker_tools as tools
-from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef,\
-                     ClassDef, MethodDef, ParamDef
+from etgtools import ClassDef, MethodDef, ParamDef
 
 PACKAGE   = "wx" 
 MODULE    = "_xrc"
 NAME      = "_xrc"   # Base name of the file to generate to for this script
-DOCSTRING = ""
+DOCSTRING = """\
+The classes in this module enable loading widgets and layout from XML.
+"""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script. 
diff --git a/etg/bitmap.py b/etg/bitmap.py
index e51c4542..551efaa6 100644
--- a/etg/bitmap.py
+++ b/etg/bitmap.py
@@ -198,7 +198,7 @@ def run():
             'premultiplied' by the alpha values.  (The other platforms do 
             the multiplication themselves.)
         
-            Unlike :func:`ImageFromBuffer` the bitmap created with this function
+            Unlike :func:`wx.ImageFromBuffer` the bitmap created with this function
             does not share the memory block with the buffer object.  This is
             because the native pixel buffer format varies on different
             platforms, and so instead an efficient as possible copy of the
@@ -245,7 +245,7 @@ def run():
             as a string, bytearray, etc.  The data object is expected to contain 
             a series of RGB bytes and be at least width*height*3 bytes long.
             
-            Unlike :func:`ImageFromBuffer` the bitmap created with this function
+            Unlike :func:`wx.ImageFromBuffer` the bitmap created with this function
             does not share the memory block with the buffer object.  This is
             because the native pixel buffer format varies on different
             platforms, and so instead an efficient as possible copy of the
@@ -287,7 +287,7 @@ def run():
             On Windows and Mac the RGB values will be 'premultiplied' by the 
             alpha values.  (The other platforms do the multiplication themselves.)
             
-            Unlike :func:`ImageFromBuffer` the bitmap created with this function
+            Unlike :func:`wx.ImageFromBuffer` the bitmap created with this function
             does not share the memory block with the buffer object.  This is
             because the native pixel buffer format varies on different
             platforms, and so instead an efficient as possible copy of the
diff --git a/etg/choicdlg.py b/etg/choicdlg.py
index 309daafe..0a22acde 100644
--- a/etg/choicdlg.py
+++ b/etg/choicdlg.py
@@ -35,13 +35,12 @@ def run():
     c = module.find('wxMultiChoiceDialog')
     assert isinstance(c, etgtools.ClassDef)
     tools.fixTopLevelWindowClass(c)
-    
-    
+
     
     c = module.find('wxSingleChoiceDialog')
     tools.fixTopLevelWindowClass(c)
     
-    # Make a new class so we can ignore the clientData parameter in the 
+    # Make a new class so we can ignore the clientData parameter in the ctor
     c.addHeaderCode("""\
     class wxPySingleChoiceDialog : public wxSingleChoiceDialog {
     public:
@@ -59,7 +58,7 @@ def run():
     for item in c.allItems():  
         if item.name == 'wxSingleChoiceDialog':
             item.name = 'wxPySingleChoiceDialog' 
-    c.pyName = 'SingleChoiceDialog'
+    c.renameClass('SingleChoiceDialog')
 
     # ignore this ctor
     c.find('wxPySingleChoiceDialog').findOverload('int n').ignore()
diff --git a/etg/dialog.py b/etg/dialog.py
index ca4f1ef6..4a1ee588 100644
--- a/etg/dialog.py
+++ b/etg/dialog.py
@@ -57,7 +57,12 @@ def run():
     c.addPyMethod('__exit__', '(self, exc_type, exc_val, exc_tb)', 'self.Destroy()')
         
     tools.fixTopLevelWindowClass(c)
-    
+
+
+    c = module.find('wxWindowModalDialogEvent')
+    tools.fixEventClass(c)
+
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)
diff --git a/etg/gbsizer.py b/etg/gbsizer.py
index 4c596248..6f71fa88 100644
--- a/etg/gbsizer.py
+++ b/etg/gbsizer.py
@@ -149,7 +149,9 @@ def run():
             func.find('userData').type = 'wxPyUserData*'
         if func.findItem('item'):
             func.find('item').transfer = True
-    
+
+    c.addPyCode(
+        "GridBagSizer.CheckForIntersectionPos = wx.deprecated(GridBagSizer.CheckForIntersection, 'Use CheckForIntersection instead.')")
     
     # TODO: In Classic we had GetChildren return a list of wxGBSizerItems (in
     # a faked out way). Figure out how to do that here too....
diff --git a/etg/geometry.py b/etg/geometry.py
index 656ca26c..595d4e33 100644
--- a/etg/geometry.py
+++ b/etg/geometry.py
@@ -32,8 +32,7 @@ def run():
     #-----------------------------------------------------------------
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
-    
-    
+
     module.addHeaderCode('#include <wx/wx.h>')
     
     
@@ -41,7 +40,7 @@ def run():
     # wxPoint2D and wxRect2D tweaks
     
     c = module.find('wxPoint2DDouble')
-    c.pyName = 'Point2D'
+    c.renameClass('Point2D')
     c.find('wxPoint2DDouble').findOverload('wxPoint2DInt').ignore()
     
     c.find('m_x').pyName = 'x'
@@ -95,7 +94,7 @@ def run():
         
             
     c = module.find('wxRect2DDouble')
-    c.pyName = 'Rect2D'
+    c.renameClass('Rect2D')
     c.find('m_x').pyName = 'x'
     c.find('m_y').pyName = 'y'
     c.find('m_width').pyName = 'width'
diff --git a/etg/grid.py b/etg/grid.py
index 259b70d1..3c8b940b 100644
--- a/etg/grid.py
+++ b/etg/grid.py
@@ -134,7 +134,7 @@ def run():
         tools.addAutoProperties(klass)
         
         methods = [
-            ('Clone',       "virtual wxGridCellRenderer* Clone() const;"),
+            ('Clone',       "virtual wxGridCellRenderer* Clone() const /Factory/;"),
             ('Draw',        "virtual void Draw(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, "
                             "    const wxRect& rect, int row, int col, bool isSelected);"),
             ('GetBestSize', "virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, "
@@ -148,6 +148,7 @@ def run():
     c = module.find('wxGridCellRenderer')
     c.addPrivateCopyCtor()
     c.find('~wxGridCellRenderer').ignore(False)
+    c.find('Clone').factory = True
     
     for name in ITEMS:
         if 'Cell' in name and 'Renderer' in name:
@@ -164,7 +165,7 @@ def run():
 
         methods = [
             ('BeginEdit',  "virtual void BeginEdit(int row, int col, wxGrid* grid);"),
-            ('Clone',      "virtual wxGridCellEditor* Clone() const;"),
+            ('Clone',      "virtual wxGridCellEditor* Clone() const /Factory/;"),
             ('Create',     "virtual void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler);"),
             #('EndEdit',    "virtual bool EndEdit(int row, int col, const wxGrid* grid, const wxString& oldval, wxString* newval);"),
             ('ApplyEdit',  "virtual void ApplyEdit(int row, int col, wxGrid* grid);"),
@@ -244,6 +245,7 @@ def run():
     c = module.find('wxGridCellEditor')
     c.addPrivateCopyCtor()
     c.find('~wxGridCellEditor').ignore(False)
+    c.find('Clone').factory = True
 
     c = module.find('wxGridCellChoiceEditor')
     c.find('wxGridCellChoiceEditor').findOverload('count').ignore()
@@ -258,6 +260,7 @@ def run():
     c = module.find('wxGridCellAttr')
     c.addPrivateCopyCtor()
     c.find('~wxGridCellAttr').ignore(False)
+    c.find('Clone').factory = True
 
     c.find('GetAlignment.hAlign').out = True
     c.find('GetAlignment.vAlign').out = True
diff --git a/etg/object.py b/etg/object.py
index 5b390c11..1bf1798e 100644
--- a/etg/object.py
+++ b/etg/object.py
@@ -58,7 +58,7 @@ def run():
     c.find('IsKindOf').ignore()
     
     # EXPERIMENTAL: By turning off the virtualness of the wxObject dtor, and
-    # since there are no other virutals that we are exposing here, then all
+    # since there are no other virtuals that we are exposing here, then all
     # classes that derive from wxObject that do not have any virtuals of
     # their own (or have the virtual flags turned off by the tweaker code)
     # can have simpler wrappers generated for them with no extra derived
diff --git a/etg/platinfo.py b/etg/platinfo.py
index 652ae6ca..b5a4a0db 100644
--- a/etg/platinfo.py
+++ b/etg/platinfo.py
@@ -37,7 +37,7 @@ def run():
     assert isinstance(c, etgtools.ClassDef)
     
     # to avoid conflicts with wxPython's wx.PlatformInfo
-    c.pyName = 'PlatformInformation'        
+    c.renameClass('PlatformInformation')
     
     c.find('GetEndianness').findOverload('end').ignore()
     c.find('GetArchName').findOverload('arch').ignore()
diff --git a/etg/rawbmp.py b/etg/rawbmp.py
index ae66e6c1..f43ec4df 100644
--- a/etg/rawbmp.py
+++ b/etg/rawbmp.py
@@ -89,7 +89,7 @@ def addPixelDataBaseClass(module):
             briefDoc="Returns the distance between the start of one row to the start of the next row."),
         ])
     
-    # TODO: Try to remember why I chose to do it this way instead of direclty
+    # TODO: Try to remember why I chose to do it this way instead of directly
     # returning an instance of the Iterator and giving it the methods needed
     # to be a Python iterator...
     
diff --git a/etg/richtextbuffer.py b/etg/richtextbuffer.py
index 946344bf..d6e96e6f 100644
--- a/etg/richtextbuffer.py
+++ b/etg/richtextbuffer.py
@@ -214,7 +214,13 @@ def run():
     
         if c.findItem('CalculateRange'):
             c.find('CalculateRange.end').out = True  # TODO: should it be an inOut?
-    
+
+        if c.findItem('Clone'):
+            c.find('Clone').factory = True
+        else:
+            c.addItem(etgtools.WigCode("""\
+            virtual wxRichTextObject* Clone() const /Factory/;
+            """))
     
         # These are the pure virtuals in the base class. SIP needs to see that
         # all the derived classes have an implementation, otherwise it will
@@ -269,6 +275,10 @@ def run():
     c = module.find('wxRichTextBox')
     _fixDrawObject(c)
 
+    #-------------------------------------------------------
+    c = module.find('wxRichTextCell')
+    _fixDrawObject(c)
+
     #-------------------------------------------------------
     c = module.find('wxRichTextField')
     _fixDrawObject(c)
@@ -279,7 +289,7 @@ def run():
     tools.ignoreConstOverloads(c)
     c.find('SetRange.from').name = 'from_'
     c.find('SetRange.to').name = 'to_'
-
+    c.find('Clone').factory = True
 
     #-------------------------------------------------------
     c = module.find('wxRichTextParagraph')
diff --git a/etgtools/extractors.py b/etgtools/extractors.py
index eb2d1b01..9e86b31e 100644
--- a/etgtools/extractors.py
+++ b/etgtools/extractors.py
@@ -20,7 +20,7 @@ import xml.etree.ElementTree as et
 from .tweaker_tools import FixWxPrefix, magicMethods, \
                            guessTypeInt, guessTypeFloat, guessTypeStr, \
                            textfile_open
-from sphinxtools.utilities import FindDescendants
+from sphinxtools.utilities import findDescendants
 
 #---------------------------------------------------------------------------
 # These classes simply hold various bits of information about the classes,
@@ -629,7 +629,8 @@ class ClassDef(BaseDef):
         self.allowNone = False      # Allow the convertFrom code to handle None too.
         self.instanceCode = None    # Code to be used to create new instances of this class
         self.innerclasses = []
-        self.isInner = False
+        self.isInner = False        # Is this a nested class?
+        self.klass = None           # if so, then this is the outer class
         
         # Stuff that needs to be generated after the class instead of within
         # it. Some back-end generators need to put stuff inside the class, and
@@ -643,15 +644,23 @@ class ClassDef(BaseDef):
             self.extract(element)
 
 
-    def findHierarchy(self, element, all_classes, specials, read):
+    def renameClass(self, newName):
+        self.pyName = newName
+        for item in self.items:
+            if hasattr(item, 'className'):
+                item.className = newName
+                for overload in item.overloads:
+                    overload.className = newName
 
+
+    def findHierarchy(self, element, all_classes, specials, read):
         from etgtools import XMLSRC
         
         if not read:
-            nodename = fullname = self.name
-            specials = [nodename]
+            fullname = self.name
+            specials = [fullname]
         else:
-            nodename = fullname = element.text
+            fullname = element.text
 
         baselist = []
 
@@ -662,14 +671,14 @@ class ClassDef(BaseDef):
             
             fname = os.path.join(XMLSRC, refid+'.xml')
             root = et.parse(fname).getroot()
-            compounds = FindDescendants(root, 'basecompoundref')
+            compounds = findDescendants(root, 'basecompoundref')
         else:
             compounds = element.findall('basecompoundref')        
 
         for c in compounds:
             baselist.append(c.text)
 
-        all_classes[nodename] = (nodename, fullname, baselist)
+        all_classes[fullname] = (fullname, baselist)
 
         for c in compounds:
             all_classes, specials = self.findHierarchy(c, all_classes, specials, True)
@@ -706,6 +715,7 @@ class ClassDef(BaseDef):
             item = ClassDef(innerclass, kind)
             item.protection = node.get('prot')
             item.isInner = True
+            item.klass = self      # This makes a reference cycle but it's okay
             self.innerclasses.append(item)
         
         
@@ -1266,14 +1276,14 @@ class PyClassDef(BaseDef):
     def findHierarchy(self):
 
         all_classes = {}
-        nodename = fullname = self.name
-        specials = [nodename]
+        fullname = self.name
+        specials = [fullname]
 
         baselist = [base for base in self.bases if base != 'object']
-        all_classes[nodename] = (nodename, fullname, baselist)
+        all_classes[fullname] = (fullname, baselist)
 
         for base in baselist:
-            all_classes[base] = (base, base, [])
+            all_classes[base] = (base, [])
 
         return all_classes, specials
         
@@ -1311,6 +1321,7 @@ class ModuleDef(BaseDef):
         self.postInitializerCode = []
         self.includes = []
         self.imports = []
+        self.isARealModule = (module == name)
 
 
     def parseCompleted(self):
diff --git a/etgtools/generators.py b/etgtools/generators.py
index 339eb3d7..d4017e18 100644
--- a/etgtools/generators.py
+++ b/etgtools/generators.py
@@ -13,6 +13,8 @@ Just some base classes and stubs for the various generators
 
 import sys
 
+#---------------------------------------------------------------------------
+
 class WrapperGeneratorBase(object):
     def __init__(self):
         pass    
@@ -120,3 +122,4 @@ def textfile_open(filename, mode='rt'):
     
     
 #---------------------------------------------------------------------------
+
diff --git a/etgtools/item_module_map.py b/etgtools/item_module_map.py
new file mode 100644
index 00000000..9936fb54
--- /dev/null
+++ b/etgtools/item_module_map.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# ---------------------------------------------------------------------------
+# Name:        etgtools/map_generator.py
+# Author:      Robin Dunn
+#
+# Created:     20-May-2016
+# Copyright:   (c) 2016 by Total Control Software
+# License:     wxWindows License
+# ---------------------------------------------------------------------------
+
+"""
+This module provides a class that manages a persistent mapping, currently just
+for mapping module item names to the name of their module, so other phases of
+the code generation can find things that may not have been seen yet.  This
+class can easily be adapted to other purposes however, if the need arises.
+"""
+
+# Standard library imports
+import os.path as op
+import json
+
+
+# Phoenix imports
+from .generators import textfile_open
+from sphinxtools.constants import SPHINXROOT
+
+# ---------------------------------------------------------------------------
+
+class ItemModuleMap(object):
+    """
+    A persistent (across builds) mapping.  It manages the data in a
+    dictionary, and also has a few methods to make the object quack a little
+    like a real dictionary.
+    """
+
+    # This is the Borg pattern, so all instances of this class actually share
+    # the same data attributes
+    __shared_state = dict(_haveReadData=False,
+                          _items=dict())
+
+    def __init__(self):
+        self.__dict__ = self.__shared_state # Borg part 2
+        self.fileName = op.join(SPHINXROOT, 'itemToModuleMap.json')
+
+
+    @property
+    def items(self):
+        # lazy load the items on first use
+        if not self._haveReadData:
+            self.read()
+        return self._items
+
+
+    # Methods for reading/writing the data from/to persistent storage.
+    def read(self):
+        if op.isfile(self.fileName):
+            with textfile_open(self.fileName, 'rt') as fid:
+                items = json.load(fid)
+                # TODO: catch JSON exception...
+                if items is None:
+                    items = dict()
+        else:
+            items = dict()
+
+        self._items.clear()
+        self._items.update(items)
+        self._haveReadData = True
+
+
+    def flush(self):
+        if not self._haveReadData and not self._items:
+            return
+        with textfile_open(self.fileName, 'wt') as fid:
+            # Dump the data to a file in json, using a format that minimizes
+            # excess whitespace.
+            json.dump(self._items, fid, sort_keys=True,
+                      indent=0, separators=(',', ':'))
+
+
+    def reset(self):
+        self._haveReadData = False,
+        self._items.clear()
+
+
+    def get_module(self, name):
+        return self.items.get(name)
+
+    def get_fullname(self, name):
+        module = self.items.get(name)
+        if not module:
+            return name
+        return module + name
+
+
+
+    # Methods for a dictionary Facade, for convenience
+    def get(self, key, default=None):
+        return self.items.get(key, default)
+
+    def clear(self):
+        self.items.clear()
+
+    def __len__(self):
+        return len(self.items)
+
+    def __getitem__(self, key):
+        if key in self.items:
+            return self.items[key]
+        raise KeyError(key)
+
+    def __setitem__(self, key, item):
+        self.items[key] = item
+
+    def __delitem__(self, key):
+        del self.items[key]
+
+    def __iter__(self):
+        return iter(self.items)
+
+    def __contains__(self, key):
+        return key in self.items
+
+
+
+
+# ---------------------------------------------------------------------------
diff --git a/etgtools/map_generator.py b/etgtools/map_generator.py
new file mode 100644
index 00000000..23706af2
--- /dev/null
+++ b/etgtools/map_generator.py
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# ---------------------------------------------------------------------------
+# Name:        etgtools/map_generator.py
+# Author:      Robin Dunn
+#
+# Created:     20-May-2016
+# Copyright:   (c) 2016 by Total Control Software
+# License:     wxWindows License
+# ---------------------------------------------------------------------------
+
+"""
+This generator simply maintains a persistent map of top-level item names and
+the module each is in.  This will be used in the Sphinx generator and will
+perhaps help simplify other generator tasks as well.
+"""
+
+
+# Phoenix-specific imports
+from . import extractors
+from . import generators
+from .tweaker_tools import removeWxPrefix
+from .item_module_map import ItemModuleMap
+from sphinxtools.constants import MODULENAME_REPLACE
+
+# ---------------------------------------------------------------------------
+
+class ItemMapGenerator(generators.DocsGeneratorBase):
+    def __init__(self):
+        super(ItemMapGenerator, self).__init__()
+
+    def generate(self, module):
+        assert isinstance(module, extractors.ModuleDef)
+        realModuleName = MODULENAME_REPLACE[module.module]
+
+        dispatchMap = {
+            extractors.ClassDef : self.generateClass,
+            extractors.EnumDef: self.generateEnum,
+        }
+
+        imm = ItemModuleMap()
+        for item in module.items:
+            func = dispatchMap.get(item.__class__, self.generateDefault)
+            func(item, imm, realModuleName)
+
+        imm.flush()
+
+
+    def generateClass(self, item, imm, scope):
+        # Map names for classes, nested classes and nested enums
+        if item.ignored:
+            return
+        name = self._getName(item)
+        if not name or name.startswith('@'):
+            return
+
+        imm[name] = scope
+
+        # are there nested classes?
+        for inner in item.innerclasses:
+            self.generateClass(inner, imm, '{}{}.'.format(scope, name))
+
+        # Check for nested enums too
+        for classItem in item.items:
+            if isinstance(classItem, extractors.EnumDef):
+                self.generateEnum(
+                    classItem, imm, '{}{}.'.format(scope, name), False)
+
+
+    def generateEnum(self, item, imm, scope, topLevel=True):
+        # map names of enum types and enum elements
+        if item.ignored:
+            return
+        name = self._getName(item)
+        if name and not name.startswith('@'):
+            imm[name] = scope
+
+        # TODO: Investigate if there are cases where nested enum elements
+        # should be tracked too.
+        if topLevel:
+            # Also add an entry for the elements of the enum, as they are also
+            # names accessible from the top-level namespace.
+            for enum in item:
+                self.generateDefault(enum, imm, scope)
+
+
+    def generateDefault(self, item, imm, scope):
+        # this handles all types that don't need special attention
+        if item.ignored:
+            return
+        name = self._getName(item)
+        if not name or name.startswith('@'):
+            return
+        imm[name] = scope
+
+
+    def _getName(self, item):
+        return item.pyName if item.pyName else removeWxPrefix(item.name)
+
+# ---------------------------------------------------------------------------
+
+
diff --git a/etgtools/pi_generator.py b/etgtools/pi_generator.py
index 03aa6968..90036538 100644
--- a/etgtools/pi_generator.py
+++ b/etgtools/pi_generator.py
@@ -89,15 +89,17 @@ class PiWrapperGenerator(generators.WrapperGeneratorBase, FixWxPrefix):
         destFile_pi = destFile + '.pi'
         destFile_pyi = destFile + '.pyi'
 
-        def _checkAndWriteHeader(destFile, header):
+        def _checkAndWriteHeader(destFile, header, docstring):
             if not os.path.exists(destFile):
                 # create the file and write the header
                 f = textfile_open(destFile, 'wt')
                 f.write(header)
+                if docstring:
+                    f.write('\n"""\n%s"""\n' % docstring)
                 f.close()
 
-        _checkAndWriteHeader(destFile_pi, header_pi)
-        _checkAndWriteHeader(destFile_pyi, header_pyi)
+        _checkAndWriteHeader(destFile_pi, header_pi, module.docstring)
+        _checkAndWriteHeader(destFile_pyi, header_pyi, module.docstring)
 
         self.writeSection(destFile_pi, module.name, stream.getvalue())
         self.writeSection(destFile_pyi, module.name, stream.getvalue())
diff --git a/etgtools/sip_generator.py b/etgtools/sip_generator.py
index 864519bd..2aed9c07 100644
--- a/etgtools/sip_generator.py
+++ b/etgtools/sip_generator.py
@@ -76,7 +76,7 @@ class SipWrapperGenerator(generators.WrapperGeneratorBase):
 };
 
 %%Copying
-    Copyright: (c) 2013 by Total Control Software
+    Copyright: (c) 2016 by Total Control Software
     License:   wxWindows License
 %%End
 
@@ -87,7 +87,7 @@ class SipWrapperGenerator(generators.WrapperGeneratorBase):
             if module.name.startswith('_'):
                 doc = ''
                 if module.docstring:
-                    doc = '\n"""\n%s\n"""\n' % module.docstring 
+                    doc = '\n"""\n%s"""\n' % module.docstring
                 stream.write("""\
 %%Extract(id=pycode%s, order=5)
 # This file is generated by wxPython's SIP generator.  Do not edit by hand.
diff --git a/etgtools/sphinx_generator.py b/etgtools/sphinx_generator.py
index bba9a381..58415c8b 100644
--- a/etgtools/sphinx_generator.py
+++ b/etgtools/sphinx_generator.py
@@ -6,7 +6,7 @@
 # Author:      Andrea Gavana
 #
 # Created:     30-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -21,15 +21,11 @@ import operator
 import sys
 import shutil
 import textwrap
-import glob
 
 if sys.version_info < (3, ):
-
     from StringIO import StringIO
     string_base = basestring
-
 else:
-    
     from io import StringIO
     string_base = str
     
@@ -38,26 +34,29 @@ import xml.etree.ElementTree as et
 # Phoenix-specific stuff
 import etgtools.extractors as extractors
 import etgtools.generators as generators
+from etgtools.item_module_map import ItemModuleMap
+from etgtools.tweaker_tools import removeWxPrefix
 
 # Sphinx-Phoenix specific stuff
 from sphinxtools.inheritance import InheritanceDiagram
-
 from sphinxtools import templates
 
-from sphinxtools.utilities import odict
-from sphinxtools.utilities import ConvertToPython
-from sphinxtools.utilities import RemoveWxPrefix, WriteSphinxOutput
-from sphinxtools.utilities import FindControlImages, MakeSummary, PickleItem
-from sphinxtools.utilities import ChopDescription, PythonizeType, Wx2Sphinx
-from sphinxtools.utilities import PickleClassInfo, IsNumeric
-from sphinxtools.utilities import Underscore2Capitals, CountSpaces
-from sphinxtools.utilities import FormatContributedSnippets
+from sphinxtools.utilities import ODict
+from sphinxtools.utilities import convertToPython
+from sphinxtools.utilities import writeSphinxOutput
+from sphinxtools.utilities import findControlImages, makeSummary, pickleItem
+from sphinxtools.utilities import chopDescription, pythonizeType, wx2Sphinx
+from sphinxtools.utilities import pickleClassInfo, pickleFunctionInfo, isNumeric
+from sphinxtools.utilities import underscore2Capitals, countSpaces
+from sphinxtools.utilities import formatContributedSnippets
+from sphinxtools.utilities import PickleFile
 
 from sphinxtools.constants import VERSION, REMOVED_LINKS, SECTIONS
 from sphinxtools.constants import MAGIC_METHODS, MODULENAME_REPLACE
-from sphinxtools.constants import IGNORE, NO_MODULE
+from sphinxtools.constants import IGNORE
 from sphinxtools.constants import SPHINXROOT, DOXYROOT
 from sphinxtools.constants import SNIPPETROOT, TABLEROOT, OVERVIEW_IMAGES_ROOT
+from sphinxtools.constants import DOCSTRING_KEY
 
 
 # ----------------------------------------------------------------------- #
@@ -197,7 +196,7 @@ class Node(object):
         if xml_docs.kind != 'class':
             return ''
 
-        dummy, class_name = Wx2Sphinx(xml_docs.class_name)
+        dummy, class_name = wx2Sphinx(xml_docs.class_name)
         return class_name
     
 
@@ -281,13 +280,13 @@ class Node(object):
             if link in text.strip():
                 return ''
         
-        text = ConvertToPython(text)
+        text = convertToPython(text)
 
         for child in self.children:
             text += child.Join(with_tail)
         
         if with_tail and tail:
-            text += ConvertToPython(tail)
+            text += convertToPython(tail)
 
         if text.strip() and not text.endswith('\n'):
             text += ' '
@@ -323,7 +322,7 @@ class Root(Node):
         self.is_overload = is_overload
         self.share_docstrings = share_docstrings
         
-        self.sections = odict()
+        self.sections = ODict()
 
 
     # -----------------------------------------------------------------------
@@ -521,7 +520,7 @@ class ParameterList(Node):
         self.kind = kind
 
         self.checked = False        
-        self.py_parameters = odict()
+        self.py_parameters = ODict()
         
         for pdef in xml_item.items:
             name = pdef.name    
@@ -579,8 +578,7 @@ class ParameterList(Node):
         if isinstance(xml_item, (extractors.PyFunctionDef, extractors.CppMethodDef)):
             return
         
-        name = xml_item.name or xml_item.pyName
-        name = RemoveWxPrefix(name)
+        name = xml_item.pyName if xml_item.pyName else removeWxPrefix(xml_item.name)
 
         parent = self.GetTopLevelParent()
         is_overload = parent.is_overload if parent else False
@@ -644,7 +642,7 @@ class ParameterList(Node):
 
                 class_name = ''
                 if hasattr(xml_item, 'className') and xml_item.className is not None:
-                    class_name = Wx2Sphinx(xml_item.className)[1] + '.'
+                    class_name = wx2Sphinx(xml_item.className)[1] + '.'
 
                 print((message % (class_name + name, arg, signature, py_parameters)))
 
@@ -652,7 +650,7 @@ class ParameterList(Node):
 ##            if param not in theargs:
 ##                class_name = ''
 ##                if hasattr(xml_item, 'className') and xml_item.className is not None:
-##                    class_name = Wx2Sphinx(xml_item.className)[1] + '.'
+##                    class_name = wx2Sphinx(xml_item.className)[1] + '.'
 ##
 ##                print '\n      |||  %s;%s;%s  |||\n'%(class_name[0:-1], signature, param)
 ##                fid = open('mismatched.txt', 'a')
@@ -732,7 +730,7 @@ class Parameter(Node):
         self.pdef = pdef
         self.name = pdef.name
 
-        self.type = PythonizeType(pdef.type, is_param=True)
+        self.type = pythonizeType(pdef.type, is_param=True)
                 
 
 # ----------------------------------------------------------------------- # 
@@ -900,7 +898,7 @@ class List(Node):
 
         if self.element.tail:
             spacer = ('ParameterList' in self.GetHierarchy() and [' '] or [''])[0]
-            text = '%s%s\n'%(spacer, ConvertToPython(self.element.tail.strip()))
+            text = '%s%s\n'%(spacer, convertToPython(self.element.tail.strip()))
             docstrings += text
         
         return docstrings
@@ -1166,7 +1164,7 @@ class Image(Node):
         docstrings += '|\n\n'
 
         if self.element.tail and self.element.tail.strip():
-            docstrings += ConvertToPython(self.element.tail.rstrip())
+            docstrings += convertToPython(self.element.tail.rstrip())
 
         return docstrings
 
@@ -1191,14 +1189,19 @@ class Table(Node):
          ``*.rst`` file name for the custom table.
 
         .. note:: 
-
-                  There are 4 customized versions of 4 XML tables up to now, for various reasons:
+           There are 4 customized versions of 4 XML tables up to now, for various
+           reasons:
         
-                  1. The `wx.Sizer` flags table is a flexible grid table, very difficult to ReSTify automatically
-                  2. The `wx.ColourDatabase` table of colour comes up all messy when ReSTified from XML
-                  3. The "wxWidgets 2.8 Compatibility Functions" table for `wx.VScrolledWindow`
-                  4. The `wx.ArtProvider` IDs table
-         
+           1. The `wx.Sizer` flags table is a flexible grid table, very difficult
+              to ReSTify automatically due to embedded newlines messing up the col
+              width calculations.
+           2. The `wx.ColourDatabase` table of colour comes up all messy when
+              ReSTified from XML
+           3. The "wxWidgets 2.8 Compatibility Functions" table for `wx.VScrolledWindow`
+           4. The `wx.ArtProvider` IDs table
+
+           The customized versions of those tables are located in
+           ``docs/sphinx/rest_substitutions/tables``
         """
 
         Node.__init__(self, element, parent)
@@ -1295,7 +1298,7 @@ class Table(Node):
             table = '\n\n' + spacer + '.. include:: %s\n\n'%os.path.join(rst_folder, rst_file)
 
         if self.element.tail and self.element.tail.strip():
-            rest = ConvertToPython(self.element.tail.rstrip())
+            rest = convertToPython(self.element.tail.rstrip())
             split = rest.splitlines()
             for index, r in enumerate(split):
                 table += spacer + r
@@ -1478,7 +1481,7 @@ class Snippet(Node):
             elif 'List' in hierarchy:
                 spacer = '  '
                 
-            tail = ConvertToPython(self.element.tail.lstrip())
+            tail = convertToPython(self.element.tail.lstrip())
             tail = tail.replace('\n', ' ')
             docstrings += spacer + tail.replace('  ', ' ')
 
@@ -1526,6 +1529,7 @@ class XRef(Node):
            :class:`ComputerOutput`) the `with_tail` parameter should be set to ``False`` in order
            to avoid wrong ReST output.
         """
+        imm = ItemModuleMap()
 
         element = self.element
         text = element.text
@@ -1536,32 +1540,34 @@ class XRef(Node):
         hascomma = '::' in text
 
         original = text        
-        text = RemoveWxPrefix(text)
+        text = removeWxPrefix(text)
         text = text.replace("::", ".")
         
         if "(" in text:
             text = text[0:text.index("(")]
 
-        refid, link = list(element.items())[0]
-        remainder = link.split('_')[-1]
+        refid = element.get('refid', '')
+        remainder = refid.split('_')[-1]
+        values = [v for k,v in element.items()]
 
-        space_before, space_after = CountSpaces(text)
+        space_before, space_after = countSpaces(text)
         stripped = text.strip()
             
         if stripped in IGNORE:
             return space_before + text + space_after + tail
         
-        if ' ' in stripped or 'overview' in link:
-            if 'classwx_' in link:
+        if ' ' in stripped or 'overview' in values:
+            if 'classwx_' in refid:
                 ref = 1000
-                if '_1' in link:
-                    ref = link.index('_1')
+                if '_1' in refid:
+                    ref = refid.index('_1')
 
-                ref = Underscore2Capitals(link[6:ref])
+                ref = underscore2Capitals(refid[6:ref])
+                ref = imm.get_fullname(ref)
                 text = ':ref:`%s <%s>`'%(stripped, ref)
 
-            elif 'funcmacro' in link or 'samples' in link or 'debugging' in text.lower() or \
-                 'unix' in text.lower() or 'page_libs' in link:
+            elif 'funcmacro' in values or 'samples' in values or 'debugging' in text.lower() or \
+                 'unix' in text.lower() or 'page_libs' in values:
                 text = space_before + space_after
             elif 'library list' in stripped.lower():
                 text = space_before + text + space_after
@@ -1569,7 +1575,7 @@ class XRef(Node):
                 backlink = stripped.lower()
                 if 'device context' in backlink:
                     backlink = 'device contexts'
-                elif 'reference count' in backlink or 'refcount' in link:
+                elif 'reference count' in backlink or 'refcount' in values:
                     backlink = 'reference counting'
                 elif 'this list' in backlink:
                     backlink = 'stock items'
@@ -1578,7 +1584,7 @@ class XRef(Node):
                 elif 'programming with wxboxsizer' in backlink:
                     stripped = 'Programming with BoxSizer'
                     backlink = 'programming with boxsizer'
-                    
+
                 text = ':ref:`%s <%s>`'%(stripped, backlink)
         
         elif (text.upper() == text and len(stripped) > 4):
@@ -1586,10 +1592,10 @@ class XRef(Node):
             if not original.strip().startswith('wx') or ' ' in stripped:
                 text = ''
             
-            elif not IsNumeric(text):
+            elif not isNumeric(text):
                 text = '``%s``'%text
                 
-        elif 'funcmacro' in link:
+        elif 'funcmacro' in values:
             if '(' in stripped:
                 stripped = stripped[0:stripped.index('(')].strip()
                 
@@ -1611,22 +1617,24 @@ class XRef(Node):
                     if '(' in stripped:
                         stripped = stripped[0:stripped.index('(')].strip()
 
-                    if stripped in NO_MODULE:
-                        text = ':ref:`%s`'%(NO_MODULE[stripped] + stripped)
+                    if stripped in imm:
+                        text = ':ref:`%s`' % (imm.get_fullname(stripped))
                     else:                    
                         if '.' not in stripped:
                             klass = self.IsClassDescription()
                             if klass:
-                                text = ':meth:`~%s.%s`'%(klass, stripped)
+                                text = ':meth:`~%s.%s`' % (klass, stripped)
                             else:
-                                text =  ':meth:`%s` '%stripped
+                                text =  ':meth:`%s` ' % stripped
                         else:
-                            text =  ':meth:`%s` '%stripped
+                            scope, item_name = stripped.split('.', 1)
+                            scope = wx2Sphinx(scope)[1]
+                            text =  ':meth:`%s.%s` ' % (scope, item_name)
 
         else:
-            text = ':ref:`%s`'%Wx2Sphinx(stripped)[1]
+            text = ':ref:`%s`' % wx2Sphinx(stripped)[1]
 
-        return space_before + text + space_after + ConvertToPython(tail)
+        return space_before + text + space_after + convertToPython(tail)
     
 
 # ----------------------------------------------------------------------- #
@@ -1674,9 +1682,9 @@ class ComputerOutput(Node):
 
         if text is not None:
             stripped = text.strip()
-            space_before, space_after = CountSpaces(text)
+            space_before, space_after = countSpaces(text)
         
-            text = RemoveWxPrefix(text.strip())
+            text = removeWxPrefix(text.strip())
 
         else:
             text = ''
@@ -1688,9 +1696,9 @@ class ComputerOutput(Node):
             text = "``%s`` "%text
 
         if self.element.tail:
-            text += ConvertToPython(self.element.tail)
+            text += convertToPython(self.element.tail)
 
-        space_before, space_after = CountSpaces(text)
+        space_before, space_after = countSpaces(text)
         if space_before == '':
             space_before = ' '
 
@@ -1766,15 +1774,22 @@ class Emphasis(Node):
                 tail = (tail is not None and [tail] or [''])[0]
 
                 if tail.strip() != ':':
-                    childText = childText.replace(ConvertToPython(tail), '')
+                    childText = childText.replace(convertToPython(tail), '')
                     
                 fullChildText = child.Join()
                 endPos = text.index(childText)
 
-                newText += ' ' + emphasys + text[startPos:endPos].strip() + emphasys + ' '
+                if text[startPos:endPos].strip():
+                    newText += ' ' + emphasys + text[startPos:endPos].strip() + emphasys + ' '
+                else:
+                    newText += ' ' + emphasys + ' '
+
                 newText += childText + ' '
                 remaining = fullChildText.replace(childText, '')
-                newText += emphasys + remaining.strip() + emphasys + ' '
+                if remaining.strip():
+                    newText += emphasys + remaining.strip() + emphasys + ' '
+                else:
+                    newText += emphasys + ' '
                 
                 startPos = endPos
 
@@ -1786,7 +1801,7 @@ class Emphasis(Node):
                 text = spacing + format % text.strip()
 
         if self.element.tail:
-            text += ConvertToPython(self.element.tail)
+            text += convertToPython(self.element.tail)
 
         return text
 
@@ -1834,11 +1849,11 @@ class Title(Node):
 
         if isinstance(self.parent, Section) and self.parent.section_type == 'par':
             # Sub-title in a @par doxygen tag
-            text = ConvertToPython(self.element.text)
+            text = convertToPython(self.element.text)
             underline = '-'
         else:
             # Normal big title
-            text = '|phoenix_title| ' + ConvertToPython(self.element.text)
+            text = '|phoenix_title| ' + convertToPython(self.element.text)
             underline = '='
 
         lentext = len(text)
@@ -1894,7 +1909,7 @@ class ULink(Node):
         text = '`%s <%s>`_'%(text, link)
 
         if self.element.tail:
-            text += ConvertToPython(self.element.tail)
+            text += convertToPython(self.element.tail)
 
         return text
 
@@ -1953,8 +1968,9 @@ class XMLDocString(object):
             self.kind = 'function'
         elif isinstance(xml_item, (extractors.ClassDef, extractors.PyClassDef, extractors.TypedefDef)):
             self.kind = 'class'
-            self.appearance = FindControlImages(xml_item)
-            self.class_name = RemoveWxPrefix(xml_item.name) or xml_item.pyName
+            self.appearance = findControlImages(xml_item)
+            self.class_name = xml_item.pyName if xml_item.pyName else removeWxPrefix(xml_item.name)
+            self.isInner = getattr(xml_item, 'isInner', False)
         elif isinstance(xml_item, extractors.EnumDef):
             self.kind = 'enum'
         else:
@@ -2052,7 +2068,7 @@ class XMLDocString(object):
             if sub_item.ignored:
                 continue
             
-            sub_item.name = self.xml_item.pyName or RemoveWxPrefix(self.xml_item.name)
+            sub_item.name = self.xml_item.pyName or removeWxPrefix(self.xml_item.name)
             docstring = XMLDocString(sub_item, is_overload=True, share_docstrings=share_docstrings)
             docstring.class_name = self.class_name
             docstring.current_module = self.current_module
@@ -2169,7 +2185,7 @@ class XMLDocString(object):
             rest_class = Emphasis(element, parent)
 
         elif tag == 'title':
-            text = ConvertToPython(element.text)
+            text = convertToPython(element.text)
             rest_class = Title(element, parent)
 
         elif tag == 'para':
@@ -2212,38 +2228,30 @@ class XMLDocString(object):
         :rtype: `string`
         """
 
+        imm = ItemModuleMap()
+
         if self.kind == 'class':
             klass = self.xml_item
-            name = RemoveWxPrefix(klass.name) or klass.pyName
-            dummy, fullname = Wx2Sphinx(name)
+            name = klass.pyName if klass.pyName else removeWxPrefix(klass.name)
+            fullname = imm.get_fullname(name)
+
         elif self.kind == 'method':
             method = self.xml_item
             if hasattr(method, 'isCtor') and method.isCtor:
                 method_name = '__init__'
-                
-                if hasattr(method, 'className') and method.className is not None:
-                    klass = RemoveWxPrefix(method.className)
-                else:
-                    klass = RemoveWxPrefix(method.klass.name)
-                    
-                method_name = '%s.%s'%(klass, method_name)
             else:
-                method_name = method.name or method.pyName
-                if hasattr(method, 'className') and method.className is not None:
-                    klass = RemoveWxPrefix(method.className)
-                    method_name = '%s.%s'%(klass, method_name)
-                elif hasattr(method, 'klass'):
-                    klass = RemoveWxPrefix(method.klass.name)
-                    method_name = '%s.%s'%(klass, method_name)
-                else:
-                    method_name = RemoveWxPrefix(method_name)
-                    method_name = '%s'%method_name
-                    klass = None
+                method_name = method.pyName if method.pyName else method.name
+
+            if hasattr(method, 'className') and method.className is not None:
+                klass = removeWxPrefix(method.className)
+            else:
+                klass = method.klass.pyName if method.klass.pyName else removeWxPrefix(method.klass.name)
+
+            fullname = '%s.%s' % (imm.get_fullname(klass), method_name)
 
-            dummy, fullname = Wx2Sphinx(method_name)
         elif self.kind == 'function':
             function = self.xml_item
-            name = function.pyName or function.name
+            name = function.pyName if function.pyName else function.name
             fullname = self.current_module + 'functions.%s'%name
 
         if not fullname.strip():
@@ -2341,22 +2349,18 @@ class XMLDocString(object):
         # class declaration
         klass = self.xml_item
         name = self.class_name
-        dummy, fullname = Wx2Sphinx(name)
+        dummy, fullname = wx2Sphinx(name)
 
-        if '.' in fullname:
-            parts = fullname.split('.')
-            module = '.'.join(parts[0:-1])
-            stream.write('\n\n.. currentmodule:: %s\n\n'%module)
+        # if '.' in fullname:
+        #     module = self.current_module[:-1]
+        #     stream.write('\n\n.. currentmodule:: %s\n\n' % module)
         
-        stream.write(templates.TEMPLATE_DESCRIPTION % (fullname, name))
+        stream.write(templates.TEMPLATE_DESCRIPTION % (fullname, fullname))
 
         self.Reformat(stream)
 
-        if not klass.nodeBases:
-            klass.nodeBases = ({name: (name, name, [])}, [name])
-            
         inheritance_diagram = InheritanceDiagram(klass.nodeBases)
-        png, map = inheritance_diagram.MakeInheritanceDiagram()
+        png, map = inheritance_diagram.makeInheritanceDiagram()
 
         image_desc = templates.TEMPLATE_INHERITANCE % ('class', name, png, name, map)
         stream.write(image_desc)
@@ -2366,7 +2370,7 @@ class XMLDocString(object):
             stream.write(appearance_desc)
 
         if klass.subClasses:
-            subs = [':ref:`%s`'%Wx2Sphinx(cls)[1] for cls in klass.subClasses]
+            subs = [':ref:`%s`' % wx2Sphinx(cls)[1] for cls in klass.subClasses]
             subs = ', '.join(subs)
             subs_desc = templates.TEMPLATE_SUBCLASSES % subs
             stream.write(subs_desc)
@@ -2375,25 +2379,26 @@ class XMLDocString(object):
         
         if possible_py:
             possible_py.sort()
-            snippets = FormatContributedSnippets(self.kind, possible_py)
+            snippets = formatContributedSnippets(self.kind, possible_py)
             stream.write(snippets)
 
         if klass.method_list:
-            summary = MakeSummary(name, klass.method_list, templates.TEMPLATE_METHOD_SUMMARY, 'meth')
+            summary = makeSummary(name, klass.method_list, templates.TEMPLATE_METHOD_SUMMARY, 'meth')
             stream.write(summary)
 
-        if klass.property_list:
-            summary = MakeSummary(name, klass.property_list, templates.TEMPLATE_PROPERTY_SUMMARY, 'attr')
+        if klass.property_list or klass.memberVar_list:
+            allAttrs = klass.property_list + klass.memberVar_list
+            summary = makeSummary(name, allAttrs, templates.TEMPLATE_PROPERTY_SUMMARY, 'attr')
             stream.write(summary)
 
         stream.write(templates.TEMPLATE_API)
-        stream.write("\n.. class:: %s"%name)
+        stream.write("\n.. class:: %s" % fullname)
 
         bases = klass.bases or ['object']
         
         if bases:
             stream.write('(')
-            bases = [RemoveWxPrefix(b) for b in bases]
+            bases = [removeWxPrefix(b) for b in bases]  # ***
             stream.write(', '.join(bases))
             stream.write(')')
 
@@ -2414,11 +2419,11 @@ class XMLDocString(object):
                         found = True
                 else:
                     found = False
-                    newlines.append(ConvertToPython(line))
+                    newlines.append(convertToPython(line))
 
                 if found:
                     line = line.replace('wx.EmptyString', '""')
-                    line = line.replace('wx.', '')
+                    line = line.replace('wx.', '')  # ***
                     newlines = self.CodeIndent(line, newlines)
 
         newdocs = ''
@@ -2426,9 +2431,9 @@ class XMLDocString(object):
             newdocs += ' '*3 + line + "\n"
 
         stream.write(newdocs + "\n\n")
-        
+
         if write:
-            WriteSphinxOutput(stream, self.output_file)
+            writeSphinxOutput(stream, self.output_file)
         else:
             return stream.getvalue()
         
@@ -2445,7 +2450,7 @@ class XMLDocString(object):
 
             method = self.xml_item
             name = method.name or method.pyName
-            name = RemoveWxPrefix(name)            
+            name = removeWxPrefix(name)
 
             if method.overloads and not self.is_overload:
                 if not method.isStatic:
@@ -2479,8 +2484,8 @@ class XMLDocString(object):
         elif self.kind == 'function':
 
             function = self.xml_item
-            name = function.name or function.pyName
-            name = RemoveWxPrefix(name)
+            name = function.pyName if function.pyName else function.name
+            name = removeWxPrefix(name)
 
             if function.overloads and not self.is_overload:
                 arguments = '(*args, **kw)'
@@ -2539,14 +2544,15 @@ class XMLDocString(object):
             
             for ret in return_section:
                 stripped = ret.strip()
-                if stripped in NO_MODULE:
-                    ret = NO_MODULE[stripped] + stripped
-                    new_section.append(':ref:`%s`'%ret)
+                imm = ItemModuleMap()
+                if stripped in imm:
+                    ret = imm[stripped] + stripped
+                    new_section.append(':ref:`%s`' % ret)
                 else:
                     if ret[0].isupper():
-                        new_section.append(':ref:`%s`'%stripped)
+                        new_section.append(':ref:`%s`' % stripped)
                     else:
-                        new_section.append('`%s`'%stripped)
+                        new_section.append('`%s`' % stripped)
 
             element = et.Element('return', kind='return')
             element.text = '( %s )'%(', '.join(new_section))
@@ -2556,7 +2562,7 @@ class XMLDocString(object):
                     
         else:
 
-            rtype = PythonizeType(after, is_param=False)
+            rtype = pythonizeType(after, is_param=False)
 
             if not rtype:
                 return
@@ -2589,8 +2595,8 @@ class XMLDocString(object):
         stream = StringIO()
         
         method = self.xml_item
-        name = method.name or method.pyName
-        name = RemoveWxPrefix(name)
+        name = method.pyName if method.pyName else method.name
+        name = removeWxPrefix(name)
 
         if self.is_overload:
             definition = '**%s** '%name
@@ -2618,13 +2624,13 @@ class XMLDocString(object):
         
         if possible_py:
             possible_py.sort()
-            snippets = FormatContributedSnippets(self.kind, possible_py)
+            snippets = formatContributedSnippets(self.kind, possible_py)
             stream.write(snippets)
 
         stream.write("\n\n")
 
         if not self.is_overload and write:
-            WriteSphinxOutput(stream, self.output_file, append=True)
+            writeSphinxOutput(stream, self.output_file, append=True)
 
         return stream.getvalue()
 
@@ -2645,13 +2651,14 @@ class XMLDocString(object):
         
         function = self.xml_item
         name = function.pyName or function.name
+        fullname = ItemModuleMap().get_fullname(name)
 
         if self.is_overload:
-            definition = '**%s** '%name
+            definition = '**%s** ' % name
         else:
-            definition = '.. function:: ' + name
+            definition = '.. function:: ' + fullname
 
-        stream.write('\n%s'%definition)
+        stream.write('\n%s' % definition)
                     
         stream.write(self.arguments.strip())
         stream.write('\n\n')                    
@@ -2670,11 +2677,11 @@ class XMLDocString(object):
         
         if possible_py:
             possible_py.sort()
-            snippets = FormatContributedSnippets(self.kind, possible_py)
+            snippets = formatContributedSnippets(self.kind, possible_py)
             stream.write(snippets)
 
         if not self.is_overload and write:        
-            PickleItem(stream.getvalue(), self.current_module, name, 'function')
+            pickleItem(stream.getvalue(), self.current_module, name, 'function')
 
         return stream.getvalue()
 
@@ -2691,19 +2698,23 @@ class XMLDocString(object):
         :rtype: `string`
         """
 
-        enum_name, fullname = Wx2Sphinx(self.xml_item.name)
+        enum_name, fullname = wx2Sphinx(self.xml_item.name)
 
         if '@' in enum_name:
             return
-        
-        stream = StringIO()
-        self.output_file = self.current_module + "%s.enumeration.txt"%enum_name
 
-        if self.current_module.strip():
-            stream.write('\n\n.. currentmodule:: %s\n\n'%self.current_module[0:-1])
+        if self.current_class:
+            self.current_class.enum_list.append(fullname)
+
+        stream = StringIO()
+        self.output_file = "%s.enumeration.txt" % fullname
+
+        # if self.current_module.strip():
+        #     module = self.current_module.strip()[:-1]
+        #     stream.write('\n\n.. currentmodule:: %s\n\n' % module)
         
-        stream.write(templates.TEMPLATE_DESCRIPTION % (fullname, enum_name))
-        stream.write('\n\nThe `%s` enumeration provides the following values:\n\n'%enum_name)
+        stream.write(templates.TEMPLATE_DESCRIPTION % (fullname, fullname))
+        stream.write('\n\nThe `%s` enumeration provides the following values:\n\n' % enum_name)
         
         stream.write('\n\n' + '='*80 + ' ' + '='*80 + '\n')
         stream.write('%-80s **Value**\n'%'**Description**')
@@ -2716,8 +2727,9 @@ class XMLDocString(object):
                 continue
 
             docstrings = v.briefDoc
-            name = ConvertToPython(RemoveWxPrefix(v.name))
-            stream.write('%-80s'%name)
+            name = v.pyName if v.pyName else removeWxPrefix(v.name)
+            name = convertToPython(name)
+            stream.write('%-80s' % name)
             
             if not isinstance(docstrings, string_base):
                 rest_class = self.RecurseXML(docstrings, self.root)
@@ -2730,16 +2742,8 @@ class XMLDocString(object):
 
         text_file = os.path.join(SPHINXROOT, self.output_file)
 
-        #if os.path.isfile(text_file):
-        #    message = '\nWARNING: Duplicated description for `%s` enumeration.\n\n' \
-        #              'The duplicated instance will still be written to its output ReST file but\n' \
-        #              'Sphinx/Docutils will issue a warning when building the HTML docs.\n\n'
-        #
-        #    duplicated = self.output_file.replace('.enumeration.txt', '')
-        #    print message % duplicated
-
         if count > 0 and write:
-            WriteSphinxOutput(stream, self.output_file)
+            writeSphinxOutput(stream, self.output_file)
 
         return stream.getvalue()
     
@@ -2866,10 +2870,9 @@ class XMLDocString(object):
                 docstrings = self.Indent(class_name, self.docstrings, spacer, '')
             
             if self.kind == 'class':
-                desc = ChopDescription(docstrings)
+                desc = chopDescription(docstrings)
                 self.short_description = desc
-                class_name = self.class_name.lower()
-                PickleItem(desc, self.current_module, self.class_name, 'class')
+                pickleItem(desc, self.current_module, self.class_name, 'class')
                         
         if self.overloads:
 
@@ -2894,7 +2897,6 @@ class XMLDocString(object):
 class SphinxGenerator(generators.DocsGeneratorBase):
         
     def generate(self, module):
-
         self.current_module = MODULENAME_REPLACE[module.module]
         self.module_name = module.name
         self.current_class = None
@@ -2903,7 +2905,7 @@ class SphinxGenerator(generators.DocsGeneratorBase):
 
     # -----------------------------------------------------------------------
 
-    def RemoveDuplicated(self, class_name, class_items):
+    def removeDuplicated(self, class_name, class_items):
 
         duplicated_indexes = []
         done = []
@@ -2961,7 +2963,12 @@ class SphinxGenerator(generators.DocsGeneratorBase):
             extractors.PyFunctionDef    : self.generatePyFunction,
             extractors.PyClassDef       : self.generatePyClass,
             }
-        
+
+        if module.isARealModule:
+            filename = os.path.join(SPHINXROOT, self.current_module+'1moduleindex.pkl')
+            with PickleFile(filename) as pf:
+                pf.items[DOCSTRING_KEY] = module.docstring
+
         for item in module:
             if item.ignored:
                 continue
@@ -2973,33 +2980,45 @@ class SphinxGenerator(generators.DocsGeneratorBase):
     # -----------------------------------------------------------------------
             
     def generatePyFunction(self, function):
+        name = function.pyName if function.pyName else removeWxPrefix(function.name)
+        imm = ItemModuleMap()
+        fullname = imm.get_fullname(name)
 
         function.overloads = []
         function.pyArgsString = function.argsString
 
-        self.UnIndent(function)
+        self.unIndent(function)
         
         # docstring
         docstring = XMLDocString(function)
         docstring.kind = 'function'
         docstring.current_module = self.current_module
-
         docstring.Dump()
 
-        
+        desc = chopDescription(docstring.docstrings)
+        pickleFunctionInfo(fullname, desc)
+
     # -----------------------------------------------------------------------
         
     def generateFunction(self, function):
-        
+        name = function.pyName if function.pyName else removeWxPrefix(function.name)
+        if name.startswith('operator'):
+            return
+
+        imm = ItemModuleMap()
+        fullname = imm.get_fullname(name)
+
         # docstring
         docstring = XMLDocString(function)
         docstring.kind = 'function'
         docstring.current_module = self.current_module
-
         docstring.Dump()
-                        
 
-    def UnIndent(self, item):
+        desc = chopDescription(docstring.docstrings)
+        pickleFunctionInfo(fullname, desc)
+
+
+    def unIndent(self, item):
 
         if not item.briefDoc:
             return
@@ -3024,17 +3043,21 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         
     def generatePyClass(self, klass):
 
+        self.fixNodeBaseNames(klass, ItemModuleMap())
+
         klass.module = self.current_module
         self.current_class = klass
 
         class_name = klass.name
+        class_fullname = ItemModuleMap().get_fullname(class_name)
         self.current_class.method_list = []
         self.current_class.property_list = []
+        self.current_class.memberVar_list = []
 
         class_items = [i for i in klass if not i.ignored]
         class_items = sorted(class_items, key=operator.attrgetter('name'))
 
-        class_items = self.RemoveDuplicated(class_name, class_items)
+        class_items = self.removeDuplicated(class_fullname, class_items)
 
         init_position = -1
         
@@ -3043,29 +3066,29 @@ class SphinxGenerator(generators.DocsGeneratorBase):
                 method_name, simple_docs = self.getName(item)
                 if method_name == '__init__':
                     init_position = index
-                    self.current_class.method_list.insert(0, ('%s.%s'%(class_name, method_name), simple_docs))
+                    self.current_class.method_list.insert(0, ('%s.%s'%(class_fullname, method_name), simple_docs))
                 else:
-                    self.current_class.method_list.append(('%s.%s'%(class_name, method_name), simple_docs))
+                    self.current_class.method_list.append(('%s.%s'%(class_fullname, method_name), simple_docs))
             elif isinstance(item, extractors.PyPropertyDef):
-                simple_docs = self.createPropertyLinks(class_name, item)
-                self.current_class.property_list.append(('%s.%s'%(class_name, item.name), simple_docs))
+                simple_docs = self.createPropertyLinks(class_fullname, item)
+                self.current_class.property_list.append(('%s.%s'%(class_fullname, item.name), simple_docs))
 
         if init_position >= 0:
             init_method = class_items.pop(init_position)
             class_items.insert(0, init_method)
 
-        self.UnIndent(klass)
+        self.unIndent(klass)
 
         docstring = XMLDocString(klass)
         docstring.kind = 'class'
 
-        filename = self.current_module + "%s.txt"%class_name
+        filename = "%s.txt" % class_fullname
         docstring.output_file = filename
         docstring.current_module = self.current_module
 
         docstring.Dump()
 
-        PickleClassInfo(self.current_module + class_name, self.current_class, docstring.short_description)
+        pickleClassInfo(class_fullname, self.current_class, docstring.short_description)
 
         # these are the only kinds of items allowed to be items in a PyClass
         dispatch = [(extractors.PyFunctionDef, self.generateMethod),
@@ -3084,19 +3107,20 @@ class SphinxGenerator(generators.DocsGeneratorBase):
 
     def generatePyProperty(self, prop):
 
-        name = RemoveWxPrefix(self.current_class.name) or self.current_class.pyName
-        getter_setter = self.createPropertyLinks(name, prop)
+        c = self.current_class
+        name = c.pyName if c.pyName else removeWxPrefix(c.name)
+        fullname = ItemModuleMap().get_fullname(name)
+        getter_setter = self.createPropertyLinks(fullname, prop)
 
         stream = StringIO()
         stream.write('\n   .. attribute:: %s\n\n' % prop.name)
         stream.write('      %s\n\n'%getter_setter)
 
-        filename = self.current_module + "%s.txt"%name
+        filename = "%s.txt" % fullname
 
-        WriteSphinxOutput(stream, filename, append=True)
+        writeSphinxOutput(stream, filename, append=True)
     
     # -----------------------------------------------------------------------
-        
     def generateClass(self, klass):
 
         assert isinstance(klass, extractors.ClassDef)
@@ -3104,22 +3128,25 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         if klass.ignored:
             return
 
+        imm = ItemModuleMap()
+
+        self.fixNodeBaseNames(klass, imm)
+
         # generate nested classes
         for item in klass.innerclasses:
             self.generateClass(item)
 
-        name = RemoveWxPrefix(klass.name) or klass.pyName
-
-##        # Hack for App/PyApp...
-##        if name == 'PyApp':
-##            klass.name = name = 'App'
+        name = klass.pyName if klass.pyName else removeWxPrefix(klass.name)
+        fullname = imm.get_fullname(name)
 
         klass.module = self.current_module
         self.current_class = klass
 
-        self.current_class.method_list = []
-        self.current_class.property_list = []
-        
+        klass.method_list = []
+        klass.property_list = []
+        klass.memberVar_list = []
+        klass.enum_list = []
+
         #   Inspected class               Method to call           Sort order
         dispatch = {
             extractors.MethodDef        : (self.generateMethod,     1),
@@ -3150,30 +3177,33 @@ class SphinxGenerator(generators.DocsGeneratorBase):
             item.sort_order = dispatch[item.__class__][1]
 
         class_items = sorted(class_items, key=operator.attrgetter('sort_order', 'name'))
-        class_items = self.RemoveDuplicated(name, class_items)
+        class_items = self.removeDuplicated(fullname, class_items)
 
         for item in class_items:
             if isinstance(item, methods) and not self.IsFullyDeprecated(item):
                 method_name, simple_docs = self.getName(item)
-                self.current_class.method_list.append(('%s.%s'%(name, method_name), simple_docs))
+                klass.method_list.append(('%s.%s' % (fullname, method_name), simple_docs))
             elif isinstance(item, properties):
-                simple_docs = self.createPropertyLinks(name, item)
-                self.current_class.property_list.append(('%s.%s'%(name, item.name), simple_docs))
+                simple_docs = self.createPropertyLinks(fullname, item)
+                klass.property_list.append(('%s.%s' % (fullname, item.name), simple_docs))
+            elif isinstance(item, extractors.MemberVarDef):
+                description = self.createMemberVarDescription(item)
+                klass.memberVar_list.append(('%s.%s' % (fullname, item.name), description))
 
         for item in ctors: 
             if item.isCtor:
                 method_name, simple_docs = self.getName(item)
-                self.current_class.method_list.insert(0, ('%s.__init__'%name, simple_docs))
+                klass.method_list.insert(0, ('%s.__init__'%fullname, simple_docs))
                 
         docstring = XMLDocString(klass)
 
-        filename = self.current_module + "%s.txt"%name
+        filename = "%s.txt" % fullname
         docstring.output_file = filename
         docstring.current_module = self.current_module
 
         docstring.Dump()
 
-        PickleClassInfo(self.current_module + name, self.current_class, docstring.short_description)
+        pickleClassInfo(fullname, self.current_class, docstring.short_description)
         
         for item in ctors: 
             if item.isCtor:
@@ -3182,9 +3212,39 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         for item in class_items:
             f = dispatch[item.__class__][0]
             f(item)
-        
+
+        if klass.enum_list:
+            stream = StringIO()
+            stream.write("\n.. toctree::\n   :maxdepth: 1\n   :hidden:\n\n")
+            for enum_name in klass.enum_list:
+                stream.write("   {}.enumeration\n".format(enum_name))
+            writeSphinxOutput(stream, filename, True)
+
+
     # -----------------------------------------------------------------------
-        
+
+    def fixNodeBaseNames(self, klass, imm):
+        # convert the names in nodeBases to fullnames
+        def _fix(name):
+            return imm.get_fullname(removeWxPrefix(name))
+
+        if not klass.nodeBases:
+            name = klass.pyName if klass.pyName else klass.name
+            name = _fix(name)
+            klass.nodeBases = ([(name, [])], [name])
+            return
+
+        bases, specials = klass.nodeBases
+        bases = list(bases.values())
+        specials = [_fix(s) for s in specials]
+        for idx, (name, baselist) in enumerate(bases):
+            name = _fix(name)
+            baselist = [_fix(b) for b in baselist]
+            bases[idx] = (name, baselist)
+        klass.nodeBases = (bases, specials)
+
+    # -----------------------------------------------------------------------
+
     def generateMethod(self, method, name=None, docstring=None):
 
         if method.ignored:
@@ -3195,18 +3255,20 @@ class SphinxGenerator(generators.DocsGeneratorBase):
 ##            return
 
         if isinstance(method, extractors.PyFunctionDef):
-            self.UnIndent(method)
-            
-        class_name = RemoveWxPrefix(self.current_class.name) or self.current_class.pyName
-            
+            self.unIndent(method)
+
+        imm = ItemModuleMap()
+        c = self.current_class
+        class_name = c.pyName if c.pyName else removeWxPrefix(c.name)
+        fullname = imm.get_fullname(class_name)
+
         # docstring
         method.name = name
         method.pyArgsString = method.pyArgsString.replace('(self)', ' ').replace('(self, ', ' ')
         docstring = XMLDocString(method)
         docstring.kind = 'method'
 
-        name = RemoveWxPrefix(self.current_class.name) or self.current_class.pyName
-        filename = self.current_module + "%s.txt"%class_name
+        filename = "%s.txt" % fullname
 
         docstring.output_file = filename
         docstring.class_name = class_name
@@ -3248,11 +3310,11 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         for line in pm.pyDocstring.splitlines():
             if '->' in line:
                 arguments, after = line.strip().split("->")
-                return_type = self.ReturnSection(after)
+                return_type = self.returnSection(after)
             else:
                 docstrings += line + '\n'
                 
-        docstrings = ConvertToPython(docstrings)
+        docstrings = convertToPython(docstrings)
 
         newdocs = ''
         spacer = ' '*6
@@ -3269,18 +3331,43 @@ class SphinxGenerator(generators.DocsGeneratorBase):
             text = '%s %s\n%s%s\n\n'%('      .. deprecated::', VERSION, ' '*9, pm.deprecated.replace('\n', ' '))
             stream.write(text)
 
-        name = RemoveWxPrefix(self.current_class.name) or self.current_class.pyName
-        filename = self.current_module + "%s.txt"%name
+        c = self.current_class
+        name = c.pyName if c.pyName else removeWxPrefix(c.name)
+        imm = ItemModuleMap()
+        filename = "%s.txt" % imm.get_fullname(name)
 
-        WriteSphinxOutput(stream, filename, append=True)
+        writeSphinxOutput(stream, filename, append=True)
            
     # -----------------------------------------------------------------------
 
     def generateMemberVar(self, memberVar):
         assert isinstance(memberVar, extractors.MemberVarDef)
-        if memberVar.ignored:
+        if memberVar.ignored or memberVar.protection != 'public':
             return
 
+        c = self.current_class
+        name = c.pyName if c.pyName else removeWxPrefix(c.name)
+        fullname = ItemModuleMap().get_fullname(name)
+
+        description = self.createMemberVarDescription(memberVar)
+
+        stream = StringIO()
+        stream.write('\n   .. attribute:: %s\n\n' % memberVar.name)
+        stream.write('      %s\n\n' % description)
+
+        filename = "%s.txt" % fullname
+        writeSphinxOutput(stream, filename, append=True)
+
+
+    def createMemberVarDescription(self, memberVar):
+        varType = pythonizeType(memberVar.type, False)
+        if varType.startswith('wx.'):
+            varType = ':ref:`~%s`' % varType
+        else:
+            varType = '``%s``' % varType
+        return 'A public C++ attribute of type %s' % varType
+
+
     # -----------------------------------------------------------------------
 
     def generateProperty(self, prop):
@@ -3288,26 +3375,27 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         if prop.ignored:
             return
 
-        name = RemoveWxPrefix(self.current_class.name) or self.current_class.pyName
+        c = self.current_class
+        name = c.pyName if c.pyName else removeWxPrefix(c.name)
+        fullname = ItemModuleMap().get_fullname(name)
 
-        getter_setter = self.createPropertyLinks(name, prop)
+        getter_setter = self.createPropertyLinks(fullname, prop)
 
         stream = StringIO()
         stream.write('\n   .. attribute:: %s\n\n' % prop.name)
-        stream.write('      %s\n\n'%getter_setter)
+        stream.write('      %s\n\n' % getter_setter)
 
-        filename = self.current_module + "%s.txt"%name
-
-        WriteSphinxOutput(stream, filename, append=True)
+        filename = "%s.txt" % fullname
+        writeSphinxOutput(stream, filename, append=True)
 
 
     def createPropertyLinks(self, name, prop):
 
         if prop.getter and prop.setter:
-            return 'See :meth:`~%s.%s` and :meth:`~%s.%s`'%(name, prop.getter, name, prop.setter)
+            return 'See :meth:`~%s.%s` and :meth:`~%s.%s`' % (name, prop.getter, name, prop.setter)
         else:
             method = (prop.getter and [prop.getter] or [prop.setter])[0]            
-            return 'See :meth:`~%s.%s`'%(name, method)
+            return 'See :meth:`~%s.%s`' % (name, method)
             
 
     # -----------------------------------------------------------------------
@@ -3319,6 +3407,7 @@ class SphinxGenerator(generators.DocsGeneratorBase):
 
         docstring = XMLDocString(enum)
         docstring.current_module = self.current_module
+        docstring.current_class = self.current_class if hasattr(self, 'current_class') else None
 
         docstring.Dump()
 
@@ -3336,7 +3425,7 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         elif guessTypeStr(globalVar):
             valTyp = '""'
         else:
-            valTyp = RemoveWxPrefix(globalVar.type) + '()'
+            valTyp = removeWxPrefix(globalVar.type) + '()'
 
     # -----------------------------------------------------------------------
     def generateDefine(self, define):
@@ -3350,24 +3439,27 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         if typedef.ignored or not typedef.docAsClass:
             return
 
-        name = RemoveWxPrefix(typedef.name) or typedef.pyName        
+        name = typedef.pyName if typedef.pyName else removeWxPrefix(typedef.name)
         typedef.module = self.current_module
 
         all_classes = {}
-        nodename = fullname = name
-        specials = [nodename]
+        fullname = name
+        specials = [fullname]
 
         baselist = [base for base in typedef.bases if base != 'object']
-        all_classes[nodename] = (nodename, fullname, baselist)
+        all_classes[fullname] = (fullname, baselist)
 
         for base in baselist:
-            all_classes[base] = (base, base, [])
+            all_classes[base] = (base, [])
 
-        self.UnIndent(typedef)
+        self.unIndent(typedef)
 
         typedef.nodeBases = all_classes, specials
+        self.fixNodeBaseNames(typedef, ItemModuleMap())
         typedef.subClasses = []
-        typedef.method_list = typedef.property_list = []
+        typedef.method_list = []
+        typedef.property_list = []
+        typedef.memberVar_list = []
         typedef.pyDocstring = typedef.briefDoc
 
         self.current_class = typedef
@@ -3381,7 +3473,7 @@ class SphinxGenerator(generators.DocsGeneratorBase):
 
         docstring.Dump()
 
-        PickleClassInfo(self.current_module + name, self.current_class, docstring.short_description)
+        pickleClassInfo(self.current_module + name, self.current_class, docstring.short_description)
 
 
     # -----------------------------------------------------------------------
@@ -3407,7 +3499,7 @@ class SphinxGenerator(generators.DocsGeneratorBase):
         simple_docs = ''
         
         if isinstance(method, extractors.PyMethodDef):
-            simple_docs = ConvertToPython(method.pyDocstring)
+            simple_docs = convertToPython(method.pyDocstring)
         else:
             brief = method.briefDoc
             if not isinstance(brief, string_base):
@@ -3416,14 +3508,14 @@ class SphinxGenerator(generators.DocsGeneratorBase):
                 docstring.current_module = self.current_module
                 simple_docs = docstring.GetBrief()
             elif brief is not None:
-                simple_docs = ConvertToPython(brief)
+                simple_docs = convertToPython(brief)
 
-        simple_docs = ChopDescription(simple_docs)
+        simple_docs = chopDescription(simple_docs)
 
         return method_name, simple_docs
 
     # ---------------------------------------------------------------------------
-    def ReturnSection(self, after):
+    def returnSection(self, after):
 
         if '(' in after:
 
@@ -3435,8 +3527,9 @@ class SphinxGenerator(generators.DocsGeneratorBase):
             
             for ret in return_section:
                 stripped = ret.strip()
-                if stripped in NO_MODULE:
-                    ret = NO_MODULE[stripped] + stripped
+                imm = ItemModuleMap()
+                if stripped in imm:
+                    ret = imm[stripped] + stripped
                     new_section.append(':ref:`%s`'%ret)
                 else:
                     if ret[0].isupper():
@@ -3452,7 +3545,7 @@ class SphinxGenerator(generators.DocsGeneratorBase):
             
         else:
 
-            rtype = PythonizeType(after, is_param=False)
+            rtype = pythonizeType(after, is_param=False)
 
             if not rtype:
                 return ''
diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py
index cba0f783..9596eadc 100644
--- a/etgtools/tweaker_tools.py
+++ b/etgtools/tweaker_tools.py
@@ -40,7 +40,7 @@ def removeWxPrefixes(node):
     """
     Rename items with a 'wx' prefix to not have the prefix. If the back-end
     generator supports auto-renaming then it can ignore the pyName value for
-    those that are changed here. We'll still change them all incase the
+    those that are changed here. We'll still change them all in case the
     pyNames are needed elsewhere.
     """
     for item in node.allItems():
@@ -57,6 +57,9 @@ def removeWxPrefixes(node):
             
 
 def removeWxPrefix(name):
+    """
+    Remove the "wx" prefix from a name, except for those which should keep it.
+    """
     if name.startswith('wx.') or name.startswith('``wx.'):
         return name
     
@@ -70,7 +73,6 @@ def removeWxPrefix(name):
 
 
 
-
 class FixWxPrefix(object):
     """
     A mixin class that can help with removing the wx prefix, or changing it
@@ -210,6 +212,8 @@ def fixEventClass(klass, ignoreProtected=True):
         # it won't think that they are abstract classes too.
         if not klass.findItem('Clone'):
             klass.addPublic('virtual wxEvent* Clone() const /Factory/;')
+        else:
+            klass.findItem('Clone').factory = True
 
     # Add a private assignment operator so the back-end (if it's watching out
     # for this) won't try to make copies by assignment.
@@ -568,7 +572,11 @@ def runGenerators(module):
     # Toss in the PI generator too
     from etgtools import pi_generator
     generators.append(pi_generator.PiWrapperGenerator())    
-    
+
+    # Now the item map generator
+    from etgtools import map_generator
+    generators.append((map_generator.ItemMapGenerator()))
+
     # And finally add the documentation generator
     generators.append(getDocsGenerator())
 
diff --git a/packaging/README-snapshots.txt b/packaging/README-snapshots.txt
index 14cb5dc8..6c0323ec 100644
--- a/packaging/README-snapshots.txt
+++ b/packaging/README-snapshots.txt
@@ -58,8 +58,7 @@ software wheels like what is available here, with a command like
 this:
 
     pip install -U --pre \
-        --trusted-host wxpython.org \
-        -f http://wxpython.org/Phoenix/snapshot-builds/ \
+        -f https://wxpython.org/Phoenix/snapshot-builds/ \
         wxPython_Phoenix
 
 NOTE: if there isn't a binary here for the latest version of Phoenix
@@ -72,8 +71,7 @@ To install a specific binary from this site you can append the version
 number to the command, like this:
 
     pip install -U --pre \
-        --trusted-host wxpython.org \
-        -f http://wxpython.org/Phoenix/snapshot-builds/ \
+        -f https://wxpython.org/Phoenix/snapshot-builds/ \
         wxPython_Phoenix==3.0.3.dev1641+76cf834
 
 If you don't already have pip then you can install it with commands
diff --git a/requirements.txt b/requirements.txt
index a56e1b56..bed2eb85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,14 @@
-pip
-setuptools
-six 
-wheel 
-Sphinx 
-docutils
+# Phoenix build requirements
+setuptools == 20.2.2
+six == 1.10.0
+wheel == 0.29.0
+twine==1.6.5
+Pygments == 2.1.3
+alabaster == 0.7.8
+babel == 2.3.4
+imagesize == 0.7.1
+pytz == 2016.4
+sphinx == 1.4.1
+docutils == 0.12
+Jinja2 == 2.8
+MarkupSafe == 0.23
diff --git a/sip/siplib/sip.h b/sip/siplib/sip.h
index d2d27db6..d0f7d227 100644
--- a/sip/siplib/sip.h
+++ b/sip/siplib/sip.h
@@ -54,8 +54,8 @@ extern "C" {
 /*
  * Define the SIP version number.
  */
-#define SIP_VERSION         0x041007
-#define SIP_VERSION_STR     "4.16.7"
+#define SIP_VERSION         0x041201
+#define SIP_VERSION_STR     "4.18.1.dev1606100655"
 
 
 /*
@@ -68,6 +68,11 @@ extern "C" {
  *
  * History:
  *
+ * 11.3 Added sip_api_get_interpreter() to the public API.
+ *
+ * 11.1 Added sip_api_invoke_slot_ex().
+ * 11.2 Added sip_api_get_reference() to the private API.
+ *
  * 11.1 Added sip_api_invoke_slot_ex().
  *
  * 11.0 Added the pyqt5QtSignal and pyqt5ClassTypeDef structures.
@@ -212,7 +217,7 @@ extern "C" {
  * 0.0  Original version.
  */
 #define SIP_API_MAJOR_NR    11
-#define SIP_API_MINOR_NR    1
+#define SIP_API_MINOR_NR    3
 
 
 /* The name of the sip module. */
@@ -590,7 +595,8 @@ typedef enum {
 
 
 /*
- * The different Python slot types.
+ * The different Python slot types.  New slots must be added to the end,
+ * otherwise the major version of the internal ABI must be changed.
  */
 typedef enum {
     str_slot,           /* __str__ */
@@ -655,6 +661,11 @@ typedef enum {
     iter_slot,          /* __iter__ */
     next_slot,          /* __next__ */
     setattr_slot,       /* __setattr__, __delattr__ */
+    matmul_slot,        /* __matmul__ (for Python v3.5 and later) */
+    imatmul_slot,       /* __imatmul__ (for Python v3.5 and later) */
+    await_slot,         /* __await__ (for Python v3.5 and later) */
+    aiter_slot,         /* __aiter__ (for Python v3.5 and later) */
+    anext_slot,         /* __anext__ (for Python v3.5 and later) */
 } sipPySlotType;
 
 
@@ -1522,6 +1533,16 @@ typedef struct _sipAPIDef {
      */
     PyObject *(*api_invoke_slot_ex)(const sipSlot *slot, PyObject *sigargs,
             int check_receiver);
+
+    /*
+     * The following is not part of the public API.
+     */
+    PyObject *(*api_get_reference)(PyObject *self, int key);
+
+    /*
+     * The following is part of the public API.
+     */
+    PyInterpreterState *(*api_get_interpreter)();
 } sipAPIDef;
 
 
diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c
index bac662d7..5fae68ff 100644
--- a/sip/siplib/siplib.c
+++ b/sip/siplib/siplib.c
@@ -1,7 +1,7 @@
 /*
  * SIP library code.
  *
- * Copyright (c) 2015 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2016 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
  * This file is part of SIP.
  *
@@ -59,7 +59,7 @@ static PyTypeObject sipWrapperType_Type = {
     0,                      /* tp_print */
     0,                      /* tp_getattr */
     0,                      /* tp_setattr */
-    0,                      /* tp_reserved (Python v3), tp_compare (Python v2) */
+    0,                      /* tp_as_async (Python v3.5), tp_compare (Python v2) */
     0,                      /* tp_repr */
     0,                      /* tp_as_number */
     0,                      /* tp_as_sequence */
@@ -126,7 +126,7 @@ static sipWrapperType sipWrapper_Type = {
             0,              /* tp_print */
             0,              /* tp_getattr */
             0,              /* tp_setattr */
-            0,              /* tp_reserved (Python v3), tp_compare (Python v2) */
+            0,              /* tp_as_async (Python v3.5), tp_compare (Python v2) */
             0,              /* tp_repr */
             0,              /* tp_as_number */
             0,              /* tp_as_sequence */
@@ -171,6 +171,106 @@ static sipWrapperType sipWrapper_Type = {
             0,              /* tp_finalize */
 #endif
         },
+#if PY_VERSION_HEX >= 0x03050000
+        {
+            0,              /* am_await */
+            0,              /* am_aiter */
+            0,              /* am_anext */
+        },
+#endif
+        {
+            0,              /* nb_add */
+            0,              /* nb_subtract */
+            0,              /* nb_multiply */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_divide */
+#endif
+            0,              /* nb_remainder */
+            0,              /* nb_divmod */
+            0,              /* nb_power */
+            0,              /* nb_negative */
+            0,              /* nb_positive */
+            0,              /* nb_absolute */
+            0,              /* nb_bool (Python v3), nb_nonzero (Python v2) */
+            0,              /* nb_invert */
+            0,              /* nb_lshift */
+            0,              /* nb_rshift */
+            0,              /* nb_and */
+            0,              /* nb_xor */
+            0,              /* nb_or */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_coerce */
+#endif
+            0,              /* nb_int */
+            0,              /* nb_reserved (Python v3), nb_long (Python v2) */
+            0,              /* nb_float */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_oct */
+            0,              /* nb_hex */
+#endif
+            0,              /* nb_inplace_add */
+            0,              /* nb_inplace_subtract */
+            0,              /* nb_inplace_multiply */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_inplace_divide */
+#endif
+            0,              /* nb_inplace_remainder */
+            0,              /* nb_inplace_power */
+            0,              /* nb_inplace_lshift */
+            0,              /* nb_inplace_rshift */
+            0,              /* nb_inplace_and */
+            0,              /* nb_inplace_xor */
+            0,              /* nb_inplace_or */
+#if PY_VERSION_HEX >= 0x02020000
+            0,              /* nb_floor_divide */
+            0,              /* nb_true_divide */
+            0,              /* nb_inplace_floor_divide */
+            0,              /* nb_inplace_true_divide */
+#endif
+#if PY_VERSION_HEX >= 0x02050000
+            0,              /* nb_index */
+#endif
+#if PY_VERSION_HEX >= 0x03050000
+            0,              /* nb_matrix_multiply */
+            0,              /* nb_inplace_matrix_multiply */
+#endif
+        },
+        {
+            0,              /* mp_length */
+            0,              /* mp_subscript */
+            0,              /* mp_ass_subscript */
+        },
+        {
+            0,              /* sq_length */
+            0,              /* sq_concat */
+            0,              /* sq_repeat */
+            0,              /* sq_item */
+            0,              /* was_sq_slice */
+            0,              /* sq_ass_item */
+            0,              /* was_sq_ass_slice */
+            0,              /* sq_contains */
+            0,              /* sq_inplace_concat */
+            0,              /* sq_inplace_repeat */
+        },
+        {
+#if PY_MAJOR_VERSION >= 3
+            0,              /* bf_getbuffer */
+            0,              /* bf_releasebuffer */
+#else
+            0,              /* bf_getreadbuffer */
+            0,              /* bf_getwritebuffer */
+            0,              /* bf_getsegcount */
+            0,              /* bf_getcharbuffer */
+            0,              /* bf_getbuffer */
+            0,              /* bf_releasebuffer */
+#endif
+        },
+        0,                  /* ht_name */
+        0,                  /* ht_slots */
+#if PY_MAJOR_VERSION >= 3
+        0,                  /* ht_qualname */
+        0,                  /* ht_cached_keys */
+#endif
 #if !defined(STACKLESS)
     },
 #endif
@@ -280,6 +380,7 @@ static int sip_api_register_attribute_getter(const sipTypeDef *td,
 static void sip_api_clear_any_slot_reference(sipSlot *slot);
 static int sip_api_visit_slot(sipSlot *slot, visitproc visit, void *arg);
 static void sip_api_keep_reference(PyObject *self, int key, PyObject *obj);
+static PyObject *sip_api_get_reference(PyObject *self, int key);
 static void sip_api_add_exception(sipErrorState es, PyObject **parseErrp);
 static void sip_api_set_destroy_on_exit(int value);
 static int sip_api_enable_autoconversion(const sipTypeDef *td, int enable);
@@ -289,6 +390,7 @@ static void *sip_api_get_mixin_address(sipSimpleWrapper *w,
         const sipTypeDef *td);
 static int sip_api_register_proxy_resolver(const sipTypeDef *td,
         sipProxyResolverFunc resolver);
+static PyInterpreterState *sip_api_get_interpreter();
 
 
 /*
@@ -419,6 +521,14 @@ static const sipAPIDef sip_api = {
      * code.
      */
     sip_api_invoke_slot_ex,
+    /*
+     * The following is not part of the public API.
+     */
+    sip_api_get_reference,
+    /*
+     * The following is part of the public API.
+     */
+    sip_api_get_interpreter,
 };
 
 
@@ -529,7 +639,7 @@ static PyTypeObject sipEnumType_Type = {
     0,                      /* tp_print */
     0,                      /* tp_getattr */
     0,                      /* tp_setattr */
-    0,                      /* tp_reserved (Python v3), tp_compare (Python v2) */
+    0,                      /* tp_as_async (Python v3.5), tp_compare (Python v2) */
     0,                      /* tp_repr */
     0,                      /* tp_as_number */
     0,                      /* tp_as_sequence */
@@ -647,10 +757,9 @@ static int getSelfFromArgs(sipTypeDef *td, PyObject *args, int argnr,
 static PyObject *createEnumMember(sipTypeDef *td, sipEnumMemberDef *enm);
 static int compareTypedefName(const void *key, const void *el);
 static int checkPointer(void *ptr, sipSimpleWrapper *sw);
-static void *cast_cpp_ptr(void *ptr, PyTypeObject *src_type,
-        const sipTypeDef *dst_type);
 static void finalise(void);
-static PyObject *getDefaultBases(void);
+static PyObject *getDefaultBase(void);
+static PyObject *getDefaultSimpleBase(void);
 static PyObject *getScopeDict(sipTypeDef *td, PyObject *mod_dict,
         sipExportedModuleDef *client);
 static PyObject *createContainerType(sipContainerDef *cod, sipTypeDef *td,
@@ -768,6 +877,7 @@ static sipSimpleWrapper *deref_mixin(sipSimpleWrapper *w);
 static PyObject *wrap_simple_instance(void *cpp, const sipTypeDef *td,
         sipWrapper *owner, int flags);
 static void *resolve_proxy(const sipTypeDef *td, void *proxy);
+static void clear_wrapper(sipSimpleWrapper *sw);
 
 
 /*
@@ -997,6 +1107,15 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
 }
 
 
+/*
+ * Return the current interpreter, if there is one.
+ */
+static PyInterpreterState *sip_api_get_interpreter()
+{
+    return sipInterpreter;
+}
+
+
 /*
  * Display a printf() style message to stderr according to the current trace
  * mask.
@@ -1210,15 +1329,7 @@ static PyObject *callDtor(PyObject *self, PyObject *args)
     if (checkPointer(addr, sw) < 0)
         return NULL;
 
-    if (PyObject_TypeCheck((PyObject *)sw, (PyTypeObject *)&sipWrapper_Type))
-    {
-        /*
-         * Transfer ownership to C++ so we don't try to release it again when
-         * the Python object is garbage collected.
-         */
-        removeFromParent((sipWrapper *)sw);
-        sipResetPyOwned(sw);
-    }
+    clear_wrapper(sw);
 
     release(addr, (const sipTypeDef *)ctd, sw->flags);
 
@@ -1300,17 +1411,7 @@ static PyObject *setDeleted(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "O!:setdeleted", &sipSimpleWrapper_Type, &sw))
         return NULL;
 
-    if (PyObject_TypeCheck((PyObject *)sw, (PyTypeObject *)&sipWrapper_Type))
-    {
-        /*
-         * Transfer ownership to C++ so we don't try to release it when the
-         * Python object is garbage collected.
-         */
-        removeFromParent((sipWrapper *)sw);
-        sipResetPyOwned(sw);
-    }
-
-    clear_access_func(sw);
+    clear_wrapper(sw);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -1977,15 +2078,13 @@ static PyObject *sip_api_call_method(int *isErr, PyObject *method,
 
     va_start(va,fmt);
 
-    if ((args = PyTuple_New(strlen(fmt))) != NULL && buildObject(args,fmt,va) != NULL)
-        res = PyEval_CallObject(method,args);
+    if ((args = PyTuple_New(strlen(fmt))) != NULL && buildObject(args, fmt, va) != NULL)
+        res = PyEval_CallObject(method, args);
     else
-    {
         res = NULL;
 
-        if (isErr != NULL)
-            *isErr = TRUE;
-    }
+    if (res == NULL && isErr != NULL)
+        *isErr = TRUE;
 
     Py_XDECREF(args);
 
@@ -5840,29 +5939,56 @@ static SIP_SSIZE_T sip_api_convert_from_sequence_index(SIP_SSIZE_T idx,
 
 
 /*
- * Return a tuple of the base classes of a type that has no explicit
- * super-type.
+ * Return a tuple of the base class of a type that has no explicit super-type.
  */
-static PyObject *getDefaultBases(void)
+static PyObject *getDefaultBase(void)
 {
-    static PyObject *default_bases = NULL;
+    static PyObject *default_base = NULL;
 
     /* Only do this once. */
-    if (default_bases == NULL)
+    if (default_base == NULL)
     {
 #if PY_VERSION_HEX >= 0x02040000
-        default_bases = PyTuple_Pack(1, (PyObject *)&sipWrapper_Type);
+        default_base = PyTuple_Pack(1, (PyObject *)&sipWrapper_Type);
 #else
-        default_bases = Py_BuildValue("(O)", &sipWrapper_Type);
+        default_base = Py_BuildValue("(O)", &sipWrapper_Type);
 #endif
 
-        if (default_bases == NULL)
+        if (default_base == NULL)
             return NULL;
     }
 
-    Py_INCREF(default_bases);
+    Py_INCREF(default_base);
 
-    return default_bases;
+    return default_base;
+}
+
+
+/*
+ * Return a tuple of the base class of a simple type that has no explicit
+ * super-type.
+ */
+static PyObject *getDefaultSimpleBase(void)
+{
+    static PyObject *default_simple_base = NULL;
+
+    /* Only do this once. */
+    if (default_simple_base == NULL)
+    {
+#if PY_VERSION_HEX >= 0x02040000
+        default_simple_base = PyTuple_Pack(1,
+                (PyObject *)&sipSimpleWrapper_Type);
+#else
+        default_simple_base = Py_BuildValue("(O)", &sipSimpleWrapper_Type);
+#endif
+
+        if (default_simple_base == NULL)
+            return NULL;
+    }
+
+    Py_INCREF(default_simple_base);
+
+    return default_simple_base;
 }
 
 
@@ -5987,7 +6113,7 @@ static int createClassType(sipExportedModuleDef *client, sipClassTypeDef *ctd,
     {
         if (ctd->ctd_supertype < 0)
         {
-            bases = getDefaultBases();
+            bases = (sipTypeIsNamespace(&ctd->ctd_base) ? getDefaultSimpleBase() : getDefaultBase());
         }
         else
         {
@@ -6125,7 +6251,7 @@ static int createMappedType(sipExportedModuleDef *client,
     mtd->mtd_base.td_module = client;
 
     /* Create the tuple of super-types. */
-    if ((bases = getDefaultBases()) == NULL)
+    if ((bases = getDefaultBase()) == NULL)
         goto reterr;
 
     /* Create the type dictionary. */
@@ -6625,6 +6751,10 @@ static int isNonlazyMethod(PyMethodDef *pmd)
         "__getattr__",
         "__enter__",
         "__exit__",
+#if PY_VERSION_HEX >= 0x03050000
+        "__aenter__",
+        "__aexit__",
+#endif
         NULL
     };  
 
@@ -7466,11 +7596,20 @@ static void sip_api_bad_class(const char *classname)
 
 
 /*
- * Report a Python member function with an unexpected return type.
+ * Report a Python member function with an unexpected result.
  */
 static void sip_api_bad_catcher_result(PyObject *method)
 {
-    PyObject *mname;
+    PyObject *mname, *etype, *evalue, *etraceback;
+
+    /*
+     * Get the current exception object if there is one.  Its string
+     * representation will be used as the detail of a new exception.
+     */
+    PyErr_Fetch(&etype, &evalue, &etraceback);
+    PyErr_NormalizeException(&etype, &evalue, &etraceback);
+    Py_XDECREF(etype);
+    Py_XDECREF(etraceback);
 
     /*
      * This is part of the public API so we make no assumptions about the
@@ -7488,14 +7627,34 @@ static void sip_api_bad_catcher_result(PyObject *method)
 
     mname = ((PyFunctionObject *)PyMethod_GET_FUNCTION(method))->func_name;
 
+    if (evalue != NULL)
+    {
 #if PY_MAJOR_VERSION >= 3
-    PyErr_Format(PyExc_TypeError, "invalid result type from %s.%U()",
-            Py_TYPE(PyMethod_GET_SELF(method))->tp_name, mname);
+        PyErr_Format(PyExc_TypeError, "invalid result from %s.%U(), %S",
+                Py_TYPE(PyMethod_GET_SELF(method))->tp_name, mname, evalue);
 #else
-    PyErr_Format(PyExc_TypeError, "invalid result type from %s.%s()",
-            Py_TYPE(PyMethod_GET_SELF(method))->tp_name,
-            PyString_AsString(mname));
+        PyObject *evalue_s = PyObject_Str(evalue);
+
+        PyErr_Format(PyExc_TypeError, "invalid result from %s.%s(), %s",
+                Py_TYPE(PyMethod_GET_SELF(method))->tp_name,
+                PyString_AsString(mname), PyString_AsString(evalue_s));
+
+        Py_XDECREF(evalue_s);
 #endif
+
+        Py_DECREF(evalue);
+    }
+    else
+    {
+#if PY_MAJOR_VERSION >= 3
+        PyErr_Format(PyExc_TypeError, "invalid result from %s.%U()",
+                Py_TYPE(PyMethod_GET_SELF(method))->tp_name, mname);
+#else
+        PyErr_Format(PyExc_TypeError, "invalid result from %s.%s()",
+                Py_TYPE(PyMethod_GET_SELF(method))->tp_name,
+                PyString_AsString(mname));
+#endif
+    }
 }
 
 
@@ -8355,7 +8514,6 @@ static void *indirect_access_func(sipSimpleWrapper *sw, AccessFuncOp op)
 
     default:
         addr = NULL;
-        break;
     }
 
     return addr;
@@ -8404,7 +8562,18 @@ void *sip_api_get_cpp_ptr(sipSimpleWrapper *sw, const sipTypeDef *td)
 
     if (td != NULL)
     {
-        ptr = cast_cpp_ptr(ptr, Py_TYPE(sw), td);
+        if (PyObject_TypeCheck((PyObject *)sw, sipTypeAsPyTypeObject(td)))
+        {
+            sipCastFunc cast = ((const sipClassTypeDef *)((sipWrapperType *)Py_TYPE(sw))->type)->ctd_cast;
+
+            /* Handle any multiple inheritance. */
+            if (cast != NULL)
+                ptr = (*cast)(ptr, td);
+        }
+        else
+        {
+            ptr = NULL;
+        }
 
         if (ptr == NULL)
             PyErr_Format(PyExc_TypeError, "could not convert '%s' to '%s'",
@@ -8416,22 +8585,6 @@ void *sip_api_get_cpp_ptr(sipSimpleWrapper *sw, const sipTypeDef *td)
 }
 
 
-/*
- * Cast a C/C++ pointer from a source type to a destination type.
- */
-static void *cast_cpp_ptr(void *ptr, PyTypeObject *src_type,
-        const sipTypeDef *dst_type)
-{
-    sipCastFunc cast = ((const sipClassTypeDef *)((sipWrapperType *)src_type)->type)->ctd_cast;
-
-    /* C structures don't have cast functions. */
-    if (cast != NULL)
-        ptr = (*cast)(ptr, dst_type);
-
-    return ptr;
-}
-
-
 /*
  * Check that a pointer is non-NULL.
  */
@@ -8494,6 +8647,33 @@ static void sip_api_keep_reference(PyObject *self, int key, PyObject *obj)
 }
 
 
+/*
+ * Get an object that has an extra reference.
+ */
+static PyObject *sip_api_get_reference(PyObject *self, int key)
+{
+    PyObject *dict, *key_obj, *obj;
+
+    /* Get the extra references dictionary if there is one. */
+    if ((dict = ((sipSimpleWrapper *)self)->extra_refs) == NULL)
+        return NULL;
+
+#if PY_MAJOR_VERSION >= 3
+    key_obj = PyLong_FromLong(key);
+#else
+    key_obj = PyInt_FromLong(key);
+#endif
+
+    if (key_obj == NULL)
+        return NULL;
+
+    obj = PyDict_GetItem(dict, key_obj);
+    Py_XINCREF(obj);
+
+    return obj;
+}
+
+
 /*
  * Check to see if a Python object can be converted to a type.
  */
@@ -8502,10 +8682,17 @@ static int sip_api_can_convert_to_type(PyObject *pyObj, const sipTypeDef *td,
 {
     int ok;
 
-    assert(sipTypeIsClass(td) || sipTypeIsMapped(td));
+    assert(td == NULL || sipTypeIsClass(td) || sipTypeIsMapped(td));
 
-    /* None is handled outside the type checkers. */
-    if (pyObj == Py_None)
+    if (td == NULL)
+    {
+        /*
+         * The type must be /External/ and the module that contains the
+         * implementation hasn't been imported.
+         */
+        ok = FALSE;
+    }
+    else if (pyObj == Py_None)
     {
         /* If the type explicitly handles None then ignore the flags. */
         if (sipTypeAllowNone(td))
@@ -8697,12 +8884,28 @@ PyObject *sip_api_convert_from_type(void *cpp, const sipTypeDef *td,
     if (cfrom != NULL)
         return cfrom(cpp, transferObj);
 
-    /* Apply any sub-class convertor. */
-    if (sipTypeHasSCC(td))
+    /*
+     * See if we have already wrapped it.  Invoking sub-class code can be
+     * expensive so we check the cache first, even though the sub-class code
+     * might perform a down-cast.
+     */
+    if ((py = sip_api_get_pyobject(cpp, td)) == NULL && sipTypeHasSCC(td))
+    {
+        void *orig_cpp = cpp;
+        const sipTypeDef *orig_td = td;
+
+        /* Apply the sub-class convertor. */
         td = convertSubClass(td, &cpp);
 
-    /* See if we have already wrapped it. */
-    if ((py = sip_api_get_pyobject(cpp, td)) != NULL)
+        /*
+         * If the sub-class convertor has done something then check the cache
+         * again using the modified values.
+         */
+        if (cpp != orig_cpp || td != orig_td)
+            py = sip_api_get_pyobject(cpp, td);
+    }
+
+    if (py != NULL)
         Py_INCREF(py);
     else if ((py = wrap_simple_instance(cpp, td, NULL, SIP_SHARE_MAP)) == NULL)
         return NULL;
@@ -9017,7 +9220,7 @@ static int convertPass(const sipTypeDef **tdp, void **cppPtr)
 
         while (scc->scc_convertor != NULL)
         {
-            PyTypeObject *base_type = sipTypeAsPyTypeObject(scc->scc_basetype);
+            PyTypeObject *base_type, *tp;
 
             /*
              * The base type is the "root" class that may have a number of
@@ -9026,14 +9229,21 @@ static int convertPass(const sipTypeDef **tdp, void **cppPtr)
              * provides the RTTI used by the convertors and is re-implemented
              * by derived classes.  We therefore see if the target type is a
              * sub-class of the root, ie. see if the convertor might be able to
-             * convert the target type to something more specific.
+             * convert the target type to something more specific.  Note that
+             * we only consider direct sub-classes so that (for example) a
+             * QLayout is only handled by the QObject convertor and not by the
+             * QLayoutItem convertor.
              */
-            if (PyType_IsSubtype(py_type, base_type))
-            {
-                void *ptr;
-                const sipTypeDef *sub_td;
+            base_type = sipTypeAsPyTypeObject(scc->scc_basetype);
 
-                ptr = cast_cpp_ptr(*cppPtr, py_type, scc->scc_basetype);
+            for (tp = py_type; tp != NULL; tp = tp->tp_base)
+                if (tp == base_type)
+                    break;
+
+            if (tp != NULL)
+            {
+                void *ptr = *cppPtr;
+                const sipTypeDef *sub_td;
 
                 if ((sub_td = (*scc->scc_convertor)(&ptr)) != NULL)
                 {
@@ -9897,7 +10107,10 @@ static void *sip_api_get_mixin_address(sipSimpleWrapper *w,
     void *cpp;
 
     if ((mixin = PyObject_GetAttrString((PyObject *)w, sipTypeName(td))) == NULL)
+    {
+        PyErr_Clear();
         return NULL;
+    }
 
     cpp = sip_api_get_address((sipSimpleWrapper *)mixin);
 
@@ -10545,7 +10758,7 @@ sipWrapperType sipSimpleWrapper_Type = {
             0,              /* tp_print */
             0,              /* tp_getattr */
             0,              /* tp_setattr */
-            0,              /* tp_reserved (Python v3), tp_compare (Python v2) */
+            0,              /* tp_as_async (Python v3.5), tp_compare (Python v2) */
             0,              /* tp_repr */
             0,              /* tp_as_number */
             0,              /* tp_as_sequence */
@@ -10588,6 +10801,106 @@ sipWrapperType sipSimpleWrapper_Type = {
             0,              /* tp_finalize */
 #endif
         },
+#if PY_VERSION_HEX >= 0x03050000
+        {
+            0,              /* am_await */
+            0,              /* am_aiter */
+            0,              /* am_anext */
+        },
+#endif
+        {
+            0,              /* nb_add */
+            0,              /* nb_subtract */
+            0,              /* nb_multiply */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_divide */
+#endif
+            0,              /* nb_remainder */
+            0,              /* nb_divmod */
+            0,              /* nb_power */
+            0,              /* nb_negative */
+            0,              /* nb_positive */
+            0,              /* nb_absolute */
+            0,              /* nb_bool (Python v3), nb_nonzero (Python v2) */
+            0,              /* nb_invert */
+            0,              /* nb_lshift */
+            0,              /* nb_rshift */
+            0,              /* nb_and */
+            0,              /* nb_xor */
+            0,              /* nb_or */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_coerce */
+#endif
+            0,              /* nb_int */
+            0,              /* nb_reserved (Python v3), nb_long (Python v2) */
+            0,              /* nb_float */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_oct */
+            0,              /* nb_hex */
+#endif
+            0,              /* nb_inplace_add */
+            0,              /* nb_inplace_subtract */
+            0,              /* nb_inplace_multiply */
+#if PY_MAJOR_VERSION < 3
+            0,              /* nb_inplace_divide */
+#endif
+            0,              /* nb_inplace_remainder */
+            0,              /* nb_inplace_power */
+            0,              /* nb_inplace_lshift */
+            0,              /* nb_inplace_rshift */
+            0,              /* nb_inplace_and */
+            0,              /* nb_inplace_xor */
+            0,              /* nb_inplace_or */
+#if PY_VERSION_HEX >= 0x02020000
+            0,              /* nb_floor_divide */
+            0,              /* nb_true_divide */
+            0,              /* nb_inplace_floor_divide */
+            0,              /* nb_inplace_true_divide */
+#endif
+#if PY_VERSION_HEX >= 0x02050000
+            0,              /* nb_index */
+#endif
+#if PY_VERSION_HEX >= 0x03050000
+            0,              /* nb_matrix_multiply */
+            0,              /* nb_inplace_matrix_multiply */
+#endif
+        },
+        {
+            0,              /* mp_length */
+            0,              /* mp_subscript */
+            0,              /* mp_ass_subscript */
+        },
+        {
+            0,              /* sq_length */
+            0,              /* sq_concat */
+            0,              /* sq_repeat */
+            0,              /* sq_item */
+            0,              /* was_sq_slice */
+            0,              /* sq_ass_item */
+            0,              /* was_sq_ass_slice */
+            0,              /* sq_contains */
+            0,              /* sq_inplace_concat */
+            0,              /* sq_inplace_repeat */
+        },
+        {
+#if PY_MAJOR_VERSION >= 3
+            0,              /* bf_getbuffer */
+            0,              /* bf_releasebuffer */
+#else
+            0,              /* bf_getreadbuffer */
+            0,              /* bf_getwritebuffer */
+            0,              /* bf_getsegcount */
+            0,              /* bf_getcharbuffer */
+            0,              /* bf_getbuffer */
+            0,              /* bf_releasebuffer */
+#endif
+        },
+        0,                  /* ht_name */
+        0,                  /* ht_slots */
+#if PY_MAJOR_VERSION >= 3
+        0,                  /* ht_qualname */
+        0,                  /* ht_cached_keys */
+#endif
 #if !defined(STACKLESS)
     },
 #endif
@@ -10608,7 +10921,7 @@ static int sipWrapper_clear(sipWrapper *self)
     vret = sipSimpleWrapper_clear(sw);
 
     /* Remove any slots connected via a proxy. */
-    if (sipQtSupport != NULL && sipPossibleProxy(sw))
+    if (sipQtSupport != NULL && sipPossibleProxy(sw) && !sipNotInMap(sw))
     {
         void *tx = sip_api_get_address(sw);
 
@@ -10667,8 +10980,13 @@ static int sipWrapper_traverse(sipWrapper *self, visitproc visit, void *arg)
     if ((vret = sipSimpleWrapper_traverse(sw, visit, arg)) != 0)
         return vret;
 
-    /* This should be handwritten code in PyQt. */
-    if (sipQtSupport != NULL && sipQtSupport->qt_find_sipslot)
+    /*
+     * This should be handwritten code in PyQt.  The map check is a bit of a
+     * hack to work around PyQt4 problems with qApp and a user created
+     * instance.  qt_find_sipslot() will return the same slot information for
+     * both causing the gc module to trigger assert() failures.
+     */
+    if (sipQtSupport != NULL && sipQtSupport->qt_find_sipslot && !sipNotInMap(sw))
     {
         void *tx = sip_api_get_address(sw);
 
@@ -10710,46 +11028,49 @@ static int sipWrapper_traverse(sipWrapper *self, visitproc visit, void *arg)
  */
 static void addClassSlots(sipWrapperType *wt, const sipClassTypeDef *ctd)
 {
+    PyHeapTypeObject *heap_to = &wt->super;
+    PyBufferProcs *bp = &heap_to->as_buffer;
+
     /* Add the buffer interface. */
 #if PY_MAJOR_VERSION >= 3
     if (ctd->ctd_getbuffer != NULL)
-        wt->super.as_buffer.bf_getbuffer = (getbufferproc)sipSimpleWrapper_getbuffer;
+        bp->bf_getbuffer = (getbufferproc)sipSimpleWrapper_getbuffer;
 
     if (ctd->ctd_releasebuffer != NULL)
-        wt->super.as_buffer.bf_releasebuffer = (releasebufferproc)sipSimpleWrapper_releasebuffer;
+        bp->bf_releasebuffer = (releasebufferproc)sipSimpleWrapper_releasebuffer;
 #else
     if (ctd->ctd_readbuffer != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-        wt->super.as_buffer.bf_getreadbuffer = (readbufferproc)sipSimpleWrapper_getreadbuffer;
+        bp->bf_getreadbuffer = (readbufferproc)sipSimpleWrapper_getreadbuffer;
 #else
-        wt->super.as_buffer.bf_getreadbuffer = (getreadbufferproc)sipSimpleWrapper_getreadbuffer;
+        bp->bf_getreadbuffer = (getreadbufferproc)sipSimpleWrapper_getreadbuffer;
 #endif
 
     if (ctd->ctd_writebuffer != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-        wt->super.as_buffer.bf_getwritebuffer = (writebufferproc)sipSimpleWrapper_getwritebuffer;
+        bp->bf_getwritebuffer = (writebufferproc)sipSimpleWrapper_getwritebuffer;
 #else
-        wt->super.as_buffer.bf_getwritebuffer = (getwritebufferproc)sipSimpleWrapper_getwritebuffer;
+        bp->bf_getwritebuffer = (getwritebufferproc)sipSimpleWrapper_getwritebuffer;
 #endif
 
     if (ctd->ctd_segcount != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-        wt->super.as_buffer.bf_getsegcount = (segcountproc)sipSimpleWrapper_getsegcount;
+        bp->bf_getsegcount = (segcountproc)sipSimpleWrapper_getsegcount;
 #else
-        wt->super.as_buffer.bf_getsegcount = (getsegcountproc)sipSimpleWrapper_getsegcount;
+        bp->bf_getsegcount = (getsegcountproc)sipSimpleWrapper_getsegcount;
 #endif
 
     if (ctd->ctd_charbuffer != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-        wt->super.as_buffer.bf_getcharbuffer = (charbufferproc)sipSimpleWrapper_getcharbuffer;
+        bp->bf_getcharbuffer = (charbufferproc)sipSimpleWrapper_getcharbuffer;
 #else
-        wt->super.as_buffer.bf_getcharbuffer = (getcharbufferproc)sipSimpleWrapper_getcharbuffer;
+        bp->bf_getcharbuffer = (getcharbufferproc)sipSimpleWrapper_getcharbuffer;
 #endif
 #endif
 
     /* Add the slots for this type. */
     if (ctd->ctd_pyslots != NULL)
-        addTypeSlots(&wt->super, ctd->ctd_pyslots);
+        addTypeSlots(heap_to, ctd->ctd_pyslots);
 }
 
 
@@ -10762,12 +11083,18 @@ static void addTypeSlots(PyHeapTypeObject *heap_to, sipPySlotDef *slots)
     PyNumberMethods *nb;
     PySequenceMethods *sq;
     PyMappingMethods *mp;
+#if PY_VERSION_HEX >= 0x03050000
+    PyAsyncMethods *am;
+#endif
     void *f;
 
-    to = (PyTypeObject *)heap_to;
+    to = &heap_to->ht_type;
     nb = &heap_to->as_number;
     sq = &heap_to->as_sequence;
     mp = &heap_to->as_mapping;
+#if PY_VERSION_HEX >= 0x03050000
+    am = &heap_to->as_async;
+#endif
 
     while ((f = slots->psd_func) != NULL)
         switch (slots++->psd_type)
@@ -10777,203 +11104,161 @@ static void addTypeSlots(PyHeapTypeObject *heap_to, sipPySlotDef *slots)
             break;
 
         case int_slot:
-            if (nb != NULL)
-                nb->nb_int = (unaryfunc)f;
+            nb->nb_int = (unaryfunc)f;
             break;
 
 #if PY_MAJOR_VERSION < 3
         case long_slot:
-            if (nb != NULL)
-                nb->nb_long = (unaryfunc)f;
+            nb->nb_long = (unaryfunc)f;
             break;
 #endif
 
         case float_slot:
-            if (nb != NULL)
-                nb->nb_float = (unaryfunc)f;
+            nb->nb_float = (unaryfunc)f;
             break;
 
         case len_slot:
-            if (mp != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-                mp->mp_length = (lenfunc)f;
+            mp->mp_length = (lenfunc)f;
+            sq->sq_length = (lenfunc)f;
 #else
-                mp->mp_length = (inquiry)f;
-#endif
-            if (sq != NULL)
-#if PY_VERSION_HEX >= 0x02050000
-                sq->sq_length = (lenfunc)f;
-#else
-                sq->sq_length = (inquiry)f;
+            mp->mp_length = (inquiry)f;
+            sq->sq_length = (inquiry)f;
 #endif
             break;
 
         case contains_slot:
-            if (sq != NULL)
-                sq->sq_contains = (objobjproc)f;
+            sq->sq_contains = (objobjproc)f;
             break;
 
         case add_slot:
-            if (nb != NULL)
-                nb->nb_add = (binaryfunc)f;
+            nb->nb_add = (binaryfunc)f;
             break;
 
         case concat_slot:
-            if (sq != NULL)
-                sq->sq_concat = (binaryfunc)f;
+            sq->sq_concat = (binaryfunc)f;
             break;
 
         case sub_slot:
-            if (nb != NULL)
-                nb->nb_subtract = (binaryfunc)f;
+            nb->nb_subtract = (binaryfunc)f;
             break;
 
         case mul_slot:
-            if (nb != NULL)
-                nb->nb_multiply = (binaryfunc)f;
+            nb->nb_multiply = (binaryfunc)f;
             break;
 
         case repeat_slot:
-            if (sq != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-                sq->sq_repeat = (ssizeargfunc)f;
+            sq->sq_repeat = (ssizeargfunc)f;
 #else
-                sq->sq_repeat = (intargfunc)f;
+            sq->sq_repeat = (intargfunc)f;
 #endif
             break;
 
         case div_slot:
-            if (nb != NULL)
-            {
-                nb->nb_true_divide = (binaryfunc)f;
+            nb->nb_true_divide = (binaryfunc)f;
 #if PY_MAJOR_VERSION < 3
-                nb->nb_divide = (binaryfunc)f;
+            nb->nb_divide = (binaryfunc)f;
 #endif
-            }
             break;
 
         case mod_slot:
-            if (nb != NULL)
-                nb->nb_remainder = (binaryfunc)f;
+            nb->nb_remainder = (binaryfunc)f;
             break;
 
         case floordiv_slot:
-            if (nb != NULL)
-                nb->nb_floor_divide = (binaryfunc)f;
+            nb->nb_floor_divide = (binaryfunc)f;
             break;
 
         case truediv_slot:
-            if (nb != NULL)
-                nb->nb_true_divide = (binaryfunc)f;
+            nb->nb_true_divide = (binaryfunc)f;
             break;
 
         case and_slot:
-            if (nb != NULL)
-                nb->nb_and = (binaryfunc)f;
+            nb->nb_and = (binaryfunc)f;
             break;
 
         case or_slot:
-            if (nb != NULL)
-                nb->nb_or = (binaryfunc)f;
+            nb->nb_or = (binaryfunc)f;
             break;
 
         case xor_slot:
-            if (nb != NULL)
-                nb->nb_xor = (binaryfunc)f;
+            nb->nb_xor = (binaryfunc)f;
             break;
 
         case lshift_slot:
-            if (nb != NULL)
-                nb->nb_lshift = (binaryfunc)f;
+            nb->nb_lshift = (binaryfunc)f;
             break;
 
         case rshift_slot:
-            if (nb != NULL)
-                nb->nb_rshift = (binaryfunc)f;
+            nb->nb_rshift = (binaryfunc)f;
             break;
 
         case iadd_slot:
-            if (nb != NULL)
-                nb->nb_inplace_add = (binaryfunc)f;
+            nb->nb_inplace_add = (binaryfunc)f;
             break;
 
         case iconcat_slot:
-            if (sq != NULL)
-                sq->sq_inplace_concat = (binaryfunc)f;
+            sq->sq_inplace_concat = (binaryfunc)f;
             break;
 
         case isub_slot:
-            if (nb != NULL)
-                nb->nb_inplace_subtract = (binaryfunc)f;
+            nb->nb_inplace_subtract = (binaryfunc)f;
             break;
 
         case imul_slot:
-            if (nb != NULL)
-                nb->nb_inplace_multiply = (binaryfunc)f;
+            nb->nb_inplace_multiply = (binaryfunc)f;
             break;
 
         case irepeat_slot:
-            if (sq != NULL)
 #if PY_VERSION_HEX >= 0x02050000
-                sq->sq_inplace_repeat = (ssizeargfunc)f;
+            sq->sq_inplace_repeat = (ssizeargfunc)f;
 #else
-                sq->sq_inplace_repeat = (intargfunc)f;
+            sq->sq_inplace_repeat = (intargfunc)f;
 #endif
             break;
 
         case idiv_slot:
-            if (nb != NULL)
-            {
-                nb->nb_inplace_true_divide = (binaryfunc)f;
+            nb->nb_inplace_true_divide = (binaryfunc)f;
 #if PY_MAJOR_VERSION < 3
-                nb->nb_inplace_divide = (binaryfunc)f;
+            nb->nb_inplace_divide = (binaryfunc)f;
 #endif
-            }
             break;
 
         case imod_slot:
-            if (nb != NULL)
-                nb->nb_inplace_remainder = (binaryfunc)f;
+            nb->nb_inplace_remainder = (binaryfunc)f;
             break;
 
         case ifloordiv_slot:
-            if (nb != NULL)
-                nb->nb_inplace_floor_divide = (binaryfunc)f;
+            nb->nb_inplace_floor_divide = (binaryfunc)f;
             break;
 
         case itruediv_slot:
-            if (nb != NULL)
-                nb->nb_inplace_true_divide = (binaryfunc)f;
+            nb->nb_inplace_true_divide = (binaryfunc)f;
             break;
 
         case iand_slot:
-            if (nb != NULL)
-                nb->nb_inplace_and = (binaryfunc)f;
+            nb->nb_inplace_and = (binaryfunc)f;
             break;
 
         case ior_slot:
-            if (nb != NULL)
-                nb->nb_inplace_or = (binaryfunc)f;
+            nb->nb_inplace_or = (binaryfunc)f;
             break;
 
         case ixor_slot:
-            if (nb != NULL)
-                nb->nb_inplace_xor = (binaryfunc)f;
+            nb->nb_inplace_xor = (binaryfunc)f;
             break;
 
         case ilshift_slot:
-            if (nb != NULL)
-                nb->nb_inplace_lshift = (binaryfunc)f;
+            nb->nb_inplace_lshift = (binaryfunc)f;
             break;
 
         case irshift_slot:
-            if (nb != NULL)
-                nb->nb_inplace_rshift = (binaryfunc)f;
+            nb->nb_inplace_rshift = (binaryfunc)f;
             break;
 
         case invert_slot:
-            if (nb != NULL)
-                nb->nb_invert = (unaryfunc)f;
+            nb->nb_invert = (unaryfunc)f;
             break;
 
         case call_slot:
@@ -10981,18 +11266,14 @@ static void addTypeSlots(PyHeapTypeObject *heap_to, sipPySlotDef *slots)
             break;
 
         case getitem_slot:
-            if (mp != NULL)
-                mp->mp_subscript = (binaryfunc)f;
-            if (sq != NULL)
-                sq->sq_item = slot_sq_item;
+            mp->mp_subscript = (binaryfunc)f;
+            sq->sq_item = slot_sq_item;
             break;
 
         case setitem_slot:
         case delitem_slot:
-            if (mp != NULL)
-                mp->mp_ass_subscript = slot_mp_ass_subscript;
-            if (sq != NULL)
-                sq->sq_ass_item = slot_sq_ass_item;
+            mp->mp_ass_subscript = slot_mp_ass_subscript;
+            sq->sq_ass_item = slot_sq_ass_item;
             break;
 
         case lt_slot:
@@ -11011,17 +11292,15 @@ static void addTypeSlots(PyHeapTypeObject *heap_to, sipPySlotDef *slots)
 #endif
 
         case bool_slot:
-            if (nb != NULL)
 #if PY_MAJOR_VERSION >= 3
-                nb->nb_bool = (inquiry)f;
+            nb->nb_bool = (inquiry)f;
 #else
-                nb->nb_nonzero = (inquiry)f;
+            nb->nb_nonzero = (inquiry)f;
 #endif
             break;
 
         case neg_slot:
-            if (nb != NULL)
-                nb->nb_negative = (unaryfunc)f;
+            nb->nb_negative = (unaryfunc)f;
             break;
 
         case repr_slot:
@@ -11033,19 +11312,16 @@ static void addTypeSlots(PyHeapTypeObject *heap_to, sipPySlotDef *slots)
             break;
 
         case pos_slot:
-            if (nb != NULL)
-                nb->nb_positive = (unaryfunc)f;
+            nb->nb_positive = (unaryfunc)f;
             break;
 
         case abs_slot:
-            if (nb != NULL)
-                nb->nb_absolute = (unaryfunc)f;
+            nb->nb_absolute = (unaryfunc)f;
             break;
 
 #if PY_VERSION_HEX >= 0x02050000
         case index_slot:
-            if (nb != NULL)
-                nb->nb_index = (unaryfunc)f;
+            nb->nb_index = (unaryfunc)f;
             break;
 #endif
 
@@ -11060,6 +11336,32 @@ static void addTypeSlots(PyHeapTypeObject *heap_to, sipPySlotDef *slots)
         case setattr_slot:
             to->tp_setattro = (setattrofunc)f;
             break;
+
+#if PY_VERSION_HEX >= 0x03050000
+        case matmul_slot:
+            nb->nb_matrix_multiply = (binaryfunc)f;
+            break;
+
+        case imatmul_slot:
+            nb->nb_inplace_matrix_multiply = (binaryfunc)f;
+            break;
+
+        case await_slot:
+            am->am_await = (unaryfunc)f;
+            break;
+
+        case aiter_slot:
+            am->am_aiter = (unaryfunc)f;
+            break;
+
+        case anext_slot:
+            am->am_anext = (unaryfunc)f;
+            break;
+#endif
+
+        /* Suppress a compiler warning. */
+        default:
+            ;
         }
 }
 
@@ -12253,3 +12555,23 @@ static void *resolve_proxy(const sipTypeDef *td, void *proxy)
 
     return proxy;
 }
+
+
+/*
+ * Clear a simple wrapper.
+ */
+static void clear_wrapper(sipSimpleWrapper *sw)
+{
+    if (PyObject_TypeCheck((PyObject *)sw, (PyTypeObject *)&sipWrapper_Type))
+        removeFromParent((sipWrapper *)sw);
+
+    /*
+     * Transfer ownership to C++ so we don't try to release it when the
+     * Python object is garbage collected.
+     */
+    sipResetPyOwned(sw);
+
+    sipOMRemoveObject(&cppPyMap, sw);
+
+    clear_access_func(sw);
+}
diff --git a/sip/siplib/voidptr.c b/sip/siplib/voidptr.c
index d1eb02b5..4202e776 100644
--- a/sip/siplib/voidptr.c
+++ b/sip/siplib/voidptr.c
@@ -314,7 +314,11 @@ static PyNumberMethods sipVoidPtr_NumberMethods = {
     0,                      /* nb_inplace_floor_divide */
     0,                      /* nb_inplace_true_divide */
 #if PY_VERSION_HEX >= 0x02050000
-    0                       /* nb_index */
+    0,                      /* nb_index */
+#endif
+#if PY_VERSION_HEX >= 0x03050000
+    0,                      /* nb_matrix_multiply */
+    0,                      /* nb_inplace_matrix_multiply */
 #endif
 };
 
@@ -1063,10 +1067,14 @@ static int vp_convertor(PyObject *arg, struct vp_values *vp)
 
         if (PyErr_Occurred())
         {
-#if PY_VERSION_HEX >= 0x03010000
-            PyErr_SetString(PyExc_TypeError, "a single integer, CObject, None, buffer protocol implementor or another sip.voidptr object is required");
+#if defined(SIP_USE_PYCAPSULE)
+#if defined(SIP_SUPPORT_PYCOBJECT)
+            PyErr_SetString(PyExc_TypeError, "a single integer, Capsule, CObject, None, bytes-like object or another sip.voidptr object is required");
 #else
-            PyErr_SetString(PyExc_TypeError, "a single integer, Capsule, CObject, None, buffer protocol implementor or another sip.voidptr object is required");
+            PyErr_SetString(PyExc_TypeError, "a single integer, Capsule, None, bytes-like object or another sip.voidptr object is required");
+#endif
+#else
+            PyErr_SetString(PyExc_TypeError, "a single integer, CObject, None, bytes-like object or another sip.voidptr object is required");
 #endif
             return 0;
         }
diff --git a/sphinxtools/constants.py b/sphinxtools/constants.py
index 71c1f427..e5414d0c 100644
--- a/sphinxtools/constants.py
+++ b/sphinxtools/constants.py
@@ -5,7 +5,7 @@
 # Author:      Andrea Gavana
 #
 # Created:     30-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -69,93 +69,27 @@ REMOVED_LINKS = ['Library:', 'Category:', 'Predefined objects/pointers:']
 # Dictionary mapping the etg module name to the real Phoenix module name
 # This needs to be kept up to date when other stuff comes in (i.e., wx.grid,
 # wx.html and so on)
-MODULENAME_REPLACE = {'_core'    : '',
-                      '_dataview': 'dataview.',
-                      '_adv'     : 'adv.',
-                      '_stc'     : 'stc.',
-                      '_html'    : 'html.',
-                      '_html2'   : 'html2.',
-                      '_glcanvas': 'glcanvas.',
-                      '_xml'     : 'xml.',
-                      '_xrc'     : 'xrc.',
-                      '_grid'    : 'grid.',
-                      '_richtext': 'richtext.',
-                      '_webkit'  : 'webkit.',
-                      '_media'   : 'media.',
-                      '_msw'     : 'msw',
+MODULENAME_REPLACE = {'_core'    : 'wx.',
+                      '_dataview': 'wx.dataview.',
+                      '_adv'     : 'wx.adv.',
+                      '_stc'     : 'wx.stc.',
+                      '_html'    : 'wx.html.',
+                      '_html2'   : 'wx.html2.',
+                      '_glcanvas': 'wx.glcanvas.',
+                      '_xml'     : 'wx.xml.',
+                      '_xrc'     : 'wx.xrc.',
+                      '_grid'    : 'wx.grid.',
+                      '_richtext': 'wx.richtext.',
+                      '_webkit'  : 'wx.webkit.',
+                      '_media'   : 'wx.media.',
+                      '_msw'     : 'wx.msw.',
                       }
 
-NO_MODULE = {
-             # -- wxAdvanced -- #
-             # Widgets
-             'DatePickerCtrlGeneric': 'adv.',
-             'GenericCalendarCtrl'  : 'adv.',
-             'OwnerDrawnComboBox'   : 'adv.',
-             
-             # Enums/constants
-             'AnimationType'                  : 'adv.',
-             'CalendarDateBorder'             : 'adv.',
-             'CalendarHitTestResult'          : 'adv.',
-             'LayoutAlignment'                : 'adv.',
-             'LayoutOrientation'              : 'adv.',
-             'OwnerDrawnComboBoxPaintingFlags': 'adv.',
-             'SashDragStatus'                 : 'adv.',
-             'SashEdgePosition'               : 'adv.',
-             'TaskBarIconType'                : 'adv.',
-             'TipKind'                        : 'adv.',
 
-             # -- wxDataView -- #
-             # Widgets
-             'DataViewItemObjectMapper': 'dataview.',
-             'PyDataViewModel'         : 'dataview.',
-             
-             # Enums/constants
-             'DataViewCellMode'        : 'dataview.',
-             'DataViewCellRenderState' : 'dataview.',
-             'DataViewColumnFlags'     : 'dataview.',
-             
-             # -- wxHTML -- #
-             # Widgets
-             'HTMLHelpDialog'          : 'html.',
-             'HTMLHelpFrame'           : 'html.',
-             'HTMLHelpWindow'          : 'html.',
-             
-             # Enums/constants
-             'HTMLCursor'              : 'html.',
-             'HtmlOpeningStatus'       : 'html.',
-             'HtmlScriptMode'          : 'html.',
-             'HtmlSelectionState'      : 'html.',
-             'HtmlURLType'             : 'html.',
-
-             # -- wxHTML2 -- #
-             # Widgets
-             
-             # Enums/constants
-             'WebViewBackend'          : 'html2.',
-             'WebViewNavigationError'  : 'html2.',
-             'WebViewReloadFlags'      : 'html2.',
-             'WebViewZoom'             : 'html2.',
-             'WebViewZoomType'         : 'html2.',
-
-             # -- wxXML -- #
-             # Widgets
-             
-             # Enums/constants
-             'XmlDocumentLoadFlag'     : 'xml.',
-             'XmlNodeType'             : 'xml.',
-             
-             # -- wxXRC -- #
-             # Widgets
-             'XmlSubclassFactory'      : 'xrc.',
-             
-             # Enums/constants
-             'XmlResourceFlags'        : 'xrc.',
-             }
-             
 # Other C++ specific things to strip away
 CPP_ITEMS = ['*', '&', 'const', 'unsigned', '(size_t)', 'size_t', 'void']
 
-# Serie of paths containing the input data for Sphinx and for the scripts
+# Series of paths containing the input data for Sphinx and for the scripts
 # building the ReST docs:
 
 # The location of the Phoenix main folder
@@ -189,6 +123,7 @@ WIDGETS_IMAGES_ROOT  = os.path.join(SPHINXROOT,  '_static', 'images', 'widgets',
 # Folder for the icons used for titles, sub-titles and so on for the Sphinx documentation
 SPHINX_IMAGES_ROOT   = os.path.join(SPHINXROOT,  '_static', 'images', 'sphinxdocs')
 
+DOCSTRING_KEY = '__module_docstring'
 
 # The Doxygen root for the XML docstrings
 xmlsrcbase = 'docs/doxygen/out/xml'
@@ -286,7 +221,8 @@ class Enumeration(object):
 CONSTANT_RE = re.compile('^([\w\s,]+)=', re.M)
 
 EXCLUDED_ATTRS = ['__builtins__', '__doc__', '__name__', '__file__', '__path__',
-                  '__module__', '__all__']
+                  '__module__', '__all__', '__cached__', '__loader__', '__package__',
+                  '__spec__', ]
 
 TYPE_DESCRIPTION = ['library',
                     'package',
diff --git a/sphinxtools/inheritance.py b/sphinxtools/inheritance.py
index d2c970bf..67637d8e 100644
--- a/sphinxtools/inheritance.py
+++ b/sphinxtools/inheritance.py
@@ -5,7 +5,7 @@
 # Author:      Andrea Gavana
 #
 # Created:     30-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ from subprocess import Popen, PIPE
 
 # Phoenix-specific imports
 
-from .utilities import Wx2Sphinx, FormatExternalLink
+from .utilities import wx2Sphinx, formatExternalLink
 from .constants import INHERITANCEROOT
 
 ENOENT = getattr(errno, 'ENOENT', 0)
@@ -41,7 +41,6 @@ class InheritanceDiagram(object):
 
         if main_class is None:
             self.class_info, self.specials = classes
-            self.class_info = list(self.class_info.values())
         else:
             self.class_info, self.specials = self._class_info(classes)
             
@@ -60,23 +59,24 @@ class InheritanceDiagram(object):
         specials = []
 
         def recurse(cls):
-            nodename, fullname = self.class_name(cls)
-            if cls in [object] or nodename.startswith('sip.'):
+            fullname = self.class_name(cls)
+            if cls in [object] or fullname.startswith('sip.'):
                 return
             
             baselist = []
-            all_classes[cls] = (nodename, fullname, baselist)
+            all_classes[cls] = (fullname, baselist)
 
             for base in cls.__bases__:
-                if base in [object] or self.class_name(base)[0].startswith('sip.'):
+                name = self.class_name(base)
+                if base in [object] or name.startswith('sip.'):
                     continue
-                baselist.append(self.class_name(base)[0])
+                baselist.append(name)
                 if base not in all_classes:
                     recurse(base)
 
         for cls in classes:
             recurse(cls)
-            specials.append(self.class_name(cls)[1])
+            specials.append(self.class_name(cls))
 
         return list(all_classes.values()), specials
 
@@ -95,16 +95,12 @@ class InheritanceDiagram(object):
         else:
             fullname = '%s.%s' % (module, cls.__name__)
 
-        name_parts = fullname.split('.')
-        if 'wx._' in fullname:
-            nodename = fullname = name_parts[-1]
-        else:
-            # Just the last 2 parts
-            nodename = '.'.join(name_parts[-2:])
-            if fullname.startswith('wx.'):
-                fullname = fullname[3:]
-                
-        return nodename, fullname
+        if fullname.startswith('wx._'):
+            parts = fullname.split('.')
+            del parts[1]
+            fullname = '.'.join(parts)
+
+        return fullname
 
 
     # These are the default attrs for graphviz
@@ -166,7 +162,7 @@ class InheritanceDiagram(object):
         res.append('digraph %s {\n' % name)
         res.append(self._format_graph_attrs(g_attrs))
 
-        for name, fullname, bases in self.class_info:
+        for fullname, bases in self.class_info:
             # Write the node
             this_node_attrs = n_attrs.copy()
 
@@ -175,40 +171,28 @@ class InheritanceDiagram(object):
                 this_node_attrs['color'] = 'blue'
                 this_node_attrs['style'] = 'bold'
 
-            if self.main_class is None:
-                newname, fullname = Wx2Sphinx(name)
-            else:
-                newname = name
-
             if class_summary is None:
                 # Phoenix base classes, assume there is always a link
-                this_node_attrs['URL'] = '"%s.html"'%fullname
+                this_node_attrs['URL'] = '"%s.html"' % fullname
             else:
-                if 'wx.' in fullname:
-                    fullname = fullname[3:]
-                
                 if fullname in class_summary:
-                    this_node_attrs['URL'] = '"%s.html"'%fullname
+                    this_node_attrs['URL'] = '"%s.html"' % fullname
                 else:
-                    full_page = FormatExternalLink(fullname, inheritance=True)
+                    full_page = formatExternalLink(fullname, inheritance=True)
                     if full_page:
                         this_node_attrs['URL'] = full_page
                     
             res.append('  "%s" [%s];\n' %
-                       (newname, self._format_node_attrs(this_node_attrs)))
+                       (fullname, self._format_node_attrs(this_node_attrs)))
 
             # Write the edges
             for base_name in bases:
-
                 this_edge_attrs = e_attrs.copy()
                 if fullname in self.specials:
                     this_edge_attrs['color'] = 'red'
 
-                if self.main_class is None:
-                    base_name, dummy = Wx2Sphinx(base_name)
-
                 res.append('  "%s" -> "%s" [%s];\n' %
-                           (base_name, newname,
+                           (base_name, fullname,
                             self._format_node_attrs(this_edge_attrs)))
         res.append('}\n')
         return ''.join(res)
@@ -216,7 +200,7 @@ class InheritanceDiagram(object):
 
     # ----------------------------------------------------------------------- #
 
-    def MakeInheritanceDiagram(self, class_summary=None):
+    def makeInheritanceDiagram(self, class_summary=None):
         """
         Actually generates the inheritance diagram as a PNG file plus the corresponding
         MAP file for mouse navigation over the inheritance boxes.
@@ -242,7 +226,7 @@ class InheritanceDiagram(object):
         if self.main_class is not None:
             filename = self.main_class.name
         else:                        
-            dummy, filename = Wx2Sphinx(self.specials[0])
+            filename = self.specials[0]
 
         outfn = os.path.join(static_root, filename + '_inheritance.png')
         mapfile = outfn + '.map'
diff --git a/sphinxtools/librarydescription.py b/sphinxtools/librarydescription.py
index f43d99f3..5c4828a8 100644
--- a/sphinxtools/librarydescription.py
+++ b/sphinxtools/librarydescription.py
@@ -1,19 +1,16 @@
 import sys
 import os
-import operator
 import re
 
 if sys.version_info < (3,):
-    import cPickle as pickle
     from StringIO import StringIO
 else:
-    import pickle
     from io import StringIO
 
 from inspect import getmro, getclasstree, getdoc, getcomments
 
-from .utilities import MakeSummary, ChopDescription, WriteSphinxOutput
-from .utilities import FindControlImages, FormatExternalLink, IsPython3
+from .utilities import makeSummary, chopDescription, writeSphinxOutput, PickleFile
+from .utilities import findControlImages, formatExternalLink, isPython3
 from .constants import object_types, MODULE_TO_ICON, DOXY_2_REST, SPHINXROOT
 from . import templates
 
@@ -56,7 +53,7 @@ def generic_summary(libraryItem, stream):
 
         templ = [templates.TEMPLATE_STD_FUNCTION_SUMMARY, templates.TEMPLATE_STD_CLASS_SUMMARY]
         refs = ['func', 'ref']
-        add_tilde = [True, False]
+        add_tilde = [True, True]
 
     elif libraryItem.kind == object_types.KLASS:
         write_toc = False
@@ -79,16 +76,16 @@ def generic_summary(libraryItem, stream):
             if item.is_redundant:
                 continue
 
-            item_docs = ReplaceWxDot(item.docs)
-            item_docs = KillEpydoc(item, item_docs)
-            docs = ChopDescription(item_docs)
+            item_docs = replaceWxDot(item.docs)
+            item_docs = killEpydoc(item, item_docs)
+            docs = chopDescription(item_docs)
             table.append((item.name, docs))
 
             if item.kind != object_types.FUNCTION:
                 toctree += '   %s\n'%item.name
 
         if table:
-            summary = MakeSummary(libraryItem.name, table, templ[index], refs[index], add_tilde[index])
+            summary = makeSummary(libraryItem.name, table, templ[index], refs[index], add_tilde[index])
             stream.write(summary)
             
     if toctree and write_toc:
@@ -96,18 +93,12 @@ def generic_summary(libraryItem, stream):
         stream.write('\n\n')
 
 
-def MakeSphinxFile(name):
+def makeSphinxFile(name):
 
-    return os.path.join(os.getcwd(), 'docs', 'sphinx', '%s.txt'%name)
+    return os.path.join(os.getcwd(), 'docs', 'sphinx', '%s.txt' % name)
 
 
-def ReplaceWxDot(text):
-
-    # Double ticks with 'wx.' in them
-    text = re.sub(r'``wx\.(.*?)``', r'``\1``   ', text)
-    
-    # Signle ticks with 'wx.' in them... try and referencing them
-    text = re.sub(r'`wx\.(.*?)`', r'`\1`   ', text)
+def replaceWxDot(text):
 
     # Masked is funny...
     text = text.replace('</LI>', '')
@@ -121,7 +112,7 @@ def ReplaceWxDot(text):
         if new in [':keyword', ':param']:
             if not space_added:
                 space_added = True
-                new_with_newline = '\n%s'%new
+                new_with_newline = '\n%s' % new
                 text = text.replace(old, new_with_newline, 1)
 
         text = text.replace(old, new)
@@ -167,13 +158,13 @@ def GetTopLevelParent(klass):
     return parents[-2]
 
 
-def FindInHierarchy(klass, newlink):
+def findInHierarchy(klass, newlink):
 
     library = GetTopLevelParent(klass)
     return library.FindItem(newlink)
 
 
-def FindBestLink(klass, newlink):
+def findBestLink(klass, newlink):
 
     parent_class = klass.parent
     
@@ -195,7 +186,7 @@ def FindBestLink(klass, newlink):
                 else:
                     return ':attr:`~%s`'%child.name
 
-    full_loop = FindInHierarchy(klass, newlink)
+    full_loop = findInHierarchy(klass, newlink)
 
     if full_loop:
         return full_loop
@@ -203,7 +194,7 @@ def FindBestLink(klass, newlink):
     return ':ref:`%s`'%newlink
 
 
-def KillEpydoc(klass, newtext):
+def killEpydoc(klass, newtext):
 
     epydocs = re.findall(EPYDOC_PATTERN, newtext)
 
@@ -235,16 +226,14 @@ def KillEpydoc(klass, newtext):
             newlink = regex[start+1:end]
 
             if 'wx.' in regex or 'wx' in regex:
-                newlink = newlink.replace('wx.', '')
-                newlink = newlink.replace('wx', '')
-                newlink = ':class:`%s`'%newlink.strip()
+                newlink = ':class:`%s`' % newlink.strip()
             else:
-                newlink = '`%s`'%newlink
+                newlink = '`%s`' % newlink
 
         elif 'I{' in regex:
             # It's an inclined text
             newlink = regex[start+1:end]
-            newlink = ' `%s` '%newlink
+            newlink = ' `%s` ' % newlink
 
         elif 'L{' in regex:
             # Some kind of link, but we can't figure it out
@@ -253,10 +242,10 @@ def KillEpydoc(klass, newtext):
 
             if newlink.upper() == newlink:
                 # Use double backticks
-                newlink = '``%s``'%newlink
+                newlink = '``%s``' % newlink
             else:
                 # Try and reference it
-                bestlink = FindBestLink(klass, newlink)
+                bestlink = findBestLink(klass, newlink)
                 if bestlink:
                     newlink = bestlink
                 
@@ -406,7 +395,7 @@ class Library(ParentBase):
         self.obj_type = 'Library'
         self.python_version = ''
 
-        self.sphinx_file = MakeSphinxFile(name)
+        self.sphinx_file = makeSphinxFile(name)
         self.base_name = name
 
 
@@ -483,19 +472,19 @@ class Library(ParentBase):
 
     def ToRest(self, class_summary):
 
-        print(('\n\nReST-ifying %s...\n\n'%self.base_name))
+        print('\n\nReST-ifying %s...\n\n' % self.base_name)
         stream = StringIO()
 
         header = templates.TEMPLATE_DESCRIPTION%(self.base_name, self.base_name)
         stream.write(header)
 
-        newtext = ReplaceWxDot(self.docs)
-        newtext = KillEpydoc(self, newtext)
+        newtext = replaceWxDot(self.docs)
+        newtext = killEpydoc(self, newtext)
 
         stream.write(newtext + '\n\n')
 
         generic_summary(self, stream)
-        WriteSphinxOutput(stream, self.sphinx_file)
+        writeSphinxOutput(stream, self.sphinx_file)
 
 
     def ClassesToPickle(self, obj, class_dict):
@@ -512,7 +501,7 @@ class Library(ParentBase):
                 if child.is_redundant:
                     continue
                 
-                class_dict[child.name] = (child.method_list, child.bases, ChopDescription(child.docs))
+                class_dict[child.name] = (child.method_list, child.bases, chopDescription(child.docs))
 
             # recursively scan other folders, appending results
             class_dict = self.ClassesToPickle(child, class_dict)
@@ -521,25 +510,14 @@ class Library(ParentBase):
 
 
     def Save(self):
-
         ParentBase.Save(self)
 
         class_dict = {}
         class_dict = self.ClassesToPickle(self, class_dict)
 
-        pickle_file = os.path.join(SPHINXROOT, 'class_summary.lst')
-
-        if os.path.isfile(pickle_file):
-            fid = open(pickle_file, 'rb')
-            items = pickle.load(fid)
-            fid.close()
-        else:
-            items = {}
-
-        items.update(class_dict)
-        fid = open(pickle_file, 'wb')
-        pickle.dump(items, fid)
-        fid.close()
+        pickle_file = os.path.join(SPHINXROOT, 'class_summary.pkl')
+        with PickleFile(pickle_file) as pf:
+            pf.items.update(class_dict)
 
 
 class Module(ParentBase):
@@ -549,7 +527,7 @@ class Module(ParentBase):
         ParentBase.__init__(self, name, kind)
         
         self.filename = ''
-        self.sphinx_file = MakeSphinxFile(name)
+        self.sphinx_file = makeSphinxFile(name)
 
         if kind == object_types.PACKAGE:
             self.obj_type = 'Package'
@@ -570,23 +548,23 @@ class Module(ParentBase):
 
         if self.is_redundant:
             return
-        
+
         stream = StringIO()
 
         label = 'Module'
         if self.kind == object_types.PACKAGE:
             label = 'Package'
 
-        stream.write('.. module:: %s\n\n'%self.name)
-        stream.write('.. currentmodule:: %s\n\n'%self.name)
+        stream.write('.. module:: %s\n\n' % self.name)
+        stream.write('.. currentmodule:: %s\n\n' % self.name)
         stream.write('.. highlight:: python\n\n')
             
-        header = templates.TEMPLATE_DESCRIPTION%(self.name, '%s'%self.GetShortName())
+        header = templates.TEMPLATE_DESCRIPTION % (self.name, self.name)
         
         stream.write(header)
         
-        newtext = ReplaceWxDot(self.docs)
-        newtext = KillEpydoc(self, newtext)
+        newtext = replaceWxDot(self.docs)
+        newtext = killEpydoc(self, newtext)
 
         stream.write(newtext + '\n\n')
 
@@ -600,12 +578,12 @@ class Module(ParentBase):
         if self.kind != object_types.PACKAGE:
             print(('%s - %s (module)'%(spacer, self.name)))
             if self.inheritance_diagram:
-                png, map = self.inheritance_diagram.MakeInheritanceDiagram(class_summary)
+                png, map = self.inheritance_diagram.makeInheritanceDiagram(class_summary)
                 short_name = self.GetShortName()
                 image_desc = templates.TEMPLATE_INHERITANCE % ('module', short_name, png, short_name, map)
                 stream.write(image_desc)
         else:
-            print(('%s - %s (package)'%(spacer, self.name)))
+            print('%s - %s (package)' % (spacer, self.name))
 
         generic_summary(self, stream)
 
@@ -625,7 +603,7 @@ class Module(ParentBase):
                 continue
             fun.Write(stream)
 
-        WriteSphinxOutput(stream, self.sphinx_file)
+        writeSphinxOutput(stream, self.sphinx_file)
 
 
     def Save(self):
@@ -654,17 +632,23 @@ class Class(ParentBase):
 
         for item in sups:
             item = repr(item)
-            
+
             sup = item.replace('<class ', '').replace('>', '').replace('<type ', '')
             sup = sup.strip().replace('"', '').replace("'", '')
             if ' at ' in sup:
                 sup = sup[0:sup.index(' at ')].strip()
 
-            if 'wx._' in sup:
-                name_parts = sup.split('.')
-                sup = name_parts[-1]
+            if sup.startswith('wx._'):
+                # take out the '_core' in things like 'wx._core.Control'
+                parts = sup.split('.')
+                if parts[1] == '_core':
+                    del parts[1]
+                else:
+                    # or just the '_' otherwise
+                    parts[1] = parts[1][1:]
+                sup = '.'.join(parts)
 
-            sortedSupClasses.append(sup.replace('wx.', ''))
+            sortedSupClasses.append(sup)
 
         sortedSupClasses.sort()    
            
@@ -678,11 +662,7 @@ class Class(ParentBase):
             else:
                 cls = s
 
-            if 'wx._' in cls:
-                name_parts = cls.split('.')
-                cls = name_parts[-1]
-
-            sortedSubClasses.append(cls.replace('wx.', ''))
+            sortedSubClasses.append(cls)
 
         sortedSubClasses.sort()
 
@@ -702,7 +682,7 @@ class Class(ParentBase):
         
         self.order = 3
         self.obj_type = 'Class'
-        self.sphinx_file = MakeSphinxFile(name)
+        self.sphinx_file = makeSphinxFile(name)
 
 
     def ToRest(self, class_summary):
@@ -715,35 +695,35 @@ class Class(ParentBase):
         parts = self.name.split('.')
         current_module = '.'.join(parts[0:-1])
 
-        stream.write('.. currentmodule:: %s\n\n'%current_module)
+        stream.write('.. currentmodule:: %s\n\n' % current_module)
         stream.write('.. highlight:: python\n\n')
 
-        class_docs = ReplaceWxDot(self.docs)
-        class_docs = KillEpydoc(self, class_docs)
+        class_docs = replaceWxDot(self.docs)
+        class_docs = killEpydoc(self, class_docs)
         
-        header = templates.TEMPLATE_DESCRIPTION%(self.name, self.GetShortName())
+        header = templates.TEMPLATE_DESCRIPTION % (self.name, self.name)
         stream.write(header)
         stream.write(class_docs + '\n\n')
 
         if self.inheritance_diagram:
-            png, map = self.inheritance_diagram.MakeInheritanceDiagram(class_summary)
+            png, map = self.inheritance_diagram.makeInheritanceDiagram(class_summary)
             short_name = self.GetShortName()
             image_desc = templates.TEMPLATE_INHERITANCE % ('class', short_name, png, short_name, map)
             stream.write(image_desc)
 
-        appearance = FindControlImages(self.name.lower())
+        appearance = findControlImages(self.name.lower())
         if appearance:
             appearance_desc = templates.TEMPLATE_APPEARANCE % tuple(appearance)
             stream.write(appearance_desc + '\n\n')
 
         if self.subClasses:
-            subs = [FormatExternalLink(cls) for cls in self.subClasses]
+            subs = [formatExternalLink(cls) for cls in self.subClasses]
             subs = ', '.join(subs)
             subs_desc = templates.TEMPLATE_SUBCLASSES % subs
             stream.write(subs_desc)
 
         if self.superClasses:
-            sups = [FormatExternalLink(cls) for cls in self.superClasses]
+            sups = [formatExternalLink(cls) for cls in self.superClasses]
             sups = ', '.join(sups)
             sups_desc = templates.TEMPLATE_SUPERCLASSES % sups
             stream.write(sups_desc)
@@ -768,7 +748,7 @@ class Class(ParentBase):
         for prop in properties:
             prop.Write(stream, short_name)
             
-        WriteSphinxOutput(stream, self.sphinx_file)
+        writeSphinxOutput(stream, self.sphinx_file)
         self.bases = self.superClasses
         
 
@@ -787,7 +767,7 @@ class Class(ParentBase):
             init = self.children.pop(pop)
             self.children.insert(0, init)
 
-        self.signature = self.signature.replace('wx.', '')
+        #self.signature = self.signature.replace('wx.', '')
         self.signature = self.signature.rstrip(':').lstrip('class ')
 
         if ' def __init__' in self.signature:
@@ -903,8 +883,6 @@ class Method(ChildrenBase):
                 newargs.append((name, repr_val, eval_val))
 
         self.arguments = newargs
-
-        self.signature = self.signature.replace('wx.', '')
         self.signature = self.signature.rstrip(':').lstrip()
         
         if self.signature.startswith('def '):
@@ -948,12 +926,12 @@ class Method(ChildrenBase):
             return
             
         text = ''
-        newdocs = ReplaceWxDot(self.docs)
+        newdocs = replaceWxDot(self.docs)
         
         for line in newdocs.splitlines(True):
             text += indent + line
 
-        text = KillEpydoc(self, text)
+        text = killEpydoc(self, text)
         text += '\n\n\n'
         stream.write(text)
 
@@ -1013,7 +991,7 @@ class Attribute(ChildrenBase):
 
     def __init__(self, name, specs, value):
 
-        if IsPython3():
+        if isPython3():
             specs = str(specs)
         else:
             specs = unicode(specs)
diff --git a/sphinxtools/modulehunter.py b/sphinxtools/modulehunter.py
index 56f63f6c..0881fac1 100644
--- a/sphinxtools/modulehunter.py
+++ b/sphinxtools/modulehunter.py
@@ -6,18 +6,12 @@
 
 import os
 import sys
-import glob
 import types
-import imp
+import importlib
 import traceback
 import pkgutil
 
 
-if sys.version_info < (3,):
-    import cPickle as pickle
-else:
-    import pickle
-
 from buildtools.config import phoenixDir
 
 from inspect import getargspec, ismodule, getdoc, getmodule, getcomments, isfunction
@@ -29,7 +23,7 @@ from .librarydescription import Method, Property, Attribute
 
 from . import inheritance
 
-from .utilities import IsPython3
+from .utilities import isPython3, PickleFile
 from .constants import object_types, EXCLUDED_ATTRS, MODULE_TO_ICON
 from .constants import CONSTANT_RE
 
@@ -127,7 +121,8 @@ def analyze_params(obj, signature):
 
     try:
         arginfo = getargspec(obj)
-    except TypeError:
+        # TODO: Switch to getfullargspec
+    except (TypeError, ValueError):
         arginfo = None
 
     pevals = {}
@@ -156,7 +151,7 @@ def analyze_params(obj, signature):
             pvalue = pvalue.strip()
             if pname in pevals:
                 try:
-                    if IsPython3():
+                    if isPython3():
                         peval = str(pevals[pname])
                     else:
                         peval = unicode(pevals[pname])
@@ -224,7 +219,7 @@ def inspect_source(method_class, obj, source):
 def is_classmethod(instancemethod):
     """ Determine if an instancemethod is a classmethod. """
 
-    attribute = (IsPython3() and ['__self__'] or ['im_self'] )[0]
+    attribute = (isPython3() and ['__self__'] or ['im_self'])[0]
 
     if hasattr(instancemethod, attribute):
         return getattr(instancemethod, attribute) is not None
@@ -254,7 +249,11 @@ def describe_func(obj, parent_class, module_name):
     comments = getcomments(obj)
     
     if isfunction(obj):
-        method = object_types.FUNCTION
+        # in Py3 unbound methods have same type as functions.
+        if isinstance(parent_class, Class):
+            method = object_types.METHOD
+        else:
+            method = object_types.FUNCTION
     elif ismethod(obj):
         method = object_types.METHOD
     elif ismethoddescriptor(obj):
@@ -277,32 +276,33 @@ def describe_func(obj, parent_class, module_name):
 
     if source_code:
         inspect_source(klass, obj, source_code)
-        klass.number_lines = '%d'%len(source_code.split('\n'))
+        klass.number_lines = '%d' % len(source_code.split('\n'))
         
     if isinstance(obj, staticmethod):
         klass.method = method = object_types.STATIC_METHOD
 
     try:
+        code = None
         if method in [object_types.METHOD, object_types.METHOD_DESCRIPTOR, object_types.INSTANCE_METHOD]:
-            if IsPython3():
+            if isPython3():
                 code = obj.__func__.__code__
             else:
                 code = obj.im_func.func_code
         elif method == object_types.STATIC_METHOD:
-            if IsPython3():
+            if isPython3():
                 code = obj.__func__.__code__
             else:
                 code = obj.im_func.func_code
         else:
-            if IsPython3():
-                obj.__code__
+            if isPython3():
+                code = obj.__code__
             else:
                 code = obj.func_code
     except AttributeError:
         code = None
 
     if code is not None:
-        klass.firstlineno = '%d'%code.co_firstlineno
+        klass.firstlineno = '%d' % code.co_firstlineno
     
     parent_class.Add(klass)
                         
@@ -318,6 +318,9 @@ def describe_class(obj, module_class, module_name, constants):
     if class_name == 'object':
         return
 
+    if 'GenBitmapButton' in class_name:
+        print('GenBitmapButton')
+
     class_name = module_class.name + '.' + class_name
     
     docs = getdoc(obj)
@@ -404,7 +407,7 @@ def describe_class(obj, module_class, module_name, constants):
             description = description[0:description.index(':')]
             
         klass.signature = description.strip()
-        klass.number_lines = '%d'%len(source_code.split('\n'))
+        klass.number_lines = '%d' % len(source_code.split('\n'))
 
 
 def describe_module(module, kind, constants=[]):
@@ -477,26 +480,17 @@ def Import(init_name, import_name, full_process=True):
         path = list(sys.path)    
         sys.path.insert(0, dirname)
 
-    f = None
-
     try:
-
-        f, filename, description = imp.find_module(import_name, [dirname])
-        mainmod = imp.load_module(import_name, f, filename, description) 
-        
+        mainmod = importlib.import_module(import_name)
     except (ImportError, NameError):
-
         message = format_traceback()
-        print(('Error: %s'%message))
+        print('Error: %s' % message)
 
         if not full_process:
             sys.path = path[:]
             
         return
     
-    if f:
-        f.close()
-
     if not full_process:
         sys.path = path[:]
         try:
@@ -536,7 +530,7 @@ def FindModuleType(filename):
 def SubImport(import_string, module, parent_class, ispkg):
     
     try:
-        submod = __import__(import_string, fromlist=[module])            
+        submod = importlib.import_module(import_string)
     except:
         # pubsub and Editra can be funny sometimes...
         message = "Unable to import module/package '%s.%s'.\n         Exception was: %s"%(import_string, module, format_traceback())
@@ -550,7 +544,7 @@ def SubImport(import_string, module, parent_class, ispkg):
 
     subpath = os.path.dirname(filename)
     if subpath not in sys.path:
-        sys.path.append(subpath)
+        sys.path.append(subpath)   # *** WHY?
     
     if ispkg:
         kind = object_types.PACKAGE
@@ -561,8 +555,9 @@ def SubImport(import_string, module, parent_class, ispkg):
 
     if kind in [object_types.PY_MODULE, object_types.PACKAGE]:
 
-        contents = open(filename, 'rt').read()
-        consts = CONSTANT_RE.findall(contents)
+        with open(filename, 'rt') as f:
+            contents = f.read()
+            consts = CONSTANT_RE.findall(contents)
 
         for c in consts:
             if ',' in c:
@@ -580,15 +575,13 @@ def SubImport(import_string, module, parent_class, ispkg):
 def ToRest(import_name):
 
     sphinxDir = os.path.join(phoenixDir(), 'docs', 'sphinx')
-    pickle_file = os.path.join(sphinxDir, 'wx%s.pkl'%import_name)
+    pickle_file = os.path.join(sphinxDir, '%s.pkl' % import_name)
 
-    fid = open(pickle_file, 'rb')
-    library_class = pickle.load(fid)
-    fid.close()
+    pf = PickleFile(pickle_file)
+    library_class = pf.read()
 
-    fid = open(os.path.join(sphinxDir, 'class_summary.lst'), 'rb')
-    class_summary = pickle.load(fid)
-    fid.close()
+    pf = PickleFile(os.path.join(sphinxDir, 'class_summary.pkl'))
+    class_summary = pf.read()
 
     library_class.Walk(library_class, class_summary)
 
@@ -596,14 +589,15 @@ def ToRest(import_name):
 def ModuleHunter(init_name, import_name, version):
 
     sphinxDir = os.path.join(phoenixDir(), 'docs', 'sphinx')
-    pickle_file = os.path.join(sphinxDir, 'wx%s.pkl'%import_name)
-    
+    pickle_file = os.path.join(sphinxDir, '%s.pkl' % import_name)
+
+    # TODO: instead of just skipping to generating the ReST files, do some
+    # dependency checking and rescan those files that are newer than the
+    # pickle file.
     if os.path.isfile(pickle_file):
         ToRest(import_name)
         return
 
-    path = list(sys.path)
-
     directory, module_name = os.path.split(init_name)
     path = list(sys.path)
     
@@ -612,8 +606,8 @@ def ModuleHunter(init_name, import_name, version):
     if mainmod is None:
         return
     
-    message = "Importing main library '%s'..."%import_name
-    print(('Message: %s'%message))
+    message = "Importing main library '%s'..." % import_name
+    print('Message: %s' % message)
 
     module_name = os.path.splitext(getfile(mainmod))[0] + '.py'
     contents = open(module_name, 'rt').read()
@@ -622,11 +616,11 @@ def ModuleHunter(init_name, import_name, version):
     library_class, count = describe_module(mainmod, kind=object_types.LIBRARY, constants=constants)
     library_class.name = '%s-%s'%(import_name, version)
 
-    message = "Main library '%s' imported..."%library_class.name
-    print(('Message: %s'%message))
+    message = "Main library '%s' imported..." % library_class.name
+    print('Message: %s' % message)
     
     message = "Importing sub-modules and sub-packages...\n"    
-    print(('Message: %s'%message))
+    print('Message: %s' % message)
 
     looped_names = []
     ancestors_dict = {import_name: library_class}
@@ -634,7 +628,6 @@ def ModuleHunter(init_name, import_name, version):
     for importer, module_name, ispkg in pkgutil.walk_packages(path=[directory],
                                                               prefix=import_name+'.',
                                                               onerror=lambda x: None):
-
         import_string = module_name
         splitted = module_name.split('.')
 
@@ -660,9 +653,8 @@ def ModuleHunter(init_name, import_name, version):
 
     sys.path[:] = path # restore
 
-    fid = open(pickle_file, 'wb')
-    pickle.dump(library_class, fid)
-    fid.close()
+    pf = PickleFile(pickle_file)
+    pf.write(library_class)
 
     ToRest(import_name)
 
diff --git a/sphinxtools/postprocess.py b/sphinxtools/postprocess.py
index 0d213945..3cedc576 100644
--- a/sphinxtools/postprocess.py
+++ b/sphinxtools/postprocess.py
@@ -1,37 +1,33 @@
 # -*- coding: utf-8 -*-
-
 #---------------------------------------------------------------------------
 # Name:        sphinxtools/postprocess.py
 # Author:      Andrea Gavana
 #
 # Created:     30-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
 # Standard library imports
 import os
-import sys
 import re
 import glob
 import random
-import subprocess
-
-if sys.version_info < (3,):
-    import cPickle as pickle
-else:
-    import pickle
 
 # Phoenix-specific imports
 from buildtools.config import copyIfNewer, writeIfChanged, newer, getVcsRev, textfile_open
+from etgtools.item_module_map import ItemModuleMap
 
 from . import templates
-from .utilities import Wx2Sphinx
+from .utilities import wx2Sphinx, PickleFile
 from .constants import HTML_REPLACE, TODAY, SPHINXROOT, SECTIONS_EXCLUDE
 from .constants import CONSTANT_INSTANCES, WIDGETS_IMAGES_ROOT, SPHINX_IMAGES_ROOT
+from .constants import DOCSTRING_KEY
+
+# ----------------------------------------------------------------------- #
 
 
-def MakeHeadings():
+def makeHeadings():
     """
     Generates the "headings.inc" file containing the substitution reference
     for the small icons used in the Sphinx titles, sub-titles and so on.
@@ -63,7 +59,7 @@ def MakeHeadings():
 
 # ----------------------------------------------------------------------- #
 
-def SphinxIndexes(sphinxDir):
+def genIndexes(sphinxDir):
     """
     This is the main function called after the `etg` process has finished.
 
@@ -76,16 +72,16 @@ def SphinxIndexes(sphinxDir):
     
     for file in pklfiles:
         if file.endswith('functions.pkl'):
-            ReformatFunctions(file)
-        elif 'classindex' in file:
-            MakeClassIndex(sphinxDir, file)
+            reformatFunctions(file)
+        elif 'moduleindex' in file:
+            makeModuleIndex(sphinxDir, file)
 
-    BuildEnumsAndMethods(sphinxDir)
+    buildEnumsAndMethods(sphinxDir)
 
 
 # ----------------------------------------------------------------------- #
 
-def BuildEnumsAndMethods(sphinxDir):
+def buildEnumsAndMethods(sphinxDir):
     """
     This function does some clean-up/refactoring of the generated ReST files by:
 
@@ -100,9 +96,8 @@ def BuildEnumsAndMethods(sphinxDir):
     4. Some cleanup.
     """
 
-    fid = open(os.path.join(sphinxDir, 'class_summary.lst'), 'rb')
-    class_summary = pickle.load(fid)
-    fid.close()
+    pf = PickleFile(os.path.join(sphinxDir, 'class_summary.pkl'))
+    class_summary = pf.read()
     
     unreferenced_classes = {}
     
@@ -144,15 +139,12 @@ def BuildEnumsAndMethods(sphinxDir):
 
         text = newtext
     
-        text = FindInherited(input, class_summary, enum_base, text)
-        text, unreferenced_classes = RemoveUnreferenced(input, class_summary, enum_base, unreferenced_classes, text)
+        text = findInherited(input, class_summary, enum_base, text)
+        text, unreferenced_classes = removeUnreferenced(input, class_summary, enum_base, unreferenced_classes, text)
         
-        text = text.replace('wx``', '``')
-        text = text.replace('wx.``', '``')
         text = text.replace('non-NULL', 'not ``None``')
         text = text.replace(',,', ',').replace(', ,', ',')
-        text = text.replace('|wx', '|')
-        
+
         # Replacements for ScrolledWindow and ScrolledCanvas...
         text = text.replace('<wxWindow>', 'Window')
         text = text.replace('<wxPanel>', 'Panel')
@@ -182,8 +174,8 @@ def BuildEnumsAndMethods(sphinxDir):
         # Remove lines with "Event macros" in them...
         text = text.replace('Event macros:', '')
 
-        text = TooltipsOnInheritance(text, class_summary)
-        text = AddSpacesToLinks(text)
+        text = tooltipsOnInheritance(text, class_summary)
+        text = addSpacesToLinks(text)
 
         if text != orig_text:
             fid = textfile_open(input, 'wt')  
@@ -222,7 +214,7 @@ def BuildEnumsAndMethods(sphinxDir):
 
 # ----------------------------------------------------------------------- #
 
-def FindInherited(input, class_summary, enum_base, text):
+def findInherited(input, class_summary, enum_base, text):
 
     # Malformed inter-links
     regex = re.findall(r'\S:meth:\S+', text)
@@ -311,7 +303,7 @@ def FindInherited(input, class_summary, enum_base, text):
 
 # ----------------------------------------------------------------------- #
 
-def RemoveUnreferenced(input, class_summary, enum_base, unreferenced_classes, text):
+def removeUnreferenced(input, class_summary, enum_base, unreferenced_classes, text):
 
     regex = re.findall(':ref:`(.*?)`', text)
     
@@ -339,14 +331,14 @@ def RemoveUnreferenced(input, class_summary, enum_base, unreferenced_classes, te
         if split not in unreferenced_classes[reg]:
             unreferenced_classes[reg].append(split)
                 
-        text = text.replace(':ref:`%s`'%reg, '`%s`'%reg, 1)
+        text = text.replace(':ref:`%s`'%reg, '`%s`     '%reg, 1)
 
     return text, unreferenced_classes        
 
 
 # ----------------------------------------------------------------------- #
 
-def AddSpacesToLinks(text):
+def addSpacesToLinks(text):
 
     regex = re.findall('\w:ref:`(.*?)`', text)
 
@@ -357,7 +349,7 @@ def AddSpacesToLinks(text):
 
 # ----------------------------------------------------------------------- #
 
-def ReformatFunctions(file):
+def reformatFunctions(file):
 
     text_file = os.path.splitext(file)[0] + '.txt'
     local_file = os.path.split(file)[1]
@@ -365,15 +357,14 @@ def ReformatFunctions(file):
     if not newer(file, text_file):
         return
     
-    fid = open(file, 'rb')
-    functions = pickle.load(fid)
-    fid.close()
-    
-    if local_file.count('.') == 1:
+    pf = PickleFile(file)
+    functions = pf.read()
+
+    if local_file.count('.') == 2:
         # Core functions
-        label = 'Core'
+        label = 'wx'
     else:
-        label = local_file.split('.')[0:-2][0]
+        label = '.'.join(local_file.split('.')[0:2])
 
     names = list(functions.keys())
     names = [name.lower() for name in names]
@@ -392,6 +383,7 @@ def ReformatFunctions(file):
 
     names = list(functions.keys())
     names = sorted(names, key=str.lower)
+    imm = ItemModuleMap()
 
     for letter in letters:
         text += '.. _%s %s:\n\n%s\n^\n\n'%(label, letter, letter)
@@ -399,7 +391,7 @@ def ReformatFunctions(file):
             if fun[0].upper() != letter:
                 continue
 
-            text += '* :func:`%s`\n'%fun
+            text += '* :func:`%s`\n' % imm.get_fullname(fun)
 
         text += '\n\n'
 
@@ -412,79 +404,110 @@ def ReformatFunctions(file):
 
 # ----------------------------------------------------------------------- #
 
-def MakeClassIndex(sphinxDir, file):
+def makeModuleIndex(sphinxDir, file):
 
     text_file = os.path.splitext(file)[0] + '.txt'
     local_file = os.path.split(file)[1]
 
     if not newer(file, text_file):
         return
-    
-    fid = open(file, 'rb')
-    classes = pickle.load(fid)
-    fid.close()
-    
-    if local_file.count('.') == 1:
-        # Core functions
-        label = 'Core'
-        module = ''
-        enumDots = 1
-    else:
-        label = local_file.split('.')[0:-2][0]
-        module = label
-        enumDots = 2
 
-    enum_files = glob.glob(sphinxDir + '/%s*.enumeration.txt'%module)
+    pf = PickleFile(file)
+    classes = pf.read()
+    module_docstring = classes.get(DOCSTRING_KEY)
+    if module_docstring is not None:
+        del classes[DOCSTRING_KEY]
+
+    if local_file.startswith('wx.1'):
+        # Core functions
+        label = 'wx'
+        module = 'wx'
+        enumDots = 2
+        # Take care to get only files starting with "wx.UpperName", not
+        # "wx.lower.UpperName". This is so we don't put all the enums in the
+        # submodules in the core wx module too.
+        # TODO: This may not work on case-insensitive file systems, check it.
+        enum_files = glob.glob(sphinxDir + '/wx.[A-Z]*.enumeration.txt')
+    else:
+        label = '.'.join(local_file.split('.')[0:2])
+        module = label
+        enumDots = 3
+        enum_files = glob.glob(sphinxDir + '/%s*.enumeration.txt' % module)
+
     enum_base = [os.path.split(os.path.splitext(enum)[0])[1] for enum in enum_files]
 
+    imm = ItemModuleMap()
     names = list(classes.keys())
-    names.sort()
+    names.sort(key=lambda n: imm.get_fullname(n))
 
     text = ''
     if module:
-        text += '\n\n.. module:: %s\n\n'%module
+        text += '\n\n.. module:: %s\n\n' % module
         
-    text += templates.TEMPLATE_CLASS_INDEX % (label, label)
+    text += templates.TEMPLATE_CLASS_INDEX % (label, module_docstring)
 
     text += 80*'=' + ' ' + 80*'=' + '\n'
-    text += '%-80s **Short Description**\n'%'**Class**'
+    text += '%-80s **Short Description**\n' % '**Class**'
     text += 80*'=' + ' ' + 80*'=' + '\n'
 
     for cls in names:
         out = classes[cls]
         if '=====' in out:
             out = ''
-        text += '%-80s %s\n'%(':ref:`%s`'%Wx2Sphinx(cls)[1], out)
+        text += '%-80s %s\n' % (':ref:`~%s`' % wx2Sphinx(cls)[1], out)
 
     text += 80*'=' + ' ' + 80*'=' + '\n\n'
 
     contents = []
     for cls in names:
-        contents.append(Wx2Sphinx(cls)[1])
+        contents.append(wx2Sphinx(cls)[1])
 
     for enum in enum_base:
         if enum.count('.') == enumDots:
             contents.append(enum)
 
     contents.sort()
-    
+
+    # Are there functions for this module too?
+    functionsFile = os.path.join(sphinxDir, module + '.functions.pkl')
+    if os.path.exists(functionsFile):
+        pf = PickleFile(functionsFile)
+        functions = list(pf.read().keys())
+        functions.sort(key=lambda n: imm.get_fullname(n))
+
+        pf = PickleFile(os.path.join(SPHINXROOT, 'function_summary.pkl'))
+        function_summaries = pf.read()
+
+        text += templates.TEMPLATE_MODULE_FUNCTION_SUMMARY
+        text += 80*'=' + ' ' + 80*'=' + '\n'
+        text += '%-80s **Short Description**\n' % '**Function**'
+        text += 80*'=' + ' ' + 80*'=' + '\n'
+
+        for func_name in functions:
+            fullname = imm.get_fullname(func_name)
+            doc = function_summaries.get(fullname, '')
+            text += '%-80s %s\n' % (':func:`~%s`' % fullname, doc)
+
+        text += 80 * '=' + ' ' + 80 * '=' + '\n\n'
+        contents.append(module + '.functions')
+
     toctree = ''
     for item in contents:
-        toctree += '   %s\n'%item
+        toctree += '   %s\n' % item
 
-    text += templates.TEMPLATE_TOCTREE%toctree
+    text += templates.TEMPLATE_TOCTREE % toctree
         
     writeIfChanged(text_file, text)
 
 
 # ----------------------------------------------------------------------- #
 
-def GenGallery():
+def genGallery():
 
     link = '<div class="gallery_class">'
 
     link_template = """\
-    <table><caption align="bottom"><a href="%s"<b>%s</b></a</caption>
+    <table><caption align="bottom"><a href="%s"><b>%s</b></a></caption>
     <tr>
     <td><a href="%s"><img src="_static/images/widgets/fullsize/%s/%s" border="20" alt="%s"/></a>
     </td>
@@ -512,8 +535,7 @@ def GenGallery():
 
     for text in txt_files:
         simple = os.path.split(os.path.splitext(text)[0])[1]
-        possible = simple.split('.')[-1]
-        possible = possible.lower()
+        possible = simple.lower()
         html_files[possible + '.png'] = simple + '.html'
 
     keys = list(html_files.keys())
@@ -533,7 +555,7 @@ def GenGallery():
             plat_images = image_files[platform]
 
             if possible_png in plat_images:
-                text += link_template%(html, os.path.splitext(html)[0], html, platform, possible_png, os.path.splitext(html)[0])
+                text += link_template % (html, os.path.splitext(html)[0], html, platform, possible_png, os.path.splitext(html)[0])
                 text += '\n'
                 break
 
@@ -543,7 +565,7 @@ def GenGallery():
 
 # ----------------------------------------------------------------------- #
 
-def AddPrettyTable(text):
+def addPrettyTable(text):
     """ Unused at the moment. """
 
     newtext = """<br>
@@ -564,7 +586,7 @@ def AddPrettyTable(text):
 
 # ----------------------------------------------------------------------- #
 
-def ClassToFile(line):
+def classToFile(line):
 
     if '&#8211' not in line:
         return line
@@ -590,7 +612,7 @@ def ClassToFile(line):
 
 # ----------------------------------------------------------------------- #
 
-def AddJavaScript(text):
+def addJavaScript(text):
 
     jsCode = """\
         <script>
@@ -620,7 +642,7 @@ def AddJavaScript(text):
     
 # ----------------------------------------------------------------------- #
 
-def PostProcess(folder):
+def postProcess(folder):
 
     fileNames = glob.glob(folder + "/*.html")
 
@@ -652,7 +674,7 @@ def PostProcess(folder):
         split = os.path.split(files)[1]
 
         if split in ['index.html', 'main.html']:
-            text = ChangeSVNRevision(text)
+            text = changeSVNRevision(text)
         else:
             text = text.replace('class="headerimage"', 'class="headerimage-noshow"')
         
@@ -697,7 +719,7 @@ def PostProcess(folder):
         for old, new in list(enum_dict.items()):
             newtext = newtext.replace(old, new)
 
-        newtext = AddJavaScript(newtext)            
+        newtext = addJavaScript(newtext)
 
         if orig_text != newtext:
             fid = open(files, "wt")
@@ -707,14 +729,14 @@ def PostProcess(folder):
 
 # ----------------------------------------------------------------------- #
 
-def ChangeSVNRevision(text):
+def changeSVNRevision(text):
     REVISION = getVcsRev()
     text = text.replace('|TODAY|', TODAY)
     text = text.replace('|VCSREV|', REVISION)
     return text
 
 
-def TooltipsOnInheritance(text, class_summary):
+def tooltipsOnInheritance(text, class_summary):
 
     graphviz = re.findall(r'<p class="graphviz">(.*?)</p>', text, re.DOTALL)
 
diff --git a/sphinxtools/templates.py b/sphinxtools/templates.py
index 0147b4cf..efb857e3 100644
--- a/sphinxtools/templates.py
+++ b/sphinxtools/templates.py
@@ -5,7 +5,7 @@
 # Author:      Andrea Gavana
 #
 # Created:     30-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -168,17 +168,20 @@ TEMPLATE_CLASS_INDEX = '''
 .. include:: headings.inc
 
 =========================================================================
-**%s** Classes
+**%s**
 =========================================================================
 
-This is an alphabetical listing of all the classes defined in the **%s** module, together with a brief description of them (if available).
-
-You can look up a class using the alphabetical listing of them.
-
+%s
 
 Class Summary
 =============
 
+'''
+
+# Template for the functions header in the module index
+TEMPLATE_MODULE_FUNCTION_SUMMARY = '''
+Functions Summary
+=================
 
 '''
 
diff --git a/sphinxtools/utilities.py b/sphinxtools/utilities.py
index 03d872dc..0493d382 100644
--- a/sphinxtools/utilities.py
+++ b/sphinxtools/utilities.py
@@ -5,7 +5,7 @@
 # Author:      Andrea Gavana
 #
 # Created:     30-Nov-2010
-# Copyright:   (c) 2013 by Total Control Software
+# Copyright:   (c) 2010-2016 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------
 
@@ -14,8 +14,6 @@ import sys
 import os
 import codecs
 import shutil
-import glob
-import imp
 import re
 
 if sys.version_info < (3,):
@@ -28,18 +26,16 @@ else:
     string_base = str
 
 # Phoenix-specific imports
-from buildtools.config import phoenixDir
-
 from .templates import TEMPLATE_CONTRIB
-
 from .constants import IGNORE, PUNCTUATION, MODULENAME_REPLACE
-from .constants import CPP_ITEMS, VERSION, VALUE_MAP, NO_MODULE
+from .constants import CPP_ITEMS, VERSION, VALUE_MAP
 from .constants import RE_KEEP_SPACES, EXTERN_INHERITANCE
 from .constants import DOXYROOT, SPHINXROOT, WIDGETS_IMAGES_ROOT
 
 
 # ----------------------------------------------------------------------- #
-class odict(UserDict):
+
+class ODict(UserDict):
     """
     An ordered dict (odict). This is a dict which maintains an order to its items;
     the order is rather like that of a list, in that new items are, by default,
@@ -105,31 +101,7 @@ class odict(UserDict):
 
 # ----------------------------------------------------------------------- #
 
-def RemoveWxPrefix(name):
-    """
-    Removes the `wx` prefix from a string.
-
-    :param string `name`: a string, possibly starting with "wx" or "``wx".
-
-    :rtype: `string`
-
-    .. note:: This function is similar to the one already present in `tweaker_tools`
-       but I had to extend it a bit to suite the ReSTification of the XML docs.
-
-    """       
-
-    if name.startswith('wx') and not name.startswith('wxEVT_') and not name.startswith('wx.'):
-        name = name[2:]
-
-    if name.startswith('``wx') and not name.startswith('``wxEVT_') and not name.startswith('``wx.'):
-        name = name[0:2] + name[4:]
-        
-    return name
-
-
-# ----------------------------------------------------------------------- #
-
-def IsNumeric(input_string):
+def isNumeric(input_string):
     """
     Checks if the string `input_string` actually represents a number.
 
@@ -150,7 +122,7 @@ def IsNumeric(input_string):
 
 # ----------------------------------------------------------------------- #
 
-def CountSpaces(text):
+def countSpaces(text):
     """
     Counts the number of spaces before and after a string.
 
@@ -169,7 +141,7 @@ def CountSpaces(text):
 
 # ----------------------------------------------------------------------- #
 
-def Underscore2Capitals(string):
+def underscore2Capitals(string):
     """
     Replaces the underscore letter in a string with the following letter capitalized.
 
@@ -189,7 +161,7 @@ def Underscore2Capitals(string):
 
 # ----------------------------------------------------------------------- #
 
-def ReplaceCppItems(line):
+def replaceCppItems(line):
     """
     Replaces various C++ specific stuff with more Pythonized version of them.
 
@@ -233,7 +205,7 @@ def ReplaceCppItems(line):
 
 # ----------------------------------------------------------------------- #
 
-def PythonizeType(ptype, is_param):
+def pythonizeType(ptype, is_param):
     """
     Replaces various C++ specific stuff with more Pythonized version of them,
     for parameter lists and return types (i.e., the `:param:` and `:rtype:`
@@ -245,13 +217,14 @@ def PythonizeType(ptype, is_param):
 
     :rtype: `string`
     """
+    from etgtools.tweaker_tools import removeWxPrefix
 
     if 'size_t' in ptype:
         ptype = 'int'
     elif 'wx.' in ptype:
-        ptype = ptype[3:]
+        ptype = ptype[3:]    # ***
     else:
-        ptype = Wx2Sphinx(ReplaceCppItems(ptype))[1]
+        ptype = wx2Sphinx(replaceCppItems(ptype))[1]
         
     ptype = ptype.replace('::', '.').replace('*&', '')
     ptype = ptype.replace('int const', 'int')
@@ -263,9 +236,9 @@ def PythonizeType(ptype, is_param):
         ptype = ptype.replace(item, 'int')
     
     ptype = ptype.strip()        
-    ptype = RemoveWxPrefix(ptype)
+    ptype = removeWxPrefix(ptype)
 
-    if '. wx' in ptype:
+    if '. wx' in ptype: #***
         ptype = ptype.replace('. wx', '.')
 
     plower = ptype.lower()
@@ -312,7 +285,7 @@ def PythonizeType(ptype, is_param):
 
 # ----------------------------------------------------------------------- #
 
-def ConvertToPython(text):
+def convertToPython(text):
     """
     Converts the input `text` into a more ReSTified version of it.
 
@@ -323,12 +296,14 @@ def ConvertToPython(text):
     2. Lines starting with "Include file" or "#include" are ignored.
     3. Uppercase constants (i.e., like ID_ANY, HORIZONTAL and so on) are converted
        into inline literals (i.e., ``ID_ANY``, ``HORIZONTAL``).
-    4. The "wx" prefix is removed from all the words in the input `text`.
+    4. The "wx" prefix is removed from all the words in the input `text`.  #***
     
     :param string `text`: any string.
 
     :rtype: `string`
     """
+    from etgtools.tweaker_tools import removeWxPrefix
+    from etgtools.item_module_map import ItemModuleMap
 
     newlines = []
     unwanted = ['Include file', '#include']
@@ -344,7 +319,7 @@ def ConvertToPython(text):
 
         spacer = ' '*(len(line) - len(line.lstrip()))
 
-        line = ReplaceCppItems(line)
+        line = replaceCppItems(line)
         
         for word in RE_KEEP_SPACES.split(line):
 
@@ -362,23 +337,24 @@ def ConvertToPython(text):
                 continue
                 
             if newword not in IGNORE and not newword.startswith('wx.'):
-                word = RemoveWxPrefix(word)
-                newword = RemoveWxPrefix(newword)
+                word = removeWxPrefix(word)
+                newword = removeWxPrefix(newword)
 
             if "::" in word and not word.endswith("::"):
                 # Bloody SetCursorEvent...
-                word = word.replace("::wx", ".")
+                word = word.replace("::wx", ".") # ***
                 word = word.replace("::", ".")
-                word = "`%s`"%word
+                word = "`%s`" % word
                 newline.append(word)
                 continue
                 
-            if newword.upper() == newword and newword not in PUNCTUATION and \
-               newword not in IGNORE and len(newword.strip()) > 1 and \
-               not IsNumeric(newword) and newword not in ['DC', 'GCDC']:
+            if (newword.upper() == newword and newword not in PUNCTUATION and
+                newword not in IGNORE and len(newword.strip()) > 1 and
+                not isNumeric(newword) and newword not in ['DC', 'GCDC']):
 
                 if '``' not in newword and '()' not in word and '**' not in word:
-                    word = word.replace(newword, "``%s``"%newword)
+                    word = word.replace(newword, "``%s``" %
+                                        ItemModuleMap().get_fullname(newword))
 
             word = word.replace('->', '.')
             newline.append(word)
@@ -396,7 +372,7 @@ def ConvertToPython(text):
 
 # ----------------------------------------------------------------------- #
 
-def FindDescendants(element, tag, descendants=None):
+def findDescendants(element, tag, descendants=None):
     """
     Finds and returns all descendants of a specific `xml.etree.ElementTree.Element`
     whose tag matches the input `tag`.
@@ -420,14 +396,14 @@ def FindDescendants(element, tag, descendants=None):
         if childElement.tag == tag:
             descendants.append(childElement)
 
-        descendants = FindDescendants(childElement, tag, descendants)
+        descendants = findDescendants(childElement, tag, descendants)
 
     return descendants
     
 
 # ----------------------------------------------------------------------- #
 
-def FindControlImages(elementOrString):
+def findControlImages(elementOrString):
     """
     Given the input `element` (an instance of `xml.etree.ElementTree.Element`
     or a plain string)
@@ -451,21 +427,22 @@ def FindControlImages(elementOrString):
        exists for others, the missing images will be replaced by the "no_appearance.png"
        file (you can find it inside the ``WIDGETS_IMAGES_ROOT`` folder.
 
-    """       
+    """
+    from etgtools.tweaker_tools import removeWxPrefix
 
     if isinstance(elementOrString, string_base):
         class_name = py_class_name = elementOrString.lower()
     else:
         element = elementOrString
-        class_name = RemoveWxPrefix(element.name) or element.pyName
-        py_class_name = Wx2Sphinx(class_name)[1]
+        class_name = element.pyName if element.pyName else removeWxPrefix(element.name)
+        py_class_name = wx2Sphinx(class_name)[1]
 
         class_name = class_name.lower()
         py_class_name = py_class_name.lower()
 
     image_folder = os.path.join(DOXYROOT, 'images')
 
-    appearance = odict()
+    appearance = ODict()
 
     for sub_folder in ['wxmsw', 'wxmac', 'wxgtk']:
 
@@ -504,7 +481,7 @@ def FindControlImages(elementOrString):
 
 # ----------------------------------------------------------------------- #
 
-def MakeSummary(class_name, item_list, template, kind, add_tilde=True):
+def makeSummary(class_name, item_list, template, kind, add_tilde=True):
     """
     This function generates a table containing a method/property name
     and a shortened version of its docstrings.
@@ -564,7 +541,18 @@ def MakeSummary(class_name, item_list, template, kind, add_tilde=True):
 
 # ----------------------------------------------------------------------- #
 
-def WriteSphinxOutput(stream, filename, append=False):
+header = """\
+.. wxPython Phoenix documentation
+
+   This file was generated by Phoenix's sphinx generator and associated
+   tools, do not edit by hand.
+
+   Copyright: (c) 2011-2016 by Total Control Software
+   License:   wxWindows License
+
+"""
+
+def writeSphinxOutput(stream, filename, append=False):
     """
     Writes the text contained in the `stream` to the `filename` output file.
 
@@ -578,17 +566,16 @@ def WriteSphinxOutput(stream, filename, append=False):
     text = stream.getvalue()
 
     mode = 'a' if append else 'w'
-    fid = codecs.open(text_file, mode, encoding='utf-8')        
-    if mode == 'w':
-        fid.write('.. include:: headings.inc\n\n')
-
-    fid.write(text)
-    fid.close()
+    with codecs.open(text_file, mode, encoding='utf-8') as fid:
+        if mode == 'w':
+            fid.write(header)
+            fid.write('.. include:: headings.inc\n\n')
+        fid.write(text)
 
 
 # ----------------------------------------------------------------------- #
 
-def ChopDescription(text):
+def chopDescription(text):
     """
     Given the (possibly multiline) input text, this function will get the
     first non-blank line up to the next newline character.
@@ -614,7 +601,36 @@ def ChopDescription(text):
 
 # ----------------------------------------------------------------------- #
 
-def PickleItem(description, current_module, name, kind):
+class PickleFile(object):
+    """
+    A class to help simplify loading and saving data to pickle files.
+    """
+    def __init__(self, fileName):
+        self.fileName = fileName
+
+    def __enter__(self):
+        self.read()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.write(self.items)
+
+    def read(self):
+        if os.path.isfile(self.fileName):
+            with open(self.fileName, 'rb') as fid:
+                items = pickle.load(fid)
+        else:
+            items = {}
+        self.items = items
+        return items
+
+    def write(self, items):
+        with open(self.fileName, 'wb') as fid:
+            pickle.dump(items, fid)
+
+# ----------------------------------------------------------------------- #
+
+def pickleItem(description, current_module, name, kind):
     """
     This function pickles/unpickles a dictionary containing class names as keys
     and class brief description (chopped docstrings) as values to build the
@@ -634,24 +650,15 @@ def PickleItem(description, current_module, name, kind):
     if kind == 'function':
         pickle_file = os.path.join(SPHINXROOT, current_module + 'functions.pkl')
     else:
-        pickle_file = os.path.join(SPHINXROOT, current_module + '1classindex.pkl')
-        
-    if os.path.isfile(pickle_file):
-        fid = open(pickle_file, 'rb')
-        items = pickle.load(fid)
-        fid.close()
-    else:
-        items = {}
+        pickle_file = os.path.join(SPHINXROOT, current_module + '1moduleindex.pkl')
 
-    items[name] = description
-    fid = open(pickle_file, 'wb')
-    pickle.dump(items, fid)
-    fid.close()
+    with PickleFile(pickle_file) as pf:
+        pf.items[name] = description
 
 
 # ----------------------------------------------------------------------- #
 
-def PickleClassInfo(class_name, element, short_description):
+def pickleClassInfo(class_name, element, short_description):
     """
     Saves some information about a class in a pickle-compatible file., i.e. the
     list of methods in that class and its super-classes.
@@ -661,82 +668,58 @@ def PickleClassInfo(class_name, element, short_description):
     :param string `short_description`: the class short description (if any).
     """
 
-    pickle_file = os.path.join(SPHINXROOT, 'class_summary.lst')
-        
-    if os.path.isfile(pickle_file):
-        fid = open(pickle_file, 'rb')
-        items = pickle.load(fid)
-        fid.close()
-    else:
-        items = {}
-
     method_list, bases = [], []
     for method, description in element.method_list:
         method_list.append(method)
 
     for base in element.bases:
-        bases.append(Wx2Sphinx(base)[1])
+        bases.append(wx2Sphinx(base)[1])
 
-    items[class_name] = (method_list, bases, short_description)
-    fid = open(pickle_file, 'wb')
-    pickle.dump(items, fid)
-    fid.close()
+    pickle_file = os.path.join(SPHINXROOT, 'class_summary.pkl')
+    with PickleFile(pickle_file) as pf:
+        pf.items[class_name] = (method_list, bases, short_description)
 
 
 # ----------------------------------------------------------------------- #
 
-global ALL_ITEMS
-ALL_ITEMS = {}
+def pickleFunctionInfo(fullname, short_description):
+    """
+    Saves the short description for each function, used for generating the
+    summary pages later.
+    """
+    pickle_file = os.path.join(SPHINXROOT, 'function_summary.pkl')
+    with PickleFile(pickle_file) as pf:
+        pf.items[fullname] = short_description
 
-def Class2Module():
 
-    global ALL_ITEMS
-    
-    if ALL_ITEMS:
-        return ALL_ITEMS
+# ----------------------------------------------------------------------- #
 
-    etg_files = glob.glob(os.path.join(phoenixDir(), 'etg') + '/*.py')
-    etg_files = [files for files in etg_files if not files.startswith('_')]
 
-    for files in etg_files:
-        split = os.path.split(os.path.splitext(files)[0])[1]
-        module = imp.load_source(split, files)
-
-        current_module = MODULENAME_REPLACE.get(module.MODULE, '')
-
-        for item in module.ITEMS:
-            
-            item = RemoveWxPrefix(item)
-            ALL_ITEMS[item] = current_module
-
-    ALL_ITEMS.update(NO_MODULE)
-
-    return ALL_ITEMS            
-    
-    
-def Wx2Sphinx(name):
+def wx2Sphinx(name):
     """
     Converts a wxWidgets specific string into a Phoenix-ReST-ready string.
 
     :param string `name`: any string.
     """
+    from etgtools.tweaker_tools import removeWxPrefix
 
     if '<' in name:
         name = name[0:name.index('<')]
 
-    name = name.strip()    
-    newname = fullname = RemoveWxPrefix(name)
+    name = name.strip()
+    newname = fullname = removeWxPrefix(name)
 
     if '.' in newname and len(newname) > 3:
         lookup, remainder = newname.split('.')
-        remainder = '.%s'%remainder
+        remainder = '.%s' % remainder
     else:
         lookup = newname
         remainder = ''
 
-    all_items = Class2Module()
-    if lookup in all_items:
-        fullname = all_items[lookup] + lookup + remainder
+    from etgtools.item_module_map import ItemModuleMap
+    imm = ItemModuleMap()
+    if lookup in imm:
+        fullname = imm[lookup] + lookup + remainder
         
     return newname, fullname
 
@@ -759,7 +742,7 @@ RAW_2 = """
 
 """
 
-def FormatContributedSnippets(kind, contrib_snippets):
+def formatContributedSnippets(kind, contrib_snippets):
     """
     This method will include and properly ReST-ify contributed snippets
     of wxPython code (at the moment only 2 snippets are available), by
@@ -786,9 +769,8 @@ def FormatContributedSnippets(kind, contrib_snippets):
         text = '\n' + spacer + '|contributed| **Contributed Examples:**\n\n'
     
     for indx, snippet in enumerate(contrib_snippets):
-        fid = open(snippet, 'rt')
-        lines = fid.readlines()
-        fid.close()
+        with open(snippet, 'rt') as fid:
+            lines = fid.readlines()
         user = lines[0].replace('##', '').strip()
         onlyfile = os.path.split(snippet)[1]
 
@@ -809,7 +791,7 @@ def FormatContributedSnippets(kind, contrib_snippets):
     return text
 
 
-def FormatExternalLink(fullname, inheritance=False):
+def formatExternalLink(fullname, inheritance=False):
     """
     Analyzes the input `fullname` string to check whether a class description
     is actually coming from an external documentation tool
@@ -860,7 +842,7 @@ def FormatExternalLink(fullname, inheritance=False):
     return full_page
 
 
-def IsPython3():
+def isPython3():
     """ Returns ``True`` if we are using Python 3.x. """
 
     return sys.version_info >= (3, )    
diff --git a/src/event_ex.py b/src/event_ex.py
index c8dbb569..7e8a8524 100644
--- a/src/event_ex.py
+++ b/src/event_ex.py
@@ -26,8 +26,6 @@ EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
 EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
-EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
-EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
 EVT_INIT_DIALOG = wx.PyEventBinder( wxEVT_INIT_DIALOG )
 EVT_SYS_COLOUR_CHANGED = wx.PyEventBinder( wxEVT_SYS_COLOUR_CHANGED )
diff --git a/unittests/test_stc.py b/unittests/test_stc.py
index 8dc3358a..01a491ad 100644
--- a/unittests/test_stc.py
+++ b/unittests/test_stc.py
@@ -222,6 +222,27 @@ class stc_Tests(wtc.WidgetTestCase):
         stc.EVT_STC_INDICATOR_RELEASE
         stc.EVT_STC_AUTOCOMP_CANCELLED
         stc.EVT_STC_AUTOCOMP_CHAR_DELETED
+
+
+    def test_stcHasTextCtrlMethods(self):
+        # Just ensure that the common TextCtrl methods are present. This is
+        # done because the C++ class either derives from wxTextEntryBase
+        # or from wxTextCtrlIface, but these classes are not part of the API
+        # (and thus are not wrapped), so we have to kludge things.
+        # See etg/_stc.py for details.
+
+        t = stc.StyledTextCtrl(self.frame)
+        t.Cut
+        t.CanCut
+        t.DiscardEdits
+        t.GetDefaultStyle
+        t.GetNumberOfLines
+        t.GetStyle
+        t.IsModified
+        t.HitTest
+        t.AppendText
+        t.WriteText
+        t.ChangeValue
         
         
         
diff --git a/wscript b/wscript
index c278308e..b24bae24 100644
--- a/wscript
+++ b/wscript
@@ -411,8 +411,7 @@ def build(bld):
 
     from distutils.file_util import copy_file
     from distutils.dir_util  import mkpath
-    from distutils.dep_util  import newer, newer_group
-    from buildtools.config   import opj, loadETG, getEtgSipCppFiles
+    from buildtools.config   import opj
 
     cfg.finishSetup(bld.env.wx_config)
 
@@ -463,132 +462,24 @@ def build(bld):
     )  
     makeExtCopyRule(bld, 'siplib')
 
-
-    etg = loadETG('etg/_core.py')
-    rc = ['src/wxc.rc'] if isWindows else []
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_core'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WX WXPY',
-        )
-    makeExtCopyRule(bld, '_core')
-
-
-    etg = loadETG('etg/_adv.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_adv'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXADV WXPY',
-        )
-    makeExtCopyRule(bld, '_adv')
-
-
-    etg = loadETG('etg/_dataview.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_dataview'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXADV WXPY',    # dataview classes are also in the adv library
-        )
-    makeExtCopyRule(bld, '_dataview')
-
-
-    etg = loadETG('etg/_grid.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_grid'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXADV WXPY',    # grid classes are also in the adv library
-        )
-    makeExtCopyRule(bld, '_grid')
-
-
-    etg = loadETG('etg/_stc.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_stc'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXSTC WXPY',
-        )
-    makeExtCopyRule(bld, '_stc')
-
-
-    etg = loadETG('etg/_html.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_html'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXHTML WXPY',
-        )
-    makeExtCopyRule(bld, '_html')
-
-
-    etg = loadETG('etg/_glcanvas.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_glcanvas'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXGL WXPY',
-        )
-    makeExtCopyRule(bld, '_glcanvas')
-
-
-    etg = loadETG('etg/_html2.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_html2'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXWEBVIEW WXPY',
-        )
-    makeExtCopyRule(bld, '_html2')
+    # Add build rules for each of our ETG generated extension modules
+    makeETGRule(bld, 'etg/_core.py',       '_core',      'WX')
+    makeETGRule(bld, 'etg/_adv.py',        '_adv',       'WXADV')
+    makeETGRule(bld, 'etg/_dataview.py',   '_dataview',  'WXADV')
+    makeETGRule(bld, 'etg/_grid.py',       '_grid',      'WXADV')
+    makeETGRule(bld, 'etg/_stc.py',        '_stc',       'WXSTC')
+    makeETGRule(bld, 'etg/_html.py',       '_html',      'WXHTML')
+    makeETGRule(bld, 'etg/_glcanvas.py',   '_glcanvas',  'WXGL')
+    makeETGRule(bld, 'etg/_html2.py',      '_html2',     'WXWEBVIEW')
+    makeETGRule(bld, 'etg/_xml.py',        '_xml',       'WXXML')
+    makeETGRule(bld, 'etg/_xrc.py',        '_xrc',       'WXXRC')
+    makeETGRule(bld, 'etg/_richtext.py',   '_richtext',  'WXHTML WXRICHTEXT')
+    makeETGRule(bld, 'etg/_media.py',      '_media',     'WXMEDIA')
 
     if isDarwin:
-        etg = loadETG('etg/_webkit.py')
-        bld(features = 'c cxx cxxshlib pyext',
-            target   = makeTargetName(bld, '_webkit'),
-            source   = getEtgSipCppFiles(etg) + rc,
-            uselib   = 'WXWEBKIT WXPY',
-            )
-        makeExtCopyRule(bld, '_webkit')
-
-    etg = loadETG('etg/_xml.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_xml'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXXML WXPY',
-        )
-    makeExtCopyRule(bld, '_xml')
-
-
-    etg = loadETG('etg/_xrc.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_xrc'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXXRC WXPY',
-        )
-    makeExtCopyRule(bld, '_xrc')
-
-
-    etg = loadETG('etg/_richtext.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_richtext'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WXHTML WXRICHTEXT WXPY',
-        )
-    makeExtCopyRule(bld, '_richtext')
-
-    etg = loadETG('etg/_media.py')
-    bld(features = 'c cxx cxxshlib pyext',
-        target   = makeTargetName(bld, '_media'),
-        source   = getEtgSipCppFiles(etg) + rc,
-        uselib   = 'WX WXPY WXMEDIA',
-        )
-    makeExtCopyRule(bld, '_media')
-
+        makeETGRule(bld, 'etg/_webkit.py', '_webkit',    'WXWEBKIT')
     if isWindows:
-        etg = loadETG('etg/_msw.py')
-        bld(features = 'c cxx cxxshlib pyext',
-            target   = makeTargetName(bld, '_msw'),
-            source   = getEtgSipCppFiles(etg) + rc,
-            uselib   = 'WX WXPY',
-            )
-        makeExtCopyRule(bld, '_msw')
-
-
+        makeETGRule(bld, 'etg/_msw.py',    '_msw',       'WX')
 
     # ** Add code for new modules here
 
@@ -646,4 +537,16 @@ def _copyEnvGroup(env, srcPostfix, destPostfix):
             newKey = key[:-len(srcPostfix)] + destPostfix
             env[newKey] = copy.copy(env[key])
 
+# Make extension module build rules using info gleaned from an ETG script
+def makeETGRule(bld, etgScript, moduleName, libFlags):
+    from buildtools.config   import loadETG, getEtgSipCppFiles
+    rc = ['src/wxc.rc'] if isWindows else []
+    etg = loadETG(etgScript)
+    bld(features='c cxx cxxshlib pyext',
+        target=makeTargetName(bld, moduleName),
+        source=getEtgSipCppFiles(etg) + rc,
+        uselib='{} WXPY'.format(libFlags),
+        )
+    makeExtCopyRule(bld, moduleName)
+
 #-----------------------------------------------------------------------------
diff --git a/wx/lib/ClickableHtmlWindow.py b/wx/lib/ClickableHtmlWindow.py
index 4deec13d..af4177f1 100644
--- a/wx/lib/ClickableHtmlWindow.py
+++ b/wx/lib/ClickableHtmlWindow.py
@@ -19,9 +19,9 @@ import  wx.html as  html
 
 class PyClickableHtmlWindow(html.HtmlWindow):
     """
-    Class for a wxHtmlWindow which responds to clicks on links by opening a
-    browser pointed at that link, and to shift-clicks by copying the link
-    to the clipboard.
+    Class for a :class:`wx.html.HtmlWindow` which responds to clicks on
+    links by opening a browser pointed at that link, and to shift-clicks
+    by copying the link to the clipboard.
     """
     def __init__(self,parent,ID,**kw):
         html.HtmlWindow.__init__(self, parent, ID, **kw)
diff --git a/wx/lib/anchors.py b/wx/lib/anchors.py
index 47d64962..1ce15a28 100644
--- a/wx/lib/anchors.py
+++ b/wx/lib/anchors.py
@@ -23,7 +23,7 @@ import  wx
 
 class LayoutAnchors(wx.LayoutConstraints):
     """
-    A class that implements Delphi's Anchors with wx.LayoutConstraints.
+    A class that implements Delphi's Anchors with :class:`wx.LayoutConstraints`.
 
     Anchored sides maintain the distance from the edge of the control
     to the same edge of the parent.  When neither side is selected,
diff --git a/wx/lib/busy.py b/wx/lib/busy.py
index 6f7172d9..0f4167ac 100644
--- a/wx/lib/busy.py
+++ b/wx/lib/busy.py
@@ -9,7 +9,7 @@
 #---------------------------------------------------------------------------
 
 """
-A class like :class:`BusyInfo` but which doesn't take up so much space by default
+A class like :class:`wx.BusyInfo` but which doesn't take up so much space by default
 and which has a nicer look.
 """
 
@@ -21,12 +21,12 @@ from wx.lib.stattext import GenStaticText as StaticText
 
 class BusyInfo(object):
     """
-    This class is just like :class:`BusyInfo`, except that its default
+    This class is just like :class:`wx.BusyInfo`, except that its default
     size is smaller, (unless the size of the message requires a larger window
     size) and the background and foreground colors of the message box can be
     set.
 
-    Creating an instace of the class witll create an show a window with the
+    Creating an instace of the class will create and show a window with the
     given message, and when the instance is deleted then that window will be
     closed. This class also implements the context manager magic methods, so
     it can be used with Python's `with` statement, like this::
@@ -41,12 +41,12 @@ class BusyInfo(object):
         Create a new :class:`BusyInfo`.
 
         :param string `msg`:     a string to be displayed in the BusyInfo window.
-        :param Window `parent`:  an optional window to be used as the parent of
-            the `:class:`BusyInfo`.  If given then the BusyInfo will be centered
+        :param wx.Window `parent`:  an optional window to be used as the parent of
+            the `:class:`BusyInfo`.  If given then the ``BusyInfo`` will be centered
             over that window, otherwise it will be centered on the screen.
-        :param Colour `bgColour`: colour to be used for the background
+        :param wx.Colour `bgColour`: colour to be used for the background
             of the :class:`BusyInfo`
-        :param Colour `fgColour`: colour to be used for the foreground (text)
+        :param wx.Colour `fgColour`: colour to be used for the foreground (text)
             of the :class:`BusyInfo`
         """
         self.frame = _InfoFrame(parent, msg, bgColour, fgColour)
diff --git a/wx/lib/buttons.py b/wx/lib/buttons.py
index ad1a37a1..f47321af 100644
--- a/wx/lib/buttons.py
+++ b/wx/lib/buttons.py
@@ -135,20 +135,21 @@ class GenButton(wx.Control):
         """
         Default class constructor.
 
-        :param Window `parent`: parent window. Must not be ``None``;
+        :param wx.Window `parent`: parent window. Must not be ``None``;
         :param integer `id`: window identifier. A value of -1 indicates a default value;
         :param string `label`: the button text label;
-        :param `pos`: the control position. A value of (-1, -1) indicates a default position,
-         chosen by either the windowing system or wxPython, depending on platform;
-        :type `pos`: tuple or :class:`Point`
+        :param `pos`: the control position. A value of (-1, -1) indicates a default
+         position, chosen by either the windowing system or wxPython, depending on
+         platform;
+        :type `pos`: tuple or :class:`wx.Point`
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `size`: tuple or :class:`Size`
+        :type `size`: tuple or :class:`wx.Size`
         :param integer `style`: the button style;
-        :param Validator `validator`: the validator associated with the button;
+        :param wx.Validator `validator`: the validator associated with the button;
         :param string `name`: the button name.
 
-        .. seealso:: :class:`Button` for a list of valid window styles.
+        .. seealso:: :class:`wx.Button` for a list of valid window styles.
         """
         
         cstyle = style
@@ -202,8 +203,9 @@ class GenButton(wx.Control):
         Given the current font and bezel width settings, calculate
         and set a good size.
 
-        :param `size`: an instance of :class:`Size` or ``None``, in which case the wxPython
-         ``DefaultSize`` is used instead.        
+        :param `size`: an instance of :class:`wx.Size` or ``None``,
+         in which case the wxPython
+         ``wx.DefaultSize`` is used instead.        
         """
         
         if size is None:
@@ -219,9 +221,9 @@ class GenButton(wx.Control):
         Overridden base class virtual. Determines the best size of the
         button based on the label and bezel size.
 
-        :return: An instance of :class:`Size`.
+        :return: An instance of :class:`wx.Size`.
         
-        .. note:: Overridden from :class:`Control`.        
+        .. note:: Overridden from :class:`wx.Control`.        
         """
         
         w, h, useMin = self._GetLabelSize()
@@ -246,7 +248,7 @@ class GenButton(wx.Control):
         """
         Can this window be given focus by mouse click?
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return self.IsShown() and self.IsEnabled()
@@ -255,11 +257,11 @@ class GenButton(wx.Control):
     def GetDefaultAttributes(self):
         """
         Overridden base class virtual. By default we should use
-        the same font/colour attributes as the native :class:`Button`.
+        the same font/colour attributes as the native :class:`wx.Button`.
 
-        :return: an instance of :class:`VisualAttributes`.
+        :return: an instance of :class:`wx.VisualAttributes`.
         
-        .. note:: Overridden from :class:`Control`.        
+        .. note:: Overridden from :class:`wx.Control`.        
         """
 
         return wx.Button.GetClassDefaultAttributes()
@@ -270,7 +272,7 @@ class GenButton(wx.Control):
         Overridden base class virtual. Buttons usually don't inherit
         the parent's colours.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
         
         return False
@@ -282,7 +284,7 @@ class GenButton(wx.Control):
 
         :param bool `enable`: ``True`` to enable the button, ``False`` to disable it.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         if enable != self.IsEnabled():
@@ -352,9 +354,9 @@ class GenButton(wx.Control):
         """
         Sets the :class:`GenButton` background colour.
 
-        :param `colour`: a valid :class:`Colour` object.
+        :param `colour`: a valid :class:`wx.Colour` object.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         wx.Control.SetBackgroundColour(self, colour)
@@ -363,11 +365,11 @@ class GenButton(wx.Control):
 
     def SetForegroundColour(self, colour):
         """
-        Sets the :class:`GenButton` foreground colour.
+        Sets the :class:`wx.GenButton` foreground colour.
 
-        :param `colour`: a valid :class:`Colour` object.
+        :param `colour`: a valid :class:`wx.Colour` object.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         wx.Control.SetForegroundColour(self, colour)
@@ -376,18 +378,22 @@ class GenButton(wx.Control):
 
     def SetDefault(self):
         """
-        This sets the :class:`GenButton` to be the default item for the panel or dialog box.
+        This sets the :class:`GenButton` to be the default item for
+        the panel or dialog box.
 
-        .. note:: Under Windows, only dialog box buttons respond to this function. As normal
-           under Windows and Motif, pressing return causes the default button to be depressed
-           when the return key is pressed. See also :meth:`Window.SetFocus` which sets the
-           keyboard focus for windows and text panel items, and :meth:`TopLevelWindow.SetDefaultItem`.
+        .. note:: Under Windows, only dialog box buttons respond to this function.
+           As normal under Windows and Motif, pressing return causes the
+           default button to be depressed when the return key is pressed. See
+           also :meth:`wx.Window.SetFocus` which sets the keyboard focus for
+           windows and text panel items, and
+           :meth:`wx.TopLevelWindow.SetDefaultItem`.
 
-        .. note:: Note that under Motif, calling this function immediately after creation of a button
-           and before the creation of other buttons will cause misalignment of the row of buttons,
-           since default buttons are larger. To get around this, call :meth:`SetDefault` after you
-           have created a row of buttons: wxPython will then set the size of all buttons currently
-           on the panel to the same size.
+        .. note:: Note that under Motif, calling this function immediately after
+           creation of a button and before the creation of other buttons will
+           cause misalignment of the row of buttons, since default buttons are
+           larger. To get around this, call :meth:`wx.SetDefault` after you
+           have created a row of buttons: wxPython will then set the size of
+           all buttons currently on the panel to the same size.
         """
 
         tlw = wx.GetTopLevelParent(self)
@@ -467,7 +473,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_PAINT`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`PaintEvent` event to be processed.
+        :param `event`: a :class:`wx.PaintEvent` event to be processed.
         """
 
         (width, height) = self.GetClientSize()
@@ -491,7 +497,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_SIZE`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`SizeEvent` event to be processed.
+        :param `event`: a :class:`wx.SizeEvent` event to be processed.
         """
 
         self.Refresh()
@@ -500,9 +506,9 @@ class GenButton(wx.Control):
 
     def GetBackgroundBrush(self, dc):
         """
-        Returns the current :class:`Brush` to be used to draw the button background.
+        Returns the current :class:`wx.Brush` to be used to draw the button background.
 
-        :param DC `dc`: the device context used to draw the button background.
+        :param wx.DC `dc`: the device context used to draw the button background.
         """
         
         if self.up:
@@ -534,7 +540,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_LEFT_DOWN`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
 
         if not self.IsEnabled():
@@ -551,7 +557,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_LEFT_UP`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
         
         if not self.IsEnabled() or not self.HasCapture():
@@ -571,7 +577,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_MOTION`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
 
         if not self.IsEnabled() or not self.HasCapture():
@@ -598,7 +604,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_SET_FOCUS`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`FocusEvent` event to be processed.
+        :param `event`: a :class:`wx.FocusEvent` event to be processed.
         """
 
         self.hasFocus = True
@@ -610,7 +616,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_KILL_FOCUS`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`FocusEvent` event to be processed.
+        :param `event`: a :class:`wx.FocusEvent` event to be processed.
         """
 
         self.hasFocus = False
@@ -622,7 +628,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_KEY_DOWN`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`KeyEvent` event to be processed.
+        :param `event`: a :class:`wx.KeyEvent` event to be processed.
         """
 
         if self.hasFocus and event.GetKeyCode() == ord(" "):
@@ -636,7 +642,7 @@ class GenButton(wx.Control):
         """
         Handles the ``wx.EVT_KEY_UP`` event for :class:`GenButton`.
 
-        :param `event`: a :class:`KeyEvent` event to be processed.
+        :param `event`: a :class:`wx.KeyEvent` event to be processed.
         """
 
         if self.hasFocus and event.GetKeyCode() == ord(" "):
@@ -659,20 +665,20 @@ class GenBitmapButton(GenButton):
         """
         Default class constructor.
 
-        :param Window `parent`: parent window. Must not be ``None``;
+        :param wx.Window `parent`: parent window. Must not be ``None``;
         :param integer `id`: window identifier. A value of -1 indicates a default value;
-        :param Bitmap `bitmap`: the button bitmap;
+        :param wx.Bitmap `bitmap`: the button bitmap;
         :param `pos`: the control position. A value of (-1, -1) indicates a default position,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `pos`: tuple or :class:`Point`
+        :type `pos`: tuple or :class:`wx.Point`
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `size`: tuple or :class:`Size`
+        :type `size`: tuple or :class:`wx.Size`
         :param integer `style`: the button style;
-        :param Validator `validator`: the validator associated to the button;
+        :param wx.Validator `validator`: the validator associated to the button;
         :param string `name`: the button name.
 
-        .. seealso:: :class:`Button` for a list of valid window styles.
+        .. seealso:: :class:`wx.Button` for a list of valid window styles.
         """
         
         self.bmpDisabled = None
@@ -686,7 +692,7 @@ class GenBitmapButton(GenButton):
         """
         Returns the bitmap for the button's normal state.
 
-        :rtype: :class:`Bitmap`
+        :rtype: :class:`wx.Bitmap`
 
         .. seealso:: :meth:`SetBitmapLabel`
         """
@@ -698,7 +704,7 @@ class GenBitmapButton(GenButton):
         """
         Returns the bitmap for the button's disabled state, which may be invalid.
 
-        :rtype: :class:`Bitmap`
+        :rtype: :class:`wx.Bitmap`
 
         .. seealso:: :meth:`SetBitmapDisabled`
         """
@@ -710,7 +716,7 @@ class GenBitmapButton(GenButton):
         """
         Returns the bitmap for the button's focused state, which may be invalid.
 
-        :rtype: :class:`Bitmap`
+        :rtype: :class:`wx.Bitmap`
 
         .. seealso:: :meth:`SetBitmapFocus`
         """
@@ -722,7 +728,7 @@ class GenBitmapButton(GenButton):
         """
         Returns the bitmap for the button's pressed state, which may be invalid.
 
-        :rtype: :class:`Bitmap`
+        :rtype: :class:`wx.Bitmap`
 
         .. seealso:: :meth:`SetBitmapSelected`
         """
@@ -734,7 +740,7 @@ class GenBitmapButton(GenButton):
         """
         Sets the bitmap for the disabled button appearance.
 
-        :param Bitmap `bitmap`: the bitmap for the disabled button appearance.
+        :param wx.Bitmap `bitmap`: the bitmap for the disabled button appearance.
 
         .. seealso::
 
@@ -750,7 +756,7 @@ class GenBitmapButton(GenButton):
         """
         Sets the bitmap for the focused button appearance.
 
-        :param Bitmap `bitmap`: the bitmap for the focused button appearance.
+        :param wx.Bitmap `bitmap`: the bitmap for the focused button appearance.
 
         .. seealso::
 
@@ -767,7 +773,7 @@ class GenBitmapButton(GenButton):
         """
         Sets the bitmap for the selected (depressed) button appearance.
 
-        :param Bitmap `bitmap`: the bitmap for the selected (depressed) button appearance.
+        :param wx.Bitmap `bitmap`: the bitmap for the selected (depressed) button appearance.
 
         .. seealso::
 
@@ -787,7 +793,7 @@ class GenBitmapButton(GenButton):
         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.
+        :param wx.Bitmap `bitmap`: the bitmap for the normal button appearance.
 
         .. note:: This is the bitmap used for the unselected state, and for all other
            states if no other bitmaps are provided.
@@ -837,21 +843,21 @@ class GenBitmapTextButton(GenBitmapButton):
         """
         Default class constructor.
 
-        :param Window `parent`: parent window. Must not be ``None``;
+        :param wx.Window `parent`: parent window. Must not be ``None``;
         :param integer `id`: window identifier. A value of -1 indicates a default value;
-        :param Bitmap `bitmap`: the button bitmap;
+        :param wx.Bitmap `bitmap`: the button bitmap;
         :param string `label`: the button text label;
         :param `pos`: the control position. A value of (-1, -1) indicates a default position,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `pos`: tuple or :class:`Point`
+        :type `pos`: tuple or :class:`wx.Point`
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `size`: tuple or :class:`Size`
+        :type `size`: tuple or :class:`wx.Size`
         :param integer `style`: the button style;
-        :param Validator `validator`: the validator associated to the button;
+        :param wx.Validator `validator`: the validator associated to the button;
         :param string `name`: the button name.
 
-        .. seealso:: :class:`Button` for a list of valid window styles.
+        .. seealso:: :class:`wx.Button` for a list of valid window styles.
         """
         
         GenBitmapButton.__init__(self, parent, id, bitmap, pos, size, style, validator, name)
@@ -890,6 +896,7 @@ class GenBitmapTextButton(GenBitmapButton):
             hasMask = bmp.GetMask() is not None
         else:
             bw = bh = 0     # no bitmap -> size is zero
+            hasMask = False
 
         dc.SetFont(self.GetFont())
         if self.IsEnabled():
@@ -915,7 +922,8 @@ class GenBitmapTextButton(GenBitmapButton):
 
 class __ToggleMixin(object):
     """
-    A mixin that allows to transform :class:`GenButton` in the corresponding toggle button.
+    A mixin that allows to transform :class:`GenButton` in the corresponding
+    toggle button.
     """
 
     def SetToggle(self, flag):
@@ -947,7 +955,7 @@ class __ToggleMixin(object):
         """
         Handles the ``wx.EVT_LEFT_DOWN`` event for :class:`GenButton` when used as toggle button.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
 
         if not self.IsEnabled():
@@ -964,7 +972,7 @@ class __ToggleMixin(object):
         """
         Handles the ``wx.EVT_LEFT_UP`` event for :class:`GenButton` when used as toggle button.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
 
         if not self.IsEnabled() or not self.HasCapture():
@@ -981,7 +989,7 @@ class __ToggleMixin(object):
         """
         Handles the ``wx.EVT_KEY_DOWN`` event for :class:`GenButton` when used as toggle button.
 
-        :param `event`: a :class:`KeyEvent` event to be processed.
+        :param `event`: a :class:`wx.KeyEvent` event to be processed.
         """
 
         event.Skip()
@@ -991,7 +999,7 @@ class __ToggleMixin(object):
         """
         Handles the ``wx.EVT_MOTION`` event for :class:`GenButton` when used as toggle button.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
 
         if not self.IsEnabled():
@@ -1018,7 +1026,7 @@ class __ToggleMixin(object):
         """
         Handles the ``wx.EVT_KEY_UP`` event for :class:`GenButton` when used as toggle button.
 
-        :param `event`: a :class:`KeyEvent` event to be processed.
+        :param `event`: a :class:`wx.KeyEvent` event to be processed.
         """
 
         if self.hasFocus and event.GetKeyCode() == ord(" "):
@@ -1061,7 +1069,7 @@ class __ThemedMixin(object):
         Handles the ``wx.EVT_ENTER_WINDOW`` and ``wx.EVT_LEAVE_WINDOW`` events for
         :class:`GenButton` when used as a themed button.
 
-        :param `event`: a :class:`MouseEvent` event to be processed.
+        :param `event`: a :class:`wx.MouseEvent` event to be processed.
         """
 
         self.Refresh()
diff --git a/wx/lib/calendar.py b/wx/lib/calendar.py
index afef0e02..24b866a6 100644
--- a/wx/lib/calendar.py
+++ b/wx/lib/calendar.py
@@ -135,9 +135,9 @@ def GetMonthList():
 
 def MakeColor(in_color):
     """
-    Try and create a :class:`Colour`.
+    Try and create a :class:`wx.Colour`.
 
-    :returns: a :class:`Colour` instance to `in_colour`
+    :returns: a :class:`wx.Colour` instance to `in_colour`
     """
     try:
         color = wx.Colour(in_color)
@@ -172,7 +172,7 @@ class CalDraw:
         """
         Default class constructor
 
-        :param Window `parent`: parent window.
+        :param wx.Window `parent`: parent window.
 
         """
         self.pwidth = 1
@@ -221,8 +221,8 @@ class CalDraw:
         """
         Set the font and background color of the week title.
 
-        :param `font_color`: the font color, a value as is accepted by :class:`Colour`
-        :param `week_color`: the week color, a value as is accepted by :class:`Colour`
+        :param `font_color`: the font color, a value as is accepted by :class:`wx.Colour`
+        :param `week_color`: the week color, a value as is accepted by :class:`wx.Colour`
         """
         self.colors[COLOR_HEADER_FONT] = MakeColor(font_color)
         self.colors[COLOR_HEADER_BACKGROUND] = MakeColor(week_color)
@@ -289,7 +289,7 @@ class CalDraw:
         """
         Draw the calendar.
 
-        :param `DC`: the :class:`DC` to use to draw on.
+        :param `DC`: the :class:`wx.DC` to use to draw upon.
         :param `sel_list`: a list of days to override the weekend highlight.
         """
         self.InitScale()
@@ -333,7 +333,7 @@ class CalDraw:
         """
         Draw a border around the outside of the main display rectangle.
 
-        :param `DC`: the :class:`DC` to use
+        :param `DC`: the :class:`wx.DC` to use
         :param `transparent`: use a transparent brush, default is ``False``.
 
         """
@@ -352,7 +352,7 @@ class CalDraw:
         """
         Draw the focus indicator
 
-        :param `DC`: the :class:`DC` to use
+        :param `DC`: the :class:`wx.DC` to use
 
         """
         if self.outer_border is True:
@@ -473,7 +473,7 @@ class CalDraw:
         """
         Draw the month and year titles.
 
-        :param `DC`: the :class:`DC` to use.
+        :param `DC`: the :class:`wx.DC` to use.
 
         """
         month = Month[self.month]
@@ -624,7 +624,7 @@ class CalDraw:
         """
         Draw the day numbers
 
-        :param `DC`: the :class:`DC` to use.
+        :param `DC`: the :class:`wx.DC` to use.
 
         """
         f = wx.Font(10, self.fontfamily, self.fontstyle, self.fontweight)  # initial font setting
@@ -681,7 +681,7 @@ class CalDraw:
         """
         Draw the day text.
 
-        :param `DC`: the :class:`DC` to use.
+        :param `DC`: the :class:`wx.DC` to use.
         :param `key`: the day to draw
 
         """
@@ -724,7 +724,7 @@ class CalDraw:
         """
         Highlight selected days.
 
-        :param `DC`: the :class:`DC` to use
+        :param `DC`: the :class:`wx.DC` to use
 
         """
         for key in self.cal_sel.keys():
@@ -746,7 +746,7 @@ class CalDraw:
         """
         Calculate and draw the grid lines.
 
-        :param `DC`: the :class:`DC` to use
+        :param `DC`: the :class:`wx.DC` to use
 
         """
         DC.SetPen(wx.Pen(MakeColor(self.colors[COLOR_GRID_LINES]), 0))
@@ -805,7 +805,7 @@ class CalDraw:
         Set a color.
 
         :param `name`: the name to assign the color too.
-        :param `value`: the color to use, see :class:`Colour`
+        :param `value`: the color to use, see :class:`wx.Colour`
 
         """
         self.colors[name] = MakeColor(value)
@@ -849,16 +849,16 @@ class Calendar(wx.Control):
         """
         Default class constructor.
 
-        :param Window `parent`: parent window. Must not be ``None``;
+        :param wx.Window `parent`: parent window. Must not be ``None``;
         :param integer `id`: window identifier. A value of -1 indicates a default value;
         :param `pos`: the control position. A value of (-1, -1) indicates a default position,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `pos`: tuple or :class:`Point`
+        :type `pos`: tuple or :class:`wx.Point`
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `size`: tuple or :class:`Size`
+        :type `size`: tuple or :class:`wx.Size`
         :param integer `style`: the button style (unused);
-        :param Validator `validator`: the validator associated to the button;
+        :param wx.Validator `validator`: the validator associated to the button;
         :param string `name`: the calendar name.
 
         """
@@ -922,7 +922,7 @@ class Calendar(wx.Control):
         Set a color.
 
         :param `name`: the name to be assigned to the color.
-        :param `value`: the color value, see :class:`Colour` for valid values
+        :param `value`: the color value, see :class:`wx.Colour` for valid values
 
         """
         self.colors[name] = MakeColor(value)
@@ -1042,7 +1042,7 @@ class Calendar(wx.Control):
 
         :param `set_size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `set_size`: tuple or :class:`Size`
+        :type `set_size`: tuple or :class:`wx.Size`
 
         """
         self.size = set_size
@@ -1263,7 +1263,7 @@ class Calendar(wx.Control):
         """
         Do the drawing.
 
-        :param `DC`: the :class:`DC` to draw
+        :param `DC`: the :class:`wx.DC` to draw
 
         """
         DC = wx.PaintDC(self)
@@ -1456,7 +1456,7 @@ class CalenDlg(wx.Dialog):
         """
         Default class constructor.
 
-        :param Window `parent`: parent window. Must not be ``None``;
+        :param wx.Window `parent`: parent window. Must not be ``None``;
         :param integer `month`: the month, if None the current day will be used
         :param integer `day`: the day
         :param integer `year`: the year
diff --git a/wx/lib/colourdb.py b/wx/lib/colourdb.py
index 886ab019..3ed16887 100644
--- a/wx/lib/colourdb.py
+++ b/wx/lib/colourdb.py
@@ -20,7 +20,7 @@ Description
 
 This module loads additional colour names/values into the :class:`ColourDatabase`.
 
-The :mod:`colourdb` will update the wxPython :class:`ColourDatabase` using a pre-defined
+The :mod:`colourdb` will update the wxPython :class:`wx.ColourDatabase` using a pre-defined
 set of colour names/colour tuples, hard-coded in this module source code.
 
 
@@ -722,7 +722,9 @@ def getColourInfoList():
 _haveUpdated = False
 
 def updateColourDB():
-    """ Updates the :class:`ColourDatabase` by adding new colour names and RGB values. """
+    """
+    Updates the :class:`wx.ColourDatabase` by adding new colour names and RGB values.
+    """
 
     global _haveUpdated
     if not _haveUpdated:
diff --git a/wx/lib/colourselect.py b/wx/lib/colourselect.py
index 39c0228d..091bdb2d 100644
--- a/wx/lib/colourselect.py
+++ b/wx/lib/colourselect.py
@@ -34,7 +34,7 @@
 #
 
 """
-Provides a :class:`~lib.colourselect.ColourSelect` button that, when clicked, will display a
+Provides a :class:`ColourSelect` button that, when clicked, will display a
 colour selection dialog.
 
 
@@ -87,8 +87,8 @@ wxEVT_COMMAND_COLOURSELECT = wx.NewEventType()
 
 class ColourSelectEvent(wx.PyCommandEvent):
     """
-    :class:`ColourSelectEvent` is a special subclassing of :class:`CommandEvent` and it
-    provides for a custom event sent every time the user chooses a colour.
+    :class:`ColourSelectEvent` is a special subclassing of :class:`wx.CommandEvent`
+    and it provides for a custom event sent every time the user chooses a colour.
     """
 
     def __init__(self, id, value):
@@ -96,7 +96,7 @@ class ColourSelectEvent(wx.PyCommandEvent):
         Default class constructor.
 
         :param integer `id`: the event identifier;
-        :param Colour `value`: the colour currently selected.
+        :param wx.Colour `value`: the colour currently selected.
         """
 
         wx.PyCommandEvent.__init__(self, id = id)
@@ -120,8 +120,8 @@ EVT_COLOURSELECT = wx.PyEventBinder(wxEVT_COMMAND_COLOURSELECT, 1)
 
 class ColourSelect(wx.BitmapButton):
     """
-    A subclass of :class:`BitmapButton` that, when clicked, will display a colour
-    selection dialog.
+    A subclass of :class:`wx.BitmapButton` that, when clicked, will
+    display a colour selection dialog.
     """
 
     def __init__(self, parent, id=wx.ID_ANY, label="", colour=wx.BLACK,
@@ -130,18 +130,18 @@ class ColourSelect(wx.BitmapButton):
         """
         Default class constructor.
 
-        :param Window `parent`: parent window. Must not be ``None``;
+        :param wx.Window `parent`: parent window. Must not be ``None``;
         :param integer `id`: window identifier. A value of -1 indicates a default value;
         :param string `label`: the button text label;
-        :param colour: a valid :class:`Colour` instance, which will be the default initial
+        :param colour: a valid :class:`wx.Colour` instance, which will be the default initial
          colour for this button;
-        :type `colour`: :class:`Colour` or tuple
+        :type `colour`: :class:`wx.Colour` or tuple
         :param `pos`: the control position. A value of (-1, -1) indicates a default position,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `pos`: tuple or :class:`Point`
+        :type `pos`: tuple or :class:`wx.Point`
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :type `size`: tuple or :class:`Size`
+        :type `size`: tuple or :class:`wx.Size`
         :param PyObject `callback`: a callable method/function that will be called every time
          the user chooses a new colour;
         :param integer `style`: the button style.
@@ -176,7 +176,7 @@ class ColourSelect(wx.BitmapButton):
         """
         Returns the current colour set for the :class:`ColourSelect`.
 
-        :rtype: :class:`Colour`
+        :rtype: :class:`wx.Colour`
         """
         
         return self.colour
@@ -186,7 +186,7 @@ class ColourSelect(wx.BitmapButton):
         """
         Returns the current colour set for the :class:`ColourSelect`.
 
-        :rtype: :class:`Colour`
+        :rtype: :class:`wx.Colour`
         """
 
         return self.colour
@@ -197,7 +197,7 @@ class ColourSelect(wx.BitmapButton):
         Sets the current colour for :class:`ColourSelect`.
 
         :param `colour`: the new colour for :class:`ColourSelect`.
-        :type `colour`: tuple or string or :class:`Colour`
+        :type `colour`: tuple or string or :class:`wx.Colour`
         """
         
         self.SetColour(colour)
@@ -208,7 +208,7 @@ class ColourSelect(wx.BitmapButton):
         Sets the current colour for :class:`ColourSelect`.
 
         :param `colour`: the new colour for :class:`ColourSelect`.
-        :type `colour`: tuple or string or :class:`Colour`
+        :type `colour`: tuple or string or :class:`wx.Colour`
         """
 
         self.colour = wx.Colour(colour)  # use the typmap or copy an existing colour object
@@ -271,7 +271,7 @@ class ColourSelect(wx.BitmapButton):
         """
         Sets the bitmap representation of the current selected colour to the button.
 
-        :param Bitmap `bmp`: the new bitmap.
+        :param wx.Bitmap `bmp`: the new bitmap.
         """
 
         self.SetBitmapLabel(bmp)
@@ -292,7 +292,7 @@ class ColourSelect(wx.BitmapButton):
         """
         Handles the ``wx.EVT_BUTTON`` event for :class:`ColourSelect`.
 
-        :param `event`: a :class:`CommandEvent` event to be processed.
+        :param `event`: a :class:`wx.CommandEvent` event to be processed.
         """
 
         data = wx.ColourData()
diff --git a/wx/lib/colourutils.py b/wx/lib/colourutils.py
index bb8f141c..70369a90 100644
--- a/wx/lib/colourutils.py
+++ b/wx/lib/colourutils.py
@@ -36,8 +36,8 @@ def AdjustAlpha(colour, alpha):
     :param integer `alpha`: the new value for the colour alpha channel (between 0
      and 255).
 
-    :rtype: :class:`Colour`
-    :returns: A new :class:`Colour` with the alpha channel specified as input
+    :rtype: :class:`wx.Colour`
+    :returns: A new :class:`wx.Colour` with the alpha channel specified as input
     """
     
     return wx.Colour(colour.Red(), colour.Green(), colour.Blue(), alpha)
@@ -48,12 +48,12 @@ def AdjustColour(color, percent, alpha=wx.ALPHA_OPAQUE):
     Brighten/darken input colour by `percent` and adjust alpha
     channel if needed. Returns the modified color.
     
-    :param Colour `color`: color object to adjust;
+    :param wx.Colour `color`: color object to adjust;
     :param integer `percent`: percent to adjust +(brighten) or -(darken);
     :param integer `alpha`: amount to adjust alpha channel.
 
-    :rtype: :class:`Colour`
-    :returns: A new darkened/lightened :class:`Colour` with the alpha channel
+    :rtype: :class:`wx.Colour`
+    :returns: A new darkened/lightened :class:`wx.Colour` with the alpha channel
      specified as input
     """
 
@@ -76,10 +76,10 @@ def BestLabelColour(color, bw=False):
     Get the best color to use for the label that will be drawn on
     top of the given color.
     
-    :param Colour `color`: background color that text will be drawn on;
+    :param wx.Colour `color`: background color that text will be drawn on;
     :param bool `bw`: If ``True``, only return black or white.
 
-    :rtype: :class:`Colour`
+    :rtype: :class:`wx.Colour`
     """
     
     avg = sum(color.Get()) / 3
@@ -100,7 +100,7 @@ def GetHighlightColour():
     """
     Gets the default highlight color.
     
-    :rtype: :class:`Colour`
+    :rtype: :class:`wx.Colour`
     """
     
     if wx.Platform == '__WXMAC__':
diff --git a/wx/lib/combotreebox.py b/wx/lib/combotreebox.py
index 588967ce..670863ba 100644
--- a/wx/lib/combotreebox.py
+++ b/wx/lib/combotreebox.py
@@ -13,12 +13,12 @@
 """ 
 ComboTreeBox provides a ComboBox that pops up a tree instead of a list. 
 
-ComboTreeBox tries to provide the same interface as :class:`ComboBox` as much as
+ComboTreeBox tries to provide the same interface as :class:`wx.ComboBox` as much as
 possible. However, whereas the ComboBox widget uses indices to access 
 items in the list of choices, ComboTreeBox uses TreeItemId's instead. If
 you add an item to the ComboTreeBox (using Append or Insert), the 
-:class:`TreeItemId` associated with the added item is returned. You can then use
-that `TreeItemId` to add items as children of that first item. For
+:class:`wx.TreeItemId` associated with the added item is returned. You can then use
+that `wx.TreeItemId` to add items as children of that first item. For
 example::
 
     from wx.lib.combotreebox import ComboTreeBox
@@ -46,7 +46,7 @@ To get the client data of the currently selected item (if any)::
         somePythonObject = combo.GetClientData(currentItem)
 
 
-Supported styles are the same as for :class:`ComboBox`, i.e. ``wx.CB_READONLY`` and
+Supported styles are the same as for :class:`wx.ComboBox`, i.e. ``wx.CB_READONLY`` and
 ``wx.CB_SORT``. Provide them as usual::
 
     combo = ComboTreeBox(parent, style=wx.CB_READONLY|wx.CB_SORT)
diff --git a/wx/lib/dialogs.py b/wx/lib/dialogs.py
index 5045c4bb..3b36a6a9 100644
--- a/wx/lib/dialogs.py
+++ b/wx/lib/dialogs.py
@@ -349,7 +349,7 @@ except AttributeError:
 
 class MultiMessageDialog(wx.Dialog):
     """
-    A dialog like wx.MessageDialog, but with an optional 2nd message string
+    A dialog like :class:`wx.MessageDialog`, but with an optional 2nd message string
     that is shown in a scrolled window, and also allows passing in the icon to
     be shown instead of the stock error, question, etc. icons. The btnLabels
     can be used if you'd like to change the stock labels on the buttons, it's
@@ -475,7 +475,7 @@ class MultiMessageDialog(wx.Dialog):
 def MultiMessageBox(message, caption, msg2="", style=wx.OK, parent=None, 
                     icon=None, btnLabels=None):
     """
-    A function like wx.MessageBox which uses MultiMessageDialog.
+    A function like :class:`wx.MessageBox` which uses :class:`MultiMessageDialog`.
     """
     #if not style & wx.ICON_NONE and not style & wx.ICON_MASK:
     if not style & wx.ICON_MASK:
diff --git a/wx/lib/docview.py b/wx/lib/docview.py
index f7d4da59..c5f3a012 100644
--- a/wx/lib/docview.py
+++ b/wx/lib/docview.py
@@ -7,7 +7,7 @@
 # Created:      5/15/03
 # Copyright:    (c) 2003-2006 ActiveGrid, Inc. (Port of wxWindows classes by Julian Smart et al)
 # License:      wxWindows license
-# Tags:         phoenix-port
+# Tags:         phoenix-port, docs
 #----------------------------------------------------------------------------
 
 
@@ -78,7 +78,7 @@ class Document(wx.EvtHandler):
     """
     The document class can be used to model an application's file-based data. It
     is part of the document/view framework supported by wxWindows, and cooperates
-    with the wxView, wxDocTemplate and wxDocManager classes.
+    with the :class:`View`, :class:`DocTemplate` and :class:`DocManager` classes.
     
     Note this wxPython version also keeps track of the modification date of the
     document and if it changes on disk outside of the application, we will warn the
@@ -114,6 +114,7 @@ class Document(wx.EvtHandler):
         method is called from the wxPython docview framework directly since
         wxPython does not have a virtual ProcessEvent function.
         """
+        # TODO: ProcessEvent is virtual now, should this method just go away?
         return False
 
 
@@ -148,7 +149,7 @@ class Document(wx.EvtHandler):
         The document type name given to the wxDocTemplate constructor,
         copied to this document when the document is created. If several
         document templates are created that use the same document type, this
-        variable is used in wxDocManager::CreateView to collate a list of
+        variable is used in :meth:`DocManager.CreateView` to collate a list of
         alternative view types that can be used on this kind of document.
         """
         return self._documentTypeName
@@ -156,10 +157,10 @@ class Document(wx.EvtHandler):
 
     def SetDocumentName(self, name):
         """
-        Sets he document type name given to the wxDocTemplate constructor,
+        Sets the document type name given to the :class:`DocTemplate` constructor,
         copied to this document when the document is created. If several
         document templates are created that use the same document type, this
-        variable is used in wxDocManager::CreateView to collate a list of
+        variable is used in :meth:`DocManager.CreateView` to collate a list of
         alternative view types that can be used on this kind of document. Do
         not change the value of this variable.
         """
@@ -168,16 +169,14 @@ class Document(wx.EvtHandler):
 
     def GetDocumentSaved(self):
         """
-        Returns True if the document has been saved.  This method has been
-        added to wxPython and is not in wxWindows.
+        Returns True if the document has been saved. 
         """
         return self._savedYet
 
 
     def SetDocumentSaved(self, saved=True):
         """
-        Sets whether the document has been saved.  This method has been
-        added to wxPython and is not in wxWindows.
+        Sets whether the document has been saved. 
         """
         self._savedYet = saved
 
@@ -193,7 +192,7 @@ class Document(wx.EvtHandler):
         """
         Sets the command processor to be used for this document. The document
         will then be responsible for its deletion. Normally you should not
-        call this; override OnCreateCommandProcessor instead.
+        call this; override :meth:`OnCreateCommandProcessor` instead.
         """
         self._commandProcessor = processor
 
@@ -213,8 +212,9 @@ class Document(wx.EvtHandler):
         Call with true to mark the document as modified since the last save,
         false otherwise. You may need to override this if your document view
         maintains its own record of being modified (for example if using
-        xTextWindow to view and edit the document).
-        This method has been extended to notify its views that the dirty flag has changed.
+        :class:`wx.TextWindow` to view and edit the document).
+        This method has been extended to notify its views that the dirty
+        flag has changed.
         """
         self._documentModified = modify
         self.UpdateAllViews(hint=("modify", self, self._documentModified))
@@ -223,8 +223,8 @@ class Document(wx.EvtHandler):
     def SetDocumentModificationDate(self):
         """
         Saves the file's last modification date.
-        This is used to check if the file has been modified outside of the application.
-        This method has been added to wxPython and is not in wxWindows.
+        This is used to check if the file has been modified outside of
+        the application.
         """
         self._documentModificationDate = os.path.getmtime(self.GetFilename())
 
@@ -233,7 +233,6 @@ class Document(wx.EvtHandler):
         """
         Returns the file's modification date when it was loaded from disk.
         This is used to check if the file has been modified outside of the application.        
-        This method has been added to wxPython and is not in wxWindows.
         """
         return self._documentModificationDate
 
@@ -241,7 +240,6 @@ class Document(wx.EvtHandler):
     def IsDocumentModificationDateCorrect(self):
         """
         Returns False if the file has been modified outside of the application.
-        This method has been added to wxPython and is not in wxWindows.
         """
         if not os.path.exists(self.GetFilename()):  # document must be in memory only and can't be out of date
             return True
@@ -291,9 +289,9 @@ class Document(wx.EvtHandler):
 
     def Close(self):
         """
-        Closes the document, by calling OnSaveModified and then (if this true)
-        OnCloseDocument. This does not normally delete the document object:
-        use DeleteAllViews to do this implicitly.
+        Closes the document, by calling :meth:`OnSaveModified` and then (if this true)
+        :meth:`OnCloseDocument`. This does not normally delete the document object:
+        use :meth:`DeleteAllViews` to do this implicitly.
         """
         if self.OnSaveModified():
             if self.OnCloseDocument():
@@ -306,7 +304,7 @@ class Document(wx.EvtHandler):
 
     def OnCloseDocument(self):
         """
-        The default implementation calls DeleteContents (an empty
+        The default implementation calls :meth:`DeleteContents` (an empty
         implementation) sets the modified flag to false. Override this to
         supply additional behaviour when the document is closed with Close.
         """
@@ -318,9 +316,9 @@ class Document(wx.EvtHandler):
 
     def DeleteAllViews(self):
         """
-        Calls wxView.Close and deletes each view. Deleting the final view will
+        Calls :meth:`View.Close` and deletes each view. Deleting the final view will
         implicitly delete the document itself, because the wxView destructor
-        calls RemoveView. This in turns calls wxDocument::OnChangedViewList,
+        calls RemoveView. This in turn calls :meth:`Document.OnChangedViewList`,
         whose default implemention is to save and delete the document if no
         views exist.
         """
@@ -370,8 +368,8 @@ class Document(wx.EvtHandler):
 
     def Save(self):
         """
-        Saves the document by calling OnSaveDocument if there is an associated
-        filename, or SaveAs if there is no filename.
+        Saves the document by calling :meth:`OnSaveDocument` if there is an
+        associated filename, or :meth:`SaveAs` if there is no filename.
         """
         if not self.IsModified():  # and self._savedYet:  This was here, but if it is not modified who cares if it hasn't been saved yet?
             return True
@@ -400,7 +398,7 @@ class Document(wx.EvtHandler):
 
     def SaveAs(self):
         """
-        Prompts the user for a file to save to, and then calls OnSaveDocument.
+        Prompts the user for a file to save to, and then calls :meth:`OnSaveDocument`.
         """
         docTemplate = self.GetDocumentTemplate()
         if not docTemplate:
@@ -439,9 +437,9 @@ class Document(wx.EvtHandler):
     def OnSaveDocument(self, filename):
         """
         Constructs an output file for the given filename (which must
-        not be empty), and calls SaveObject. If SaveObject returns true, the
-        document is set to unmodified; otherwise, an error message box is
-        displayed.
+        not be empty), and calls :meth:`SaveObject`. If :meth:`SaveObject`
+        returns true, the document is set to unmodified; otherwise, an
+        error message box is displayed.
         """
         if not filename:
             return False
@@ -510,7 +508,7 @@ class Document(wx.EvtHandler):
     def OnOpenDocument(self, filename):
         """
         Constructs an input file for the given filename (which must not
-        be empty), and calls LoadObject. If LoadObject returns true, the
+        be empty), and calls :meth:`LoadObject`. If LoadObject returns true, the
         document is set to unmodified; otherwise, an error message box is
         displayed. The document's views are notified that the filename has
         changed, to give windows an opportunity to update their titles. All of
@@ -552,8 +550,8 @@ class Document(wx.EvtHandler):
 
     def LoadObject(self, file):
         """
-        Override this function and call it from your own LoadObject before
-        loading your own data. LoadObject is called by the framework
+        Override this function and call it from your own ``LoadObject`` before
+        loading your own data. ``LoadObject`` is called by the framework
         automatically when the document contents need to be loaded.
 
         Note that the wxPython version simply sends you a Python file object,
@@ -564,8 +562,8 @@ class Document(wx.EvtHandler):
 
     def SaveObject(self, file):
         """
-        Override this function and call it from your own SaveObject before
-        saving your own data. SaveObject is called by the framework
+        Override this function and call it from your own ``SaveObject`` before
+        saving your own data. ``SaveObject`` is called by the framework
         automatically when the document contents need to be saved.
 
         Note that the wxPython version simply sends you a Python file object,
@@ -611,7 +609,7 @@ class Document(wx.EvtHandler):
         """
         Override this function if you want a different (or no) command
         processor to be created when the document is created. By default, it
-        returns an instance of wxCommandProcessor.
+        returns an instance of :class:`CommandProcessor`.
         """
         return CommandProcessor()
 
@@ -672,7 +670,7 @@ class Document(wx.EvtHandler):
     def AddView(self, view):
         """
         If the view is not already in the list of views, adds the view and
-        calls OnChangedViewList.
+        calls :meth:`OnChangedViewList`.
         """
         if not view in self._documentViews:
             self._documentViews.append(view)
@@ -683,7 +681,7 @@ class Document(wx.EvtHandler):
     def RemoveView(self, view):
         """
         Removes the view from the document's list of views, and calls
-        OnChangedViewList.
+        :meth:`OnChangedViewList`.
         """
         if view in self._documentViews:
             self._documentViews.remove(view)
@@ -693,7 +691,7 @@ class Document(wx.EvtHandler):
 
     def OnCreate(self, path, flags):
         """
-        The default implementation calls DeleteContents (an empty
+        The default implementation calls :meth:`DeleteContents` (an empty
         implementation) sets the modified flag to false. Override this to
         supply additional behaviour when the document is opened with Open.
         """
@@ -735,7 +733,7 @@ class Document(wx.EvtHandler):
     def SetFilename(self, filename, notifyViews = False):
         """
         Sets the filename for this document. Usually called by the framework.
-        If notifyViews is true, wxView.OnChangeFilename is called for all
+        If notifyViews is true, :meth:`View.OnChangeFilename` is called for all
         views.
         """
         self._documentFile = filename
@@ -747,7 +745,6 @@ class Document(wx.EvtHandler):
     def GetWriteable(self):
         """
         Returns true if the document can be written to its accociated file path.
-        This method has been added to wxPython and is not in wxWindows.
         """
         if not self._writeable:
             return False 
@@ -759,10 +756,10 @@ class Document(wx.EvtHandler):
 
     def SetWriteable(self, writeable):
         """
-        Set to False if the document can not be saved.  This will disable the ID_SAVE_AS
-        event and is useful for custom documents that should not be saveable.  The ID_SAVE
-        event can be disabled by never Modifying the document.  This method has been added
-        to wxPython and is not in wxWindows.
+        Set to False if the document can not be saved.  This will disable the
+        ``ID_SAVE_AS`` event and is useful for custom documents that should
+        not be saveable.  The ``ID_SAVE`` event can be disabled by never
+        modifying the document.
         """
         self._writeable = writeable
 
@@ -771,8 +768,8 @@ class View(wx.EvtHandler):
     """
     The view class can be used to model the viewing and editing component of
     an application's file-based data. It is part of the document/view
-    framework supported by wxWindows, and cooperates with the wxDocument,
-    wxDocTemplate and wxDocManager classes.
+    framework supported by wxWindows, and cooperates with the :class:`Document`,
+    :class:`DocTemplate` and :class:`DocManager` classes.
     """
 
     def __init__(self):
@@ -797,9 +794,7 @@ class View(wx.EvtHandler):
     def ProcessEvent(self, event):
         """
         Processes an event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).
         """
         if not self.GetDocument() or not self.GetDocument().ProcessEvent(event):
             return False
@@ -810,16 +805,14 @@ class View(wx.EvtHandler):
     def ProcessUpdateUIEvent(self, event):
         """
         Processes a UI event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         return False
 
 
     def OnActivateView(self, activate, activeView, deactiveView):
         """
-        Called when a view is activated by means of wxView::Activate. The
+        Called when a view is activated by means of :meth:`View.Activate`. The
         default implementation does nothing.
         """
         pass
@@ -844,7 +837,7 @@ class View(wx.EvtHandler):
     def OnPrint(self, dc, info):
         """
         Override this to print the view for the printing framework.  The
-        default implementation calls View.OnDraw.
+        default implementation calls :meth:`View.OnDraw`.
         """
         self.OnDraw(dc)
 
@@ -852,7 +845,7 @@ class View(wx.EvtHandler):
     def OnUpdate(self, sender, hint):
         """
         Called when the view should be updated. sender is a pointer to the
-        view that sent the update request, or NULL if no single view requested
+        view that sent the update request, or None if no single view requested
         the update (for instance, when the document is opened). hint is as yet
         unused but may in future contain application-specific information for
         making updating more efficient.
@@ -906,7 +899,7 @@ class View(wx.EvtHandler):
 
     def GetViewName(self):
         """
-        Gets the name associated with the view (passed to the wxDocTemplate
+        Gets the name associated with the view (passed to the :class:`DocTemplate`
         constructor). Not currently used by the framework.
         """
         return self._viewTypeName
@@ -921,7 +914,7 @@ class View(wx.EvtHandler):
 
     def Close(self, deleteWindow=True):
         """
-        Closes the view by calling OnClose. If deleteWindow is true, this
+        Closes the view by calling :meth:`OnClose`. If deleteWindow is true, this
         function should delete the window associated with the view.
         """
         if self.OnClose(deleteWindow = deleteWindow):
@@ -932,14 +925,14 @@ class View(wx.EvtHandler):
 
     def Activate(self, activate=True):
         """
-        Call this from your view frame's OnActivate member to tell the
+        Call this from your view frame's ``OnActivate`` member to tell the
         framework which view is currently active. If your windowing system
-        doesn't call OnActivate, you may need to call this function from
+        doesn't call ``OnActivate``, you may need to call this function from
         OnMenuCommand or any place where you know the view must be active, and
         the framework will need to get the current view.
 
-        The prepackaged view frame wxDocChildFrame calls wxView.Activate from
-        its OnActivate member and from its OnMenuCommand member.
+        The prepackaged view frame :class:`DocChildFrame` calls ``View.Activate` from
+        its ``OnActivate`` member and from its ``OnMenuCommand`` member.
         """
         if self.GetDocument() and self.GetDocumentManager():
             self.OnActivateView(activate, self, self.GetDocumentManager().GetCurrentView())
@@ -949,9 +942,9 @@ class View(wx.EvtHandler):
     def OnClose(self, deleteWindow=True):
         """
         Implements closing behaviour. The default implementation calls
-        wxDocument.Close to close the associated document. Does not delete the
+        :meth:`Document.Close` to close the associated document. Does not delete the
         view. The application may wish to do some cleaning up operations in
-        this function, if a call to wxDocument::Close succeeded. For example,
+        this function, if a call to :meth:`Document::Close` succeeded. For example,
         if your application's all share the same window, you need to
         disassociate the window from the view and perhaps clear the window. If
         deleteWindow is true, delete the frame associated with the view.
@@ -964,10 +957,11 @@ class View(wx.EvtHandler):
 
     def OnCreate(self, doc, flags):
         """
-        wxDocManager or wxDocument creates a wxView via a wxDocTemplate. Just
-        after the wxDocTemplate creates the wxView, it calls wxView::OnCreate.
-        In its OnCreate member function, the wxView can create a
-        wxDocChildFrame or a derived class. This wxDocChildFrame provides user
+        :class:`DocManager` or :class:`Document` creates a :class:`View` via
+        a :class:`DocTemplate`. Just after the :class:`DocTemplate` creates
+        the :class:`View`, it calls :meth:`xView.OnCreate`. In its ``OnCreate``
+        member function, the ``View`` can create a :class:`DocChildFrame` or
+        a derived class. This :class:`DocChildFrame` provides user
         interface elements to view and/or edit the contents of the wxDocument.
 
         By default, simply returns true. If the function returns false, the
@@ -978,14 +972,14 @@ class View(wx.EvtHandler):
 
     def OnCreatePrintout(self):
         """
-        Returns a wxPrintout object for the purposes of printing. It should
-        create a new object every time it is called; the framework will delete
+        Returns a :class:`wx.Printout` object for the purposes of printing. It
+        should create a new object every time it is called; the framework will delete
         objects it creates.
 
-        By default, this function returns an instance of wxDocPrintout, which
-        prints and previews one page by calling wxView.OnDraw.
+        By default, this function returns an instance of :class:`DocPrintout`, which
+        prints and previews one page by calling :meth:`View.OnDraw`.
 
-        Override to return an instance of a class other than wxDocPrintout.
+        Override to return an instance of a class other than :class:`DocPrintout`.
         """
         return DocPrintout(self, self.GetDocument().GetPrintableName())
 
@@ -993,9 +987,9 @@ class View(wx.EvtHandler):
     def GetFrame(self):
         """
         Gets the frame associated with the view (if any). Note that this
-        "frame" is not a wxFrame at all in the generic MDI implementation
+        "frame" is not a :class:`wx.Frame` at all in the generic MDI implementation
         which uses the notebook pages instead of the frames and this is why
-        this method returns a wxWindow and not a wxFrame.
+        this method returns a :class:`wx.Window` and not a :class:`wx.Frame`.
         """
         return self._viewFrame
 
@@ -1003,8 +997,8 @@ class View(wx.EvtHandler):
     def SetFrame(self, frame):
         """
         Sets the frame associated with this view. The application should call
-        this if possible, to tell the view about the frame.  See GetFrame for
-        the explanation about the mismatch between the "Frame" in the method
+        this if possible, to tell the view about the frame.  See :meth:`GetFrame`
+        for the explanation about the mismatch between the "Frame" in the method
         name and the type of its parameter.
         """
         self._viewFrame = frame
@@ -1022,7 +1016,7 @@ class View(wx.EvtHandler):
 
 class DocTemplate(wx.Object):
     """
-    The wxDocTemplate class is used to model the relationship between a
+    The :class:`DocTemplate` class is used to model the relationship between a
     document class and a view class.
     """
 
@@ -1060,13 +1054,13 @@ class DocTemplate(wx.Object):
         return a new view instance on demand.
 
         flags is a bit list of the following:
-        wx.TEMPLATE_VISIBLE The template may be displayed to the user in
+        ``TEMPLATE_VISIBLE``: The template may be displayed to the user in
         dialogs.
 
-        wx.TEMPLATE_INVISIBLE The template may not be displayed to the user in
+        ``TEMPLATE_INVISIBLE``: The template may not be displayed to the user in
         dialogs.
 
-        wx.DEFAULT_TEMPLATE_FLAGS Defined as wxTEMPLATE_VISIBLE.
+        ``DEFAULT_TEMPLATE_FLAGS``: Defined as ``TEMPLATE_VISIBLE``.
         """
         self._docManager = manager
         self._description = description
@@ -1178,16 +1172,14 @@ class DocTemplate(wx.Object):
     def GetIcon(self):
         """
         Returns the icon, as passed to the document template
-        constructor.  This method has been added to wxPython and is
-        not in wxWindows.
+        constructor.  
         """
         return self._icon
 
 
     def SetIcon(self, flags):
         """
-        Sets the icon.  This method has been added to wxPython and is not
-        in wxWindows.
+        Sets the icon.  
         """
         self._icon = icon
 
@@ -1220,8 +1212,6 @@ class DocTemplate(wx.Object):
         """
         Returns true if the document template can be shown in "New" dialogs,
         false otherwise.
-        
-        This method has been added to wxPython and is not in wxWindows.
         """
         return (self._flags & TEMPLATE_NO_CREATE) != TEMPLATE_NO_CREATE
         
@@ -1290,9 +1280,9 @@ class DocTemplate(wx.Object):
 
 class DocManager(wx.EvtHandler):
     """
-    The wxDocManager class is part of the document/view framework supported by
-    wxWindows, and cooperates with the wxView, wxDocument and wxDocTemplate
-    classes.
+    The :class:`DocManager` class is part of the document/view framework,
+    and cooperates with the :class:`View`, :class:`Document` and
+    :class:`DocTemplate` classes.
     """
 
     def __init__(self, flags=DEFAULT_DOCMAN_FLAGS, initialize=True):
@@ -1362,8 +1352,7 @@ class DocManager(wx.EvtHandler):
 
     def GetFlags(self):
         """
-        Returns the document manager's flags.  This method has been
-        added to wxPython and is not in wxWindows.
+        Returns the document manager's flags.  
         """
         return self._flags
 
@@ -1394,8 +1383,8 @@ class DocManager(wx.EvtHandler):
 
     def Clear(self, force=True):
         """
-        Closes all currently opened document by callling CloseDocuments and
-        clears the document manager's templates.
+        Closes all currently opened document by callling :meth:`CloseDocuments`
+        and clears the document manager's templates.
         """
         if not self.CloseDocuments(force):
             return False
@@ -1405,16 +1394,16 @@ class DocManager(wx.EvtHandler):
 
     def Initialize(self):
         """
-        Initializes data; currently just calls OnCreateFileHistory. Some data
+        Initializes data; currently just calls :meth:`OnCreateFileHistory`. Some data
         cannot always be initialized in the constructor because the programmer
         must be given the opportunity to override functionality. In fact
-        Initialize is called from the wxDocManager constructor, but this can
+        ``Initialize`` is called from the :class:`DocManager` constructor, but this can
         be vetoed by passing false to the second argument, allowing the
-        derived class's constructor to call Initialize, possibly calling a
-        different OnCreateFileHistory from the default.
+        derived class's constructor to call ``Initialize``, possibly calling a
+        different :meth:`OnCreateFileHistory` from the default.
 
-        The bottom line: if you're not deriving from Initialize, forget it and
-        construct wxDocManager with no arguments.
+        The bottom line: if you're not deriving from ``Initialize``, forget it and
+        construct :class:`DocManager` with no arguments.
         """
         self.OnCreateFileHistory()
         return True
@@ -1423,7 +1412,7 @@ class DocManager(wx.EvtHandler):
     def OnCreateFileHistory(self):
         """
         A hook to allow a derived class to create a different type of file
-        history. Called from Initialize.
+        history. Called from :meth:`Initialize`.
         """
         self._fileHistory = wx.FileHistory()
 
@@ -1474,8 +1463,8 @@ class DocManager(wx.EvtHandler):
 
     def OnFileSave(self, event):
         """
-        Saves the current document by calling wxDocument.Save for the current
-        document.
+        Saves the current document by calling :meth:`Document.Save` for
+        the current document.
         """
         doc = self.GetCurrentDocument()
         if not doc:
@@ -1485,7 +1474,7 @@ class DocManager(wx.EvtHandler):
 
     def OnFileSaveAs(self, event):
         """
-        Calls wxDocument.SaveAs for the current document.
+        Calls :meth:`Document.SaveAs` for the current document.
         """
         doc = self.GetCurrentDocument()
         if not doc:
@@ -1495,8 +1484,8 @@ class DocManager(wx.EvtHandler):
 
     def OnPrint(self, event):
         """
-        Prints the current document by calling its View's OnCreatePrintout
-        method.
+        Prints the current document by calling its View's
+        :meth:`~View.OnCreatePrintout` method.
         """
         view = self.GetCurrentView()
         if not view:
@@ -1543,8 +1532,8 @@ class DocManager(wx.EvtHandler):
 
     def OnPreview(self, event):
         """
-        Previews the current document by calling its View's OnCreatePrintout
-        method.
+        Previews the current document by calling its View's
+        :meth:`~View.OnCreatePrintout` method.
         """
         view = self.GetCurrentView()
         if not view:
@@ -1767,9 +1756,7 @@ class DocManager(wx.EvtHandler):
     def ProcessUpdateUIEvent(self, event):
         """
         Processes a UI event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         id = event.GetId()
         view = self.GetCurrentView()
@@ -1821,29 +1808,30 @@ class DocManager(wx.EvtHandler):
         Creates a new document in a manner determined by the flags parameter,
         which can be:
 
-        wx.lib.docview.DOC_NEW Creates a fresh document.
-        wx.lib.docview.DOC_SILENT Silently loads the given document file.
+        ``wx.lib.docview.DOC_NEW`` Creates a fresh document.
+        ``wx.lib.docview.DOC_SILENT`` Silently loads the given document file.
 
-        If wx.lib.docview.DOC_NEW is present, a new document will be created and returned,
-        possibly after asking the user for a template to use if there is more
-        than one document template. If wx.lib.docview.DOC_SILENT is present, a new document
-        will be created and the given file loaded into it. If neither of these
-        flags is present, the user will be presented with a file selector for
-        the file to load, and the template to use will be determined by the
-        extension (Windows) or by popping up a template choice list (other
-        platforms).
+        If ``wx.lib.docview.DOC_NEW`` is present, a new document will be
+        created and returned, possibly after asking the user for a template to
+        use if there is more than one document template. ``If
+        wx.lib.docview.DOC_SILENT`` is present, a new document will be created
+        and the given file loaded into it. If neither of these flags is
+        present, the user will be presented with a file selector for the file
+        to load, and the template to use will be determined by the extension
+        (Windows) or by popping up a template choice list (other platforms).
 
         If the maximum number of documents has been reached, this function
         will delete the oldest currently loaded document before creating a new
         one.
 
-        wxPython version supports the document manager's wx.lib.docview.DOC_OPEN_ONCE
-        and wx.lib.docview.DOC_NO_VIEW flag.
+        wxPython version supports the document manager's
+        ``wx.lib.docview.DOC_OPEN_ONCE`` and ``wx.lib.docview.DOC_NO_VIEW``
+        flag.
         
-        if wx.lib.docview.DOC_OPEN_ONCE is present, trying to open the same file multiple 
-        times will just return the same document.
-        if wx.lib.docview.DOC_NO_VIEW is present, opening a file will generate the document,
-        but not generate a corresponding view.
+        if ``wx.lib.docview.DOC_OPEN_ONCE`` is present, trying to open the
+        same file multiple times will just return the same document. if
+        ``wx.lib.docview.DOC_NO_VIEW`` is present, opening a file will
+        generate the document, but not generate a corresponding view.
         """
         templates = []
         for temp in self._templates:
@@ -2123,7 +2111,8 @@ class DocManager(wx.EvtHandler):
         only an approximate method of finding a template for creating a
         document.
         
-        Note this wxPython verson looks for and returns a default template if no specific template is found.
+        Note this wxPython verson looks for and returns a default template
+        if no specific template is found.
         """
         default = None
         for temp in self._templates:
@@ -2159,7 +2148,7 @@ class DocManager(wx.EvtHandler):
         On other platforms, if there is more than one document template a
         choice list is popped up, followed by a file selector.
 
-        This function is used in wxDocManager.CreateDocument.
+        This function is used in :meth:`DocManager.CreateDocument`.
         """
         if wx.Platform == "__WXMSW__" or wx.Platform == "__WXGTK__" or wx.Platform == "__WXMAC__":
             descr = ''
@@ -2200,7 +2189,7 @@ class DocManager(wx.EvtHandler):
     def SelectDocumentType(self, temps, sort=False):
         """
         Returns a document template by asking the user (if there is more than
-        one template). This function is used in wxDocManager.CreateDocument.
+        one template). This function is used in :methW`DocManager.CreateDocument`.
 
         Parameters
 
@@ -2247,7 +2236,12 @@ class DocManager(wx.EvtHandler):
 
     def SelectViewType(self, temps, sort=False):
         """
-        Returns a document template by asking the user (if there is more than one template), displaying a list of valid views. This function is used in wxDocManager::CreateView. The dialog normally will not appear because the array of templates only contains those relevant to the document in question, and often there will only be one such.
+        Returns a document template by asking the user (if there is
+        more than one template), displaying a list of valid views.
+        This function is used in wxDocManager::CreateView. The dialog
+        normally will not appear because the array of templates only
+        contains those relevant to the document in question, and
+        often there will only be one such.
         """
         templates = []
         strings = []
@@ -2278,8 +2272,7 @@ class DocManager(wx.EvtHandler):
 
     def GetTemplates(self):
         """
-        Returns the document manager's template list.  This method has been added to
-        wxPython and is not in wxWindows.
+        Returns the document manager's template list.
         """
         return self._templates
 
@@ -2354,15 +2347,17 @@ class DocManager(wx.EvtHandler):
 
 class DocParentFrame(wx.Frame):
     """
-    The wxDocParentFrame class provides a default top-level frame for
+    The :class:`DocParentFrame` class provides a default top-level frame for
     applications using the document/view framework. This class can only be
     used for SDI (not MDI) parent frames.
 
-    It cooperates with the wxView, wxDocument, wxDocManager and wxDocTemplates
-    classes.
+    It cooperates with the :class:`View`, :class:`Document`, :class:`DocManager`
+    and :class:`DocTemplates` classes.
     """
 
-    def __init__(self, manager, frame, id, title, pos=wx.DefaultPosition, size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE, name="frame"):
+    def __init__(self, manager, frame, id, title, pos=wx.DefaultPosition,
+                 size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE,
+                 name="frame"):
         """
         Constructor.  Note that the event table must be rebuilt for the
         frame since the EvtHandler is not virtual.
@@ -2405,9 +2400,7 @@ class DocParentFrame(wx.Frame):
     def ProcessEvent(self, event):
         """
         Processes an event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         return self._docManager and self._docManager.ProcessEvent(event)
 
@@ -2415,9 +2408,7 @@ class DocParentFrame(wx.Frame):
     def ProcessUpdateUIEvent(self, event):
         """
         Processes a UI event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         return self._docManager and self._docManager.ProcessUpdateUIEvent(event)
 
@@ -2462,20 +2453,19 @@ class DocParentFrame(wx.Frame):
 
 class DocChildFrame(wx.Frame):
     """
-    The wxDocChildFrame class provides a default frame for displaying
+    The :class:`DocChildFrame` class provides a default frame for displaying
     documents on separate windows. This class can only be used for SDI (not
     MDI) child frames.
 
-    The class is part of the document/view framework supported by wxWindows,
-    and cooperates with the wxView, wxDocument, wxDocManager and wxDocTemplate
-    classes.
+    The class is part of the document/view framework and cooperates with
+    the :class:`View`, :class:`Document`, :class:`DocManager` and
+    :class:`DocTemplate` classes.
     """
 
 
     def __init__(self, doc, view, frame, id, title, pos=wx.DefaultPosition, size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE, name="frame"):
         """
-        Constructor.  Note that the event table must be rebuilt for the
-        frame since the EvtHandler is not virtual.
+        Constructor.  
         """
         wx.Frame.__init__(self, frame, id, title, pos, size, style, name)
         wx.EVT_ACTIVATE(self, self.OnActivate)
@@ -2515,9 +2505,7 @@ class DocChildFrame(wx.Frame):
     def ProcessEvent(self, event):
         """
         Processes an event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         if self._childView:
             self._childView.Activate(True)
@@ -2535,9 +2523,7 @@ class DocChildFrame(wx.Frame):
     def ProcessUpdateUIEvent(self, event):
         """
         Processes a UI event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         if self.GetParent():
             self.GetParent().ProcessUpdateUIEvent(event)
@@ -2609,19 +2595,18 @@ class DocChildFrame(wx.Frame):
 
 class DocMDIParentFrame(wx.MDIParentFrame):
     """
-    The wxDocMDIParentFrame class provides a default top-level frame for
+    The :class:`DocMDIParentFrame` class provides a default top-level frame for
     applications using the document/view framework. This class can only be
     used for MDI parent frames.
 
-    It cooperates with the wxView, wxDocument, wxDocManager and wxDocTemplate
-    classes.
+    It cooperates with the :class:`View`, :class:`Document`,
+    :class:`DocManager` and :class:`DocTemplate` classes.
     """
 
 
     def __init__(self, manager, frame, id, title, pos=wx.DefaultPosition, size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE, name="frame"):
         """
-        Constructor.  Note that the event table must be rebuilt for the
-        frame since the EvtHandler is not virtual.
+        Constructor.  
         """
         wx.MDIParentFrame.__init__(self, frame, id, title, pos, size, style, name)
         self._docManager = manager
@@ -2661,9 +2646,7 @@ class DocMDIParentFrame(wx.MDIParentFrame):
     def ProcessEvent(self, event):
         """
         Processes an event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         return self._docManager and self._docManager.ProcessEvent(event)
 
@@ -2671,9 +2654,7 @@ class DocMDIParentFrame(wx.MDIParentFrame):
     def ProcessUpdateUIEvent(self, event):
         """
         Processes a UI event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         return self._docManager and self._docManager.ProcessUpdateUIEvent(event)
 
@@ -2718,12 +2699,12 @@ class DocMDIParentFrame(wx.MDIParentFrame):
 
 class DocMDIChildFrame(wx.MDIChildFrame):
     """
-    The wxDocMDIChildFrame class provides a default frame for displaying
+    The :class:`DocMDIChildFrame` class provides a default frame for displaying
     documents on separate windows. This class can only be used for MDI child
     frames.
 
-    The class is part of the document/view framework supported by wxWindows,
-    and cooperates with the wxView, wxDocument, wxDocManager and wxDocTemplate
+    The class is part of the document/view framework and cooperates with the
+    :class:`View`, :class:`Document`, :class:`DocManager` and :class:`DocTemplate`
     classes.
     """
 
@@ -2773,9 +2754,7 @@ class DocMDIChildFrame(wx.MDIChildFrame):
     def ProcessEvent(event):
         """
         Processes an event, searching event tables and calling zero or more
-        suitable event handler function(s).  Note that the ProcessEvent
-        method is called from the wxPython docview framework directly since
-        wxPython does not have a virtual ProcessEvent function.
+        suitable event handler function(s).  
         """
         if self._activeEvent == event:
             return False
@@ -2872,7 +2851,6 @@ class DocMDIChildFrame(wx.MDIChildFrame):
         """
         Add/remove to the frame's title an indication that the document is dirty.
         If the document is dirty, an '*' is appended to the title
-        This method has been added to wxPython and is not in wxWindows.
         """
         title = self.GetTitle()
         if title:
@@ -2892,8 +2870,8 @@ class DocMDIChildFrame(wx.MDIChildFrame):
 
 class DocPrintout(wx.Printout):
     """
-    DocPrintout is a default Printout that prints the first page of a document
-    view.
+    DocPrintout is a default :class:`wx.Printout` that prints the first
+    page of a document view.
     """
 
 
@@ -2953,24 +2931,24 @@ class DocPrintout(wx.Printout):
 
 class Command(wx.Object):
     """
-    wxCommand is a base class for modelling an application command, which is
-    an action usually performed by selecting a menu item, pressing a toolbar
-    button or any other means provided by the application to change the data
-    or view.
+    ``Command`` is a base class for modelling an application command,
+    which is an action usually performed by selecting a menu item, pressing a
+    toolbar button or any other means provided by the application to
+    change the data or view.
     """
 
 
     def __init__(self, canUndo = False, name = None):
         """
-        Constructor. wxCommand is an abstract class, so you will need to
+        Constructor. :class:`Command` is an abstract class, so you will need to
         derive a new class and call this constructor from your own constructor.
 
-        canUndo tells the command processor whether this command is undo-able.
+        ``canUndo`` tells the command processor whether this command is undo-able.
         You can achieve the same functionality by overriding the CanUndo member
         function (if for example the criteria for undoability is context-
         dependent).
 
-        name must be supplied for the command processor to display the command
+        ``name`` must be supplied for the command processor to display the command
         name in the application's edit menu.
         """
         self._canUndo = canUndo
@@ -2979,7 +2957,7 @@ class Command(wx.Object):
 
     def CanUndo(self):
         """
-        Returns true if the command can be undone, false otherwise.
+        Returns ``True`` if the command can be undone, false otherwise.
         """
         return self._canUndo
 
@@ -2994,7 +2972,7 @@ class Command(wx.Object):
     def Do(self):
         """
         Override this member function to execute the appropriate action when
-        called. Return true to indicate that the action has taken place, false
+        called. Return ``True`` to indicate that the action has taken place, false
         otherwise. Returning false will indicate to the command processor that
         the action is not undoable and should not be added to the command
         history.
@@ -3004,10 +2982,11 @@ class Command(wx.Object):
 
     def Undo(self):
         """
-        Override this member function to un-execute a previous Do. Return true
-        to indicate that the action has taken place, false otherwise. Returning
-        false will indicate to the command processor that the action is not
-        redoable and no change should be made to the command history.
+        Override this member function to un-execute a previous :meth:`Do`.
+        Return ``True`` to indicate that the action has taken place, ``False``
+        otherwise. Returning ``False`` will indicate to the command processor
+        that the action is not redoable and no change should be made to the
+        command history.
 
         How you implement this command is totally application dependent, but
         typical strategies include:
@@ -3028,15 +3007,15 @@ class Command(wx.Object):
 
 class CommandProcessor(wx.Object):
     """
-    wxCommandProcessor is a class that maintains a history of wxCommands, with
-    undo/redo functionality built-in. Derive a new class from this if you want
-    different behaviour.
+    :class:`CommandProcessor` is a class that maintains a history of
+    :class:`Commands`, with undo/redo functionality built-in. Derive a
+    new class from this if you want different behaviour.
     """
 
 
     def __init__(self, maxCommands=-1):
         """
-        Constructor.  maxCommands may be set to a positive integer to limit
+        Constructor.  ``maxCommands`` may be set to a positive integer to limit
         the number of commands stored to it, otherwise (and by default) the
         list of commands can grow arbitrarily.
         """
@@ -3096,7 +3075,7 @@ class CommandProcessor(wx.Object):
     def SetEditMenu(self, menu):
         """
         Tells the command processor to update the Undo and Redo items on this
-        menu as appropriate. Set this to NULL if the menu is about to be
+        menu as appropriate. Set this to ``None`` if the menu is about to be
         destroyed and command operations may still be performed, or the
         command processor may try to access an invalid pointer.
         """
@@ -3163,8 +3142,8 @@ class CommandProcessor(wx.Object):
 
     def CanUndo(self):
         """
-        Returns true if the currently-active command can be undone, false
-        otherwise.
+        Returns ``True`` if the currently-active command can be undone,
+        ``False`` otherwise.
         """
         if self._GetCurrentCommand() == None:
             return False
@@ -3173,8 +3152,8 @@ class CommandProcessor(wx.Object):
 
     def CanRedo(self):
         """
-        Returns true if the currently-active command can be redone, false
-        otherwise.
+        Returns ``True`` if the currently-active command can be redone,
+        ``False`` otherwise.
         """
         return self._GetCurrentRedoCommand() != None
 
@@ -3182,13 +3161,13 @@ class CommandProcessor(wx.Object):
     def Submit(self, command, storeIt=True):
         """
         Submits a new command to the command processor. The command processor
-        calls wxCommand::Do to execute the command; if it succeeds, the
+        calls :meth:`Command.Do` to execute the command; if it succeeds, the
         command is stored in the history list, and the associated edit menu
         (if any) updated appropriately. If it fails, the command is deleted
         immediately. Once Submit has been called, the passed command should
         not be deleted directly by the application.
 
-        storeIt indicates whether the successful command should be stored in
+        ``storeIt`` indicates whether the successful command should be stored in
         the history list.
         """
         done = command.Do()
diff --git a/wx/lib/floatcanvas/FCEvents.py b/wx/lib/floatcanvas/FCEvents.py
index 732464c9..8ff835d3 100644
--- a/wx/lib/floatcanvas/FCEvents.py
+++ b/wx/lib/floatcanvas/FCEvents.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         FCEvents.py
 # Purpose:      A convenient place to put all event types and binders for 
diff --git a/wx/lib/floatcanvas/FCObjects.py b/wx/lib/floatcanvas/FCObjects.py
index 05cb7f78..f6c15acf 100644
--- a/wx/lib/floatcanvas/FCObjects.py
+++ b/wx/lib/floatcanvas/FCObjects.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         FCObjects.py
 # Purpose:      Contains all the drawing objects FloatCanvas supports
diff --git a/wx/lib/floatcanvas/FloatCanvas.py b/wx/lib/floatcanvas/FloatCanvas.py
index 210dc890..4b225f0d 100644
--- a/wx/lib/floatcanvas/FloatCanvas.py
+++ b/wx/lib/floatcanvas/FloatCanvas.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         FloatCanvas.py
 # Purpose:
diff --git a/wx/lib/floatcanvas/GUIMode.py b/wx/lib/floatcanvas/GUIMode.py
index d28d5471..2e666e2b 100644
--- a/wx/lib/floatcanvas/GUIMode.py
+++ b/wx/lib/floatcanvas/GUIMode.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         GUIMode.py
 # Purpose:
diff --git a/wx/lib/floatcanvas/NavCanvas.py b/wx/lib/floatcanvas/NavCanvas.py
index f3812862..3c4aef58 100644
--- a/wx/lib/floatcanvas/NavCanvas.py
+++ b/wx/lib/floatcanvas/NavCanvas.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         NavCanvas.py
 # Purpose:      Combines FloatCanvas with Navigation controls
diff --git a/wx/lib/floatcanvas/Utilities/BBox.py b/wx/lib/floatcanvas/Utilities/BBox.py
index 36641d19..89f774ab 100755
--- a/wx/lib/floatcanvas/Utilities/BBox.py
+++ b/wx/lib/floatcanvas/Utilities/BBox.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         BBox.py
 # Purpose:
diff --git a/wx/lib/floatcanvas/Utilities/Colors.py b/wx/lib/floatcanvas/Utilities/Colors.py
index ea8b5831..de1f328e 100755
--- a/wx/lib/floatcanvas/Utilities/Colors.py
+++ b/wx/lib/floatcanvas/Utilities/Colors.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         Colors.py
 # Purpose:      Contains color lists used in FloatCanvas
@@ -136,4 +135,3 @@ if __name__ == "__main__":
     A = wx.App(False)
     F = TestFrame(None)
     A.MainLoop()
-    
\ No newline at end of file
diff --git a/wx/lib/floatcanvas/Utilities/GUI.py b/wx/lib/floatcanvas/Utilities/GUI.py
index 263458b0..c266c357 100644
--- a/wx/lib/floatcanvas/Utilities/GUI.py
+++ b/wx/lib/floatcanvas/Utilities/GUI.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         GUI.py
 # Purpose:      Contains GUI related utilities for FloatCanvas
diff --git a/wx/lib/floatcanvas/__init__.py b/wx/lib/floatcanvas/__init__.py
index b552660e..6a73d7c6 100644
--- a/wx/lib/floatcanvas/__init__.py
+++ b/wx/lib/floatcanvas/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #----------------------------------------------------------------------------
 # Name:         __init__.py
 # Purpose:		The FloatCanvas package
diff --git a/wx/lib/plot.py b/wx/lib/plot.py
index 4f62c161..1d68e63d 100644
--- a/wx/lib/plot.py
+++ b/wx/lib/plot.py
@@ -78,6 +78,14 @@
 #   - Added contect manager and decorator that gets and resets the pen before
 #     and after a function call
 #   - updated demo for new features
+#
+# May 27, 2016  Douglas Thor (doug.thor@gmail.com)
+#   - Added PolyBars and PolyHistogram classes
+#   - General Cleanup
+#   - Added demos for PolyBars and PolyHistogram
+#   - updated plotNN menu items status-bar text to be descriptive.
+#   - increased default size of demo
+#   - updated XSpec and YSpec to accept a list or tuple of (min, max) values.
 
 """
 This is a simple light weight plotting module that can be used with
@@ -890,6 +898,219 @@ class PolyMarker(PolyPoints):
             dc.DrawLineList(lines.astype(np.int32))
 
 
+class PolyBars(PolyPoints):
+    """
+    Rectangles!
+    """
+    _attributes = {'edgecolour': 'black',
+                   'edgewidth': 2,
+                   'edgestyle': wx.PENSTYLE_SOLID,
+                   'legend': '',
+                   'fillcolour': 'red',
+                   'fillstyle': wx.BRUSHSTYLE_SOLID,
+                   'barwidth': None
+                   }
+
+    def __init__(self, points, **attr):
+        """
+        Creates PolyRectangle object
+
+        :param `points`: sequence (array, tuple or list) of (x, y) points
+                         that define the bar.
+                         x: the centerline of the bar.
+                         y: the value of the bar (from y=0)
+        :keyword `attr`: keyword attributes, default to:
+
+         =================================  ================================
+         'edgecolour' = 'black'             wx.Pen Colour: any wx.Colour
+         'edgewidth' = 1                    wx.Pen width
+         'edgestyle' = wx.PENSTYLE_SOLID    wx.Pen style
+         'legend' = ''                      Line Legend to display
+         'fillcolour' = 'red'               wx.Brush fill color: any wx.Colour
+         'fillstyle' = wx.BRUSHSTYLE_SOLID  The fill style for the rectangle
+         'barwidth' = None                  The bar width. None means 0 space
+                                            between bars
+         =================================  ================================
+
+        """
+        PolyPoints.__init__(self, points, attr)
+
+    def _scaleAndShift(self, data, scale=(1, 1), shift=(0, 0)):
+        """same as override method, but retuns a value."""
+        scaled = scale * data + shift
+        return scaled
+
+    def draw(self, dc, printerScale, coord=None):
+        """ Draw the bars """
+        pencolour = self.attributes['edgecolour']
+        penwidth = self.attributes['edgewidth'] * printerScale * self._pointSize[0]
+        penstyle = self.attributes['edgestyle']
+        fillcolour = self.attributes['fillcolour']
+        fillstyle = self.attributes['fillstyle']
+        barwidth = self.attributes['barwidth']
+        barwidth = 1.
+
+        if not isinstance(pencolour, wx.Colour):
+            pencolour = wx.Colour(pencolour)
+        pen = wx.Pen(pencolour, penwidth, penstyle)
+        pen.SetCap(wx.CAP_BUTT)
+        if not isinstance(fillcolour, wx.Colour):
+            fillcolour = wx.Colour(fillcolour)
+        brush = wx.Brush(fillcolour, fillstyle)
+        dc.SetPen(pen)
+        dc.SetBrush(brush)
+        if coord is None:
+            rects = []
+            if isinstance(barwidth, (int, float)):
+                pts = ((x, y, barwidth) for x, y in self.points)
+            else:
+                pts = ((x, y, w) for (x, y), w in zip(self.points, barwidth))
+
+            for x, y, w in pts:
+                # Change the point to a format that works for _scaleAndShift
+                rect = [[x - w / 2, y],      # left, top
+                        [x + w / 2, 0]]      # right, bottom
+
+                # Scale the points to the plot area
+                rect = self._scaleAndShift(rect,
+                                           self.currentScale,
+                                           self.currentShift)
+
+                # Convert to (left, top, width, height)
+                rect = [rect[0][0],                 # X (left)
+                        rect[0][1],                 # Y (top)
+                        rect[1][0] - rect[0][0],    # Width
+                        rect[1][1] - rect[0][1]]    # Height
+
+                rects.append(rect)
+
+            dc.DrawRectangleList(rects)
+        else:
+            dc.DrawLines(coord)  # draw legend line
+
+    def getSymExtent(self, printerScale):
+        """Width and Height of Marker"""
+        h = self.attributes['edgewidth'] * printerScale * self._pointSize[0]
+        w = 5 * h
+        return (w, h)
+
+
+class PolyHistogram(PolyPoints):
+    """
+    Histogram
+
+    Special PolyBars where the bars span the binspec.
+    """
+
+    _attributes = {'edgecolour': 'black',
+                   'edgewidth': 3,
+                   'edgestyle': wx.PENSTYLE_SOLID,
+                   'legend': '',
+                   'fillcolour': wx.GREEN,
+                   'fillstyle': wx.BRUSHSTYLE_SOLID,
+                   }
+
+    def __init__(self, hist, binspec, **attr):
+        """
+        Creates PolyHistogram object
+
+        :param `hist`: sequence (array, tuple or list) of y values
+                       that define the heights of the bars (same as 1st
+                       returned parameter from ``np.histogram(data)``).
+        :param `binspec`: sequence of x values that define the edges of the
+                          bins (same as 2nd returned parameter from
+                          ``np.histogram(data)``).
+                          len(binspec) must equal len(hist) + 1
+        :keyword `attr`: keyword attributes, default to:
+
+         =================================  ================================
+         'edgecolour' = 'black'             wx.Pen Colour: any wx.Colour
+         'edgewidth' = 3                    wx.Pen width
+         'edgestyle' = wx.PENSTYLE_SOLID    wx.Pen style
+         'legend' = ''                      Line Legend to display
+         'fillcolour' = 'blue'              wx.Brush fill color: any wx.Colour
+         'fillstyle' = wx.BRUSHSTYLE_SOLID  The fill style for the rectangle
+         =================================  ================================
+
+        """
+        if len(binspec) != len(hist) + 1:
+            raise ValueError("Length of binspec must = length of hist + 1")
+
+        self.hist = hist
+        self.binspec = binspec
+
+        # need to create a series of points to be used by PolyPoints
+        import itertools
+        def pairwise(iterable):
+            "s -> (s0,s1), (s1,s2), (s2, s3), ..."
+            a, b = itertools.tee(iterable)
+            next(b, None)
+            return zip(a, b)
+
+        self.bins = list(pairwise(self.binspec))
+        x = []
+        for pair in self.bins:
+            x.append(pair[0] + (pair[1] - pair[0])/2)
+
+        points = list(zip(x, self.hist))
+
+        PolyPoints.__init__(self, points, attr)
+
+    def _scaleAndShift(self, data, scale=(1, 1), shift=(0, 0)):
+        """same as override method, but retuns a value."""
+        scaled = scale * data + shift
+        return scaled
+
+    def draw(self, dc, printerScale, coord=None):
+        """ Draw the bars """
+        pencolour = self.attributes['edgecolour']
+        penwidth = self.attributes['edgewidth'] * printerScale * self._pointSize[0]
+        penstyle = self.attributes['edgestyle']
+        fillcolour = self.attributes['fillcolour']
+        fillstyle = self.attributes['fillstyle']
+
+        if not isinstance(pencolour, wx.Colour):
+            pencolour = wx.Colour(pencolour)
+        pen = wx.Pen(pencolour, penwidth, penstyle)
+        pen.SetCap(wx.CAP_BUTT)
+        if not isinstance(fillcolour, wx.Colour):
+            fillcolour = wx.Colour(fillcolour)
+        brush = wx.Brush(fillcolour, fillstyle)
+        dc.SetPen(pen)
+        dc.SetBrush(brush)
+        if coord is None:
+
+            rects = []
+
+            for y, (low, high) in zip(self.hist, self.bins):
+                # Change the point to a format that works for _scaleAndShift
+                rect = [[low, y],      # left, top
+                        [high, 0]]      # right, bottom
+
+                # Scale the points to the plot area
+                rect = self._scaleAndShift(rect,
+                                           self.currentScale,
+                                           self.currentShift)
+
+                # Convert to (left, top, width, height)
+                rect = [rect[0][0],                 # X (left)
+                        rect[0][1],                 # Y (top)
+                        rect[1][0] - rect[0][0],    # Width
+                        rect[1][1] - rect[0][1]]    # Height
+
+                rects.append(rect)
+
+            dc.DrawRectangleList(rects)
+        else:
+            dc.DrawLines(coord)  # draw legend line
+
+    def getSymExtent(self, printerScale):
+        """Width and Height of Marker"""
+        h = self.attributes['edgewidth'] * printerScale * self._pointSize[0]
+        w = 5 * h
+        return (w, h)
+
+
 class BoxPlot(PolyPoints):
     """
     Class to contain box plots
@@ -3850,9 +4071,9 @@ def _draw8Objects():
     Box plot
     """
     data1 = np.array([912, 337, 607, 583, 512, 531, 558, 381, 621, 574,
-                     538, 577, 679, 415, 454, 417, 635, 319, 350, 183,
-                     863, 337, 607, 583, 512, 531, 558, 381, 621, 574,
-                     538, 577, 679, 415, 454, 417, 635, 319, 350, 97])
+                      538, 577, 679, 415, 454, 417, 635, 319, 350, 183,
+                      863, 337, 607, 583, 512, 531, 558, 381, 621, 574,
+                      538, 577, 679, 415, 454, 417, 635, 319, 350, 97])
     data2 = np.array([912, 337, 607, 583, 512, 531, 558, 381, 621, 574,
                       538, 532, 829, 82, 454, 417, 635, 319, 350, 183,
                       863, 337, 607, 583, 512, 531, 558, 866, 621, 574,
@@ -3874,11 +4095,52 @@ def _draw8Objects():
                         "",
                         "Value")
 
+def _draw9Objects():
+    """
+    Histogram
+
+    The following must be true:
+    len(bspec) = len(hist_data) + 1
+    """
+
+    data = 2.25 * np.random.randn(50) + 3
+    heights, bins = np.histogram(data, bins=10)
+
+    hist_fixed_binsize = PolyHistogram(heights, bins)
+
+    # Bins can also be arbitrary widths:
+    hist_variable_binsize = PolyHistogram(
+        [2, 3, 4, 6, 3],
+        [18, 19, 22, 25, 26, 27],
+        fillcolour=wx.BLUE,
+        edgewidth=2,
+        edgecolour=wx.RED,
+    )
+
+    return PlotGraphics(
+        [hist_fixed_binsize, hist_variable_binsize],
+        "Histogram with fixed binsize (left) and variable binsize (right)",
+        "Value",
+        "Count",
+    )
+
+
+def _draw10Objects():
+    """
+    A real bar graph
+    """
+    bar_height = np.array([1, 5, 8, 16, 12, 15, 18, 23, 4, 7, 9, 6])
+    bar_location = np.array([0, 2, 4, 6, 8, 10, 11, 12, 16, 20, 30])
+    data = list(zip(bar_location, bar_height))
+    bars = [PolyBars(data)]
+
+    return PlotGraphics(bars, "Histogram", "XValue", "Count")
+
 
 class TestFrame(wx.Frame):
     def __init__(self, parent, id, title):
         wx.Frame.__init__(self, parent, id, title,
-                          wx.DefaultPosition, (600, 400))
+                          wx.DefaultPosition, (800, 600))
 
         # Now Create the menu bar and items
         self.mainmenu = wx.MenuBar()
@@ -3903,22 +4165,36 @@ class TestFrame(wx.Frame):
         ### "Plot" Menu Items ###############################################
         # -------------------------------------------------------------------
         menu = wx.Menu()
-        menu.Append(206, 'Draw1 - sin, cos', 'Draw plots1')
+        menu.Append(206, 'Draw1 - sin, cos',
+                    'Draw Sin and Cos curves')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw1, id=206)
-        menu.Append(207, 'Draw2 - sin, cos, large joined markers', 'Draw plots2')
+        menu.Append(207, 'Draw2 - sin, cos, large joined markers',
+                    'Draw Sin and Cos curves with some large joined makers')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw2, id=207)
-        menu.Append(208, 'Draw3 - various markers', 'Draw plots3')
+        menu.Append(208, 'Draw3 - various markers',
+                    'Demo various markers')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw3, id=208)
-        menu.Append(209, 'Draw4 - 25k pts', 'Draw plots4')
+        menu.Append(209, 'Draw4 - 25k pts',
+                    'Example of drawing many points quickly')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw4, id=209)
-        menu.Append(210, 'Draw5 - empty plot', 'Draw plots5')
+        menu.Append(210, 'Draw5 - empty plot',
+                    'An empty plot')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw5, id=210)
-        menu.Append(260, 'Draw6 - bar graph', 'Draw plots6')
+        menu.Append(260, 'Draw6 - fake bar graph via lines',
+                    'Fake a bar graph by using lines.')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw6, id=260)
-        menu.Append(261, 'Draw7 - log-log', 'Draw plots7')
+        menu.Append(261, 'Draw7 - log-log',
+                    'Plot a Log-Log graph')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw7, id=261)
-        menu.Append(262, 'Draw8 - Box Plots', 'Draw plots8')
+        menu.Append(262, 'Draw8 - Box Plots',
+                    'Show off some box plots')
         self.Bind(wx.EVT_MENU, self.OnPlotDraw8, id=262)
+        menu.Append(263, 'Draw9 - Histogram',
+                    'Plot a histogram')
+        self.Bind(wx.EVT_MENU, self.OnPlotDraw9, id=263)
+        menu.Append(264, 'Draw10 - real bar graph',
+                    'Plot a real bar chart (not faked with lines)')
+        self.Bind(wx.EVT_MENU, self.OnPlotDraw10, id=264)
 
         menu.AppendSeparator()
 
@@ -4259,6 +4535,16 @@ class TestFrame(wx.Frame):
         self.resetDefaults()
         self.client.Draw(_draw8Objects())
 
+    def OnPlotDraw9(self, event):
+        """Histogram example"""
+        self.resetDefaults()
+        self.client.Draw(_draw9Objects())
+
+    def OnPlotDraw10(self, event):
+        """Bar Chart example"""
+        self.resetDefaults()
+        self.client.Draw(_draw10Objects())
+
     def OnPlotRedraw(self, event):
         self.client.Redraw()
 
diff --git a/wx/lib/statbmp.py b/wx/lib/statbmp.py
index 33ec80c2..43019a18 100644
--- a/wx/lib/statbmp.py
+++ b/wx/lib/statbmp.py
@@ -11,21 +11,23 @@
 #----------------------------------------------------------------------
 
 """
-:class:`~lib.statbmp.GenStaticBitmap` is a generic implementation of :class:`StaticBitmap`.
+:class:`GenStaticBitmap` is a generic implementation of :class:`wx.StaticBitmap`.
 
 
 Description
 ===========
 
-:class:`GenStaticBitmap` is a generic implementation of :class:`StaticBitmap`.
+:class:`GenStaticBitmap` is a generic implementation of
+:class:`wx.StaticBitmap`.
 
-Some of the platforms supported by wxPython (most notably GTK), do not consider
-:class:`StaticBitmap` as a separate widget; instead, the bitmap is just drawn on its
-parent window. This essentially bars the use of almost all mouse events (such as
-detection of mouse motions, mouse clicks and so on).
+Some of the platforms supported by wxPython (most notably GTK), do not
+consider :class:`wx.StaticBitmap` as a separate widget; instead, the bitmap is
+just drawn on its parent window. This essentially bars the use of almost all
+mouse events (such as detection of mouse motions, mouse clicks and so on) on
+the widget.
 
-Using :class:`GenStaticBitmap` will overcome all the problems described above, as it
-is a generic widget and a real window on its own.
+Using :class:`GenStaticBitmap` will overcome the problems described above, as
+it is a generic widget and a real window on its own.
 
 
 Usage
@@ -58,7 +60,7 @@ import wx
 #----------------------------------------------------------------------
 
 class GenStaticBitmap(wx.Control):
-    """ :class:`GenStaticBitmap` is a generic implementation of :class:`StaticBitmap`. """
+    """ :class:`GenStaticBitmap` is a generic implementation of :class:`wx.StaticBitmap`. """
     
     labelDelta = 1
 
@@ -71,17 +73,17 @@ class GenStaticBitmap(wx.Control):
 
         :param `parent`: parent window, must not be ``None``;
         :param integer `ID`: window identifier. A value of -1 indicates a default value;
-        :param Bitmap `bitmap`: the static bitmap used in the control;
+        :param wx.Bitmap `bitmap`: the static bitmap used in the control;
         :param `pos`: the control position. A value of (-1, -1) indicates a default position,
          chosen by either the windowing system or wxPython, depending on platform;
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :param integer `style`: the underlying :class:`Control` style;
+        :param integer `style`: the underlying :class:`wx.Control` style;
         :param string `name`: the widget name.
 
-        :type parent: :class:`Window`
-        :type pos: tuple or :class:`Point`
-        :type size: tuple or :class:`Size`
+        :type parent: :class:`wx.Window`
+        :type pos: tuple or :class:`wx.Point`
+        :type size: tuple or :class:`wx.Size`
         """
 
         if not style & wx.BORDER_MASK:
@@ -101,7 +103,7 @@ class GenStaticBitmap(wx.Control):
         """
         Sets the bitmap label.
 
-        :param Bitmap `bitmap`: the new bitmap.
+        :param wx.Bitmap `bitmap`: the new bitmap.
         
         .. seealso:: :meth:`GetBitmap`
         """
@@ -115,7 +117,7 @@ class GenStaticBitmap(wx.Control):
         """
         Returns the bitmap currently used in the control.
 
-        :rtype: Bitmap
+        :rtype: wx.Bitmap
         
         .. seealso:: :meth:`SetBitmap`
         """
@@ -128,7 +130,7 @@ class GenStaticBitmap(wx.Control):
         Overridden base class virtual.  Determines the best size of
         the control based on the label size and the current font.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return wx.Size(self._bitmap.GetWidth(), self._bitmap.GetHeight())
@@ -138,7 +140,7 @@ class GenStaticBitmap(wx.Control):
         """
         Can this window be given focus by mouse click?
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return False
@@ -149,7 +151,7 @@ class GenStaticBitmap(wx.Control):
         Overridden base class virtual.  By default we should use
         the same font/colour attributes as the native :class:`StaticBitmap`.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return wx.StaticBitmap.GetClassDefaultAttributes()
@@ -160,7 +162,7 @@ class GenStaticBitmap(wx.Control):
         Overridden base class virtual.  If the parent has non-default
         colours then we want this control to inherit them.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return True
@@ -170,7 +172,7 @@ class GenStaticBitmap(wx.Control):
         """
         Handles the ``wx.EVT_PAINT`` for :class:`GenStaticBitmap`.
 
-        :param `event`: a :class:`PaintEvent` event to be processed.
+        :param `event`: a :class:`wx.PaintEvent` event to be processed.
         """
 
         dc = wx.PaintDC(self)
@@ -182,7 +184,7 @@ class GenStaticBitmap(wx.Control):
         """
         Handles the ``wx.EVT_ERASE_BACKGROUND`` event for :class:`GenStaticBitmap`.
 
-        :param `event`: a :class:`EraseEvent` event to be processed.
+        :param `event`: a :class:`wx.EraseEvent` event to be processed.
 
         .. note:: This is intentionally empty to reduce flicker.
         """
diff --git a/wx/lib/stattext.py b/wx/lib/stattext.py
index 410d536d..fa991a87 100644
--- a/wx/lib/stattext.py
+++ b/wx/lib/stattext.py
@@ -18,24 +18,25 @@
 #
 
 """
-:class:`~lib.stattext.GenStaticText` is a generic implementation of :class:`StaticText`.
+:class:`GenStaticText` is a generic implementation of :class:`wx.StaticText`.
 
 
 Description
 ===========
 
-:class:`GenStaticText` is a generic implementation of :class:`StaticText`.
+:class:`GenStaticText` is a generic implementation of :class:`wx.StaticText`.
 
-Some of the platforms supported by wxPython (most notably GTK), do not consider
-:class:`StaticText` as a separate widget; instead, the label is just drawn on its
-parent window. This essentially bars the use of almost all mouse events (such as
-detection of mouse motions, mouse clicks and so on).
+Some of the platforms supported by wxPython (most notably GTK), do not
+consider :class:`wx.StaticText` as a separate widget; instead, the label is
+just drawn directly on its parent window. This essentially bars the use of
+almost all mouse events (such as detection of mouse motions, mouse clicks and
+so on) on that widget.
 
-Moreover, these platforms do not allow the developer to change the widget's background
-colour.
+Moreover, these platforms do not allow the developer to change the widget's
+background colour.
 
-Using :class:`GenStaticText` will overcome all the problems described above, as it
-is a generic widget and a real window on its own.
+Using :class:`GenStaticText` will overcome all the problems described above,
+as it is a generic widget and a real window on its own.
 
 
 Usage
@@ -79,7 +80,9 @@ if wx.Platform == "__WXMAC__":
 #----------------------------------------------------------------------
 
 class GenStaticText(wx.Control):
-    """ :class:`GenStaticText` is a generic implementation of :class:`StaticText`. """
+    """
+    :class:`GenStaticText` is a generic implementation of :class:`wx.StaticText`.
+    """
     labelDelta = 1
 
     def __init__(self, parent, ID=-1, label="",
@@ -96,12 +99,12 @@ class GenStaticText(wx.Control):
          chosen by either the windowing system or wxPython, depending on platform;
         :param `size`: the control size. A value of (-1, -1) indicates a default size,
          chosen by either the windowing system or wxPython, depending on platform;
-        :param integer `style`: the underlying :class:`Control` style;
+        :param integer `style`: the underlying :class:`wx.Control` style;
         :param string `name`: the widget name.
 
-        :type parent: :class:`Window`
-        :type pos: tuple or :class:`Point`
-        :type size: tuple or :class:`Size`
+        :type parent: :class:`wx.Window`
+        :type pos: tuple or :class:`wx.Point`
+        :type size: tuple or :class:`wx.Size`
         """
 
         wx.Control.__init__(self, parent, ID, pos, size, style|wx.NO_BORDER,
@@ -123,7 +126,7 @@ class GenStaticText(wx.Control):
     def SetLabel(self, label):
         """
         Sets the static text label and updates the control's size to exactly
-        fit the label unless the control has wx.ST_NO_AUTORESIZE flag.
+        fit the label unless the control has ``wx.ST_NO_AUTORESIZE`` flag.
 
         :param string `label`: the static text label (i.e., its text label).
         """
@@ -139,9 +142,9 @@ class GenStaticText(wx.Control):
     def SetFont(self, font):
         """
         Sets the static text font and updates the control's size to exactly
-        fit the label unless the control has wx.ST_NO_AUTORESIZE flag.
+        fit the label unless the control has ``wx.ST_NO_AUTORESIZE`` flag.
 
-        :param Font `font`: a valid font instance, which will be the new font used
+        :param wx.Font `font`: a valid font instance, which will be the new font used
          to display the text.
         """
         
@@ -158,7 +161,7 @@ class GenStaticText(wx.Control):
         Overridden base class virtual.  Determines the best size of
         the control based on the label size and the current font.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
         
         label = self.GetLabel()
@@ -185,15 +188,18 @@ class GenStaticText(wx.Control):
         """
         Enable or disable the widget for user input. 
 
-        :param bool `enable`: If ``True``, enables the window for input. If ``False``, disables the window.
+        :param bool `enable`: If ``True``, enables the window for input. If
+          ``False``, disables the window.
 
-        :returns: ``True`` if the window has been enabled or disabled, ``False`` if nothing was
-         done, i.e. if the window had already been in the specified state.
+        :returns: ``True`` if the window has been enabled or disabled,
+          ``False`` if nothing was done, i.e. if the window had already been
+          in the specified state.
 
-        .. note:: Note that when a parent window is disabled, all of its children are disabled as
-           well and they are reenabled again when the parent is.
+        .. note:: Note that when a parent window is disabled, all of its
+           children are disabled as well and they are reenabled again when
+           the parent is.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         retVal = wx.Control.Enable(self, enable)
@@ -209,9 +215,10 @@ class GenStaticText(wx.Control):
         :returns: ``True`` if the window has been disabled, ``False`` if it had been
          already disabled before the call to this function.
          
-        .. note:: This is functionally equivalent of calling :meth:`~Control.Enable` with a ``False`` flag.
+        .. note:: This is functionally equivalent of calling :meth:`~wx.Control.Enable`
+           with a ``False`` flag.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         retVal = wx.Control.Disable(self)
@@ -224,7 +231,7 @@ class GenStaticText(wx.Control):
         """
         Can this window be given focus by mouse click?
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return False
@@ -233,9 +240,9 @@ class GenStaticText(wx.Control):
     def GetDefaultAttributes(self):
         """
         Overridden base class virtual.  By default we should use
-        the same font/colour attributes as the native :class:`StaticText`.
+        the same font/colour attributes as the native :class:`wx.StaticText`.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
         
         return wx.StaticText.GetClassDefaultAttributes()
@@ -246,7 +253,7 @@ class GenStaticText(wx.Control):
         Overridden base class virtual.  If the parent has non-default
         colours then we want this control to inherit them.
 
-        .. note:: Overridden from :class:`Control`.
+        .. note:: Overridden from :class:`wx.Control`.
         """
 
         return True
@@ -256,7 +263,7 @@ class GenStaticText(wx.Control):
         """
         Handles the ``wx.EVT_PAINT`` for :class:`GenStaticText`.
 
-        :param `event`: a :class:`PaintEvent` event to be processed.
+        :param `event`: a :class:`wx.PaintEvent` event to be processed.
         """
         
         if BUFFERED:
@@ -304,11 +311,10 @@ class GenStaticText(wx.Control):
         """
         Handles the ``wx.EVT_ERASE_BACKGROUND`` event for :class:`GenStaticText`.
 
-        :param `event`: a :class:`EraseEvent` event to be processed.
+        :param `event`: a :class:`wx.EraseEvent` event to be processed.
 
         .. note:: This is intentionally empty to reduce flicker.
         """
-
         pass
 
 
diff --git a/wx/lib/wxpTag.py b/wx/lib/wxpTag.py
index a7ec03cf..5b2ea8da 100644
--- a/wx/lib/wxpTag.py
+++ b/wx/lib/wxpTag.py
@@ -77,15 +77,15 @@ An example::
         <param name="id" value="ID_OK">
     </wxp>
 
-Both the begining and ending WXP tags are required.
+Both the beginning and ending WXP tags are required.
 
 In the future support will be added for another tag that can be
-embedded between the two begining and ending WXP tags and will
+embedded between the two beginning and ending WXP tags and will
 facilitate calling methods of the widget to help initialize it.
 Additionally, support may be added to fetch the module from a web
 server as is done with java applets.
-
 '''
+
 #----------------------------------------------------------------------
 
 import  types
diff --git a/wx/tools/pywxrc.py b/wx/tools/pywxrc.py
index 2ec5ab94..75872caf 100644
--- a/wx/tools/pywxrc.py
+++ b/wx/tools/pywxrc.py
@@ -31,10 +31,8 @@ Usage: python pywxrc.py -h
   -o, --output   output filename, or - for stdout
 """
 
-import sys, os, getopt, glob, re, cPickle
+import sys, os, getopt, glob, re
 import xml.dom.minidom as minidom
-import wx
-import wx.xrc
 from wx.lib.six import print_
 
 #----------------------------------------------------------------------