Track and translate typenames where possible

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

diff --git a/wxPython/docs/bin/simplify.py b/wxPython/docs/bin/simplify.py
index afcbbe3ea73b750771210b494c65477fd99638a6..152642e7b6519aebfeafaf8d6649168d387bbe5f 100755 (executable)
--- a/wxPython/docs/bin/simplify.py
+++ b/wxPython/docs/bin/simplify.py
@@ -15,6 +15,11 @@ DEST="docs/xml/wxPython-metadata.xml"
 SRC="docs/xml-raw"
 
 
+classMap = {
+    'wxString'   : 'String',
+    'void'       : '',
+    }
+
 
 def getModuleNames():
     """
@@ -38,7 +43,14 @@ def getAttr(node, name):
         return None
 
 
-
+def fixType(typeStr):
+    """
+    Fixup type string, dropping the swig pointer and other flags
+    """
+    pos = typeStr.rfind('.')
+    if pos != -1:
+        typeStr = typeStr[pos+1:]
+    return classMap.get(typeStr, typeStr)
 
 
 def processModule(newDocNode, modulename):
@@ -100,7 +112,7 @@ def processInclude(moduleNode, includeNode):
             func = libxml2.newNode("method")
             func.setProp("name",    getAttr(node, "sym_name"))
             func.setProp("oldname", getAttr(node, "name"))
-            func.setProp("type",    getAttr(node, "type"))
+            func.setProp("type",    fixType(getAttr(node, "type")))
             doCheckOverloaded(func, node)
             doDocStrings(func, node)
             doParamList(func, node)
@@ -132,8 +144,11 @@ def processClass(parentNode, classNode):
     """
     # make class element
     klass = libxml2.newNode("class")
-    klass.setProp("name",    getAttr(classNode, "sym_name"))
-    klass.setProp("oldname", getAttr(classNode, "name"))
+    name = getAttr(classNode, "sym_name")
+    oldname = getAttr(classNode, "name")
+    classMap[oldname] = name
+    klass.setProp("name",    name)
+    klass.setProp("oldname", oldname)
     klass.setProp("module",  getAttr(classNode, "module"))
     doDocStrings(klass, classNode)
     parentNode.addChild(klass)
@@ -141,7 +156,8 @@ def processClass(parentNode, classNode):
     # check for baseclass(es)
     for node in classNode.xpathEval2("attributelist/baselist/base"):
         baseclass = libxml2.newNode("baseclass")
-        baseclass.setProp("name", node.prop("name"))
+        basename = node.prop("name")
+        baseclass.setProp("name", classMap.get(basename, basename))
         klass.addChild(baseclass)
 
     # check for constructors/destructors
@@ -162,7 +178,7 @@ def processClass(parentNode, classNode):
         if view == "memberfunctionHandler":
             func = libxml2.newNode("method")
             func.setProp("name", getAttr(node, "sym_name"))
-            func.setProp("type",    getAttr(node, "type"))
+            func.setProp("type", fixType(getAttr(node, "type")))
             doCheckOverloaded(func, node)
             doDocStrings(func, node)
             doParamList(func, node)
@@ -171,7 +187,7 @@ def processClass(parentNode, classNode):
         elif view == "staticmemberfunctionHandler":
             func = libxml2.newNode("staticmethod")
             func.setProp("name", getAttr(node, "sym_name"))
-            func.setProp("type",    getAttr(node, "type"))
+            func.setProp("type", fixType(getAttr(node, "type")))
             doCheckOverloaded(func, node)
             doDocStrings(func, node)
             doParamList(func, node)
@@ -180,7 +196,7 @@ def processClass(parentNode, classNode):
         elif view == "variableHandler":
             prop = libxml2.newNode("property")
             prop.setProp("name", getAttr(node, "sym_name"))
-            prop.setProp("type", getAttr(node, "type"))
+            prop.setProp("type", fixType(getAttr(node, "type")))
             if getAttr(node, "feature_immutable"):
                 prop.setProp("readonly", "yes")
             else:
@@ -199,8 +215,8 @@ def doParamList(parentNode, srcNode):
         plist = libxml2.newNode("paramlist")
         for p in params:
             pnode = libxml2.newNode("param")
-            pnode.setProp("name",    getAttr(p, "name"))
-            pnode.setProp("type",    getAttr(p, "type"))
+            pnode.setProp("name", getAttr(p, "name"))
+            pnode.setProp("type", fixType(getAttr(p, "type")))
             pnode.setProp("default", getAttr(p, "value"))
             plist.addChild(pnode)
         parentNode.addChild(plist)
@@ -255,7 +271,7 @@ def main():
         processModule(newTopNode, m)
 
     newDoc.saveFormatFile(DEST, True)
-
+    print "Wrote simplified metadata to", DEST
 
 #---------------------------------------------------------------------------
 

diff --git a/wxPython/docs/xml/wxPython-metadata.xml b/wxPython/docs/xml/wxPython-metadata.xml
index 6e45e88ab9ff9d4dfd294221973b99108c415f10..cda9834f52992f62fdf68538c29a7fa052adcac2 100644 (file)
--- a/wxPython/docs/xml/wxPython-metadata.xml
+++ b/wxPython/docs/xml/wxPython-metadata.xml
@@ -17,11 +17,11 @@ wx = _sys.modules[__name__]
     <class name="Object" oldname="wxObject" module="core">
       <docstring>The base class for most wx objects, although in wxPython not
 much functionality is needed nor exposed.</docstring>
-      <method name="GetClassName" type="wxString" overloaded="no">
+      <method name="GetClassName" type="String" overloaded="no">
         <autodoc>GetClassName() -&gt; String</autodoc>
         <docstring>Returns the class name of the C++ object using wxRTTI.</docstring>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
         <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
       </method>
@@ -54,47 +54,47 @@ instead.</docstring>
         <autodoc>__eq__(Size sz) -&gt; bool</autodoc>
         <docstring>Test for equality of wx.Size objects.</docstring>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Size sz) -&gt; bool</autodoc>
         <docstring>Test for inequality.</docstring>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxSize" overloaded="no">
+      <method name="__add__" type="Size" overloaded="no">
         <autodoc>__add__(Size sz) -&gt; Size</autodoc>
         <docstring>Add sz's proprties to this and return the result.</docstring>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxSize" overloaded="no">
+      <method name="__sub__" type="Size" overloaded="no">
         <autodoc>__sub__(Size sz) -&gt; Size</autodoc>
         <docstring>Subtract sz's properties from this and return the result.</docstring>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="IncTo" type="void" overloaded="no">
+      <method name="IncTo" type="" overloaded="no">
         <autodoc>IncTo(Size sz)</autodoc>
         <docstring>Increments this object so that both of its dimensions are not less
 than the corresponding dimensions of the size.</docstring>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="DecTo" type="void" overloaded="no">
+      <method name="DecTo" type="" overloaded="no">
         <autodoc>DecTo(Size sz)</autodoc>
         <docstring>Decrements this object so that both of its dimensions are not greater
 than the corresponding dimensions of the size.</docstring>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int w, int h)</autodoc>
         <docstring>Set both width and height.</docstring>
         <paramlist>
@@ -102,13 +102,13 @@ than the corresponding dimensions of the size.</docstring>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHeight" type="void" overloaded="no">
+      <method name="SetHeight" type="" overloaded="no">
         <autodoc>SetHeight(int h)</autodoc>
         <paramlist>
           <param name="h" type="int" default=""/>
@@ -149,31 +149,31 @@ accept a (x,y) tuple.</docstring>
         <autodoc>__eq__(RealPoint pt) -&gt; bool</autodoc>
         <docstring>Test for equality of wx.RealPoint objects.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxRealPoint" default=""/>
+          <param name="pt" type="RealPoint" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(RealPoint pt) -&gt; bool</autodoc>
         <docstring>Test for inequality of wx.RealPoint objects.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxRealPoint" default=""/>
+          <param name="pt" type="RealPoint" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxRealPoint" overloaded="no">
+      <method name="__add__" type="RealPoint" overloaded="no">
         <autodoc>__add__(RealPoint pt) -&gt; RealPoint</autodoc>
         <docstring>Add pt's proprties to this and return the result.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxRealPoint" default=""/>
+          <param name="pt" type="RealPoint" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxRealPoint" overloaded="no">
+      <method name="__sub__" type="RealPoint" overloaded="no">
         <autodoc>__sub__(RealPoint pt) -&gt; RealPoint</autodoc>
         <docstring>Subtract pt's proprties from this and return the result</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxRealPoint" default=""/>
+          <param name="pt" type="RealPoint" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(double x, double y)</autodoc>
         <docstring>Set both the x and y properties</docstring>
         <paramlist>
@@ -210,45 +210,45 @@ properties.  Most places in wxPython that expect a wx.Point can also accept a
         <autodoc>__eq__(Point pt) -&gt; bool</autodoc>
         <docstring>Test for equality of wx.Point objects.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Point pt) -&gt; bool</autodoc>
         <docstring>Test for inequality of wx.Point objects.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxPoint" overloaded="no">
+      <method name="__add__" type="Point" overloaded="no">
         <autodoc>__add__(Point pt) -&gt; Point</autodoc>
         <docstring>Add pt's proprties to this and return the result.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxPoint" overloaded="no">
+      <method name="__sub__" type="Point" overloaded="no">
         <autodoc>__sub__(Point pt) -&gt; Point</autodoc>
         <docstring>Subtract pt's proprties from this and return the result</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="__iadd__" type="wxPoint" overloaded="no">
+      <method name="__iadd__" type="Point" overloaded="no">
         <autodoc>__iadd__(Point pt) -&gt; Point</autodoc>
         <docstring>Add pt to this object.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="__isub__" type="wxPoint" overloaded="no">
+      <method name="__isub__" type="Point" overloaded="no">
         <autodoc>__isub__(Point pt) -&gt; Point</autodoc>
         <docstring>Subtract pt from this object.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(long x, long y)</autodoc>
         <docstring>Set both the x and y properties</docstring>
         <paramlist>
@@ -282,16 +282,16 @@ accept a (x,y,width,height) tuple.</docstring>
         <autodoc>RectPP(Point topLeft, Point bottomRight) -&gt; Rect</autodoc>
         <docstring>Create a new Rect object from Points representing two corners.</docstring>
         <paramlist>
-          <param name="topLeft" type="r.q(const).wxPoint" default=""/>
-          <param name="bottomRight" type="r.q(const).wxPoint" default=""/>
+          <param name="topLeft" type="Point" default=""/>
+          <param name="bottomRight" type="Point" default=""/>
         </paramlist>
       </constructor>
       <constructor name="RectPS" overloaded="no">
         <autodoc>RectPS(Point pos, Size size) -&gt; Rect</autodoc>
         <docstring>Create a new Rect from a position and size.</docstring>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="pos" type="Point" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxRect" overloaded="no">
@@ -300,7 +300,7 @@ accept a (x,y,width,height) tuple.</docstring>
       <method name="GetX" type="int" overloaded="no">
         <autodoc>GetX() -&gt; int</autodoc>
       </method>
-      <method name="SetX" type="void" overloaded="no">
+      <method name="SetX" type="" overloaded="no">
         <autodoc>SetX(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -309,7 +309,7 @@ accept a (x,y,width,height) tuple.</docstring>
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>
       </method>
-      <method name="SetY" type="void" overloaded="no">
+      <method name="SetY" type="" overloaded="no">
         <autodoc>SetY(int y)</autodoc>
         <paramlist>
           <param name="y" type="int" default=""/>
@@ -318,7 +318,7 @@ accept a (x,y,width,height) tuple.</docstring>
       <method name="GetWidth" type="int" overloaded="no">
         <autodoc>GetWidth() -&gt; int</autodoc>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
@@ -327,46 +327,46 @@ accept a (x,y,width,height) tuple.</docstring>
       <method name="GetHeight" type="int" overloaded="no">
         <autodoc>GetHeight() -&gt; int</autodoc>
       </method>
-      <method name="SetHeight" type="void" overloaded="no">
+      <method name="SetHeight" type="" overloaded="no">
         <autodoc>SetHeight(int h)</autodoc>
         <paramlist>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point p)</autodoc>
         <paramlist>
-          <param name="p" type="r.q(const).wxPoint" default=""/>
+          <param name="p" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size s)</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxSize" default=""/>
+          <param name="s" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetTopLeft" type="wxPoint" overloaded="no">
+      <method name="GetTopLeft" type="Point" overloaded="no">
         <autodoc>GetTopLeft() -&gt; Point</autodoc>
       </method>
-      <method name="SetTopLeft" type="void" overloaded="no">
+      <method name="SetTopLeft" type="" overloaded="no">
         <autodoc>SetTopLeft(Point p)</autodoc>
         <paramlist>
-          <param name="p" type="r.q(const).wxPoint" default=""/>
+          <param name="p" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="GetBottomRight" type="wxPoint" overloaded="no">
+      <method name="GetBottomRight" type="Point" overloaded="no">
         <autodoc>GetBottomRight() -&gt; Point</autodoc>
       </method>
-      <method name="SetBottomRight" type="void" overloaded="no">
+      <method name="SetBottomRight" type="" overloaded="no">
         <autodoc>SetBottomRight(Point p)</autodoc>
         <paramlist>
-          <param name="p" type="r.q(const).wxPoint" default=""/>
+          <param name="p" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetLeft" type="int" overloaded="no">
@@ -381,31 +381,31 @@ accept a (x,y,width,height) tuple.</docstring>
       <method name="GetRight" type="int" overloaded="no">
         <autodoc>GetRight() -&gt; int</autodoc>
       </method>
-      <method name="SetLeft" type="void" overloaded="no">
+      <method name="SetLeft" type="" overloaded="no">
         <autodoc>SetLeft(int left)</autodoc>
         <paramlist>
           <param name="left" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRight" type="void" overloaded="no">
+      <method name="SetRight" type="" overloaded="no">
         <autodoc>SetRight(int right)</autodoc>
         <paramlist>
           <param name="right" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetTop" type="void" overloaded="no">
+      <method name="SetTop" type="" overloaded="no">
         <autodoc>SetTop(int top)</autodoc>
         <paramlist>
           <param name="top" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetBottom" type="void" overloaded="no">
+      <method name="SetBottom" type="" overloaded="no">
         <autodoc>SetBottom(int bottom)</autodoc>
         <paramlist>
           <param name="bottom" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Inflate" type="wxRect" overloaded="no">
+      <method name="Inflate" type="Rect" overloaded="no">
         <autodoc>Inflate(int dx, int dy) -&gt; Rect</autodoc>
         <docstring>Increase the rectangle size by dx in x direction and dy in y direction. Both
 (or one of) parameters may be negative to decrease the rectangle size.</docstring>
@@ -414,7 +414,7 @@ accept a (x,y,width,height) tuple.</docstring>
           <param name="dy" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Deflate" type="wxRect" overloaded="no">
+      <method name="Deflate" type="Rect" overloaded="no">
         <autodoc>Deflate(int dx, int dy) -&gt; Rect</autodoc>
         <docstring>Decrease the rectangle size by dx in x direction and dy in y direction. Both
 (or one of) parameters may be negative to increase the rectngle size. This
@@ -424,7 +424,7 @@ method is the opposite of Inflate.</docstring>
           <param name="dy" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="OffsetXY" type="void" overloaded="no">
+      <method name="OffsetXY" type="" overloaded="no">
         <autodoc>OffsetXY(int dx, int dy)</autodoc>
         <docstring>Moves the rectangle by the specified offset. If dx is positive, the rectangle
 is moved to the right, if dy is positive, it is moved to the bottom, otherwise
@@ -434,46 +434,46 @@ it is moved to the left or top respectively.</docstring>
           <param name="dy" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Offset" type="void" overloaded="no">
+      <method name="Offset" type="" overloaded="no">
         <autodoc>Offset(Point pt)</autodoc>
         <docstring>Same as OffsetXY but uses dx,dy from Point</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="Intersect" type="wxRect" overloaded="no">
+      <method name="Intersect" type="Rect" overloaded="no">
         <autodoc>Intersect(Rect rect) -&gt; Rect</autodoc>
         <docstring>Return the intersectsion of this rectangle and rect.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxRect" overloaded="no">
+      <method name="__add__" type="Rect" overloaded="no">
         <autodoc>__add__(Rect rect) -&gt; Rect</autodoc>
         <docstring>Add the properties of rect to this rectangle and return the result.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="__iadd__" type="wxRect" overloaded="no">
+      <method name="__iadd__" type="Rect" overloaded="no">
         <autodoc>__iadd__(Rect rect) -&gt; Rect</autodoc>
         <docstring>Add the properties of rect to this rectangle, updating this rectangle.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Rect rect) -&gt; bool</autodoc>
         <docstring>Test for equality.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Rect rect) -&gt; bool</autodoc>
         <docstring>Test for inequality.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="InsideXY" type="bool" overloaded="no">
@@ -488,21 +488,21 @@ it is moved to the left or top respectively.</docstring>
         <autodoc>Inside(Point pt) -&gt; bool</autodoc>
         <docstring>Return True if the point is (not strcitly) inside the rect.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="Intersects" type="bool" overloaded="no">
         <autodoc>Intersects(Rect rect) -&gt; bool</autodoc>
         <docstring>Returns True if the rectangles have a non empty intersection.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <property name="x" type="int" readonly="no"/>
       <property name="y" type="int" readonly="no"/>
       <property name="width" type="int" readonly="no"/>
       <property name="height" type="int" readonly="no"/>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int x=0, int y=0, int width=0, int height=0)</autodoc>
         <docstring>Set all rectangle properties.</docstring>
         <paramlist>
@@ -521,8 +521,8 @@ it is moved to the left or top respectively.</docstring>
       <autodoc>IntersectRect(Rect r1, Rect r2) -&gt; Rect</autodoc>
       <docstring>Calculate and return the intersection of r1 and r2.</docstring>
       <paramlist>
-        <param name="r1" type="p.wxRect" default=""/>
-        <param name="r2" type="p.wxRect" default=""/>
+        <param name="r1" type="Rect" default=""/>
+        <param name="r2" type="Rect" default=""/>
       </paramlist>
     </method>
     <pythoncode>
@@ -542,30 +542,30 @@ it is moved to the left or top respectively.</docstring>
         <autodoc>Point2DCopy(Point2D pt) -&gt; Point2D</autodoc>
         <docstring>Create a w.Point2D object.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </constructor>
       <constructor name="Point2DFromPoint" overloaded="no">
         <autodoc>Point2DFromPoint(Point pt) -&gt; Point2D</autodoc>
         <docstring>Create a w.Point2D object.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </constructor>
-      <method name="GetFloor" type="void" overloaded="no">
+      <method name="GetFloor" type="" overloaded="no">
         <autodoc>GetFloor() -&gt; (x,y)</autodoc>
         <docstring>Convert to integer</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetRounded" type="void" overloaded="no">
+      <method name="GetRounded" type="" overloaded="no">
         <autodoc>GetRounded() -&gt; (x,y)</autodoc>
         <docstring>Convert to integer</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetVectorLength" type="double" overloaded="no">
@@ -574,13 +574,13 @@ it is moved to the left or top respectively.</docstring>
       <method name="GetVectorAngle" type="double" overloaded="no">
         <autodoc>GetVectorAngle() -&gt; double</autodoc>
       </method>
-      <method name="SetVectorLength" type="void" overloaded="no">
+      <method name="SetVectorLength" type="" overloaded="no">
         <autodoc>SetVectorLength(double length)</autodoc>
         <paramlist>
           <param name="length" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetVectorAngle" type="void" overloaded="no">
+      <method name="SetVectorAngle" type="" overloaded="no">
         <autodoc>SetVectorAngle(double degrees)</autodoc>
         <paramlist>
           <param name="degrees" type="double" default=""/>
@@ -589,72 +589,72 @@ it is moved to the left or top respectively.</docstring>
       <method name="GetDistance" type="double" overloaded="no">
         <autodoc>GetDistance(Point2D pt) -&gt; double</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
       <method name="GetDistanceSquare" type="double" overloaded="no">
         <autodoc>GetDistanceSquare(Point2D pt) -&gt; double</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
       <method name="GetDotProduct" type="double" overloaded="no">
         <autodoc>GetDotProduct(Point2D vec) -&gt; double</autodoc>
         <paramlist>
-          <param name="vec" type="r.q(const).wxPoint2D" default=""/>
+          <param name="vec" type="Point2D" default=""/>
         </paramlist>
       </method>
       <method name="GetCrossProduct" type="double" overloaded="no">
         <autodoc>GetCrossProduct(Point2D vec) -&gt; double</autodoc>
         <paramlist>
-          <param name="vec" type="r.q(const).wxPoint2D" default=""/>
+          <param name="vec" type="Point2D" default=""/>
         </paramlist>
       </method>
-      <method name="__neg__" type="wxPoint2D" overloaded="no">
+      <method name="__neg__" type="Point2D" overloaded="no">
         <autodoc>__neg__() -&gt; Point2D</autodoc>
         <docstring>the reflection of this point</docstring>
       </method>
-      <method name="__iadd__" type="wxPoint2D" overloaded="no">
+      <method name="__iadd__" type="Point2D" overloaded="no">
         <autodoc>__iadd__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
-      <method name="__isub__" type="wxPoint2D" overloaded="no">
+      <method name="__isub__" type="Point2D" overloaded="no">
         <autodoc>__isub__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
-      <method name="__imul__" type="wxPoint2D" overloaded="no">
+      <method name="__imul__" type="Point2D" overloaded="no">
         <autodoc>__imul__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
-      <method name="__idiv__" type="wxPoint2D" overloaded="no">
+      <method name="__idiv__" type="Point2D" overloaded="no">
         <autodoc>__idiv__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Point2D pt) -&gt; bool</autodoc>
         <docstring>Test for equality</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Point2D pt) -&gt; bool</autodoc>
         <docstring>Test for inequality</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint2D" default=""/>
+          <param name="pt" type="Point2D" default=""/>
         </paramlist>
       </method>
       <property name="x" type="double" readonly="no"/>
       <property name="y" type="double" readonly="no"/>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(double x=0, double y=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default="0"/>
@@ -673,13 +673,13 @@ it is moved to the left or top respectively.</docstring>
       <constructor name="wxPyInputStream" overloaded="no">
         <autodoc>__init__(PyObject p) -&gt; InputStream</autodoc>
         <paramlist>
-          <param name="p" type="p.PyObject" default=""/>
+          <param name="p" type="PyObject" default=""/>
         </paramlist>
       </constructor>
-      <method name="close" type="void" overloaded="no">
+      <method name="close" type="" overloaded="no">
         <autodoc>close()</autodoc>
       </method>
-      <method name="flush" type="void" overloaded="no">
+      <method name="flush" type="" overloaded="no">
         <autodoc>flush()</autodoc>
       </method>
       <method name="eof" type="bool" overloaded="no">
@@ -703,7 +703,7 @@ it is moved to the left or top respectively.</docstring>
           <param name="sizehint" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="seek" type="void" overloaded="no">
+      <method name="seek" type="" overloaded="no">
         <autodoc>seek(int offset, int whence=0)</autodoc>
         <paramlist>
           <param name="offset" type="int" default=""/>
@@ -746,10 +746,10 @@ it is moved to the left or top respectively.</docstring>
       </method>
     </class>
     <class name="OutputStream" oldname="wxOutputStream" module="core">
-      <method name="write" type="void" overloaded="no">
+      <method name="write" type="" overloaded="no">
         <autodoc>write(PyObject obj)</autodoc>
         <paramlist>
-          <param name="obj" type="p.PyObject" default=""/>
+          <param name="obj" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -757,15 +757,15 @@ it is moved to the left or top respectively.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="FSFile" oldname="wxFSFile" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="FSFile" overloaded="no">
         <autodoc>__init__(InputStream stream, String loc, String mimetype, String anchor, 
     DateTime modif) -&gt; FSFile</autodoc>
         <paramlist>
-          <param name="stream" type="p.wxInputStream" default=""/>
-          <param name="loc" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
-          <param name="anchor" type="r.q(const).wxString" default=""/>
+          <param name="stream" type="wxInputStream" default=""/>
+          <param name="loc" type="String" default=""/>
+          <param name="mimetype" type="String" default=""/>
+          <param name="anchor" type="String" default=""/>
           <param name="modif" type="wxDateTime" default=""/>
         </paramlist>
       </constructor>
@@ -775,13 +775,13 @@ it is moved to the left or top respectively.</docstring>
       <method name="GetStream" type="wxInputStream" overloaded="no">
         <autodoc>GetStream() -&gt; InputStream</autodoc>
       </method>
-      <method name="GetMimeType" type="q(const).wxString" overloaded="no">
+      <method name="GetMimeType" type="String" overloaded="no">
         <autodoc>GetMimeType() -&gt; String</autodoc>
       </method>
-      <method name="GetLocation" type="q(const).wxString" overloaded="no">
+      <method name="GetLocation" type="String" overloaded="no">
         <autodoc>GetLocation() -&gt; String</autodoc>
       </method>
-      <method name="GetAnchor" type="q(const).wxString" overloaded="no">
+      <method name="GetAnchor" type="String" overloaded="no">
         <autodoc>GetAnchor() -&gt; String</autodoc>
       </method>
       <method name="GetModificationTime" type="wxDateTime" overloaded="no">
@@ -790,196 +790,196 @@ it is moved to the left or top respectively.</docstring>
     </class>
     <class name="CPPFileSystemHandler" oldname="wxFileSystemHandler" module="core"/>
     <class name="FileSystemHandler" oldname="wxPyFileSystemHandler" module="core">
-      <baseclass name="wxFileSystemHandler"/>
+      <baseclass name="CPPFileSystemHandler"/>
       <constructor name="wxPyFileSystemHandler" overloaded="no">
         <autodoc>__init__() -&gt; FileSystemHandler</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="CanOpen" type="bool" overloaded="no">
         <autodoc>CanOpen(String location) -&gt; bool</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="OpenFile" type="wxFSFile" overloaded="no">
+      <method name="OpenFile" type="FSFile" overloaded="no">
         <autodoc>OpenFile(FileSystem fs, String location) -&gt; FSFile</autodoc>
         <paramlist>
-          <param name="fs" type="r.wxFileSystem" default=""/>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="fs" type="wxFileSystem" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindFirst" type="wxString" overloaded="no">
+      <method name="FindFirst" type="String" overloaded="no">
         <autodoc>FindFirst(String spec, int flags=0) -&gt; String</autodoc>
         <paramlist>
-          <param name="spec" type="r.q(const).wxString" default=""/>
+          <param name="spec" type="String" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="FindNext" type="wxString" overloaded="no">
+      <method name="FindNext" type="String" overloaded="no">
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>
-      <method name="GetProtocol" type="wxString" overloaded="no">
+      <method name="GetProtocol" type="String" overloaded="no">
         <autodoc>GetProtocol(String location) -&gt; String</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLeftLocation" type="wxString" overloaded="no">
+      <method name="GetLeftLocation" type="String" overloaded="no">
         <autodoc>GetLeftLocation(String location) -&gt; String</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetAnchor" type="wxString" overloaded="no">
+      <method name="GetAnchor" type="String" overloaded="no">
         <autodoc>GetAnchor(String location) -&gt; String</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetRightLocation" type="wxString" overloaded="no">
+      <method name="GetRightLocation" type="String" overloaded="no">
         <autodoc>GetRightLocation(String location) -&gt; String</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetMimeTypeFromExt" type="wxString" overloaded="no">
+      <method name="GetMimeTypeFromExt" type="String" overloaded="no">
         <autodoc>GetMimeTypeFromExt(String location) -&gt; String</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FileSystem" oldname="wxFileSystem" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="FileSystem" overloaded="no">
         <autodoc>__init__() -&gt; FileSystem</autodoc>
       </constructor>
       <destructor name="~wxFileSystem" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="ChangePathTo" type="void" overloaded="no">
+      <method name="ChangePathTo" type="" overloaded="no">
         <autodoc>ChangePathTo(String location, bool is_dir=False)</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
           <param name="is_dir" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
-      <method name="OpenFile" type="wxFSFile" overloaded="no">
+      <method name="OpenFile" type="FSFile" overloaded="no">
         <autodoc>OpenFile(String location) -&gt; FSFile</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindFirst" type="wxString" overloaded="no">
+      <method name="FindFirst" type="String" overloaded="no">
         <autodoc>FindFirst(String spec, int flags=0) -&gt; String</autodoc>
         <paramlist>
-          <param name="spec" type="r.q(const).wxString" default=""/>
+          <param name="spec" type="String" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="FindNext" type="wxString" overloaded="no">
+      <method name="FindNext" type="String" overloaded="no">
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>
-      <staticmethod name="AddHandler" type="void" overloaded="no">
+      <staticmethod name="AddHandler" type="" overloaded="no">
         <autodoc>FileSystem.AddHandler(CPPFileSystemHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxFileSystemHandler" default=""/>
+          <param name="handler" type="CPPFileSystemHandler" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="CleanUpHandlers" type="void" overloaded="no">
+      <staticmethod name="CleanUpHandlers" type="" overloaded="no">
         <autodoc>FileSystem.CleanUpHandlers()</autodoc>
       </staticmethod>
-      <staticmethod name="FileNameToURL" type="wxString" overloaded="no">
+      <staticmethod name="FileNameToURL" type="String" overloaded="no">
         <autodoc>FileSystem.FileNameToURL(String filename) -&gt; String</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </staticmethod>
     </class>
-    <method name="FileSystem_URLToFileName" oldname="wxFileSystem_URLToFileName" type="wxString" overloaded="no">
+    <method name="FileSystem_URLToFileName" oldname="wxFileSystem_URLToFileName" type="String" overloaded="no">
       <autodoc>FileSystem_URLToFileName(String url) -&gt; String</autodoc>
       <paramlist>
-        <param name="url" type="r.q(const).wxString" default=""/>
+        <param name="url" type="String" default=""/>
       </paramlist>
     </method>
     <class name="InternetFSHandler" oldname="wxInternetFSHandler" module="core">
-      <baseclass name="wxFileSystemHandler"/>
+      <baseclass name="CPPFileSystemHandler"/>
       <constructor name="InternetFSHandler" overloaded="no">
         <autodoc>__init__() -&gt; InternetFSHandler</autodoc>
       </constructor>
       <method name="CanOpen" type="bool" overloaded="no">
         <autodoc>CanOpen(String location) -&gt; bool</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="OpenFile" type="wxFSFile" overloaded="no">
+      <method name="OpenFile" type="FSFile" overloaded="no">
         <autodoc>OpenFile(FileSystem fs, String location) -&gt; FSFile</autodoc>
         <paramlist>
-          <param name="fs" type="r.wxFileSystem" default=""/>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="fs" type="FileSystem" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ZipFSHandler" oldname="wxZipFSHandler" module="core">
-      <baseclass name="wxFileSystemHandler"/>
+      <baseclass name="CPPFileSystemHandler"/>
       <constructor name="ZipFSHandler" overloaded="no">
         <autodoc>__init__() -&gt; ZipFSHandler</autodoc>
       </constructor>
       <method name="CanOpen" type="bool" overloaded="no">
         <autodoc>CanOpen(String location) -&gt; bool</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="OpenFile" type="wxFSFile" overloaded="no">
+      <method name="OpenFile" type="FSFile" overloaded="no">
         <autodoc>OpenFile(FileSystem fs, String location) -&gt; FSFile</autodoc>
         <paramlist>
-          <param name="fs" type="r.wxFileSystem" default=""/>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="fs" type="FileSystem" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindFirst" type="wxString" overloaded="no">
+      <method name="FindFirst" type="String" overloaded="no">
         <autodoc>FindFirst(String spec, int flags=0) -&gt; String</autodoc>
         <paramlist>
-          <param name="spec" type="r.q(const).wxString" default=""/>
+          <param name="spec" type="String" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="FindNext" type="wxString" overloaded="no">
+      <method name="FindNext" type="String" overloaded="no">
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>
     </class>
-    <method name="__wxMemoryFSHandler_AddFile_wxImage" oldname="__wxMemoryFSHandler_AddFile_wxImage" type="void" overloaded="no">
+    <method name="__wxMemoryFSHandler_AddFile_wxImage" oldname="__wxMemoryFSHandler_AddFile_wxImage" type="" overloaded="no">
       <autodoc>__wxMemoryFSHandler_AddFile_wxImage(String filename, Image image, long type)</autodoc>
       <paramlist>
-        <param name="filename" type="r.q(const).wxString" default=""/>
-        <param name="image" type="r.wxImage" default=""/>
+        <param name="filename" type="String" default=""/>
+        <param name="image" type="wxImage" default=""/>
         <param name="type" type="long" default=""/>
       </paramlist>
     </method>
-    <method name="__wxMemoryFSHandler_AddFile_wxBitmap" oldname="__wxMemoryFSHandler_AddFile_wxBitmap" type="void" overloaded="no">
+    <method name="__wxMemoryFSHandler_AddFile_wxBitmap" oldname="__wxMemoryFSHandler_AddFile_wxBitmap" type="" overloaded="no">
       <autodoc>__wxMemoryFSHandler_AddFile_wxBitmap(String filename, Bitmap bitmap, long type)</autodoc>
       <paramlist>
-        <param name="filename" type="r.q(const).wxString" default=""/>
-        <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+        <param name="filename" type="String" default=""/>
+        <param name="bitmap" type="wxBitmap" default=""/>
         <param name="type" type="long" default=""/>
       </paramlist>
     </method>
-    <method name="__wxMemoryFSHandler_AddFile_Data" oldname="__wxMemoryFSHandler_AddFile_Data" type="void" overloaded="no">
+    <method name="__wxMemoryFSHandler_AddFile_Data" oldname="__wxMemoryFSHandler_AddFile_Data" type="" overloaded="no">
       <autodoc>__wxMemoryFSHandler_AddFile_Data(String filename, PyObject data)</autodoc>
       <paramlist>
-        <param name="filename" type="r.q(const).wxString" default=""/>
-        <param name="data" type="p.PyObject" default=""/>
+        <param name="filename" type="String" default=""/>
+        <param name="data" type="PyObject" default=""/>
       </paramlist>
     </method>
     <pythoncode>
@@ -993,37 +993,37 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
     else: raise TypeError, 'wx.Image, wx.Bitmap or string expected'
 </pythoncode>
     <class name="MemoryFSHandler" oldname="wxMemoryFSHandler" module="core">
-      <baseclass name="wxFileSystemHandler"/>
+      <baseclass name="CPPFileSystemHandler"/>
       <constructor name="MemoryFSHandler" overloaded="no">
         <autodoc>__init__() -&gt; MemoryFSHandler</autodoc>
       </constructor>
-      <staticmethod name="RemoveFile" type="void" overloaded="no">
+      <staticmethod name="RemoveFile" type="" overloaded="no">
         <autodoc>MemoryFSHandler.RemoveFile(String filename)</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <method name="CanOpen" type="bool" overloaded="no">
         <autodoc>CanOpen(String location) -&gt; bool</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="OpenFile" type="wxFSFile" overloaded="no">
+      <method name="OpenFile" type="FSFile" overloaded="no">
         <autodoc>OpenFile(FileSystem fs, String location) -&gt; FSFile</autodoc>
         <paramlist>
-          <param name="fs" type="r.wxFileSystem" default=""/>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="fs" type="FileSystem" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindFirst" type="wxString" overloaded="no">
+      <method name="FindFirst" type="String" overloaded="no">
         <autodoc>FindFirst(String spec, int flags=0) -&gt; String</autodoc>
         <paramlist>
-          <param name="spec" type="r.q(const).wxString" default=""/>
+          <param name="spec" type="String" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="FindNext" type="wxString" overloaded="no">
+      <method name="FindNext" type="String" overloaded="no">
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>
     </class>
@@ -1031,47 +1031,47 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ImageHandler" oldname="wxImageHandler" module="core">
-      <baseclass name="wxObject"/>
-      <method name="GetName" type="wxString" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="GetExtension" type="wxString" overloaded="no">
+      <method name="GetExtension" type="String" overloaded="no">
         <autodoc>GetExtension() -&gt; String</autodoc>
       </method>
       <method name="GetType" type="long" overloaded="no">
         <autodoc>GetType() -&gt; long</autodoc>
       </method>
-      <method name="GetMimeType" type="wxString" overloaded="no">
+      <method name="GetMimeType" type="String" overloaded="no">
         <autodoc>GetMimeType() -&gt; String</autodoc>
       </method>
       <method name="CanRead" type="bool" overloaded="no">
         <autodoc>CanRead(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetName" type="void" overloaded="no">
+      <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String name)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetExtension" type="void" overloaded="no">
+      <method name="SetExtension" type="" overloaded="no">
         <autodoc>SetExtension(String extension)</autodoc>
         <paramlist>
-          <param name="extension" type="r.q(const).wxString" default=""/>
+          <param name="extension" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetType" type="void" overloaded="no">
+      <method name="SetType" type="" overloaded="no">
         <autodoc>SetType(long type)</autodoc>
         <paramlist>
           <param name="type" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetMimeType" type="void" overloaded="no">
+      <method name="SetMimeType" type="" overloaded="no">
         <autodoc>SetMimeType(String mimetype)</autodoc>
         <paramlist>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="mimetype" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -1094,9 +1094,9 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
 startR, startG, startB.  Returns a tuple consisting of a success flag and rgb
 values.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.unsigned char" default=""/>
-          <param name="OUTPUT" type="p.unsigned char" default=""/>
-          <param name="OUTPUT" type="p.unsigned char" default=""/>
+          <param name="OUTPUT" type="unsigned char" default=""/>
+          <param name="OUTPUT" type="unsigned char" default=""/>
+          <param name="OUTPUT" type="unsigned char" default=""/>
           <param name="startR" type="unsigned char" default="1"/>
           <param name="startG" type="unsigned char" default="0"/>
           <param name="startB" type="unsigned char" default="0"/>
@@ -1104,11 +1104,11 @@ values.</docstring>
       </method>
     </class>
     <class name="Image" oldname="wxImage" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Image" overloaded="no">
         <autodoc>__init__(String name, long type=BITMAP_TYPE_ANY, int index=-1) -&gt; Image</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
@@ -1116,15 +1116,15 @@ values.</docstring>
       <constructor name="ImageFromMime" overloaded="no">
         <autodoc>ImageFromMime(String name, String mimetype, int index=-1) -&gt; Image</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="mimetype" type="String" default=""/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
       </constructor>
       <constructor name="ImageFromStream" overloaded="no">
         <autodoc>ImageFromStream(InputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -&gt; Image</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
+          <param name="stream" type="wxInputStream" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
@@ -1132,8 +1132,8 @@ values.</docstring>
       <constructor name="ImageFromStreamMime" overloaded="no">
         <autodoc>ImageFromStreamMime(InputStream stream, String mimetype, int index=-1) -&gt; Image</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="stream" type="wxInputStream" default=""/>
+          <param name="mimetype" type="String" default=""/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
       </constructor>
@@ -1148,7 +1148,7 @@ values.</docstring>
       <constructor name="ImageFromBitmap" overloaded="no">
         <autodoc>ImageFromBitmap(Bitmap bitmap) -&gt; Image</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="wxBitmap" default=""/>
         </paramlist>
       </constructor>
       <constructor name="ImageFromData" overloaded="no">
@@ -1156,45 +1156,45 @@ values.</docstring>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
-          <param name="data" type="p.unsigned char" default=""/>
+          <param name="data" type="unsigned char" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxImage" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Create" type="void" overloaded="no">
+      <method name="Create" type="" overloaded="no">
         <autodoc>Create(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
         <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
       </method>
-      <method name="Scale" type="wxImage" overloaded="no">
+      <method name="Scale" type="Image" overloaded="no">
         <autodoc>Scale(int width, int height) -&gt; Image</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ShrinkBy" type="wxImage" overloaded="no">
+      <method name="ShrinkBy" type="Image" overloaded="no">
         <autodoc>ShrinkBy(int xFactor, int yFactor) -&gt; Image</autodoc>
         <paramlist>
           <param name="xFactor" type="int" default=""/>
           <param name="yFactor" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Rescale" type="wxImage" overloaded="no">
+      <method name="Rescale" type="Image" overloaded="no">
         <autodoc>Rescale(int width, int height) -&gt; Image</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRGB" type="void" overloaded="no">
+      <method name="SetRGB" type="" overloaded="no">
         <autodoc>SetRGB(int x, int y, unsigned char r, unsigned char g, unsigned char b)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -1225,7 +1225,7 @@ values.</docstring>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAlpha" type="void" overloaded="no">
+      <method name="SetAlpha" type="" overloaded="no">
         <autodoc>SetAlpha(int x, int y, unsigned char alpha)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -1249,9 +1249,9 @@ values.</docstring>
 startR, startG, startB.  Returns a tuple consisting of a success flag and rgb
 values.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.byte" default=""/>
-          <param name="OUTPUT" type="p.byte" default=""/>
-          <param name="OUTPUT" type="p.byte" default=""/>
+          <param name="OUTPUT" type="byte" default=""/>
+          <param name="OUTPUT" type="byte" default=""/>
+          <param name="OUTPUT" type="byte" default=""/>
           <param name="startR" type="byte" default="0"/>
           <param name="startG" type="byte" default="0"/>
           <param name="startB" type="byte" default="0"/>
@@ -1260,7 +1260,7 @@ values.</docstring>
       <method name="SetMaskFromImage" type="bool" overloaded="no">
         <autodoc>SetMaskFromImage(Image mask, byte mr, byte mg, byte mb) -&gt; bool</autodoc>
         <paramlist>
-          <param name="mask" type="r.q(const).wxImage" default=""/>
+          <param name="mask" type="Image" default=""/>
           <param name="mr" type="byte" default=""/>
           <param name="mg" type="byte" default=""/>
           <param name="mb" type="byte" default=""/>
@@ -1269,20 +1269,20 @@ values.</docstring>
       <staticmethod name="CanRead" type="bool" overloaded="no">
         <autodoc>Image.CanRead(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetImageCount" type="int" overloaded="no">
         <autodoc>Image.GetImageCount(String name, long type=BITMAP_TYPE_ANY) -&gt; int</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>
         </paramlist>
       </staticmethod>
       <method name="LoadFile" type="bool" overloaded="no">
         <autodoc>LoadFile(String name, long type=BITMAP_TYPE_ANY, int index=-1) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
@@ -1290,35 +1290,35 @@ values.</docstring>
       <method name="LoadMimeFile" type="bool" overloaded="no">
         <autodoc>LoadMimeFile(String name, String mimetype, int index=-1) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="mimetype" type="String" default=""/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
       </method>
       <method name="SaveFile" type="bool" overloaded="no">
         <autodoc>SaveFile(String name, int type) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="int" default=""/>
         </paramlist>
       </method>
       <method name="SaveMimeFile" type="bool" overloaded="no">
         <autodoc>SaveMimeFile(String name, String mimetype) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="mimetype" type="String" default=""/>
         </paramlist>
       </method>
       <staticmethod name="CanReadStream" type="bool" overloaded="no">
         <autodoc>Image.CanReadStream(InputStream stream) -&gt; bool</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
+          <param name="stream" type="wxInputStream" default=""/>
         </paramlist>
       </staticmethod>
       <method name="LoadStream" type="bool" overloaded="no">
         <autodoc>LoadStream(InputStream stream, long type=BITMAP_TYPE_ANY, int index=-1) -&gt; bool</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
+          <param name="stream" type="wxInputStream" default=""/>
           <param name="type" type="long" default="wxBITMAP_TYPE_ANY"/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
@@ -1326,8 +1326,8 @@ values.</docstring>
       <method name="LoadMimeStream" type="bool" overloaded="no">
         <autodoc>LoadMimeStream(InputStream stream, String mimetype, int index=-1) -&gt; bool</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="stream" type="wxInputStream" default=""/>
+          <param name="mimetype" type="String" default=""/>
           <param name="index" type="int" default="-1"/>
         </paramlist>
       </method>
@@ -1340,19 +1340,19 @@ values.</docstring>
       <method name="GetHeight" type="int" overloaded="no">
         <autodoc>GetHeight() -&gt; int</autodoc>
       </method>
-      <method name="GetSubImage" type="wxImage" overloaded="no">
+      <method name="GetSubImage" type="Image" overloaded="no">
         <autodoc>GetSubImage(Rect rect) -&gt; Image</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="Copy" type="wxImage" overloaded="no">
+      <method name="Copy" type="Image" overloaded="no">
         <autodoc>Copy() -&gt; Image</autodoc>
       </method>
-      <method name="Paste" type="void" overloaded="no">
+      <method name="Paste" type="" overloaded="no">
         <autodoc>Paste(Image image, int x, int y)</autodoc>
         <paramlist>
-          <param name="image" type="r.q(const).wxImage" default=""/>
+          <param name="image" type="Image" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
@@ -1360,40 +1360,40 @@ values.</docstring>
       <method name="GetData" type="PyObject" overloaded="no">
         <autodoc>GetData() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetData" type="void" overloaded="no">
+      <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(PyObject data)</autodoc>
         <paramlist>
-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetDataBuffer" type="PyObject" overloaded="no">
         <autodoc>GetDataBuffer() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetDataBuffer" type="void" overloaded="no">
+      <method name="SetDataBuffer" type="" overloaded="no">
         <autodoc>SetDataBuffer(PyObject data)</autodoc>
         <paramlist>
-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetAlphaData" type="PyObject" overloaded="no">
         <autodoc>GetAlphaData() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetAlphaData" type="void" overloaded="no">
+      <method name="SetAlphaData" type="" overloaded="no">
         <autodoc>SetAlphaData(PyObject data)</autodoc>
         <paramlist>
-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetAlphaBuffer" type="PyObject" overloaded="no">
         <autodoc>GetAlphaBuffer() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetAlphaBuffer" type="void" overloaded="no">
+      <method name="SetAlphaBuffer" type="" overloaded="no">
         <autodoc>SetAlphaBuffer(PyObject data)</autodoc>
         <paramlist>
-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetMaskColour" type="void" overloaded="no">
+      <method name="SetMaskColour" type="" overloaded="no">
         <autodoc>SetMaskColour(unsigned char r, unsigned char g, unsigned char b)</autodoc>
         <paramlist>
           <param name="r" type="unsigned char" default=""/>
@@ -1410,7 +1410,7 @@ values.</docstring>
       <method name="GetMaskBlue" type="unsigned char" overloaded="no">
         <autodoc>GetMaskBlue() -&gt; unsigned char</autodoc>
       </method>
-      <method name="SetMask" type="void" overloaded="no">
+      <method name="SetMask" type="" overloaded="no">
         <autodoc>SetMask(bool mask=True)</autodoc>
         <paramlist>
           <param name="mask" type="bool" default="True"/>
@@ -1419,29 +1419,29 @@ values.</docstring>
       <method name="HasMask" type="bool" overloaded="no">
         <autodoc>HasMask() -&gt; bool</autodoc>
       </method>
-      <method name="Rotate" type="wxImage" overloaded="no">
+      <method name="Rotate" type="Image" overloaded="no">
         <autodoc>Rotate(double angle, Point centre_of_rotation, bool interpolating=True, 
     Point offset_after_rotation=None) -&gt; Image</autodoc>
         <paramlist>
           <param name="angle" type="double" default=""/>
-          <param name="centre_of_rotation" type="r.q(const).wxPoint" default=""/>
+          <param name="centre_of_rotation" type="Point" default=""/>
           <param name="interpolating" type="bool" default="True"/>
-          <param name="offset_after_rotation" type="p.wxPoint" default="NULL"/>
+          <param name="offset_after_rotation" type="Point" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Rotate90" type="wxImage" overloaded="no">
+      <method name="Rotate90" type="Image" overloaded="no">
         <autodoc>Rotate90(bool clockwise=True) -&gt; Image</autodoc>
         <paramlist>
           <param name="clockwise" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Mirror" type="wxImage" overloaded="no">
+      <method name="Mirror" type="Image" overloaded="no">
         <autodoc>Mirror(bool horizontally=True) -&gt; Image</autodoc>
         <paramlist>
           <param name="horizontally" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Replace" type="void" overloaded="no">
+      <method name="Replace" type="" overloaded="no">
         <autodoc>Replace(unsigned char r1, unsigned char g1, unsigned char b1, 
     unsigned char r2, unsigned char g2, unsigned char b2)</autodoc>
         <paramlist>
@@ -1453,7 +1453,7 @@ values.</docstring>
           <param name="b2" type="unsigned char" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertToMono" type="wxImage" overloaded="no">
+      <method name="ConvertToMono" type="Image" overloaded="no">
         <autodoc>ConvertToMono(unsigned char r, unsigned char g, unsigned char b) -&gt; Image</autodoc>
         <paramlist>
           <param name="r" type="unsigned char" default=""/>
@@ -1461,36 +1461,36 @@ values.</docstring>
           <param name="b" type="unsigned char" default=""/>
         </paramlist>
       </method>
-      <method name="SetOption" type="void" overloaded="no">
+      <method name="SetOption" type="" overloaded="no">
         <autodoc>SetOption(String name, String value)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetOptionInt" type="void" overloaded="no">
+      <method name="SetOptionInt" type="" overloaded="no">
         <autodoc>SetOptionInt(String name, int value)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="value" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetOption" type="wxString" overloaded="no">
+      <method name="GetOption" type="String" overloaded="no">
         <autodoc>GetOption(String name) -&gt; String</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetOptionInt" type="int" overloaded="no">
         <autodoc>GetOptionInt(String name) -&gt; int</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="HasOption" type="bool" overloaded="no">
         <autodoc>HasOption(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="CountColours" type="unsigned long" overloaded="no">
@@ -1502,28 +1502,28 @@ values.</docstring>
       <method name="ComputeHistogram" type="unsigned long" overloaded="no">
         <autodoc>ComputeHistogram(ImageHistogram h) -&gt; unsigned long</autodoc>
         <paramlist>
-          <param name="h" type="r.wxImageHistogram" default=""/>
+          <param name="h" type="ImageHistogram" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="AddHandler" type="void" overloaded="no">
+      <staticmethod name="AddHandler" type="" overloaded="no">
         <autodoc>Image.AddHandler(ImageHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxImageHandler" default=""/>
+          <param name="handler" type="ImageHandler" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="InsertHandler" type="void" overloaded="no">
+      <staticmethod name="InsertHandler" type="" overloaded="no">
         <autodoc>Image.InsertHandler(ImageHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxImageHandler" default=""/>
+          <param name="handler" type="ImageHandler" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveHandler" type="bool" overloaded="no">
         <autodoc>Image.RemoveHandler(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetImageExtWildcard" type="wxString" overloaded="no">
+      <staticmethod name="GetImageExtWildcard" type="String" overloaded="no">
         <autodoc>Image.GetImageExtWildcard() -&gt; String</autodoc>
       </staticmethod>
       <method name="ConvertToBitmap" type="wxBitmap" overloaded="no">
@@ -1538,71 +1538,71 @@ values.</docstring>
         </paramlist>
       </method>
     </class>
-    <method name="InitAllImageHandlers" oldname="wxInitAllImageHandlers" type="void" overloaded="no">
+    <method name="InitAllImageHandlers" oldname="wxInitAllImageHandlers" type="" overloaded="no">
       <autodoc>InitAllImageHandlers()</autodoc>
     </method>
     <class name="BMPHandler" oldname="wxBMPHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="BMPHandler" overloaded="no">
         <autodoc>__init__() -&gt; BMPHandler</autodoc>
       </constructor>
     </class>
     <class name="ICOHandler" oldname="wxICOHandler" module="core">
-      <baseclass name="wxBMPHandler"/>
+      <baseclass name="BMPHandler"/>
       <constructor name="ICOHandler" overloaded="no">
         <autodoc>__init__() -&gt; ICOHandler</autodoc>
       </constructor>
     </class>
     <class name="CURHandler" oldname="wxCURHandler" module="core">
-      <baseclass name="wxICOHandler"/>
+      <baseclass name="ICOHandler"/>
       <constructor name="CURHandler" overloaded="no">
         <autodoc>__init__() -&gt; CURHandler</autodoc>
       </constructor>
     </class>
     <class name="ANIHandler" oldname="wxANIHandler" module="core">
-      <baseclass name="wxCURHandler"/>
+      <baseclass name="CURHandler"/>
       <constructor name="ANIHandler" overloaded="no">
         <autodoc>__init__() -&gt; ANIHandler</autodoc>
       </constructor>
     </class>
     <class name="PNGHandler" oldname="wxPNGHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="PNGHandler" overloaded="no">
         <autodoc>__init__() -&gt; PNGHandler</autodoc>
       </constructor>
     </class>
     <class name="GIFHandler" oldname="wxGIFHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="GIFHandler" overloaded="no">
         <autodoc>__init__() -&gt; GIFHandler</autodoc>
       </constructor>
     </class>
     <class name="PCXHandler" oldname="wxPCXHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="PCXHandler" overloaded="no">
         <autodoc>__init__() -&gt; PCXHandler</autodoc>
       </constructor>
     </class>
     <class name="JPEGHandler" oldname="wxJPEGHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="JPEGHandler" overloaded="no">
         <autodoc>__init__() -&gt; JPEGHandler</autodoc>
       </constructor>
     </class>
     <class name="PNMHandler" oldname="wxPNMHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="PNMHandler" overloaded="no">
         <autodoc>__init__() -&gt; PNMHandler</autodoc>
       </constructor>
     </class>
     <class name="XPMHandler" oldname="wxXPMHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="XPMHandler" overloaded="no">
         <autodoc>__init__() -&gt; XPMHandler</autodoc>
       </constructor>
     </class>
     <class name="TIFFHandler" oldname="wxTIFFHandler" module="core">
-      <baseclass name="wxImageHandler"/>
+      <baseclass name="ImageHandler"/>
       <constructor name="TIFFHandler" overloaded="no">
         <autodoc>__init__() -&gt; TIFFHandler</autodoc>
       </constructor>
@@ -1611,32 +1611,32 @@ values.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="EvtHandler" oldname="wxEvtHandler" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="EvtHandler" overloaded="no">
         <autodoc>__init__() -&gt; EvtHandler</autodoc>
       </constructor>
-      <method name="GetNextHandler" type="wxEvtHandler" overloaded="no">
+      <method name="GetNextHandler" type="EvtHandler" overloaded="no">
         <autodoc>GetNextHandler() -&gt; EvtHandler</autodoc>
       </method>
-      <method name="GetPreviousHandler" type="wxEvtHandler" overloaded="no">
+      <method name="GetPreviousHandler" type="EvtHandler" overloaded="no">
         <autodoc>GetPreviousHandler() -&gt; EvtHandler</autodoc>
       </method>
-      <method name="SetNextHandler" type="void" overloaded="no">
+      <method name="SetNextHandler" type="" overloaded="no">
         <autodoc>SetNextHandler(EvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="SetPreviousHandler" type="void" overloaded="no">
+      <method name="SetPreviousHandler" type="" overloaded="no">
         <autodoc>SetPreviousHandler(EvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
       <method name="GetEvtHandlerEnabled" type="bool" overloaded="no">
         <autodoc>GetEvtHandlerEnabled() -&gt; bool</autodoc>
       </method>
-      <method name="SetEvtHandlerEnabled" type="void" overloaded="no">
+      <method name="SetEvtHandlerEnabled" type="" overloaded="no">
         <autodoc>SetEvtHandlerEnabled(bool enabled)</autodoc>
         <paramlist>
           <param name="enabled" type="bool" default=""/>
@@ -1645,25 +1645,25 @@ values.</docstring>
       <method name="ProcessEvent" type="bool" overloaded="no">
         <autodoc>ProcessEvent(Event event) -&gt; bool</autodoc>
         <paramlist>
-          <param name="event" type="r.wxEvent" default=""/>
+          <param name="event" type="wxEvent" default=""/>
         </paramlist>
       </method>
-      <method name="AddPendingEvent" type="void" overloaded="no">
+      <method name="AddPendingEvent" type="" overloaded="no">
         <autodoc>AddPendingEvent(Event event)</autodoc>
         <paramlist>
-          <param name="event" type="r.wxEvent" default=""/>
+          <param name="event" type="wxEvent" default=""/>
         </paramlist>
       </method>
-      <method name="ProcessPendingEvents" type="void" overloaded="no">
+      <method name="ProcessPendingEvents" type="" overloaded="no">
         <autodoc>ProcessPendingEvents()</autodoc>
       </method>
-      <method name="Connect" type="void" overloaded="no">
+      <method name="Connect" type="" overloaded="no">
         <autodoc>Connect(int id, int lastId, int eventType, PyObject func)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="lastId" type="int" default=""/>
           <param name="eventType" type="int" default=""/>
-          <param name="func" type="p.PyObject" default=""/>
+          <param name="func" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="Disconnect" type="bool" overloaded="no">
@@ -1674,10 +1674,10 @@ values.</docstring>
           <param name="eventType" type="wxEventType" default="wxEVT_NULL"/>
         </paramlist>
       </method>
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -1933,11 +1933,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Event" oldname="wxEvent" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <destructor name="~wxEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetEventType" type="void" overloaded="no">
+      <method name="SetEventType" type="" overloaded="no">
         <autodoc>SetEventType(wxEventType typ)</autodoc>
         <paramlist>
           <param name="typ" type="wxEventType" default=""/>
@@ -1946,19 +1946,19 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetEventType" type="wxEventType" overloaded="no">
         <autodoc>GetEventType() -&gt; wxEventType</autodoc>
       </method>
-      <method name="GetEventObject" type="wxObject" overloaded="no">
+      <method name="GetEventObject" type="Object" overloaded="no">
         <autodoc>GetEventObject() -&gt; Object</autodoc>
       </method>
-      <method name="SetEventObject" type="void" overloaded="no">
+      <method name="SetEventObject" type="" overloaded="no">
         <autodoc>SetEventObject(Object obj)</autodoc>
         <paramlist>
-          <param name="obj" type="p.wxObject" default=""/>
+          <param name="obj" type="Object" default=""/>
         </paramlist>
       </method>
       <method name="GetTimestamp" type="long" overloaded="no">
         <autodoc>GetTimestamp() -&gt; long</autodoc>
       </method>
-      <method name="SetTimestamp" type="void" overloaded="no">
+      <method name="SetTimestamp" type="" overloaded="no">
         <autodoc>SetTimestamp(long ts=0)</autodoc>
         <paramlist>
           <param name="ts" type="long" default="0"/>
@@ -1967,7 +1967,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(int Id)</autodoc>
         <paramlist>
           <param name="Id" type="int" default=""/>
@@ -1976,7 +1976,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="IsCommandEvent" type="bool" overloaded="no">
         <autodoc>IsCommandEvent() -&gt; bool</autodoc>
       </method>
-      <method name="Skip" type="void" overloaded="no">
+      <method name="Skip" type="" overloaded="no">
         <autodoc>Skip(bool skip=True)</autodoc>
         <paramlist>
           <param name="skip" type="bool" default="True"/>
@@ -1991,13 +1991,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="StopPropagation" type="int" overloaded="no">
         <autodoc>StopPropagation() -&gt; int</autodoc>
       </method>
-      <method name="ResumePropagation" type="void" overloaded="no">
+      <method name="ResumePropagation" type="" overloaded="no">
         <autodoc>ResumePropagation(int propagationLevel)</autodoc>
         <paramlist>
           <param name="propagationLevel" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Clone" type="wxEvent" overloaded="no">
+      <method name="Clone" type="Event" overloaded="no">
         <autodoc>Clone() -&gt; Event</autodoc>
       </method>
     </class>
@@ -2008,7 +2008,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <constructor name="PropagationDisabler" overloaded="no">
         <autodoc>__init__(Event event) -&gt; PropagationDisabler</autodoc>
         <paramlist>
-          <param name="event" type="r.wxEvent" default=""/>
+          <param name="event" type="Event" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxPropagationDisabler" overloaded="no">
@@ -2019,7 +2019,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <constructor name="PropagateOnce" overloaded="no">
         <autodoc>__init__(Event event) -&gt; PropagateOnce</autodoc>
         <paramlist>
-          <param name="event" type="r.wxEvent" default=""/>
+          <param name="event" type="Event" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxPropagateOnce" overloaded="no">
@@ -2030,7 +2030,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CommandEvent" oldname="wxCommandEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="CommandEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -&gt; CommandEvent</autodoc>
         <paramlist>
@@ -2041,13 +2041,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </method>
-      <method name="SetString" type="void" overloaded="no">
+      <method name="SetString" type="" overloaded="no">
         <autodoc>SetString(String s)</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetString" type="wxString" overloaded="no">
+      <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString() -&gt; String</autodoc>
       </method>
       <method name="IsChecked" type="bool" overloaded="no">
@@ -2056,7 +2056,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="IsSelection" type="bool" overloaded="no">
         <autodoc>IsSelection() -&gt; bool</autodoc>
       </method>
-      <method name="SetExtraLong" type="void" overloaded="no">
+      <method name="SetExtraLong" type="" overloaded="no">
         <autodoc>SetExtraLong(long extraLong)</autodoc>
         <paramlist>
           <param name="extraLong" type="long" default=""/>
@@ -2065,7 +2065,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetExtraLong" type="long" overloaded="no">
         <autodoc>GetExtraLong() -&gt; long</autodoc>
       </method>
-      <method name="SetInt" type="void" overloaded="no">
+      <method name="SetInt" type="" overloaded="no">
         <autodoc>SetInt(int i)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
@@ -2074,7 +2074,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetInt" type="long" overloaded="no">
         <autodoc>GetInt() -&gt; long</autodoc>
       </method>
-      <method name="Clone" type="wxEvent" overloaded="no">
+      <method name="Clone" type="Event" overloaded="no">
         <autodoc>Clone() -&gt; Event</autodoc>
       </method>
     </class>
@@ -2082,7 +2082,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="NotifyEvent" oldname="wxNotifyEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="NotifyEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -&gt; NotifyEvent</autodoc>
         <paramlist>
@@ -2090,10 +2090,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="Veto" type="void" overloaded="no">
+      <method name="Veto" type="" overloaded="no">
         <autodoc>Veto()</autodoc>
       </method>
-      <method name="Allow" type="void" overloaded="no">
+      <method name="Allow" type="" overloaded="no">
         <autodoc>Allow()</autodoc>
       </method>
       <method name="IsAllowed" type="bool" overloaded="no">
@@ -2104,7 +2104,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrollEvent" oldname="wxScrollEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="ScrollEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int winid=0, int pos=0, 
     int orient=0) -&gt; ScrollEvent</autodoc>
@@ -2121,13 +2121,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetPosition" type="int" overloaded="no">
         <autodoc>GetPosition() -&gt; int</autodoc>
       </method>
-      <method name="SetOrientation" type="void" overloaded="no">
+      <method name="SetOrientation" type="" overloaded="no">
         <autodoc>SetOrientation(int orient)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -2138,7 +2138,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrollWinEvent" oldname="wxScrollWinEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="ScrollWinEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int pos=0, int orient=0) -&gt; ScrollWinEvent</autodoc>
         <paramlist>
@@ -2153,13 +2153,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetPosition" type="int" overloaded="no">
         <autodoc>GetPosition() -&gt; int</autodoc>
       </method>
-      <method name="SetOrientation" type="void" overloaded="no">
+      <method name="SetOrientation" type="" overloaded="no">
         <autodoc>SetOrientation(int orient)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -2170,7 +2170,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MouseEvent" oldname="wxMouseEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="MouseEvent" overloaded="no">
         <autodoc>__init__(wxEventType mouseType=wxEVT_NULL) -&gt; MouseEvent</autodoc>
         <paramlist>
@@ -2273,22 +2273,22 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="Leaving" type="bool" overloaded="no">
         <autodoc>Leaving() -&gt; bool</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
         <docstring>Returns the position of the mouse in window coordinates when the event happened.</docstring>
       </method>
-      <method name="GetPositionTuple" type="void" overloaded="no">
+      <method name="GetPositionTuple" type="" overloaded="no">
         <autodoc>GetPositionTuple() -&gt; (x,y)</autodoc>
         <docstring>Returns the position of the mouse in window coordinates when the event happened.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.long" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetLogicalPosition" type="wxPoint" overloaded="no">
+      <method name="GetLogicalPosition" type="Point" overloaded="no">
         <autodoc>GetLogicalPosition(DC dc) -&gt; Point</autodoc>
         <paramlist>
-          <param name="dc" type="r.q(const).wxDC" default=""/>
+          <param name="dc" type="wxDC" default=""/>
         </paramlist>
       </method>
       <method name="GetX" type="int" overloaded="no">
@@ -2326,7 +2326,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SetCursorEvent" oldname="wxSetCursorEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="SetCursorEvent" overloaded="no">
         <autodoc>__init__(int x=0, int y=0) -&gt; SetCursorEvent</autodoc>
         <paramlist>
@@ -2340,13 +2340,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>
       </method>
-      <method name="SetCursor" type="void" overloaded="no">
+      <method name="SetCursor" type="" overloaded="no">
         <autodoc>SetCursor(Cursor cursor)</autodoc>
         <paramlist>
-          <param name="cursor" type="r.q(const).wxCursor" default=""/>
+          <param name="cursor" type="wxCursor" default=""/>
         </paramlist>
       </method>
-      <method name="GetCursor" type="q(const).wxCursor" overloaded="no">
+      <method name="GetCursor" type="wxCursor" overloaded="no">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>
       </method>
       <method name="HasCursor" type="bool" overloaded="no">
@@ -2357,7 +2357,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="KeyEvent" oldname="wxKeyEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="KeyEvent" overloaded="no">
         <autodoc>__init__(wxEventType keyType=wxEVT_NULL) -&gt; KeyEvent</autodoc>
         <paramlist>
@@ -2391,16 +2391,16 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetRawKeyFlags" type="unsigned int" overloaded="no">
         <autodoc>GetRawKeyFlags() -&gt; unsigned int</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
         <docstring>Find the position of the event.</docstring>
       </method>
-      <method name="GetPositionTuple" type="void" overloaded="no">
+      <method name="GetPositionTuple" type="" overloaded="no">
         <autodoc>GetPositionTuple() -&gt; (x,y)</autodoc>
         <docstring>Find the position of the event.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.long" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetX" type="int" overloaded="no">
@@ -2424,73 +2424,73 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SizeEvent" oldname="wxSizeEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="SizeEvent" overloaded="no">
         <autodoc>__init__(Size sz=DefaultSize, int winid=0) -&gt; SizeEvent</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="sz" type="Size" default="wxDefaultSize"/>
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
-      <method name="SetRect" type="void" overloaded="no">
+      <method name="SetRect" type="" overloaded="no">
         <autodoc>SetRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <property name="m_size" type="wxSize" readonly="no"/>
-      <property name="m_rect" type="wxRect" readonly="no"/>
+      <property name="m_size" type="Size" readonly="no"/>
+      <property name="m_rect" type="Rect" readonly="no"/>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MoveEvent" oldname="wxMoveEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="MoveEvent" overloaded="no">
         <autodoc>__init__(Point pos=DefaultPosition, int winid=0) -&gt; MoveEvent</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
-      <method name="SetRect" type="void" overloaded="no">
+      <method name="SetRect" type="" overloaded="no">
         <autodoc>SetRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>
-          <param name="pos" type="wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
-      <property name="m_pos" type="wxPoint" readonly="no"/>
-      <property name="m_rect" type="wxRect" readonly="no"/>
+      <property name="m_pos" type="Point" readonly="no"/>
+      <property name="m_rect" type="Rect" readonly="no"/>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PaintEvent" oldname="wxPaintEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="PaintEvent" overloaded="no">
         <autodoc>__init__(int Id=0) -&gt; PaintEvent</autodoc>
         <paramlist>
@@ -2499,7 +2499,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       </constructor>
     </class>
     <class name="NcPaintEvent" oldname="wxNcPaintEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="NcPaintEvent" overloaded="no">
         <autodoc>__init__(int winid=0) -&gt; NcPaintEvent</autodoc>
         <paramlist>
@@ -2511,12 +2511,12 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="EraseEvent" oldname="wxEraseEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="EraseEvent" overloaded="no">
         <autodoc>__init__(int Id=0, DC dc=(wxDC *) NULL) -&gt; EraseEvent</autodoc>
         <paramlist>
           <param name="Id" type="int" default="0"/>
-          <param name="dc" type="p.wxDC" default="(wxDC *) NULL"/>
+          <param name="dc" type="wxDC" default="(wxDC *) NULL"/>
         </paramlist>
       </constructor>
       <method name="GetDC" type="wxDC" overloaded="no">
@@ -2527,7 +2527,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="FocusEvent" oldname="wxFocusEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="FocusEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0) -&gt; FocusEvent</autodoc>
         <paramlist>
@@ -2538,10 +2538,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetWindow" type="wxWindow" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
-      <method name="SetWindow" type="void" overloaded="no">
+      <method name="SetWindow" type="" overloaded="no">
         <autodoc>SetWindow(Window win)</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </method>
     </class>
@@ -2549,11 +2549,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ChildFocusEvent" oldname="wxChildFocusEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="ChildFocusEvent" overloaded="no">
         <autodoc>__init__(Window win=None) -&gt; ChildFocusEvent</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default="NULL"/>
+          <param name="win" type="wxWindow" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetWindow" type="wxWindow" overloaded="no">
@@ -2564,7 +2564,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ActivateEvent" oldname="wxActivateEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="ActivateEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, bool active=True, int Id=0) -&gt; ActivateEvent</autodoc>
         <paramlist>
@@ -2581,7 +2581,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="InitDialogEvent" oldname="wxInitDialogEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="InitDialogEvent" overloaded="no">
         <autodoc>__init__(int Id=0) -&gt; InitDialogEvent</autodoc>
         <paramlist>
@@ -2593,13 +2593,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MenuEvent" oldname="wxMenuEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="MenuEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0, Menu menu=None) -&gt; MenuEvent</autodoc>
         <paramlist>
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
           <param name="winid" type="int" default="0"/>
-          <param name="menu" type="p.wxMenu" default="NULL"/>
+          <param name="menu" type="wxMenu" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetMenuId" type="int" overloaded="no">
@@ -2616,7 +2616,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CloseEvent" oldname="wxCloseEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="CloseEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0) -&gt; CloseEvent</autodoc>
         <paramlist>
@@ -2624,7 +2624,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="SetLoggingOff" type="void" overloaded="no">
+      <method name="SetLoggingOff" type="" overloaded="no">
         <autodoc>SetLoggingOff(bool logOff)</autodoc>
         <paramlist>
           <param name="logOff" type="bool" default=""/>
@@ -2633,13 +2633,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetLoggingOff" type="bool" overloaded="no">
         <autodoc>GetLoggingOff() -&gt; bool</autodoc>
       </method>
-      <method name="Veto" type="void" overloaded="no">
+      <method name="Veto" type="" overloaded="no">
         <autodoc>Veto(bool veto=True)</autodoc>
         <paramlist>
           <param name="veto" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetCanVeto" type="void" overloaded="no">
+      <method name="SetCanVeto" type="" overloaded="no">
         <autodoc>SetCanVeto(bool canVeto)</autodoc>
         <paramlist>
           <param name="canVeto" type="bool" default=""/>
@@ -2656,7 +2656,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ShowEvent" oldname="wxShowEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="ShowEvent" overloaded="no">
         <autodoc>__init__(int winid=0, bool show=False) -&gt; ShowEvent</autodoc>
         <paramlist>
@@ -2664,7 +2664,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
           <param name="show" type="bool" default="False"/>
         </paramlist>
       </constructor>
-      <method name="SetShow" type="void" overloaded="no">
+      <method name="SetShow" type="" overloaded="no">
         <autodoc>SetShow(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -2678,7 +2678,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IconizeEvent" oldname="wxIconizeEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="IconizeEvent" overloaded="no">
         <autodoc>__init__(int id=0, bool iconized=True) -&gt; IconizeEvent</autodoc>
         <paramlist>
@@ -2694,7 +2694,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MaximizeEvent" oldname="wxMaximizeEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="MaximizeEvent" overloaded="no">
         <autodoc>__init__(int id=0) -&gt; MaximizeEvent</autodoc>
         <paramlist>
@@ -2706,8 +2706,8 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DropFilesEvent" oldname="wxDropFilesEvent" module="core">
-      <baseclass name="wxEvent"/>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <baseclass name="Event"/>
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetNumberOfFiles" type="int" overloaded="no">
@@ -2721,7 +2721,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="UpdateUIEvent" oldname="wxUpdateUIEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="UpdateUIEvent" overloaded="no">
         <autodoc>__init__(int commandId=0) -&gt; UpdateUIEvent</autodoc>
         <paramlist>
@@ -2734,7 +2734,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetEnabled" type="bool" overloaded="no">
         <autodoc>GetEnabled() -&gt; bool</autodoc>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetSetText" type="bool" overloaded="no">
@@ -2746,25 +2746,25 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetSetEnabled" type="bool" overloaded="no">
         <autodoc>GetSetEnabled() -&gt; bool</autodoc>
       </method>
-      <method name="Check" type="void" overloaded="no">
+      <method name="Check" type="" overloaded="no">
         <autodoc>Check(bool check)</autodoc>
         <paramlist>
           <param name="check" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Enable" type="void" overloaded="no">
+      <method name="Enable" type="" overloaded="no">
         <autodoc>Enable(bool enable)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="SetUpdateInterval" type="void" overloaded="no">
+      <staticmethod name="SetUpdateInterval" type="" overloaded="no">
         <autodoc>UpdateUIEvent.SetUpdateInterval(long updateInterval)</autodoc>
         <paramlist>
           <param name="updateInterval" type="long" default=""/>
@@ -2776,13 +2776,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <staticmethod name="CanUpdate" type="bool" overloaded="no">
         <autodoc>UpdateUIEvent.CanUpdate(Window win) -&gt; bool</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="ResetUpdateTime" type="void" overloaded="no">
+      <staticmethod name="ResetUpdateTime" type="" overloaded="no">
         <autodoc>UpdateUIEvent.ResetUpdateTime()</autodoc>
       </staticmethod>
-      <staticmethod name="SetMode" type="void" overloaded="no">
+      <staticmethod name="SetMode" type="" overloaded="no">
         <autodoc>UpdateUIEvent.SetMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="wxUpdateUIMode" default=""/>
@@ -2796,7 +2796,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SysColourChangedEvent" oldname="wxSysColourChangedEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="SysColourChangedEvent" overloaded="no">
         <autodoc>__init__() -&gt; SysColourChangedEvent</autodoc>
       </constructor>
@@ -2805,12 +2805,12 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MouseCaptureChangedEvent" oldname="wxMouseCaptureChangedEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="MouseCaptureChangedEvent" overloaded="no">
         <autodoc>__init__(int winid=0, Window gainedCapture=None) -&gt; MouseCaptureChangedEvent</autodoc>
         <paramlist>
           <param name="winid" type="int" default="0"/>
-          <param name="gainedCapture" type="p.wxWindow" default="NULL"/>
+          <param name="gainedCapture" type="wxWindow" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetCapturedWindow" type="wxWindow" overloaded="no">
@@ -2821,7 +2821,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DisplayChangedEvent" oldname="wxDisplayChangedEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="DisplayChangedEvent" overloaded="no">
         <autodoc>__init__() -&gt; DisplayChangedEvent</autodoc>
       </constructor>
@@ -2830,17 +2830,17 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PaletteChangedEvent" oldname="wxPaletteChangedEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="PaletteChangedEvent" overloaded="no">
         <autodoc>__init__(int id=0) -&gt; PaletteChangedEvent</autodoc>
         <paramlist>
           <param name="id" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="SetChangedWindow" type="void" overloaded="no">
+      <method name="SetChangedWindow" type="" overloaded="no">
         <autodoc>SetChangedWindow(Window win)</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </method>
       <method name="GetChangedWindow" type="wxWindow" overloaded="no">
@@ -2851,14 +2851,14 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="QueryNewPaletteEvent" oldname="wxQueryNewPaletteEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="QueryNewPaletteEvent" overloaded="no">
         <autodoc>__init__(int winid=0) -&gt; QueryNewPaletteEvent</autodoc>
         <paramlist>
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="SetPaletteRealized" type="void" overloaded="no">
+      <method name="SetPaletteRealized" type="" overloaded="no">
         <autodoc>SetPaletteRealized(bool realized)</autodoc>
         <paramlist>
           <param name="realized" type="bool" default=""/>
@@ -2872,14 +2872,14 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="NavigationKeyEvent" oldname="wxNavigationKeyEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="NavigationKeyEvent" overloaded="no">
         <autodoc>__init__() -&gt; NavigationKeyEvent</autodoc>
       </constructor>
       <method name="GetDirection" type="bool" overloaded="no">
         <autodoc>GetDirection() -&gt; bool</autodoc>
       </method>
-      <method name="SetDirection" type="void" overloaded="no">
+      <method name="SetDirection" type="" overloaded="no">
         <autodoc>SetDirection(bool bForward)</autodoc>
         <paramlist>
           <param name="bForward" type="bool" default=""/>
@@ -2888,7 +2888,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="IsWindowChange" type="bool" overloaded="no">
         <autodoc>IsWindowChange() -&gt; bool</autodoc>
       </method>
-      <method name="SetWindowChange" type="void" overloaded="no">
+      <method name="SetWindowChange" type="" overloaded="no">
         <autodoc>SetWindowChange(bool bIs)</autodoc>
         <paramlist>
           <param name="bIs" type="bool" default=""/>
@@ -2897,10 +2897,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetCurrentFocus" type="wxWindow" overloaded="no">
         <autodoc>GetCurrentFocus() -&gt; Window</autodoc>
       </method>
-      <method name="SetCurrentFocus" type="void" overloaded="no">
+      <method name="SetCurrentFocus" type="" overloaded="no">
         <autodoc>SetCurrentFocus(Window win)</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </method>
     </class>
@@ -2908,11 +2908,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="WindowCreateEvent" oldname="wxWindowCreateEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="WindowCreateEvent" overloaded="no">
         <autodoc>__init__(Window win=None) -&gt; WindowCreateEvent</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default="NULL"/>
+          <param name="win" type="wxWindow" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetWindow" type="wxWindow" overloaded="no">
@@ -2920,11 +2920,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       </method>
     </class>
     <class name="WindowDestroyEvent" oldname="wxWindowDestroyEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="WindowDestroyEvent" overloaded="no">
         <autodoc>__init__(Window win=None) -&gt; WindowDestroyEvent</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default="NULL"/>
+          <param name="win" type="wxWindow" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetWindow" type="wxWindow" overloaded="no">
@@ -2935,22 +2935,22 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ContextMenuEvent" oldname="wxContextMenuEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="ContextMenuEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -&gt; ContextMenuEvent</autodoc>
         <paramlist>
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
           <param name="winid" type="int" default="0"/>
-          <param name="pt" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pt" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
-      <method name="GetPosition" type="q(const).wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
     </class>
@@ -2958,11 +2958,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IdleEvent" oldname="wxIdleEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="IdleEvent" overloaded="no">
         <autodoc>__init__() -&gt; IdleEvent</autodoc>
       </constructor>
-      <method name="RequestMore" type="void" overloaded="no">
+      <method name="RequestMore" type="" overloaded="no">
         <autodoc>RequestMore(bool needMore=True)</autodoc>
         <paramlist>
           <param name="needMore" type="bool" default="True"/>
@@ -2971,7 +2971,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="MoreRequested" type="bool" overloaded="no">
         <autodoc>MoreRequested() -&gt; bool</autodoc>
       </method>
-      <staticmethod name="SetMode" type="void" overloaded="no">
+      <staticmethod name="SetMode" type="" overloaded="no">
         <autodoc>IdleEvent.SetMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="wxIdleMode" default=""/>
@@ -2983,7 +2983,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <staticmethod name="CanSend" type="bool" overloaded="no">
         <autodoc>IdleEvent.CanSend(Window win) -&gt; bool</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </staticmethod>
     </class>
@@ -2991,7 +2991,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyEvent" oldname="wxPyEvent" module="core">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="PyEvent" overloaded="no">
         <autodoc>__init__(int winid=0, wxEventType commandType=wxEVT_NULL) -&gt; PyEvent</autodoc>
         <paramlist>
@@ -3002,10 +3002,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <destructor name="~wxPyEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetSelf" type="void" overloaded="no">
+      <method name="SetSelf" type="" overloaded="no">
         <autodoc>SetSelf(PyObject self)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetSelf" type="PyObject" overloaded="no">
@@ -3013,7 +3013,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       </method>
     </class>
     <class name="PyCommandEvent" oldname="wxPyCommandEvent" module="core">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="PyCommandEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; PyCommandEvent</autodoc>
         <paramlist>
@@ -3024,10 +3024,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <destructor name="~wxPyCommandEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetSelf" type="void" overloaded="no">
+      <method name="SetSelf" type="" overloaded="no">
         <autodoc>SetSelf(PyObject self)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetSelf" type="PyObject" overloaded="no">
@@ -3038,54 +3038,54 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyApp" oldname="wxPyApp" module="core">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="PyApp" overloaded="no">
         <autodoc>__init__() -&gt; PyApp</autodoc>
       </constructor>
       <destructor name="~wxPyApp" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetAppName" type="wxString" overloaded="no">
+      <method name="GetAppName" type="String" overloaded="no">
         <autodoc>GetAppName() -&gt; String</autodoc>
         <docstring>Get the application name.</docstring>
       </method>
-      <method name="SetAppName" type="void" overloaded="no">
+      <method name="SetAppName" type="" overloaded="no">
         <autodoc>SetAppName(String name)</autodoc>
         <docstring>Set the application name. This value may be used automatically
 by wx.Config and such.</docstring>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetClassName" type="wxString" overloaded="no">
+      <method name="GetClassName" type="String" overloaded="no">
         <autodoc>GetClassName() -&gt; String</autodoc>
         <docstring>Get the application's class name.</docstring>
       </method>
-      <method name="SetClassName" type="void" overloaded="no">
+      <method name="SetClassName" type="" overloaded="no">
         <autodoc>SetClassName(String name)</autodoc>
         <docstring>Set the application's class name. This value may be used for X-resources if
 applicable for the platform</docstring>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetVendorName" type="q(const).wxString" overloaded="no">
+      <method name="GetVendorName" type="String" overloaded="no">
         <autodoc>GetVendorName() -&gt; String</autodoc>
         <docstring>Get the application's vendor name.</docstring>
       </method>
-      <method name="SetVendorName" type="void" overloaded="no">
+      <method name="SetVendorName" type="" overloaded="no">
         <autodoc>SetVendorName(String name)</autodoc>
         <docstring>Set the application's vendor name. This value may be used automatically
 by wx.Config and such.</docstring>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTraits" type="wxAppTraits" overloaded="no">
@@ -3096,7 +3096,7 @@ simply by overriding CreateTraits() and returning his own traits object) or
 which is GUI/console dependent as then wx.AppTraits allows us to abstract the
 differences behind the common facade</docstring>
       </method>
-      <method name="ProcessPendingEvents" type="void" overloaded="no">
+      <method name="ProcessPendingEvents" type="" overloaded="no">
         <autodoc>ProcessPendingEvents()</autodoc>
         <docstring>Process all events in the Pending Events list -- it is necessary to call this
 function to process posted events. This happens during each event loop
@@ -3117,7 +3117,7 @@ WARNING: This function is dangerous as it can lead to unexpected
           <param name="onlyIfNeeded" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="WakeUpIdle" type="void" overloaded="no">
+      <method name="WakeUpIdle" type="" overloaded="no">
         <autodoc>WakeUpIdle()</autodoc>
         <docstring>Make sure that idle events are sent again</docstring>
       </method>
@@ -3125,11 +3125,11 @@ WARNING: This function is dangerous as it can lead to unexpected
         <autodoc>MainLoop() -&gt; int</autodoc>
         <docstring>Execute the main GUI loop, the function returns when the loop ends.</docstring>
       </method>
-      <method name="Exit" type="void" overloaded="no">
+      <method name="Exit" type="" overloaded="no">
         <autodoc>Exit()</autodoc>
         <docstring>Exit the main loop thus terminating the application.</docstring>
       </method>
-      <method name="ExitMainLoop" type="void" overloaded="no">
+      <method name="ExitMainLoop" type="" overloaded="no">
         <autodoc>ExitMainLoop()</autodoc>
         <docstring>Exit the main GUI loop during the next iteration (i.e. it does not
 stop the program immediately!)</docstring>
@@ -3154,19 +3154,19 @@ needed, False if not.</docstring>
         <docstring>Send idle event to window and all subwindows.  Returns True if more idle time
 is requested.</docstring>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
-          <param name="event" type="r.wxIdleEvent" default=""/>
+          <param name="win" type="wxWindow" default=""/>
+          <param name="event" type="IdleEvent" default=""/>
         </paramlist>
       </method>
       <method name="IsActive" type="bool" overloaded="no">
         <autodoc>IsActive() -&gt; bool</autodoc>
         <docstring>Return True if our app has focus.</docstring>
       </method>
-      <method name="SetTopWindow" type="void" overloaded="no">
+      <method name="SetTopWindow" type="" overloaded="no">
         <autodoc>SetTopWindow(Window win)</autodoc>
         <docstring>Set the "main" top level window</docstring>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>
         </paramlist>
       </method>
       <method name="GetTopWindow" type="wxWindow" overloaded="no">
@@ -3175,7 +3175,7 @@ is requested.</docstring>
 SetTopWindow(), will return just some top level window and, if there not any,
 will return None)</docstring>
       </method>
-      <method name="SetExitOnFrameDelete" type="void" overloaded="no">
+      <method name="SetExitOnFrameDelete" type="" overloaded="no">
         <autodoc>SetExitOnFrameDelete(bool flag)</autodoc>
         <docstring>Control the exit behaviour: by default, the program will exit the main loop
 (and so, usually, terminate) when the last top-level program window is
@@ -3191,7 +3191,7 @@ from somewhere.
         <autodoc>GetExitOnFrameDelete() -&gt; bool</autodoc>
         <docstring>Get the current exit behaviour setting.</docstring>
       </method>
-      <method name="SetUseBestVisual" type="void" overloaded="no">
+      <method name="SetUseBestVisual" type="" overloaded="no">
         <autodoc>SetUseBestVisual(bool flag)</autodoc>
         <docstring>Set whether the app should try to use the best available visual on systems
 where more than one is available, (Sun, SGI, XFree86 4, etc.)</docstring>
@@ -3203,7 +3203,7 @@ where more than one is available, (Sun, SGI, XFree86 4, etc.)</docstring>
         <autodoc>GetUseBestVisual() -&gt; bool</autodoc>
         <docstring>Get current UseBestVisual setting.</docstring>
       </method>
-      <method name="SetPrintMode" type="void" overloaded="no">
+      <method name="SetPrintMode" type="" overloaded="no">
         <autodoc>SetPrintMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -3212,7 +3212,7 @@ where more than one is available, (Sun, SGI, XFree86 4, etc.)</docstring>
       <method name="GetPrintMode" type="int" overloaded="no">
         <autodoc>GetPrintMode() -&gt; int</autodoc>
       </method>
-      <method name="SetAssertMode" type="void" overloaded="no">
+      <method name="SetAssertMode" type="" overloaded="no">
         <autodoc>SetAssertMode(int mode)</autodoc>
         <docstring>Set the OnAssert behaviour for debug and hybrid builds.  The following flags
 may be or'd together:
@@ -3242,40 +3242,40 @@ may be or'd together:
       <staticmethod name="GetMacExitMenuItemId" type="long" overloaded="no">
         <autodoc>PyApp.GetMacExitMenuItemId() -&gt; long</autodoc>
       </staticmethod>
-      <staticmethod name="GetMacHelpMenuTitleName" type="wxString" overloaded="no">
+      <staticmethod name="GetMacHelpMenuTitleName" type="String" overloaded="no">
         <autodoc>PyApp.GetMacHelpMenuTitleName() -&gt; String</autodoc>
       </staticmethod>
-      <staticmethod name="SetMacSupportPCMenuShortcuts" type="void" overloaded="no">
+      <staticmethod name="SetMacSupportPCMenuShortcuts" type="" overloaded="no">
         <autodoc>PyApp.SetMacSupportPCMenuShortcuts(bool val)</autodoc>
         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetMacAboutMenuItemId" type="void" overloaded="no">
+      <staticmethod name="SetMacAboutMenuItemId" type="" overloaded="no">
         <autodoc>PyApp.SetMacAboutMenuItemId(long val)</autodoc>
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetMacPreferencesMenuItemId" type="void" overloaded="no">
+      <staticmethod name="SetMacPreferencesMenuItemId" type="" overloaded="no">
         <autodoc>PyApp.SetMacPreferencesMenuItemId(long val)</autodoc>
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetMacExitMenuItemId" type="void" overloaded="no">
+      <staticmethod name="SetMacExitMenuItemId" type="" overloaded="no">
         <autodoc>PyApp.SetMacExitMenuItemId(long val)</autodoc>
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetMacHelpMenuTitleName" type="void" overloaded="no">
+      <staticmethod name="SetMacHelpMenuTitleName" type="" overloaded="no">
         <autodoc>PyApp.SetMacHelpMenuTitleName(String val)</autodoc>
         <paramlist>
-          <param name="val" type="r.q(const).wxString" default=""/>
+          <param name="val" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="_BootstrapApp" type="void" overloaded="no">
+      <method name="_BootstrapApp" type="" overloaded="no">
         <autodoc>_BootstrapApp()</autodoc>
         <docstring>For internal use only</docstring>
       </method>
@@ -3288,7 +3288,7 @@ wasn't found at all.  Raises an exception on non-Windows platforms.</docstring>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
-    <method name="Exit" oldname="wxExit" type="void" overloaded="no">
+    <method name="Exit" oldname="wxExit" type="" overloaded="no">
       <autodoc>Exit()</autodoc>
       <docstring>Force an exit of the application.  Convenience for wx.GetApp().Exit()</docstring>
     </method>
@@ -3309,27 +3309,27 @@ implementation of some limited user interaction.
 
 Returns the result of the call to wx.Yield.</docstring>
       <paramlist>
-        <param name="win" type="p.wxWindow" default="NULL"/>
+        <param name="win" type="wxWindow" default="NULL"/>
         <param name="onlyIfNeeded" type="bool" default="False"/>
       </paramlist>
     </method>
-    <method name="WakeUpIdle" oldname="wxWakeUpIdle" type="void" overloaded="no">
+    <method name="WakeUpIdle" oldname="wxWakeUpIdle" type="" overloaded="no">
       <autodoc>WakeUpIdle()</autodoc>
       <docstring>Cause the message queue to become empty again, so idle events will be sent.</docstring>
     </method>
-    <method name="PostEvent" oldname="wxPostEvent" type="void" overloaded="no">
+    <method name="PostEvent" oldname="wxPostEvent" type="" overloaded="no">
       <autodoc>PostEvent(EvtHandler dest, Event event)</autodoc>
       <docstring>Send an event to a window or other wx.EvtHandler to be processed later.</docstring>
       <paramlist>
-        <param name="dest" type="p.wxEvtHandler" default=""/>
-        <param name="event" type="r.wxEvent" default=""/>
+        <param name="dest" type="EvtHandler" default=""/>
+        <param name="event" type="Event" default=""/>
       </paramlist>
     </method>
-    <method name="App_CleanUp" oldname="wxApp_CleanUp" type="void" overloaded="no">
+    <method name="App_CleanUp" oldname="wxApp_CleanUp" type="" overloaded="no">
       <autodoc>App_CleanUp()</autodoc>
       <docstring>For internal use only, it is used to cleanup after wxWindows when Python shuts down.</docstring>
     </method>
-    <method name="GetApp" oldname="wxGetApp" type="wxPyApp" overloaded="no">
+    <method name="GetApp" oldname="wxGetApp" type="PyApp" overloaded="no">
       <autodoc>GetApp() -&gt; PyApp</autodoc>
       <docstring>Return a reference to the current wx.App object.</docstring>
     </method>
@@ -3557,25 +3557,25 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
           <param name="flags" type="int" default="0"/>
           <param name="keyCode" type="int" default="0"/>
           <param name="cmd" type="int" default="0"/>
-          <param name="item" type="p.wxMenuItem" default="NULL"/>
+          <param name="item" type="wxMenuItem" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxAcceleratorEntry" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int flags, int keyCode, int cmd, MenuItem item=None)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
           <param name="keyCode" type="int" default=""/>
           <param name="cmd" type="int" default=""/>
-          <param name="item" type="p.wxMenuItem" default="NULL"/>
+          <param name="item" type="wxMenuItem" default="NULL"/>
         </paramlist>
       </method>
-      <method name="SetMenuItem" type="void" overloaded="no">
+      <method name="SetMenuItem" type="" overloaded="no">
         <autodoc>SetMenuItem(MenuItem item)</autodoc>
         <paramlist>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
       <method name="GetMenuItem" type="wxMenuItem" overloaded="no">
@@ -3592,14 +3592,14 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
     </class>
     <class name="AcceleratorTable" oldname="wxAcceleratorTable" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="AcceleratorTable" overloaded="no">
         <autodoc>__init__(entries) -&gt; AcceleratorTable</autodoc>
         <docstring>Construct an AcceleratorTable from a list of AcceleratorEntry items or
 3-tuples (flags, keyCode, cmdID)</docstring>
         <paramlist>
           <param name="n" type="int" default=""/>
-          <param name="entries" type="p.q(const).wxAcceleratorEntry" default=""/>
+          <param name="entries" type="AcceleratorEntry" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxAcceleratorTable" overloaded="no">
@@ -3609,27 +3609,27 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
     </class>
-    <method name="GetAccelFromString" oldname="wxGetAccelFromString" type="wxAcceleratorEntry" overloaded="no">
+    <method name="GetAccelFromString" oldname="wxGetAccelFromString" type="AcceleratorEntry" overloaded="no">
       <autodoc>GetAccelFromString(String label) -&gt; AcceleratorEntry</autodoc>
       <paramlist>
-        <param name="label" type="r.q(const).wxString" default=""/>
+        <param name="label" type="String" default=""/>
       </paramlist>
     </method>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Window" oldname="wxWindow" module="core">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="Window" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; Window</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreWindow" overloaded="no">
@@ -3639,12 +3639,12 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </method>
       <method name="Close" type="bool" overloaded="no">
@@ -3663,34 +3663,34 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       <method name="IsBeingDeleted" type="bool" overloaded="no">
         <autodoc>IsBeingDeleted() -&gt; bool</autodoc>
       </method>
-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
-      <method name="SetName" type="void" overloaded="no">
+      <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String name)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(int winid)</autodoc>
         <paramlist>
           <param name="winid" type="int" default=""/>
@@ -3714,13 +3714,13 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetDimensions" type="void" overloaded="no">
+      <method name="SetDimensions" type="" overloaded="no">
         <autodoc>SetDimensions(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -3730,28 +3730,28 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
-      <method name="SetRect" type="void" overloaded="no">
+      <method name="SetRect" type="" overloaded="no">
         <autodoc>SetRect(Rect rect, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
-      <method name="SetSizeWH" type="void" overloaded="no">
+      <method name="SetSizeWH" type="" overloaded="no">
         <autodoc>SetSizeWH(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Move" type="void" overloaded="no">
+      <method name="Move" type="" overloaded="no">
         <autodoc>Move(Point pt, int flags=SIZE_USE_EXISTING)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
           <param name="flags" type="int" default="wxSIZE_USE_EXISTING"/>
         </paramlist>
       </method>
-      <method name="MoveXY" type="void" overloaded="no">
+      <method name="MoveXY" type="" overloaded="no">
         <autodoc>MoveXY(int x, int y, int flags=SIZE_USE_EXISTING)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -3759,118 +3759,118 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
           <param name="flags" type="int" default="wxSIZE_USE_EXISTING"/>
         </paramlist>
       </method>
-      <method name="Raise" type="void" overloaded="no">
+      <method name="Raise" type="" overloaded="no">
         <autodoc>Raise()</autodoc>
       </method>
-      <method name="Lower" type="void" overloaded="no">
+      <method name="Lower" type="" overloaded="no">
         <autodoc>Lower()</autodoc>
       </method>
-      <method name="SetClientSize" type="void" overloaded="no">
+      <method name="SetClientSize" type="" overloaded="no">
         <autodoc>SetClientSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetClientSizeWH" type="void" overloaded="no">
+      <method name="SetClientSizeWH" type="" overloaded="no">
         <autodoc>SetClientSizeWH(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetClientRect" type="void" overloaded="no">
+      <method name="SetClientRect" type="" overloaded="no">
         <autodoc>SetClientRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
         <docstring>Get the window's position.</docstring>
       </method>
-      <method name="GetPositionTuple" type="void" overloaded="no">
+      <method name="GetPositionTuple" type="" overloaded="no">
         <autodoc>GetPositionTuple() -&gt; (x,y)</autodoc>
         <docstring>Get the window's position.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
         <docstring>Get the window size.</docstring>
       </method>
-      <method name="GetSizeTuple" type="void" overloaded="no">
+      <method name="GetSizeTuple" type="" overloaded="no">
         <autodoc>GetSizeTuple() -&gt; (width, height)</autodoc>
         <docstring>Get the window size.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
-      <method name="GetClientSize" type="wxSize" overloaded="no">
+      <method name="GetClientSize" type="Size" overloaded="no">
         <autodoc>GetClientSize() -&gt; Size</autodoc>
         <docstring>Get the window's client size.</docstring>
       </method>
-      <method name="GetClientSizeTuple" type="void" overloaded="no">
+      <method name="GetClientSizeTuple" type="" overloaded="no">
         <autodoc>GetClientSizeTuple() -&gt; (width, height)</autodoc>
         <docstring>Get the window's client size.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetClientAreaOrigin" type="wxPoint" overloaded="no">
+      <method name="GetClientAreaOrigin" type="Point" overloaded="no">
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>
       </method>
-      <method name="GetClientRect" type="wxRect" overloaded="no">
+      <method name="GetClientRect" type="Rect" overloaded="no">
         <autodoc>GetClientRect() -&gt; Rect</autodoc>
       </method>
-      <method name="GetBestSize" type="wxSize" overloaded="no">
+      <method name="GetBestSize" type="Size" overloaded="no">
         <autodoc>GetBestSize() -&gt; Size</autodoc>
         <docstring>Get the size best suited for the window (in fact, minimal acceptable size
 using which it will still look "nice")</docstring>
       </method>
-      <method name="GetBestSizeTuple" type="void" overloaded="no">
+      <method name="GetBestSizeTuple" type="" overloaded="no">
         <autodoc>GetBestSizeTuple() -&gt; (width, height)</autodoc>
         <docstring>Get the size best suited for the window (in fact, minimal acceptable size
 using which it will still look "nice")</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetAdjustedBestSize" type="wxSize" overloaded="no">
+      <method name="GetAdjustedBestSize" type="Size" overloaded="no">
         <autodoc>GetAdjustedBestSize() -&gt; Size</autodoc>
       </method>
-      <method name="Center" type="void" overloaded="no">
+      <method name="Center" type="" overloaded="no">
         <autodoc>Center(int direction=BOTH)</autodoc>
         <paramlist>
           <param name="direction" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
-      <method name="CenterOnScreen" type="void" overloaded="no">
+      <method name="CenterOnScreen" type="" overloaded="no">
         <autodoc>CenterOnScreen(int dir=BOTH)</autodoc>
         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
-      <method name="CenterOnParent" type="void" overloaded="no">
+      <method name="CenterOnParent" type="" overloaded="no">
         <autodoc>CenterOnParent(int dir=BOTH)</autodoc>
         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
-      <method name="Fit" type="void" overloaded="no">
+      <method name="Fit" type="" overloaded="no">
         <autodoc>Fit()</autodoc>
       </method>
-      <method name="FitInside" type="void" overloaded="no">
+      <method name="FitInside" type="" overloaded="no">
         <autodoc>FitInside()</autodoc>
       </method>
-      <method name="SetSizeHints" type="void" overloaded="no">
+      <method name="SetSizeHints" type="" overloaded="no">
         <autodoc>SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, 
     int incH=-1)</autodoc>
         <paramlist>
@@ -3882,7 +3882,7 @@ using which it will still look "nice")</docstring>
           <param name="incH" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="SetVirtualSizeHints" type="void" overloaded="no">
+      <method name="SetVirtualSizeHints" type="" overloaded="no">
         <autodoc>SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1)</autodoc>
         <paramlist>
           <param name="minW" type="int" default=""/>
@@ -3903,19 +3903,19 @@ using which it will still look "nice")</docstring>
       <method name="GetMaxHeight" type="int" overloaded="no">
         <autodoc>GetMaxHeight() -&gt; int</autodoc>
       </method>
-      <method name="GetMaxSize" type="wxSize" overloaded="no">
+      <method name="GetMaxSize" type="Size" overloaded="no">
         <autodoc>GetMaxSize() -&gt; Size</autodoc>
       </method>
-      <method name="SetVirtualSize" type="void" overloaded="no">
+      <method name="SetVirtualSize" type="" overloaded="no">
         <autodoc>SetVirtualSize(Size size)</autodoc>
         <docstring>Set the the virtual size of a window.  For most windows this is just the
 client area of the window, but for some like scrolled windows it is more or
 less independent of the screen window size.</docstring>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetVirtualSizeWH" type="void" overloaded="no">
+      <method name="SetVirtualSizeWH" type="" overloaded="no">
         <autodoc>SetVirtualSizeWH(int w, int h)</autodoc>
         <docstring>Set the the virtual size of a window.  For most windows this is just the
 client area of the window, but for some like scrolled windows it is more or
@@ -3925,23 +3925,23 @@ less independent of the screen window size.</docstring>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetVirtualSize" type="wxSize" overloaded="no">
+      <method name="GetVirtualSize" type="Size" overloaded="no">
         <autodoc>GetVirtualSize() -&gt; Size</autodoc>
         <docstring>Get the the virtual size of the window.  For most windows this is just
 the client area of the window, but for some like scrolled windows it is
 more or less independent of the screen window size.</docstring>
       </method>
-      <method name="GetVirtualSizeTuple" type="void" overloaded="no">
+      <method name="GetVirtualSizeTuple" type="" overloaded="no">
         <autodoc>GetVirtualSizeTuple() -&gt; (width, height)</autodoc>
         <docstring>Get the the virtual size of the window.  For most windows this is just
 the client area of the window, but for some like scrolled windows it is
 more or less independent of the screen window size.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetBestVirtualSize" type="wxSize" overloaded="no">
+      <method name="GetBestVirtualSize" type="Size" overloaded="no">
         <autodoc>GetBestVirtualSize() -&gt; Size</autodoc>
       </method>
       <method name="Show" type="bool" overloaded="no">
@@ -3968,7 +3968,7 @@ more or less independent of the screen window size.</docstring>
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>
       </method>
-      <method name="SetWindowStyleFlag" type="void" overloaded="no">
+      <method name="SetWindowStyleFlag" type="" overloaded="no">
         <autodoc>SetWindowStyleFlag(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
@@ -3977,7 +3977,7 @@ more or less independent of the screen window size.</docstring>
       <method name="GetWindowStyleFlag" type="long" overloaded="no">
         <autodoc>GetWindowStyleFlag() -&gt; long</autodoc>
       </method>
-      <method name="SetWindowStyle" type="void" overloaded="no">
+      <method name="SetWindowStyle" type="" overloaded="no">
         <autodoc>SetWindowStyle(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
@@ -3995,7 +3995,7 @@ more or less independent of the screen window size.</docstring>
       <method name="IsRetained" type="bool" overloaded="no">
         <autodoc>IsRetained() -&gt; bool</autodoc>
       </method>
-      <method name="SetExtraStyle" type="void" overloaded="no">
+      <method name="SetExtraStyle" type="" overloaded="no">
         <autodoc>SetExtraStyle(long exStyle)</autodoc>
         <paramlist>
           <param name="exStyle" type="long" default=""/>
@@ -4004,13 +4004,13 @@ more or less independent of the screen window size.</docstring>
       <method name="GetExtraStyle" type="long" overloaded="no">
         <autodoc>GetExtraStyle() -&gt; long</autodoc>
       </method>
-      <method name="MakeModal" type="void" overloaded="no">
+      <method name="MakeModal" type="" overloaded="no">
         <autodoc>MakeModal(bool modal=True)</autodoc>
         <paramlist>
           <param name="modal" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetThemeEnabled" type="void" overloaded="no">
+      <method name="SetThemeEnabled" type="" overloaded="no">
         <autodoc>SetThemeEnabled(bool enableTheme)</autodoc>
         <paramlist>
           <param name="enableTheme" type="bool" default=""/>
@@ -4022,13 +4022,13 @@ more or less independent of the screen window size.</docstring>
       <method name="ShouldInheritColours" type="bool" overloaded="no">
         <autodoc>ShouldInheritColours() -&gt; bool</autodoc>
       </method>
-      <method name="SetFocus" type="void" overloaded="no">
+      <method name="SetFocus" type="" overloaded="no">
         <autodoc>SetFocus()</autodoc>
       </method>
-      <method name="SetFocusFromKbd" type="void" overloaded="no">
+      <method name="SetFocusFromKbd" type="" overloaded="no">
         <autodoc>SetFocusFromKbd()</autodoc>
       </method>
-      <staticmethod name="FindFocus" type="wxWindow" overloaded="no">
+      <staticmethod name="FindFocus" type="Window" overloaded="no">
         <autodoc>Window.FindFocus() -&gt; Window</autodoc>
       </staticmethod>
       <method name="AcceptsFocus" type="bool" overloaded="no">
@@ -4037,28 +4037,28 @@ more or less independent of the screen window size.</docstring>
       <method name="AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
-      <method name="GetDefaultItem" type="wxWindow" overloaded="no">
+      <method name="GetDefaultItem" type="Window" overloaded="no">
         <autodoc>GetDefaultItem() -&gt; Window</autodoc>
       </method>
-      <method name="SetDefaultItem" type="wxWindow" overloaded="no">
+      <method name="SetDefaultItem" type="Window" overloaded="no">
         <autodoc>SetDefaultItem(Window child) -&gt; Window</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="SetTmpDefaultItem" type="void" overloaded="no">
+      <method name="SetTmpDefaultItem" type="" overloaded="no">
         <autodoc>SetTmpDefaultItem(Window win)</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="GetChildren" type="PyObject" overloaded="no">
         <autodoc>GetChildren() -&gt; PyObject</autodoc>
       </method>
-      <method name="GetParent" type="wxWindow" overloaded="no">
+      <method name="GetParent" type="Window" overloaded="no">
         <autodoc>GetParent() -&gt; Window</autodoc>
       </method>
-      <method name="GetGrandParent" type="wxWindow" overloaded="no">
+      <method name="GetGrandParent" type="Window" overloaded="no">
         <autodoc>GetGrandParent() -&gt; Window</autodoc>
       </method>
       <method name="IsTopLevel" type="bool" overloaded="no">
@@ -4067,49 +4067,49 @@ more or less independent of the screen window size.</docstring>
       <method name="Reparent" type="bool" overloaded="no">
         <autodoc>Reparent(Window newParent) -&gt; bool</autodoc>
         <paramlist>
-          <param name="newParent" type="p.wxWindow" default=""/>
+          <param name="newParent" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="AddChild" type="void" overloaded="no">
+      <method name="AddChild" type="" overloaded="no">
         <autodoc>AddChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveChild" type="void" overloaded="no">
+      <method name="RemoveChild" type="" overloaded="no">
         <autodoc>RemoveChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="FindWindowById" type="wxWindow" overloaded="no">
+      <method name="FindWindowById" type="Window" overloaded="no">
         <autodoc>FindWindowById(long winid) -&gt; Window</autodoc>
         <paramlist>
           <param name="winid" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="FindWindowByName" type="wxWindow" overloaded="no">
+      <method name="FindWindowByName" type="Window" overloaded="no">
         <autodoc>FindWindowByName(String name) -&gt; Window</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetEventHandler" type="wxEvtHandler" overloaded="no">
+      <method name="GetEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>
       </method>
-      <method name="SetEventHandler" type="void" overloaded="no">
+      <method name="SetEventHandler" type="" overloaded="no">
         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="PushEventHandler" type="void" overloaded="no">
+      <method name="PushEventHandler" type="" overloaded="no">
         <autodoc>PushEventHandler(EvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="PopEventHandler" type="wxEvtHandler" overloaded="no">
+      <method name="PopEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>PopEventHandler(bool deleteHandler=False) -&gt; EvtHandler</autodoc>
         <paramlist>
           <param name="deleteHandler" type="bool" default="False"/>
@@ -4118,25 +4118,25 @@ more or less independent of the screen window size.</docstring>
       <method name="RemoveEventHandler" type="bool" overloaded="no">
         <autodoc>RemoveEventHandler(EvtHandler handler) -&gt; bool</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="SetValidator" type="void" overloaded="no">
+      <method name="SetValidator" type="" overloaded="no">
         <autodoc>SetValidator(Validator validator)</autodoc>
         <paramlist>
-          <param name="validator" type="r.q(const).wxValidator" default=""/>
+          <param name="validator" type="wxValidator" default=""/>
         </paramlist>
       </method>
       <method name="GetValidator" type="wxValidator" overloaded="no">
         <autodoc>GetValidator() -&gt; Validator</autodoc>
       </method>
-      <method name="SetAcceleratorTable" type="void" overloaded="no">
+      <method name="SetAcceleratorTable" type="" overloaded="no">
         <autodoc>SetAcceleratorTable(AcceleratorTable accel)</autodoc>
         <paramlist>
-          <param name="accel" type="r.q(const).wxAcceleratorTable" default=""/>
+          <param name="accel" type="AcceleratorTable" default=""/>
         </paramlist>
       </method>
-      <method name="GetAcceleratorTable" type="wxAcceleratorTable" overloaded="no">
+      <method name="GetAcceleratorTable" type="AcceleratorTable" overloaded="no">
         <autodoc>GetAcceleratorTable() -&gt; AcceleratorTable</autodoc>
       </method>
       <method name="RegisterHotKey" type="bool" overloaded="no">
@@ -4153,96 +4153,96 @@ more or less independent of the screen window size.</docstring>
           <param name="hotkeyId" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertDialogPointToPixels" type="wxPoint" overloaded="no">
+      <method name="ConvertDialogPointToPixels" type="Point" overloaded="no">
         <autodoc>ConvertDialogPointToPixels(Point pt) -&gt; Point</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertDialogSizeToPixels" type="wxSize" overloaded="no">
+      <method name="ConvertDialogSizeToPixels" type="Size" overloaded="no">
         <autodoc>ConvertDialogSizeToPixels(Size sz) -&gt; Size</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="DLG_PNT" type="wxPoint" overloaded="no">
+      <method name="DLG_PNT" type="Point" overloaded="no">
         <autodoc>DLG_PNT(Point pt) -&gt; Point</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DLG_SZE" type="wxSize" overloaded="no">
+      <method name="DLG_SZE" type="Size" overloaded="no">
         <autodoc>DLG_SZE(Size sz) -&gt; Size</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertPixelPointToDialog" type="wxPoint" overloaded="no">
+      <method name="ConvertPixelPointToDialog" type="Point" overloaded="no">
         <autodoc>ConvertPixelPointToDialog(Point pt) -&gt; Point</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertPixelSizeToDialog" type="wxSize" overloaded="no">
+      <method name="ConvertPixelSizeToDialog" type="Size" overloaded="no">
         <autodoc>ConvertPixelSizeToDialog(Size sz) -&gt; Size</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="WarpPointer" type="void" overloaded="no">
+      <method name="WarpPointer" type="" overloaded="no">
         <autodoc>WarpPointer(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CaptureMouse" type="void" overloaded="no">
+      <method name="CaptureMouse" type="" overloaded="no">
         <autodoc>CaptureMouse()</autodoc>
       </method>
-      <method name="ReleaseMouse" type="void" overloaded="no">
+      <method name="ReleaseMouse" type="" overloaded="no">
         <autodoc>ReleaseMouse()</autodoc>
       </method>
-      <staticmethod name="GetCapture" type="wxWindow" overloaded="no">
+      <staticmethod name="GetCapture" type="Window" overloaded="no">
         <autodoc>Window.GetCapture() -&gt; Window</autodoc>
       </staticmethod>
       <method name="HasCapture" type="bool" overloaded="no">
         <autodoc>HasCapture() -&gt; bool</autodoc>
       </method>
-      <method name="Refresh" type="void" overloaded="no">
+      <method name="Refresh" type="" overloaded="no">
         <autodoc>Refresh(bool eraseBackground=True, Rect rect=None)</autodoc>
         <paramlist>
           <param name="eraseBackground" type="bool" default="True"/>
-          <param name="rect" type="p.q(const).wxRect" default="NULL"/>
+          <param name="rect" type="Rect" default="NULL"/>
         </paramlist>
       </method>
-      <method name="RefreshRect" type="void" overloaded="no">
+      <method name="RefreshRect" type="" overloaded="no">
         <autodoc>RefreshRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="Update" type="void" overloaded="no">
+      <method name="Update" type="" overloaded="no">
         <autodoc>Update()</autodoc>
       </method>
-      <method name="ClearBackground" type="void" overloaded="no">
+      <method name="ClearBackground" type="" overloaded="no">
         <autodoc>ClearBackground()</autodoc>
       </method>
-      <method name="Freeze" type="void" overloaded="no">
+      <method name="Freeze" type="" overloaded="no">
         <autodoc>Freeze()</autodoc>
       </method>
-      <method name="Thaw" type="void" overloaded="no">
+      <method name="Thaw" type="" overloaded="no">
         <autodoc>Thaw()</autodoc>
       </method>
-      <method name="PrepareDC" type="void" overloaded="no">
+      <method name="PrepareDC" type="" overloaded="no">
         <autodoc>PrepareDC(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="wxDC" default=""/>
         </paramlist>
       </method>
       <method name="GetUpdateRegion" type="wxRegion" overloaded="no">
         <autodoc>GetUpdateRegion() -&gt; Region</autodoc>
       </method>
-      <method name="GetUpdateClientRect" type="wxRect" overloaded="no">
+      <method name="GetUpdateClientRect" type="Rect" overloaded="no">
         <autodoc>GetUpdateClientRect() -&gt; Rect</autodoc>
       </method>
       <method name="IsExposed" type="bool" overloaded="no">
@@ -4257,25 +4257,25 @@ more or less independent of the screen window size.</docstring>
       <method name="IsExposedPoint" type="bool" overloaded="no">
         <autodoc>IsExposedPoint(Point pt) -&gt; bool</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="isExposedRect" type="bool" overloaded="no">
         <autodoc>isExposedRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="SetBackgroundColour" type="bool" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colour) -&gt; bool</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="wxColour" default=""/>
         </paramlist>
       </method>
       <method name="SetForegroundColour" type="bool" overloaded="no">
         <autodoc>SetForegroundColour(Colour colour) -&gt; bool</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="wxColour" default=""/>
         </paramlist>
       </method>
       <method name="GetBackgroundColour" type="wxColour" overloaded="no">
@@ -4287,7 +4287,7 @@ more or less independent of the screen window size.</docstring>
       <method name="SetCursor" type="bool" overloaded="no">
         <autodoc>SetCursor(Cursor cursor) -&gt; bool</autodoc>
         <paramlist>
-          <param name="cursor" type="r.q(const).wxCursor" default=""/>
+          <param name="cursor" type="wxCursor" default=""/>
         </paramlist>
       </method>
       <method name="GetCursor" type="wxCursor" overloaded="no">
@@ -4296,16 +4296,16 @@ more or less independent of the screen window size.</docstring>
       <method name="SetFont" type="bool" overloaded="no">
         <autodoc>SetFont(Font font) -&gt; bool</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="wxFont" default=""/>
         </paramlist>
       </method>
       <method name="GetFont" type="wxFont" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
-      <method name="SetCaret" type="void" overloaded="no">
+      <method name="SetCaret" type="" overloaded="no">
         <autodoc>SetCaret(Caret caret)</autodoc>
         <paramlist>
-          <param name="caret" type="p.wxCaret" default=""/>
+          <param name="caret" type="wxCaret" default=""/>
         </paramlist>
       </method>
       <method name="GetCaret" type="wxCaret" overloaded="no">
@@ -4317,52 +4317,52 @@ more or less independent of the screen window size.</docstring>
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>
       </method>
-      <method name="GetTextExtent" type="void" overloaded="no">
+      <method name="GetTextExtent" type="" overloaded="no">
         <autodoc>GetTextExtent(String string) -&gt; (width, height)</autodoc>
         <docstring>Get the width and height of the text using the current font.</docstring>
         <paramlist>
-          <param name="string" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="string" type="String" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetFullTextExtent" type="void" overloaded="no">
+      <method name="GetFullTextExtent" type="" overloaded="no">
         <autodoc>GetFullTextExtent(String string, Font font=None) -&gt;
    (width, height, descent, externalLeading)</autodoc>
         <docstring>Get the width, height, decent and leading of the text using the current or specified font.</docstring>
         <paramlist>
-          <param name="string" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="font" type="p.q(const).wxFont" default="NULL"/>
+          <param name="string" type="String" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="font" type="wxFont" default="NULL"/>
         </paramlist>
       </method>
-      <method name="ClientToScreenXY" type="void" overloaded="no">
+      <method name="ClientToScreenXY" type="" overloaded="no">
         <autodoc>ClientToScreenXY(int x, int y)</autodoc>
         <paramlist>
-          <param name="x" type="p.int" default=""/>
-          <param name="y" type="p.int" default=""/>
+          <param name="x" type="int" default=""/>
+          <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ScreenToClientXY" type="void" overloaded="no">
+      <method name="ScreenToClientXY" type="" overloaded="no">
         <autodoc>ScreenToClientXY(int x, int y)</autodoc>
         <paramlist>
-          <param name="x" type="p.int" default=""/>
-          <param name="y" type="p.int" default=""/>
+          <param name="x" type="int" default=""/>
+          <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ClientToScreen" type="wxPoint" overloaded="no">
+      <method name="ClientToScreen" type="Point" overloaded="no">
         <autodoc>ClientToScreen(Point pt) -&gt; Point</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="ScreenToClient" type="wxPoint" overloaded="no">
+      <method name="ScreenToClient" type="Point" overloaded="no">
         <autodoc>ScreenToClient(Point pt) -&gt; Point</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="HitTestXY" type="wxHitTest" overloaded="no">
@@ -4375,7 +4375,7 @@ more or less independent of the screen window size.</docstring>
       <method name="HitTest" type="wxHitTest" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetBorderFlags" type="wxBorder" overloaded="no">
@@ -4387,7 +4387,7 @@ more or less independent of the screen window size.</docstring>
       <method name="GetBorder" type="wxBorder" overloaded="no">
         <autodoc>GetBorder() -&gt; int</autodoc>
       </method>
-      <method name="UpdateWindowUI" type="void" overloaded="no">
+      <method name="UpdateWindowUI" type="" overloaded="no">
         <autodoc>UpdateWindowUI(long flags=UPDATE_UI_NONE)</autodoc>
         <paramlist>
           <param name="flags" type="long" default="wxUPDATE_UI_NONE"/>
@@ -4396,7 +4396,7 @@ more or less independent of the screen window size.</docstring>
       <method name="PopupMenuXY" type="bool" overloaded="no">
         <autodoc>PopupMenuXY(Menu menu, int x, int y) -&gt; bool</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="wxMenu" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
@@ -4404,8 +4404,8 @@ more or less independent of the screen window size.</docstring>
       <method name="PopupMenu" type="bool" overloaded="no">
         <autodoc>PopupMenu(Menu menu, Point pos) -&gt; bool</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="menu" type="wxMenu" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetHandle" type="long" overloaded="no">
@@ -4417,7 +4417,7 @@ more or less independent of the screen window size.</docstring>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetScrollbar" type="void" overloaded="no">
+      <method name="SetScrollbar" type="" overloaded="no">
         <autodoc>SetScrollbar(int orient, int pos, int thumbvisible, int range, bool refresh=True)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
@@ -4427,7 +4427,7 @@ more or less independent of the screen window size.</docstring>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetScrollPos" type="void" overloaded="no">
+      <method name="SetScrollPos" type="" overloaded="no">
         <autodoc>SetScrollPos(int orient, int pos, bool refresh=True)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
@@ -4453,12 +4453,12 @@ more or less independent of the screen window size.</docstring>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ScrollWindow" type="void" overloaded="no">
+      <method name="ScrollWindow" type="" overloaded="no">
         <autodoc>ScrollWindow(int dx, int dy, Rect rect=None)</autodoc>
         <paramlist>
           <param name="dx" type="int" default=""/>
           <param name="dy" type="int" default=""/>
-          <param name="rect" type="p.q(const).wxRect" default="NULL"/>
+          <param name="rect" type="Rect" default="NULL"/>
         </paramlist>
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
@@ -4485,55 +4485,55 @@ more or less independent of the screen window size.</docstring>
       <method name="PageDown" type="bool" overloaded="no">
         <autodoc>PageDown() -&gt; bool</autodoc>
       </method>
-      <method name="SetHelpText" type="void" overloaded="no">
+      <method name="SetHelpText" type="" overloaded="no">
         <autodoc>SetHelpText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetHelpTextForId" type="void" overloaded="no">
+      <method name="SetHelpTextForId" type="" overloaded="no">
         <autodoc>SetHelpTextForId(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetHelpText" type="wxString" overloaded="no">
+      <method name="GetHelpText" type="String" overloaded="no">
         <autodoc>GetHelpText() -&gt; String</autodoc>
       </method>
-      <method name="SetToolTipString" type="void" overloaded="no">
+      <method name="SetToolTipString" type="" overloaded="no">
         <autodoc>SetToolTipString(String tip)</autodoc>
         <paramlist>
-          <param name="tip" type="r.q(const).wxString" default=""/>
+          <param name="tip" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolTip" type="void" overloaded="no">
+      <method name="SetToolTip" type="" overloaded="no">
         <autodoc>SetToolTip(ToolTip tip)</autodoc>
         <paramlist>
-          <param name="tip" type="p.wxToolTip" default=""/>
+          <param name="tip" type="wxToolTip" default=""/>
         </paramlist>
       </method>
       <method name="GetToolTip" type="wxToolTip" overloaded="no">
         <autodoc>GetToolTip() -&gt; ToolTip</autodoc>
       </method>
-      <method name="SetDropTarget" type="void" overloaded="no">
+      <method name="SetDropTarget" type="" overloaded="no">
         <autodoc>SetDropTarget(PyDropTarget dropTarget)</autodoc>
         <paramlist>
-          <param name="dropTarget" type="p.wxPyDropTarget" default=""/>
+          <param name="dropTarget" type="wxPyDropTarget" default=""/>
         </paramlist>
       </method>
       <method name="GetDropTarget" type="wxPyDropTarget" overloaded="no">
         <autodoc>GetDropTarget() -&gt; PyDropTarget</autodoc>
       </method>
-      <method name="SetConstraints" type="void" overloaded="no">
+      <method name="SetConstraints" type="" overloaded="no">
         <autodoc>SetConstraints(LayoutConstraints constraints)</autodoc>
         <paramlist>
-          <param name="constraints" type="p.wxLayoutConstraints" default=""/>
+          <param name="constraints" type="wxLayoutConstraints" default=""/>
         </paramlist>
       </method>
       <method name="GetConstraints" type="wxLayoutConstraints" overloaded="no">
         <autodoc>GetConstraints() -&gt; LayoutConstraints</autodoc>
       </method>
-      <method name="SetAutoLayout" type="void" overloaded="no">
+      <method name="SetAutoLayout" type="" overloaded="no">
         <autodoc>SetAutoLayout(bool autoLayout)</autodoc>
         <paramlist>
           <param name="autoLayout" type="bool" default=""/>
@@ -4545,27 +4545,27 @@ more or less independent of the screen window size.</docstring>
       <method name="Layout" type="bool" overloaded="no">
         <autodoc>Layout() -&gt; bool</autodoc>
       </method>
-      <method name="SetSizer" type="void" overloaded="no">
+      <method name="SetSizer" type="" overloaded="no">
         <autodoc>SetSizer(Sizer sizer, bool deleteOld=True)</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>
           <param name="deleteOld" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetSizerAndFit" type="void" overloaded="no">
+      <method name="SetSizerAndFit" type="" overloaded="no">
         <autodoc>SetSizerAndFit(Sizer sizer, bool deleteOld=True)</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>
           <param name="deleteOld" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetSizer" type="wxSizer" overloaded="no">
         <autodoc>GetSizer() -&gt; Sizer</autodoc>
       </method>
-      <method name="SetContainingSizer" type="void" overloaded="no">
+      <method name="SetContainingSizer" type="" overloaded="no">
         <autodoc>SetContainingSizer(Sizer sizer)</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>
         </paramlist>
       </method>
       <method name="GetContainingSizer" type="wxSizer" overloaded="no">
@@ -4585,28 +4585,28 @@ def DLG_SZE(win, size_width, height=None):
     else:
         return win.ConvertDialogSizeToPixels(wx.Size(size_width, height))
 </pythoncode>
-    <method name="FindWindowById" oldname="wxFindWindowById" type="wxWindow" overloaded="no">
+    <method name="FindWindowById" oldname="wxFindWindowById" type="Window" overloaded="no">
       <autodoc>FindWindowById(long id, Window parent=None) -&gt; Window</autodoc>
       <paramlist>
         <param name="id" type="long" default=""/>
-        <param name="parent" type="p.q(const).wxWindow" default="NULL"/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="FindWindowByName" oldname="wxFindWindowByName" type="wxWindow" overloaded="no">
+    <method name="FindWindowByName" oldname="wxFindWindowByName" type="Window" overloaded="no">
       <autodoc>FindWindowByName(String name, Window parent=None) -&gt; Window</autodoc>
       <paramlist>
-        <param name="name" type="r.q(const).wxString" default=""/>
-        <param name="parent" type="p.q(const).wxWindow" default="NULL"/>
+        <param name="name" type="String" default=""/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="FindWindowByLabel" oldname="wxFindWindowByLabel" type="wxWindow" overloaded="no">
+    <method name="FindWindowByLabel" oldname="wxFindWindowByLabel" type="Window" overloaded="no">
       <autodoc>FindWindowByLabel(String label, Window parent=None) -&gt; Window</autodoc>
       <paramlist>
-        <param name="label" type="r.q(const).wxString" default=""/>
-        <param name="parent" type="p.q(const).wxWindow" default="NULL"/>
+        <param name="label" type="String" default=""/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="Window_FromHWND" oldname="wxWindow_FromHWND" type="wxWindow" overloaded="no">
+    <method name="Window_FromHWND" oldname="wxWindow_FromHWND" type="Window" overloaded="no">
       <autodoc>Window_FromHWND(unsigned long hWnd) -&gt; Window</autodoc>
       <paramlist>
         <param name="hWnd" type="unsigned long" default=""/>
@@ -4616,17 +4616,17 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Validator" oldname="wxValidator" module="core">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="Validator" overloaded="no">
         <autodoc>__init__() -&gt; Validator</autodoc>
       </constructor>
-      <method name="Clone" type="wxValidator" overloaded="no">
+      <method name="Clone" type="Validator" overloaded="no">
         <autodoc>Clone() -&gt; Validator</autodoc>
       </method>
       <method name="Validate" type="bool" overloaded="no">
         <autodoc>Validate(Window parent) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="TransferToWindow" type="bool" overloaded="no">
@@ -4635,19 +4635,19 @@ def DLG_SZE(win, size_width, height=None):
       <method name="TransferFromWindow" type="bool" overloaded="no">
         <autodoc>TransferFromWindow() -&gt; bool</autodoc>
       </method>
-      <method name="GetWindow" type="wxWindow" overloaded="no">
+      <method name="GetWindow" type="Window" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
-      <method name="SetWindow" type="void" overloaded="no">
+      <method name="SetWindow" type="" overloaded="no">
         <autodoc>SetWindow(Window window)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <staticmethod name="IsSilent" type="bool" overloaded="no">
         <autodoc>Validator.IsSilent() -&gt; bool</autodoc>
       </staticmethod>
-      <staticmethod name="SetBellOnError" type="void" overloaded="no">
+      <staticmethod name="SetBellOnError" type="" overloaded="no">
         <autodoc>Validator.SetBellOnError(int doIt=True)</autodoc>
         <paramlist>
           <param name="doIt" type="int" default="True"/>
@@ -4655,15 +4655,15 @@ def DLG_SZE(win, size_width, height=None):
       </staticmethod>
     </class>
     <class name="PyValidator" oldname="wxPyValidator" module="core">
-      <baseclass name="wxValidator"/>
+      <baseclass name="Validator"/>
       <constructor name="PyValidator" overloaded="no">
         <autodoc>__init__() -&gt; PyValidator</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class, int incref=True)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
           <param name="incref" type="int" default="True"/>
         </paramlist>
       </method>
@@ -4672,153 +4672,153 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Menu" oldname="wxMenu" module="core">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="Menu" overloaded="no">
         <autodoc>__init__(String title=EmptyString, long style=0) -&gt; Menu</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="title" type="String" default="wxPyEmptyString"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
-      <method name="Append" type="void" overloaded="no">
+      <method name="Append" type="" overloaded="no">
         <autodoc>Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>
-      <method name="AppendSeparator" type="void" overloaded="no">
+      <method name="AppendSeparator" type="" overloaded="no">
         <autodoc>AppendSeparator()</autodoc>
       </method>
-      <method name="AppendCheckItem" type="void" overloaded="no">
+      <method name="AppendCheckItem" type="" overloaded="no">
         <autodoc>AppendCheckItem(int id, String text, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="AppendRadioItem" type="void" overloaded="no">
+      <method name="AppendRadioItem" type="" overloaded="no">
         <autodoc>AppendRadioItem(int id, String text, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="AppendMenu" type="void" overloaded="no">
+      <method name="AppendMenu" type="" overloaded="no">
         <autodoc>AppendMenu(int id, String text, Menu submenu, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="submenu" type="p.wxMenu" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="submenu" type="Menu" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="AppendItem" type="void" overloaded="no">
+      <method name="AppendItem" type="" overloaded="no">
         <autodoc>AppendItem(MenuItem item)</autodoc>
         <paramlist>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
-      <method name="Break" type="void" overloaded="no">
+      <method name="Break" type="" overloaded="no">
         <autodoc>Break()</autodoc>
       </method>
       <method name="InsertItem" type="bool" overloaded="no">
         <autodoc>InsertItem(size_t pos, MenuItem item) -&gt; bool</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
-      <method name="Insert" type="void" overloaded="no">
+      <method name="Insert" type="" overloaded="no">
         <autodoc>Insert(size_t pos, int id, String text, String help=EmptyString, 
     int kind=ITEM_NORMAL)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>
-      <method name="InsertSeparator" type="void" overloaded="no">
+      <method name="InsertSeparator" type="" overloaded="no">
         <autodoc>InsertSeparator(size_t pos)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="InsertCheckItem" type="void" overloaded="no">
+      <method name="InsertCheckItem" type="" overloaded="no">
         <autodoc>InsertCheckItem(size_t pos, int id, String text, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="InsertRadioItem" type="void" overloaded="no">
+      <method name="InsertRadioItem" type="" overloaded="no">
         <autodoc>InsertRadioItem(size_t pos, int id, String text, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="InsertMenu" type="void" overloaded="no">
+      <method name="InsertMenu" type="" overloaded="no">
         <autodoc>InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="submenu" type="p.wxMenu" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="submenu" type="Menu" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="PrependItem" type="void" overloaded="no">
+      <method name="PrependItem" type="" overloaded="no">
         <autodoc>PrependItem(MenuItem item)</autodoc>
         <paramlist>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
-      <method name="Prepend" type="void" overloaded="no">
+      <method name="Prepend" type="" overloaded="no">
         <autodoc>Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>
-      <method name="PrependSeparator" type="void" overloaded="no">
+      <method name="PrependSeparator" type="" overloaded="no">
         <autodoc>PrependSeparator()</autodoc>
       </method>
-      <method name="PrependCheckItem" type="void" overloaded="no">
+      <method name="PrependCheckItem" type="" overloaded="no">
         <autodoc>PrependCheckItem(int id, String text, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="PrependRadioItem" type="void" overloaded="no">
+      <method name="PrependRadioItem" type="" overloaded="no">
         <autodoc>PrependRadioItem(int id, String text, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="PrependMenu" type="void" overloaded="no">
+      <method name="PrependMenu" type="" overloaded="no">
         <autodoc>PrependMenu(int id, String text, Menu submenu, String help=EmptyString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="submenu" type="p.wxMenu" default=""/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default=""/>
+          <param name="submenu" type="Menu" default=""/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="Remove" type="wxMenuItem" overloaded="no">
@@ -4830,7 +4830,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="RemoveItem" type="wxMenuItem" overloaded="no">
         <autodoc>RemoveItem(MenuItem item) -&gt; MenuItem</autodoc>
         <paramlist>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
       <method name="Delete" type="bool" overloaded="no">
@@ -4842,10 +4842,10 @@ def DLG_SZE(win, size_width, height=None):
       <method name="DeleteItem" type="bool" overloaded="no">
         <autodoc>DeleteItem(MenuItem item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
         <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
       </method>
@@ -4860,7 +4860,7 @@ def DLG_SZE(win, size_width, height=None):
         <autodoc>DestroyItem(MenuItem item) -&gt; bool</autodoc>
         <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
         <paramlist>
-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>
         </paramlist>
       </method>
       <method name="GetMenuItemCount" type="size_t" overloaded="no">
@@ -4872,7 +4872,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="FindItem" type="int" overloaded="no">
         <autodoc>FindItem(String item) -&gt; int</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxString" default=""/>
+          <param name="item" type="String" default=""/>
         </paramlist>
       </method>
       <method name="FindItemById" type="wxMenuItem" overloaded="no">
@@ -4887,7 +4887,7 @@ def DLG_SZE(win, size_width, height=None):
           <param name="position" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="Enable" type="void" overloaded="no">
+      <method name="Enable" type="" overloaded="no">
         <autodoc>Enable(int id, bool enable)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -4900,7 +4900,7 @@ def DLG_SZE(win, size_width, height=None):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Check" type="void" overloaded="no">
+      <method name="Check" type="" overloaded="no">
         <autodoc>Check(int id, bool check)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -4913,90 +4913,90 @@ def DLG_SZE(win, size_width, height=None):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(int id, String label)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHelpString" type="void" overloaded="no">
+      <method name="SetHelpString" type="" overloaded="no">
         <autodoc>SetHelpString(int id, String helpString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="helpString" type="r.q(const).wxString" default=""/>
+          <param name="helpString" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetHelpString" type="wxString" overloaded="no">
+      <method name="GetHelpString" type="String" overloaded="no">
         <autodoc>GetHelpString(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetTitle" type="q(const).wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
-      <method name="SetEventHandler" type="void" overloaded="no">
+      <method name="SetEventHandler" type="" overloaded="no">
         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="GetEventHandler" type="wxEvtHandler" overloaded="no">
+      <method name="GetEventHandler" type="EvtHandler" overloaded="no">
         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>
       </method>
-      <method name="SetInvokingWindow" type="void" overloaded="no">
+      <method name="SetInvokingWindow" type="" overloaded="no">
         <autodoc>SetInvokingWindow(Window win)</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="GetInvokingWindow" type="wxWindow" overloaded="no">
+      <method name="GetInvokingWindow" type="Window" overloaded="no">
         <autodoc>GetInvokingWindow() -&gt; Window</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
-      <method name="UpdateUI" type="void" overloaded="no">
+      <method name="UpdateUI" type="" overloaded="no">
         <autodoc>UpdateUI(EvtHandler source=None)</autodoc>
         <paramlist>
-          <param name="source" type="p.wxEvtHandler" default="NULL"/>
+          <param name="source" type="EvtHandler" default="NULL"/>
         </paramlist>
       </method>
       <method name="GetMenuBar" type="wxMenuBar" overloaded="no">
         <autodoc>GetMenuBar() -&gt; MenuBar</autodoc>
       </method>
-      <method name="Attach" type="void" overloaded="no">
+      <method name="Attach" type="" overloaded="no">
         <autodoc>Attach(wxMenuBarBase menubar)</autodoc>
         <paramlist>
-          <param name="menubar" type="p.wxMenuBarBase" default=""/>
+          <param name="menubar" type="wxMenuBarBase" default=""/>
         </paramlist>
       </method>
-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">
         <autodoc>Detach()</autodoc>
       </method>
       <method name="IsAttached" type="bool" overloaded="no">
         <autodoc>IsAttached() -&gt; bool</autodoc>
       </method>
-      <method name="SetParent" type="void" overloaded="no">
+      <method name="SetParent" type="" overloaded="no">
         <autodoc>SetParent(Menu parent)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxMenu" default=""/>
+          <param name="parent" type="Menu" default=""/>
         </paramlist>
       </method>
-      <method name="GetParent" type="wxMenu" overloaded="no">
+      <method name="GetParent" type="Menu" overloaded="no">
         <autodoc>GetParent() -&gt; Menu</autodoc>
       </method>
     </class>
@@ -5004,7 +5004,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MenuBar" oldname="wxMenuBar" module="core">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="MenuBar" overloaded="no">
         <autodoc>__init__(long style=0) -&gt; MenuBar</autodoc>
         <paramlist>
@@ -5014,42 +5014,42 @@ def DLG_SZE(win, size_width, height=None):
       <method name="Append" type="bool" overloaded="no">
         <autodoc>Append(Menu menu, String title) -&gt; bool</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="menu" type="Menu" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Insert" type="bool" overloaded="no">
         <autodoc>Insert(size_t pos, Menu menu, String title) -&gt; bool</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
-          <param name="menu" type="p.wxMenu" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="menu" type="Menu" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetMenuCount" type="size_t" overloaded="no">
         <autodoc>GetMenuCount() -&gt; size_t</autodoc>
       </method>
-      <method name="GetMenu" type="wxMenu" overloaded="no">
+      <method name="GetMenu" type="Menu" overloaded="no">
         <autodoc>GetMenu(size_t pos) -&gt; Menu</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="Replace" type="wxMenu" overloaded="no">
+      <method name="Replace" type="Menu" overloaded="no">
         <autodoc>Replace(size_t pos, Menu menu, String title) -&gt; Menu</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
-          <param name="menu" type="p.wxMenu" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="menu" type="Menu" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Remove" type="wxMenu" overloaded="no">
+      <method name="Remove" type="Menu" overloaded="no">
         <autodoc>Remove(size_t pos) -&gt; Menu</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="EnableTop" type="void" overloaded="no">
+      <method name="EnableTop" type="" overloaded="no">
         <autodoc>EnableTop(size_t pos, bool enable)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
@@ -5062,14 +5062,14 @@ def DLG_SZE(win, size_width, height=None):
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabelTop" type="void" overloaded="no">
+      <method name="SetLabelTop" type="" overloaded="no">
         <autodoc>SetLabelTop(size_t pos, String label)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabelTop" type="wxString" overloaded="no">
+      <method name="GetLabelTop" type="String" overloaded="no">
         <autodoc>GetLabelTop(size_t pos) -&gt; String</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
@@ -5078,8 +5078,8 @@ def DLG_SZE(win, size_width, height=None):
       <method name="FindMenuItem" type="int" overloaded="no">
         <autodoc>FindMenuItem(String menu, String item) -&gt; int</autodoc>
         <paramlist>
-          <param name="menu" type="r.q(const).wxString" default=""/>
-          <param name="item" type="r.q(const).wxString" default=""/>
+          <param name="menu" type="String" default=""/>
+          <param name="item" type="String" default=""/>
         </paramlist>
       </method>
       <method name="FindItemById" type="wxMenuItem" overloaded="no">
@@ -5091,17 +5091,17 @@ def DLG_SZE(win, size_width, height=None):
       <method name="FindMenu" type="int" overloaded="no">
         <autodoc>FindMenu(String title) -&gt; int</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Enable" type="void" overloaded="no">
+      <method name="Enable" type="" overloaded="no">
         <autodoc>Enable(int id, bool enable)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Check" type="void" overloaded="no">
+      <method name="Check" type="" overloaded="no">
         <autodoc>Check(int id, bool check)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -5120,27 +5120,27 @@ def DLG_SZE(win, size_width, height=None):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(int id, String label)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHelpString" type="void" overloaded="no">
+      <method name="SetHelpString" type="" overloaded="no">
         <autodoc>SetHelpString(int id, String helpString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="helpString" type="r.q(const).wxString" default=""/>
+          <param name="helpString" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetHelpString" type="wxString" overloaded="no">
+      <method name="GetHelpString" type="String" overloaded="no">
         <autodoc>GetHelpString(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -5152,13 +5152,13 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsAttached" type="bool" overloaded="no">
         <autodoc>IsAttached() -&gt; bool</autodoc>
       </method>
-      <method name="Attach" type="void" overloaded="no">
+      <method name="Attach" type="" overloaded="no">
         <autodoc>Attach(wxFrame frame)</autodoc>
         <paramlist>
-          <param name="frame" type="p.wxFrame" default=""/>
+          <param name="frame" type="wxFrame" default=""/>
         </paramlist>
       </method>
-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">
         <autodoc>Detach()</autodoc>
       </method>
     </class>
@@ -5166,30 +5166,30 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MenuItem" oldname="wxMenuItem" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="MenuItem" overloaded="no">
         <autodoc>__init__(Menu parentMenu=None, int id=ID_SEPARATOR, String text=EmptyString, 
     String help=EmptyString, int kind=ITEM_NORMAL, 
     Menu subMenu=None) -&gt; MenuItem</autodoc>
         <paramlist>
-          <param name="parentMenu" type="p.wxMenu" default="NULL"/>
+          <param name="parentMenu" type="Menu" default="NULL"/>
           <param name="id" type="int" default="wxID_SEPARATOR"/>
-          <param name="text" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="help" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default="wxPyEmptyString"/>
+          <param name="help" type="String" default="wxPyEmptyString"/>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
-          <param name="subMenu" type="p.wxMenu" default="NULL"/>
+          <param name="subMenu" type="Menu" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="GetMenu" type="wxMenu" overloaded="no">
+      <method name="GetMenu" type="Menu" overloaded="no">
         <autodoc>GetMenu() -&gt; Menu</autodoc>
       </method>
-      <method name="SetMenu" type="void" overloaded="no">
+      <method name="SetMenu" type="" overloaded="no">
         <autodoc>SetMenu(Menu menu)</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>
         </paramlist>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(int id)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -5201,28 +5201,28 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsSeparator" type="bool" overloaded="no">
         <autodoc>IsSeparator() -&gt; bool</autodoc>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
-      <method name="GetText" type="q(const).wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
-      <staticmethod name="GetLabelFromText" type="wxString" overloaded="no">
+      <staticmethod name="GetLabelFromText" type="String" overloaded="no">
         <autodoc>MenuItem.GetLabelFromText(String text) -&gt; String</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <method name="GetKind" type="wxItemKind" overloaded="no">
         <autodoc>GetKind() -&gt; int</autodoc>
       </method>
-      <method name="SetCheckable" type="void" overloaded="no">
+      <method name="SetCheckable" type="" overloaded="no">
         <autodoc>SetCheckable(bool checkable)</autodoc>
         <paramlist>
           <param name="checkable" type="bool" default=""/>
@@ -5234,16 +5234,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsSubMenu" type="bool" overloaded="no">
         <autodoc>IsSubMenu() -&gt; bool</autodoc>
       </method>
-      <method name="SetSubMenu" type="void" overloaded="no">
+      <method name="SetSubMenu" type="" overloaded="no">
         <autodoc>SetSubMenu(Menu menu)</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>
         </paramlist>
       </method>
-      <method name="GetSubMenu" type="wxMenu" overloaded="no">
+      <method name="GetSubMenu" type="Menu" overloaded="no">
         <autodoc>GetSubMenu() -&gt; Menu</autodoc>
       </method>
-      <method name="Enable" type="void" overloaded="no">
+      <method name="Enable" type="" overloaded="no">
         <autodoc>Enable(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
@@ -5252,7 +5252,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>
       </method>
-      <method name="Check" type="void" overloaded="no">
+      <method name="Check" type="" overloaded="no">
         <autodoc>Check(bool check=True)</autodoc>
         <paramlist>
           <param name="check" type="bool" default="True"/>
@@ -5261,37 +5261,37 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>
       </method>
-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">
         <autodoc>Toggle()</autodoc>
       </method>
-      <method name="SetHelp" type="void" overloaded="no">
+      <method name="SetHelp" type="" overloaded="no">
         <autodoc>SetHelp(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetHelp" type="q(const).wxString" overloaded="no">
+      <method name="GetHelp" type="String" overloaded="no">
         <autodoc>GetHelp() -&gt; String</autodoc>
       </method>
-      <method name="GetAccel" type="wxAcceleratorEntry" overloaded="no">
+      <method name="GetAccel" type="AcceleratorEntry" overloaded="no">
         <autodoc>GetAccel() -&gt; AcceleratorEntry</autodoc>
       </method>
-      <method name="SetAccel" type="void" overloaded="no">
+      <method name="SetAccel" type="" overloaded="no">
         <autodoc>SetAccel(AcceleratorEntry accel)</autodoc>
         <paramlist>
-          <param name="accel" type="p.wxAcceleratorEntry" default=""/>
+          <param name="accel" type="AcceleratorEntry" default=""/>
         </paramlist>
       </method>
       <staticmethod name="GetDefaultMarginWidth" type="int" overloaded="no">
         <autodoc>MenuItem.GetDefaultMarginWidth() -&gt; int</autodoc>
       </staticmethod>
-      <method name="SetBitmap" type="void" overloaded="no">
+      <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="wxBitmap" default=""/>
         </paramlist>
       </method>
-      <method name="GetBitmap" type="q(const).wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="wxBitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
     </class>
@@ -5299,19 +5299,19 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Control" oldname="wxControl" module="core">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="Control" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; Control</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyControlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyControlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreControl" overloaded="no">
@@ -5322,28 +5322,28 @@ def DLG_SZE(win, size_width, height=None):
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyControlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyControlNameStr"/>
         </paramlist>
       </method>
-      <method name="Command" type="void" overloaded="no">
+      <method name="Command" type="" overloaded="no">
         <autodoc>Command(CommandEvent event)</autodoc>
         <paramlist>
-          <param name="event" type="r.wxCommandEvent" default=""/>
+          <param name="event" type="CommandEvent" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -5354,28 +5354,28 @@ def DLG_SZE(win, size_width, height=None):
       <method name="Append" type="int" overloaded="no">
         <autodoc>Append(String item, PyObject clientData=None) -&gt; int</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxString" default=""/>
-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="item" type="String" default=""/>
+          <param name="clientData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="AppendItems" type="void" overloaded="no">
+      <method name="AppendItems" type="" overloaded="no">
         <autodoc>AppendItems(wxArrayString strings)</autodoc>
         <paramlist>
-          <param name="strings" type="r.q(const).wxArrayString" default=""/>
+          <param name="strings" type="wxArrayString" default=""/>
         </paramlist>
       </method>
       <method name="Insert" type="int" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None) -&gt; int</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxString" default=""/>
+          <param name="item" type="String" default=""/>
           <param name="pos" type="int" default=""/>
-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="clientData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
-      <method name="Delete" type="void" overloaded="no">
+      <method name="Delete" type="" overloaded="no">
         <autodoc>Delete(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -5387,7 +5387,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsEmpty" type="bool" overloaded="no">
         <autodoc>IsEmpty() -&gt; bool</autodoc>
       </method>
-      <method name="GetString" type="wxString" overloaded="no">
+      <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString(int n) -&gt; String</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -5396,20 +5396,20 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetStrings" type="wxArrayString" overloaded="no">
         <autodoc>GetStrings() -&gt; wxArrayString</autodoc>
       </method>
-      <method name="SetString" type="void" overloaded="no">
+      <method name="SetString" type="" overloaded="no">
         <autodoc>SetString(int n, String s)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
       <method name="FindString" type="int" overloaded="no">
         <autodoc>FindString(String s) -&gt; int</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Select" type="void" overloaded="no">
+      <method name="Select" type="" overloaded="no">
         <autodoc>Select(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -5418,7 +5418,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </method>
-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
       <method name="GetClientData" type="PyObject" overloaded="no">
@@ -5427,11 +5427,11 @@ def DLG_SZE(win, size_width, height=None):
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetClientData" type="void" overloaded="no">
+      <method name="SetClientData" type="" overloaded="no">
         <autodoc>SetClientData(int n, PyObject clientData)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
-          <param name="clientData" type="p.PyObject" default=""/>
+          <param name="clientData" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -5439,14 +5439,14 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ControlWithItems" oldname="wxControlWithItems" module="core">
-      <baseclass name="wxControl"/>
-      <baseclass name="wxItemContainer"/>
+      <baseclass name="Control"/>
+      <baseclass name="ItemContainer"/>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SizerItem" oldname="wxSizerItem" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="SizerItem" overloaded="no">
         <autodoc>__init__() -&gt; SizerItem</autodoc>
       </constructor>
@@ -5459,74 +5459,74 @@ def DLG_SZE(win, size_width, height=None):
           <param name="proportion" type="int" default=""/>
           <param name="flag" type="int" default=""/>
           <param name="border" type="int" default=""/>
-          <param name="userData" type="p.wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </constructor>
       <constructor name="SizerItemWindow" overloaded="no">
         <autodoc>SizerItemWindow(Window window, int proportion, int flag, int border, 
     Object userData) -&gt; SizerItem</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
           <param name="proportion" type="int" default=""/>
           <param name="flag" type="int" default=""/>
           <param name="border" type="int" default=""/>
-          <param name="userData" type="p.wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </constructor>
       <constructor name="SizerItemSizer" overloaded="no">
         <autodoc>SizerItemSizer(Sizer sizer, int proportion, int flag, int border, 
     Object userData) -&gt; SizerItem</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>
           <param name="proportion" type="int" default=""/>
           <param name="flag" type="int" default=""/>
           <param name="border" type="int" default=""/>
-          <param name="userData" type="p.wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </constructor>
-      <method name="DeleteWindows" type="void" overloaded="no">
+      <method name="DeleteWindows" type="" overloaded="no">
         <autodoc>DeleteWindows()</autodoc>
       </method>
-      <method name="DetachSizer" type="void" overloaded="no">
+      <method name="DetachSizer" type="" overloaded="no">
         <autodoc>DetachSizer()</autodoc>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
-      <method name="SetDimension" type="void" overloaded="no">
+      <method name="SetDimension" type="" overloaded="no">
         <autodoc>SetDimension(Point pos, Size size)</autodoc>
         <paramlist>
-          <param name="pos" type="wxPoint" default=""/>
-          <param name="size" type="wxSize" default=""/>
+          <param name="pos" type="Point" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetMinSize" type="wxSize" overloaded="no">
+      <method name="GetMinSize" type="Size" overloaded="no">
         <autodoc>GetMinSize() -&gt; Size</autodoc>
       </method>
-      <method name="SetInitSize" type="void" overloaded="no">
+      <method name="SetInitSize" type="" overloaded="no">
         <autodoc>SetInitSize(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRatioWH" type="void" overloaded="no">
+      <method name="SetRatioWH" type="" overloaded="no">
         <autodoc>SetRatioWH(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRatioSize" type="void" overloaded="no">
+      <method name="SetRatioSize" type="" overloaded="no">
         <autodoc>SetRatioSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetRatio" type="void" overloaded="no">
+      <method name="SetRatio" type="" overloaded="no">
         <autodoc>SetRatio(float ratio)</autodoc>
         <paramlist>
           <param name="ratio" type="float" default=""/>
@@ -5544,7 +5544,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsSpacer" type="bool" overloaded="no">
         <autodoc>IsSpacer() -&gt; bool</autodoc>
       </method>
-      <method name="SetProportion" type="void" overloaded="no">
+      <method name="SetProportion" type="" overloaded="no">
         <autodoc>SetProportion(int proportion)</autodoc>
         <paramlist>
           <param name="proportion" type="int" default=""/>
@@ -5553,7 +5553,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetProportion" type="int" overloaded="no">
         <autodoc>GetProportion() -&gt; int</autodoc>
       </method>
-      <method name="SetFlag" type="void" overloaded="no">
+      <method name="SetFlag" type="" overloaded="no">
         <autodoc>SetFlag(int flag)</autodoc>
         <paramlist>
           <param name="flag" type="int" default=""/>
@@ -5562,7 +5562,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetFlag" type="int" overloaded="no">
         <autodoc>GetFlag() -&gt; int</autodoc>
       </method>
-      <method name="SetBorder" type="void" overloaded="no">
+      <method name="SetBorder" type="" overloaded="no">
         <autodoc>SetBorder(int border)</autodoc>
         <paramlist>
           <param name="border" type="int" default=""/>
@@ -5571,34 +5571,34 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetBorder" type="int" overloaded="no">
         <autodoc>GetBorder() -&gt; int</autodoc>
       </method>
-      <method name="GetWindow" type="wxWindow" overloaded="no">
+      <method name="GetWindow" type="Window" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
-      <method name="SetWindow" type="void" overloaded="no">
+      <method name="SetWindow" type="" overloaded="no">
         <autodoc>SetWindow(Window window)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="GetSizer" type="wxSizer" overloaded="no">
         <autodoc>GetSizer() -&gt; Sizer</autodoc>
       </method>
-      <method name="SetSizer" type="void" overloaded="no">
+      <method name="SetSizer" type="" overloaded="no">
         <autodoc>SetSizer(Sizer sizer)</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>
         </paramlist>
       </method>
-      <method name="GetSpacer" type="q(const).wxSize" overloaded="no">
+      <method name="GetSpacer" type="Size" overloaded="no">
         <autodoc>GetSpacer() -&gt; Size</autodoc>
       </method>
-      <method name="SetSpacer" type="void" overloaded="no">
+      <method name="SetSpacer" type="" overloaded="no">
         <autodoc>SetSpacer(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="Show" type="void" overloaded="no">
+      <method name="Show" type="" overloaded="no">
         <autodoc>Show(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -5607,7 +5607,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetUserData" type="PyObject" overloaded="no">
@@ -5615,80 +5615,80 @@ def DLG_SZE(win, size_width, height=None):
       </method>
     </class>
     <class name="Sizer" oldname="wxSizer" module="core">
-      <baseclass name="wxObject"/>
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="Add" type="void" overloaded="no">
+      <method name="Add" type="" overloaded="no">
         <autodoc>Add(PyObject item, int proportion=0, int flag=0, int border=0, 
     PyObject userData=None)</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
           <param name="proportion" type="int" default="0"/>
           <param name="flag" type="int" default="0"/>
           <param name="border" type="int" default="0"/>
-          <param name="userData" type="p.PyObject" default="NULL"/>
+          <param name="userData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Insert" type="void" overloaded="no">
+      <method name="Insert" type="" overloaded="no">
         <autodoc>Insert(int before, PyObject item, int proportion=0, int flag=0, 
     int border=0, PyObject userData=None)</autodoc>
         <paramlist>
           <param name="before" type="int" default=""/>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
           <param name="proportion" type="int" default="0"/>
           <param name="flag" type="int" default="0"/>
           <param name="border" type="int" default="0"/>
-          <param name="userData" type="p.PyObject" default="NULL"/>
+          <param name="userData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Prepend" type="void" overloaded="no">
+      <method name="Prepend" type="" overloaded="no">
         <autodoc>Prepend(PyObject item, int proportion=0, int flag=0, int border=0, 
     PyObject userData=None)</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
           <param name="proportion" type="int" default="0"/>
           <param name="flag" type="int" default="0"/>
           <param name="border" type="int" default="0"/>
-          <param name="userData" type="p.PyObject" default="NULL"/>
+          <param name="userData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
       <method name="Remove" type="bool" overloaded="no">
         <autodoc>Remove(PyObject item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="_SetItemMinSize" type="void" overloaded="no">
+      <method name="_SetItemMinSize" type="" overloaded="no">
         <autodoc>_SetItemMinSize(PyObject item, Size size)</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="item" type="PyObject" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="AddItem" type="void" overloaded="no">
+      <method name="AddItem" type="" overloaded="no">
         <autodoc>AddItem(SizerItem item)</autodoc>
         <paramlist>
-          <param name="item" type="p.wxSizerItem" default=""/>
+          <param name="item" type="SizerItem" default=""/>
         </paramlist>
       </method>
-      <method name="InsertItem" type="void" overloaded="no">
+      <method name="InsertItem" type="" overloaded="no">
         <autodoc>InsertItem(size_t index, SizerItem item)</autodoc>
         <paramlist>
           <param name="index" type="size_t" default=""/>
-          <param name="item" type="p.wxSizerItem" default=""/>
+          <param name="item" type="SizerItem" default=""/>
         </paramlist>
       </method>
-      <method name="PrependItem" type="void" overloaded="no">
+      <method name="PrependItem" type="" overloaded="no">
         <autodoc>PrependItem(SizerItem item)</autodoc>
         <paramlist>
-          <param name="item" type="p.wxSizerItem" default=""/>
+          <param name="item" type="SizerItem" default=""/>
         </paramlist>
       </method>
-      <method name="SetDimension" type="void" overloaded="no">
+      <method name="SetDimension" type="" overloaded="no">
         <autodoc>SetDimension(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -5697,86 +5697,86 @@ def DLG_SZE(win, size_width, height=None):
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinSize" type="void" overloaded="no">
+      <method name="SetMinSize" type="" overloaded="no">
         <autodoc>SetMinSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
-      <method name="GetMinSize" type="wxSize" overloaded="no">
+      <method name="GetMinSize" type="Size" overloaded="no">
         <autodoc>GetMinSize() -&gt; Size</autodoc>
       </method>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
-      <method name="Layout" type="void" overloaded="no">
+      <method name="Layout" type="" overloaded="no">
         <autodoc>Layout()</autodoc>
       </method>
-      <method name="Fit" type="wxSize" overloaded="no">
+      <method name="Fit" type="Size" overloaded="no">
         <autodoc>Fit(Window window) -&gt; Size</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="FitInside" type="void" overloaded="no">
+      <method name="FitInside" type="" overloaded="no">
         <autodoc>FitInside(Window window)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="SetSizeHints" type="void" overloaded="no">
+      <method name="SetSizeHints" type="" overloaded="no">
         <autodoc>SetSizeHints(Window window)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="SetVirtualSizeHints" type="void" overloaded="no">
+      <method name="SetVirtualSizeHints" type="" overloaded="no">
         <autodoc>SetVirtualSizeHints(Window window)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear(bool delete_windows=False)</autodoc>
         <paramlist>
           <param name="delete_windows" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="DeleteWindows" type="void" overloaded="no">
+      <method name="DeleteWindows" type="" overloaded="no">
         <autodoc>DeleteWindows()</autodoc>
       </method>
       <method name="GetChildren" type="PyObject" overloaded="no">
         <autodoc>GetChildren() -&gt; PyObject</autodoc>
       </method>
-      <method name="Show" type="void" overloaded="no">
+      <method name="Show" type="" overloaded="no">
         <autodoc>Show(PyObject item, bool show=True)</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
           <param name="show" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Hide" type="void" overloaded="no">
+      <method name="Hide" type="" overloaded="no">
         <autodoc>Hide(PyObject item)</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown(PyObject item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
+          <param name="item" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="ShowItems" type="void" overloaded="no">
+      <method name="ShowItems" type="" overloaded="no">
         <autodoc>ShowItems(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -5784,15 +5784,15 @@ def DLG_SZE(win, size_width, height=None):
       </method>
     </class>
     <class name="PySizer" oldname="wxPySizer" module="core">
-      <baseclass name="wxSizer"/>
+      <baseclass name="Sizer"/>
       <constructor name="PySizer" overloaded="no">
         <autodoc>__init__() -&gt; PySizer</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -5800,7 +5800,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BoxSizer" oldname="wxBoxSizer" module="core">
-      <baseclass name="wxSizer"/>
+      <baseclass name="Sizer"/>
       <constructor name="BoxSizer" overloaded="no">
         <autodoc>__init__(int orient=HORIZONTAL) -&gt; BoxSizer</autodoc>
         <paramlist>
@@ -5810,16 +5810,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetOrientation" type="int" overloaded="no">
         <autodoc>GetOrientation() -&gt; int</autodoc>
       </method>
-      <method name="SetOrientation" type="void" overloaded="no">
+      <method name="SetOrientation" type="" overloaded="no">
         <autodoc>SetOrientation(int orient)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
     </class>
@@ -5827,21 +5827,21 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticBoxSizer" oldname="wxStaticBoxSizer" module="core">
-      <baseclass name="wxBoxSizer"/>
+      <baseclass name="BoxSizer"/>
       <constructor name="StaticBoxSizer" overloaded="no">
         <autodoc>__init__(wxStaticBox box, int orient=HORIZONTAL) -&gt; StaticBoxSizer</autodoc>
         <paramlist>
-          <param name="box" type="p.wxStaticBox" default=""/>
+          <param name="box" type="wxStaticBox" default=""/>
           <param name="orient" type="int" default="wxHORIZONTAL"/>
         </paramlist>
       </constructor>
       <method name="GetStaticBox" type="wxStaticBox" overloaded="no">
         <autodoc>GetStaticBox() -&gt; wxStaticBox</autodoc>
       </method>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
     </class>
@@ -5849,7 +5849,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="GridSizer" oldname="wxGridSizer" module="core">
-      <baseclass name="wxSizer"/>
+      <baseclass name="Sizer"/>
       <constructor name="GridSizer" overloaded="no">
         <autodoc>__init__(int rows=1, int cols=0, int vgap=0, int hgap=0) -&gt; GridSizer</autodoc>
         <paramlist>
@@ -5859,31 +5859,31 @@ def DLG_SZE(win, size_width, height=None):
           <param name="hgap" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
-      <method name="SetCols" type="void" overloaded="no">
+      <method name="SetCols" type="" overloaded="no">
         <autodoc>SetCols(int cols)</autodoc>
         <paramlist>
           <param name="cols" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRows" type="void" overloaded="no">
+      <method name="SetRows" type="" overloaded="no">
         <autodoc>SetRows(int rows)</autodoc>
         <paramlist>
           <param name="rows" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetVGap" type="void" overloaded="no">
+      <method name="SetVGap" type="" overloaded="no">
         <autodoc>SetVGap(int gap)</autodoc>
         <paramlist>
           <param name="gap" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHGap" type="void" overloaded="no">
+      <method name="SetHGap" type="" overloaded="no">
         <autodoc>SetHGap(int gap)</autodoc>
         <paramlist>
           <param name="gap" type="int" default=""/>
@@ -5906,7 +5906,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="FlexGridSizer" oldname="wxFlexGridSizer" module="core">
-      <baseclass name="wxGridSizer"/>
+      <baseclass name="GridSizer"/>
       <constructor name="FlexGridSizer" overloaded="no">
         <autodoc>__init__(int rows=1, int cols=0, int vgap=0, int hgap=0) -&gt; FlexGridSizer</autodoc>
         <paramlist>
@@ -5916,39 +5916,39 @@ def DLG_SZE(win, size_width, height=None):
           <param name="hgap" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
-      <method name="AddGrowableRow" type="void" overloaded="no">
+      <method name="AddGrowableRow" type="" overloaded="no">
         <autodoc>AddGrowableRow(size_t idx, int proportion=0)</autodoc>
         <paramlist>
           <param name="idx" type="size_t" default=""/>
           <param name="proportion" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="RemoveGrowableRow" type="void" overloaded="no">
+      <method name="RemoveGrowableRow" type="" overloaded="no">
         <autodoc>RemoveGrowableRow(size_t idx)</autodoc>
         <paramlist>
           <param name="idx" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="AddGrowableCol" type="void" overloaded="no">
+      <method name="AddGrowableCol" type="" overloaded="no">
         <autodoc>AddGrowableCol(size_t idx, int proportion=0)</autodoc>
         <paramlist>
           <param name="idx" type="size_t" default=""/>
           <param name="proportion" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="RemoveGrowableCol" type="void" overloaded="no">
+      <method name="RemoveGrowableCol" type="" overloaded="no">
         <autodoc>RemoveGrowableCol(size_t idx)</autodoc>
         <paramlist>
           <param name="idx" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetFlexibleDirection" type="void" overloaded="no">
+      <method name="SetFlexibleDirection" type="" overloaded="no">
         <autodoc>SetFlexibleDirection(int direction)</autodoc>
         <paramlist>
           <param name="direction" type="int" default=""/>
@@ -5957,7 +5957,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetFlexibleDirection" type="int" overloaded="no">
         <autodoc>GetFlexibleDirection() -&gt; int</autodoc>
       </method>
-      <method name="SetNonFlexibleGrowMode" type="void" overloaded="no">
+      <method name="SetNonFlexibleGrowMode" type="" overloaded="no">
         <autodoc>SetNonFlexibleGrowMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="wxFlexSizerGrowMode" default=""/>
@@ -5966,10 +5966,10 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetNonFlexibleGrowMode" type="wxFlexSizerGrowMode" overloaded="no">
         <autodoc>GetNonFlexibleGrowMode() -&gt; int</autodoc>
       </method>
-      <method name="GetRowHeights" type="q(const).wxArrayInt" overloaded="no">
+      <method name="GetRowHeights" type="wxArrayInt" overloaded="no">
         <autodoc>GetRowHeights() -&gt; wxArrayInt</autodoc>
       </method>
-      <method name="GetColWidths" type="q(const).wxArrayInt" overloaded="no">
+      <method name="GetColWidths" type="wxArrayInt" overloaded="no">
         <autodoc>GetColWidths() -&gt; wxArrayInt</autodoc>
       </method>
     </class>
@@ -5990,13 +5990,13 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetCol" type="int" overloaded="no">
         <autodoc>GetCol() -&gt; int</autodoc>
       </method>
-      <method name="SetRow" type="void" overloaded="no">
+      <method name="SetRow" type="" overloaded="no">
         <autodoc>SetRow(int row)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCol" type="void" overloaded="no">
+      <method name="SetCol" type="" overloaded="no">
         <autodoc>SetCol(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
@@ -6005,16 +6005,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(GBPosition p) -&gt; bool</autodoc>
         <paramlist>
-          <param name="p" type="r.q(const).wxGBPosition" default=""/>
+          <param name="p" type="GBPosition" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(GBPosition p) -&gt; bool</autodoc>
         <paramlist>
-          <param name="p" type="r.q(const).wxGBPosition" default=""/>
+          <param name="p" type="GBPosition" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int row=0, int col=0)</autodoc>
         <paramlist>
           <param name="row" type="int" default="0"/>
@@ -6039,13 +6039,13 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetColspan" type="int" overloaded="no">
         <autodoc>GetColspan() -&gt; int</autodoc>
       </method>
-      <method name="SetRowspan" type="void" overloaded="no">
+      <method name="SetRowspan" type="" overloaded="no">
         <autodoc>SetRowspan(int rowspan)</autodoc>
         <paramlist>
           <param name="rowspan" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColspan" type="void" overloaded="no">
+      <method name="SetColspan" type="" overloaded="no">
         <autodoc>SetColspan(int colspan)</autodoc>
         <paramlist>
           <param name="colspan" type="int" default=""/>
@@ -6054,16 +6054,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(GBSpan o) -&gt; bool</autodoc>
         <paramlist>
-          <param name="o" type="r.q(const).wxGBSpan" default=""/>
+          <param name="o" type="GBSpan" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(GBSpan o) -&gt; bool</autodoc>
         <paramlist>
-          <param name="o" type="r.q(const).wxGBSpan" default=""/>
+          <param name="o" type="GBSpan" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int rowspan=1, int colspan=1)</autodoc>
         <paramlist>
           <param name="rowspan" type="int" default="1"/>
@@ -6075,7 +6075,7 @@ def DLG_SZE(win, size_width, height=None):
       </method>
     </class>
     <class name="GBSizerItem" oldname="wxGBSizerItem" module="core">
-      <baseclass name="wxSizerItem"/>
+      <baseclass name="SizerItem"/>
       <constructor name="GBSizerItem" overloaded="no">
         <autodoc>__init__() -&gt; GBSizerItem</autodoc>
       </constructor>
@@ -6083,24 +6083,24 @@ def DLG_SZE(win, size_width, height=None):
         <autodoc>GBSizerItemWindow(Window window, GBPosition pos, GBSpan span, int flag, 
     int border, Object userData) -&gt; GBSizerItem</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="window" type="Window" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
+          <param name="span" type="GBSpan" default=""/>
           <param name="flag" type="int" default=""/>
           <param name="border" type="int" default=""/>
-          <param name="userData" type="p.wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </constructor>
       <constructor name="GBSizerItemSizer" overloaded="no">
         <autodoc>GBSizerItemSizer(Sizer sizer, GBPosition pos, GBSpan span, int flag, 
     int border, Object userData) -&gt; GBSizerItem</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="sizer" type="Sizer" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
+          <param name="span" type="GBSpan" default=""/>
           <param name="flag" type="int" default=""/>
           <param name="border" type="int" default=""/>
-          <param name="userData" type="p.wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </constructor>
       <constructor name="GBSizerItemSpacer" overloaded="no">
@@ -6109,63 +6109,63 @@ def DLG_SZE(win, size_width, height=None):
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
+          <param name="span" type="GBSpan" default=""/>
           <param name="flag" type="int" default=""/>
           <param name="border" type="int" default=""/>
-          <param name="userData" type="p.wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </constructor>
-      <method name="GetPos" type="wxGBPosition" overloaded="no">
+      <method name="GetPos" type="GBPosition" overloaded="no">
         <autodoc>GetPos() -&gt; GBPosition</autodoc>
       </method>
-      <method name="GetSpan" type="wxGBSpan" overloaded="no">
+      <method name="GetSpan" type="GBSpan" overloaded="no">
         <autodoc>GetSpan() -&gt; GBSpan</autodoc>
       </method>
       <method name="SetPos" type="bool" overloaded="no">
         <autodoc>SetPos(GBPosition pos) -&gt; bool</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
         </paramlist>
       </method>
       <method name="SetSpan" type="bool" overloaded="no">
         <autodoc>SetSpan(GBSpan span) -&gt; bool</autodoc>
         <paramlist>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="span" type="GBSpan" default=""/>
         </paramlist>
       </method>
       <method name="Intersects" type="bool" overloaded="yes">
         <paramlist>
-          <param name="other" type="r.q(const).wxGBSizerItem" default=""/>
+          <param name="other" type="GBSizerItem" default=""/>
         </paramlist>
       </method>
       <method name="Intersects" type="bool" overloaded="yes">
         <autodoc>Intersects(GBSizerItem other) -&gt; bool
 Intersects(GBPosition pos, GBSpan span) -&gt; bool</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
+          <param name="span" type="GBSpan" default=""/>
         </paramlist>
       </method>
-      <method name="GetEndPos" type="void" overloaded="no">
+      <method name="GetEndPos" type="" overloaded="no">
         <autodoc>GetEndPos(int row, int col)</autodoc>
         <paramlist>
-          <param name="row" type="r.int" default=""/>
-          <param name="col" type="r.int" default=""/>
+          <param name="row" type="int" default=""/>
+          <param name="col" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetGBSizer" type="wxGridBagSizer" overloaded="no">
         <autodoc>GetGBSizer() -&gt; GridBagSizer</autodoc>
       </method>
-      <method name="SetGBSizer" type="void" overloaded="no">
+      <method name="SetGBSizer" type="" overloaded="no">
         <autodoc>SetGBSizer(GridBagSizer sizer)</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxGridBagSizer" default=""/>
+          <param name="sizer" type="wxGridBagSizer" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="GridBagSizer" oldname="wxGridBagSizer" module="core">
-      <baseclass name="wxFlexGridSizer"/>
+      <baseclass name="FlexGridSizer"/>
       <constructor name="GridBagSizer" overloaded="no">
         <autodoc>__init__(int vgap=0, int hgap=0) -&gt; GridBagSizer</autodoc>
         <paramlist>
@@ -6177,40 +6177,40 @@ Intersects(GBPosition pos, GBSpan span) -&gt; bool</autodoc>
         <autodoc>Add(PyObject item, GBPosition pos, GBSpan span=DefaultSpan, 
     int flag=0, int border=0, PyObject userData=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="p.PyObject" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default="wxDefaultSpan"/>
+          <param name="item" type="PyObject" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
+          <param name="span" type="GBSpan" default="wxDefaultSpan"/>
           <param name="flag" type="int" default="0"/>
           <param name="border" type="int" default="0"/>
-          <param name="userData" type="p.PyObject" default="NULL"/>
+          <param name="userData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
       <method name="AddItem" type="bool" overloaded="no">
         <autodoc>AddItem(GBSizerItem item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="p.wxGBSizerItem" default=""/>
+          <param name="item" type="GBSizerItem" default=""/>
         </paramlist>
       </method>
-      <method name="GetEmptyCellSize" type="wxSize" overloaded="no">
+      <method name="GetEmptyCellSize" type="Size" overloaded="no">
         <autodoc>GetEmptyCellSize() -&gt; Size</autodoc>
       </method>
-      <method name="SetEmptyCellSize" type="void" overloaded="no">
+      <method name="SetEmptyCellSize" type="" overloaded="no">
         <autodoc>SetEmptyCellSize(Size sz)</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemPosition" type="wxGBPosition" overloaded="yes">
+      <method name="GetItemPosition" type="GBPosition" overloaded="yes">
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemPosition" type="wxGBPosition" overloaded="yes">
+      <method name="GetItemPosition" type="GBPosition" overloaded="yes">
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="Sizer" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemPosition" type="wxGBPosition" overloaded="yes">
+      <method name="GetItemPosition" type="GBPosition" overloaded="yes">
         <autodoc>GetItemPosition(Window window) -&gt; GBPosition
 GetItemPosition(Sizer sizer) -&gt; GBPosition
 GetItemPosition(size_t index) -&gt; GBPosition</autodoc>
@@ -6220,14 +6220,14 @@ GetItemPosition(size_t index) -&gt; GBPosition</autodoc>
       </method>
       <method name="SetItemPosition" type="bool" overloaded="yes">
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
+          <param name="window" type="Window" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
         </paramlist>
       </method>
       <method name="SetItemPosition" type="bool" overloaded="yes">
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
+          <param name="sizer" type="Sizer" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
         </paramlist>
       </method>
       <method name="SetItemPosition" type="bool" overloaded="yes">
@@ -6236,20 +6236,20 @@ SetItemPosition(Sizer sizer, GBPosition pos) -&gt; bool
 SetItemPosition(size_t index, GBPosition pos) -&gt; bool</autodoc>
         <paramlist>
           <param name="index" type="size_t" default=""/>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemSpan" type="wxGBSpan" overloaded="yes">
+      <method name="GetItemSpan" type="GBSpan" overloaded="yes">
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemSpan" type="wxGBSpan" overloaded="yes">
+      <method name="GetItemSpan" type="GBSpan" overloaded="yes">
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="Sizer" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemSpan" type="wxGBSpan" overloaded="yes">
+      <method name="GetItemSpan" type="GBSpan" overloaded="yes">
         <autodoc>GetItemSpan(Window window) -&gt; GBSpan
 GetItemSpan(Sizer sizer) -&gt; GBSpan
 GetItemSpan(size_t index) -&gt; GBSpan</autodoc>
@@ -6259,14 +6259,14 @@ GetItemSpan(size_t index) -&gt; GBSpan</autodoc>
       </method>
       <method name="SetItemSpan" type="bool" overloaded="yes">
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="window" type="Window" default=""/>
+          <param name="span" type="GBSpan" default=""/>
         </paramlist>
       </method>
       <method name="SetItemSpan" type="bool" overloaded="yes">
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="sizer" type="Sizer" default=""/>
+          <param name="span" type="GBSpan" default=""/>
         </paramlist>
       </method>
       <method name="SetItemSpan" type="bool" overloaded="yes">
@@ -6275,58 +6275,58 @@ SetItemSpan(Sizer sizer, GBSpan span) -&gt; bool
 SetItemSpan(size_t index, GBSpan span) -&gt; bool</autodoc>
         <paramlist>
           <param name="index" type="size_t" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
+          <param name="span" type="GBSpan" default=""/>
         </paramlist>
       </method>
-      <method name="FindItem" type="wxGBSizerItem" overloaded="yes">
+      <method name="FindItem" type="GBSizerItem" overloaded="yes">
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="FindItem" type="wxGBSizerItem" overloaded="yes">
+      <method name="FindItem" type="GBSizerItem" overloaded="yes">
         <autodoc>FindItem(Window window) -&gt; GBSizerItem
 FindItem(Sizer sizer) -&gt; GBSizerItem</autodoc>
         <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="Sizer" default=""/>
         </paramlist>
       </method>
-      <method name="FindItemAtPosition" type="wxGBSizerItem" overloaded="no">
+      <method name="FindItemAtPosition" type="GBSizerItem" overloaded="no">
         <autodoc>FindItemAtPosition(GBPosition pos) -&gt; GBSizerItem</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
+          <param name="pos" type="GBPosition" default=""/>
         </paramlist>
       </method>
-      <method name="FindItemAtPoint" type="wxGBSizerItem" overloaded="no">
+      <method name="FindItemAtPoint" type="GBSizerItem" overloaded="no">
         <autodoc>FindItemAtPoint(Point pt) -&gt; GBSizerItem</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="FindItemWithData" type="wxGBSizerItem" overloaded="no">
+      <method name="FindItemWithData" type="GBSizerItem" overloaded="no">
         <autodoc>FindItemWithData(Object userData) -&gt; GBSizerItem</autodoc>
         <paramlist>
-          <param name="userData" type="p.q(const).wxObject" default=""/>
+          <param name="userData" type="Object" default=""/>
         </paramlist>
       </method>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
       <method name="CheckForIntersection" type="bool" overloaded="yes">
         <paramlist>
-          <param name="item" type="p.wxGBSizerItem" default=""/>
-          <param name="excludeItem" type="p.wxGBSizerItem" default="NULL"/>
+          <param name="item" type="GBSizerItem" default=""/>
+          <param name="excludeItem" type="GBSizerItem" default="NULL"/>
         </paramlist>
       </method>
       <method name="CheckForIntersection" type="bool" overloaded="yes">
         <autodoc>CheckForIntersection(GBSizerItem item, GBSizerItem excludeItem=None) -&gt; bool
 CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxGBPosition" default=""/>
-          <param name="span" type="r.q(const).wxGBSpan" default=""/>
-          <param name="excludeItem" type="p.wxGBSizerItem" default="NULL"/>
+          <param name="pos" type="GBPosition" default=""/>
+          <param name="span" type="GBSpan" default=""/>
+          <param name="excludeItem" type="GBSizerItem" default="NULL"/>
         </paramlist>
       </method>
     </class>
@@ -6334,86 +6334,86 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IndividualLayoutConstraint" oldname="wxIndividualLayoutConstraint" module="core">
-      <baseclass name="wxObject"/>
-      <method name="Set" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int rel, Window otherW, int otherE, int val=0, int marg=wxLAYOUT_DEFAULT_MARGIN)</autodoc>
         <paramlist>
           <param name="rel" type="wxRelationship" default=""/>
-          <param name="otherW" type="p.wxWindow" default=""/>
+          <param name="otherW" type="Window" default=""/>
           <param name="otherE" type="wxEdge" default=""/>
           <param name="val" type="int" default="0"/>
           <param name="marg" type="int" default="wxLAYOUT_DEFAULT_MARGIN"/>
         </paramlist>
       </method>
-      <method name="LeftOf" type="void" overloaded="no">
+      <method name="LeftOf" type="" overloaded="no">
         <autodoc>LeftOf(Window sibling, int marg=0)</autodoc>
         <paramlist>
-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="RightOf" type="void" overloaded="no">
+      <method name="RightOf" type="" overloaded="no">
         <autodoc>RightOf(Window sibling, int marg=0)</autodoc>
         <paramlist>
-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="Above" type="void" overloaded="no">
+      <method name="Above" type="" overloaded="no">
         <autodoc>Above(Window sibling, int marg=0)</autodoc>
         <paramlist>
-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="Below" type="void" overloaded="no">
+      <method name="Below" type="" overloaded="no">
         <autodoc>Below(Window sibling, int marg=0)</autodoc>
         <paramlist>
-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>
           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SameAs" type="void" overloaded="no">
+      <method name="SameAs" type="" overloaded="no">
         <autodoc>SameAs(Window otherW, int edge, int marg=0)</autodoc>
         <paramlist>
-          <param name="otherW" type="p.wxWindow" default=""/>
+          <param name="otherW" type="Window" default=""/>
           <param name="edge" type="wxEdge" default=""/>
           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="PercentOf" type="void" overloaded="no">
+      <method name="PercentOf" type="" overloaded="no">
         <autodoc>PercentOf(Window otherW, int wh, int per)</autodoc>
         <paramlist>
-          <param name="otherW" type="p.wxWindow" default=""/>
+          <param name="otherW" type="Window" default=""/>
           <param name="wh" type="wxEdge" default=""/>
           <param name="per" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Absolute" type="void" overloaded="no">
+      <method name="Absolute" type="" overloaded="no">
         <autodoc>Absolute(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Unconstrained" type="void" overloaded="no">
+      <method name="Unconstrained" type="" overloaded="no">
         <autodoc>Unconstrained()</autodoc>
       </method>
-      <method name="AsIs" type="void" overloaded="no">
+      <method name="AsIs" type="" overloaded="no">
         <autodoc>AsIs()</autodoc>
       </method>
-      <method name="GetOtherWindow" type="wxWindow" overloaded="no">
+      <method name="GetOtherWindow" type="Window" overloaded="no">
         <autodoc>GetOtherWindow() -&gt; Window</autodoc>
       </method>
       <method name="GetMyEdge" type="wxEdge" overloaded="no">
         <autodoc>GetMyEdge() -&gt; int</autodoc>
       </method>
-      <method name="SetEdge" type="void" overloaded="no">
+      <method name="SetEdge" type="" overloaded="no">
         <autodoc>SetEdge(int which)</autodoc>
         <paramlist>
           <param name="which" type="wxEdge" default=""/>
         </paramlist>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
@@ -6422,7 +6422,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="GetMargin" type="int" overloaded="no">
         <autodoc>GetMargin() -&gt; int</autodoc>
       </method>
-      <method name="SetMargin" type="void" overloaded="no">
+      <method name="SetMargin" type="" overloaded="no">
         <autodoc>SetMargin(int m)</autodoc>
         <paramlist>
           <param name="m" type="int" default=""/>
@@ -6440,7 +6440,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="GetDone" type="bool" overloaded="no">
         <autodoc>GetDone() -&gt; bool</autodoc>
       </method>
-      <method name="SetDone" type="void" overloaded="no">
+      <method name="SetDone" type="" overloaded="no">
         <autodoc>SetDone(bool d)</autodoc>
         <paramlist>
           <param name="d" type="bool" default=""/>
@@ -6449,7 +6449,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="GetRelationship" type="wxRelationship" overloaded="no">
         <autodoc>GetRelationship() -&gt; int</autodoc>
       </method>
-      <method name="SetRelationship" type="void" overloaded="no">
+      <method name="SetRelationship" type="" overloaded="no">
         <autodoc>SetRelationship(int r)</autodoc>
         <paramlist>
           <param name="r" type="wxRelationship" default=""/>
@@ -6458,43 +6458,43 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="ResetIfWin" type="bool" overloaded="no">
         <autodoc>ResetIfWin(Window otherW) -&gt; bool</autodoc>
         <paramlist>
-          <param name="otherW" type="p.wxWindow" default=""/>
+          <param name="otherW" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SatisfyConstraint" type="bool" overloaded="no">
         <autodoc>SatisfyConstraint(LayoutConstraints constraints, Window win) -&gt; bool</autodoc>
         <paramlist>
-          <param name="constraints" type="p.wxLayoutConstraints" default=""/>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="constraints" type="wxLayoutConstraints" default=""/>
+          <param name="win" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="GetEdge" type="int" overloaded="no">
         <autodoc>GetEdge(int which, Window thisWin, Window other) -&gt; int</autodoc>
         <paramlist>
           <param name="which" type="wxEdge" default=""/>
-          <param name="thisWin" type="p.wxWindow" default=""/>
-          <param name="other" type="p.wxWindow" default=""/>
+          <param name="thisWin" type="Window" default=""/>
+          <param name="other" type="Window" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="LayoutConstraints" oldname="wxLayoutConstraints" module="core">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="LayoutConstraints" overloaded="no">
         <autodoc>__init__() -&gt; LayoutConstraints</autodoc>
       </constructor>
-      <property name="left" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="top" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="right" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="bottom" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="width" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="height" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="centreX" type="wxIndividualLayoutConstraint" readonly="yes"/>
-      <property name="centreY" type="wxIndividualLayoutConstraint" readonly="yes"/>
+      <property name="left" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="top" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="right" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="bottom" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="width" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="height" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="centreX" type="IndividualLayoutConstraint" readonly="yes"/>
+      <property name="centreY" type="IndividualLayoutConstraint" readonly="yes"/>
       <method name="SatisfyConstraints" type="bool" overloaded="no">
         <autodoc>SatisfyConstraints(Window win) -&gt; (areSatisfied, noChanges)</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="win" type="Window" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="AreSatisfied" type="bool" overloaded="no">
@@ -6735,7 +6735,7 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="GDIObject" oldname="wxGDIObject" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="GDIObject" overloaded="no">
         <autodoc>__init__() -&gt; GDIObject</autodoc>
       </constructor>
@@ -6745,7 +6745,7 @@ _core._wxPyFixStockObjects()
       <method name="GetVisible" type="bool" overloaded="no">
         <autodoc>GetVisible() -&gt; bool</autodoc>
       </method>
-      <method name="SetVisible" type="void" overloaded="no">
+      <method name="SetVisible" type="" overloaded="no">
         <autodoc>SetVisible(bool visible)</autodoc>
         <paramlist>
           <param name="visible" type="bool" default=""/>
@@ -6759,7 +6759,7 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Colour" oldname="wxColour" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Colour" overloaded="no">
         <autodoc>__init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -&gt; Colour</autodoc>
         <paramlist>
@@ -6771,7 +6771,7 @@ _core._wxPyFixStockObjects()
       <constructor name="NamedColour" overloaded="no">
         <autodoc>NamedColour(String colorName) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="colorName" type="r.q(const).wxString" default=""/>
+          <param name="colorName" type="String" default=""/>
         </paramlist>
       </constructor>
       <constructor name="ColourRGB" overloaded="no">
@@ -6795,7 +6795,7 @@ _core._wxPyFixStockObjects()
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(unsigned char red, unsigned char green, unsigned char blue)</autodoc>
         <paramlist>
           <param name="red" type="unsigned char" default=""/>
@@ -6803,7 +6803,7 @@ _core._wxPyFixStockObjects()
           <param name="blue" type="unsigned char" default=""/>
         </paramlist>
       </method>
-      <method name="SetRGB" type="void" overloaded="no">
+      <method name="SetRGB" type="" overloaded="no">
         <autodoc>SetRGB(unsigned long colRGB)</autodoc>
         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
@@ -6812,19 +6812,19 @@ _core._wxPyFixStockObjects()
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Colour colour) -&gt; bool</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Colour colour) -&gt; bool</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="InitFromName" type="void" overloaded="no">
+      <method name="InitFromName" type="" overloaded="no">
         <autodoc>InitFromName(String colourName)</autodoc>
         <paramlist>
-          <param name="colourName" type="r.q(const).wxString" default=""/>
+          <param name="colourName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Get" type="PyObject" overloaded="no">
@@ -6832,14 +6832,14 @@ _core._wxPyFixStockObjects()
       </method>
     </class>
     <class name="Palette" oldname="wxPalette" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Palette" overloaded="no">
         <autodoc>__init__(int n, unsigned char red, unsigned char green, unsigned char blue) -&gt; Palette</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
-          <param name="red" type="p.q(const).unsigned char" default=""/>
-          <param name="green" type="p.q(const).unsigned char" default=""/>
-          <param name="blue" type="p.q(const).unsigned char" default=""/>
+          <param name="red" type="unsigned char" default=""/>
+          <param name="green" type="unsigned char" default=""/>
+          <param name="blue" type="unsigned char" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxPalette" overloaded="no">
@@ -6857,9 +6857,9 @@ _core._wxPyFixStockObjects()
         <autodoc>GetRGB(int pixel) -&gt; (R,G,B)</autodoc>
         <paramlist>
           <param name="pixel" type="int" default=""/>
-          <param name="OUTPUT" type="p.byte" default=""/>
-          <param name="OUTPUT" type="p.byte" default=""/>
-          <param name="OUTPUT" type="p.byte" default=""/>
+          <param name="OUTPUT" type="byte" default=""/>
+          <param name="OUTPUT" type="byte" default=""/>
+          <param name="OUTPUT" type="byte" default=""/>
         </paramlist>
       </method>
       <method name="Ok" type="bool" overloaded="no">
@@ -6870,11 +6870,11 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Pen" oldname="wxPen" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Pen" overloaded="no">
         <autodoc>__init__(Colour colour, int width=1, int style=SOLID) -&gt; Pen</autodoc>
         <paramlist>
-          <param name="colour" type="r.wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
           <param name="width" type="int" default="1"/>
           <param name="style" type="int" default="wxSOLID"/>
         </paramlist>
@@ -6885,7 +6885,7 @@ _core._wxPyFixStockObjects()
       <method name="GetCap" type="int" overloaded="no">
         <autodoc>GetCap() -&gt; int</autodoc>
       </method>
-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetJoin" type="int" overloaded="no">
@@ -6900,41 +6900,41 @@ _core._wxPyFixStockObjects()
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
-      <method name="SetCap" type="void" overloaded="no">
+      <method name="SetCap" type="" overloaded="no">
         <autodoc>SetCap(int cap_style)</autodoc>
         <paramlist>
           <param name="cap_style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetJoin" type="void" overloaded="no">
+      <method name="SetJoin" type="" overloaded="no">
         <autodoc>SetJoin(int join_style)</autodoc>
         <paramlist>
           <param name="join_style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(int style)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDashes" type="void" overloaded="no">
+      <method name="SetDashes" type="" overloaded="no">
         <autodoc>SetDashes(int dashes, wxDash dashes_array)</autodoc>
         <paramlist>
           <param name="dashes" type="int" default=""/>
-          <param name="dashes_array" type="p.wxDash" default=""/>
+          <param name="dashes_array" type="wxDash" default=""/>
         </paramlist>
       </method>
       <method name="GetDashes" type="PyObject" overloaded="no">
@@ -6945,11 +6945,11 @@ _core._wxPyFixStockObjects()
       </method>
     </class>
     <class name="PyPen" oldname="wxPyPen" module="gdi">
-      <baseclass name="wxPen"/>
+      <baseclass name="Pen"/>
       <constructor name="PyPen" overloaded="no">
         <autodoc>__init__(Colour colour, int width=1, int style=SOLID) -&gt; PyPen</autodoc>
         <paramlist>
-          <param name="colour" type="r.wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
           <param name="width" type="int" default="1"/>
           <param name="style" type="int" default="wxSOLID"/>
         </paramlist>
@@ -6957,11 +6957,11 @@ _core._wxPyFixStockObjects()
       <destructor name="~wxPyPen" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetDashes" type="void" overloaded="no">
+      <method name="SetDashes" type="" overloaded="no">
         <autodoc>SetDashes(int dashes, wxDash dashes_array)</autodoc>
         <paramlist>
           <param name="dashes" type="int" default=""/>
-          <param name="dashes_array" type="p.wxDash" default=""/>
+          <param name="dashes_array" type="wxDash" default=""/>
         </paramlist>
       </method>
     </class>
@@ -6972,37 +6972,37 @@ _core._wxPyFixStockObjects()
     <class name="Brush" oldname="wxBrush" module="gdi">
       <docstring>A brush is a drawing tool for filling in areas. It is used for painting the
 background of rectangles, ellipses, etc. It has a colour and a style.</docstring>
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Brush" overloaded="no">
         <autodoc>__init__(Colour colour, int style=SOLID) -&gt; Brush</autodoc>
         <docstring>Constructs a brush from a colour object and style.</docstring>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
           <param name="style" type="int" default="wxSOLID"/>
         </paramlist>
       </constructor>
       <destructor name="~wxBrush" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(int style)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetStipple" type="void" overloaded="no">
+      <method name="SetStipple" type="" overloaded="no">
         <autodoc>SetStipple(Bitmap stipple)</autodoc>
         <paramlist>
-          <param name="stipple" type="r.q(const).wxBitmap" default=""/>
+          <param name="stipple" type="wxBitmap" default=""/>
         </paramlist>
       </method>
-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetStyle" type="int" overloaded="no">
@@ -7016,12 +7016,12 @@ background of rectangles, ellipses, etc. It has a colour and a style.</docstring
       </method>
     </class>
     <class name="Bitmap" oldname="wxBitmap" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Bitmap" overloaded="no">
         <autodoc>__init__(String name, int type=BITMAP_TYPE_ANY) -&gt; Bitmap</autodoc>
         <docstring>Loads a bitmap from a file.</docstring>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="wxBitmapType" default="wxBITMAP_TYPE_ANY"/>
         </paramlist>
       </constructor>
@@ -7040,7 +7040,7 @@ the current screen or visual. Some platforms only support 1 for monochrome and
         <autodoc>BitmapFromIcon(Icon icon) -&gt; Bitmap</autodoc>
         <docstring>Create a new bitmap from an Icon object.</docstring>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="wxIcon" default=""/>
         </paramlist>
       </constructor>
       <constructor name="BitmapFromImage" overloaded="no">
@@ -7050,7 +7050,7 @@ an image as you cannot draw an image directly on a window. The resulting
 bitmap will use the provided colour depth (or that of the current system if
 depth is -1) which entails that a colour reduction has to take place.</docstring>
         <paramlist>
-          <param name="image" type="r.q(const).wxImage" default=""/>
+          <param name="image" type="Image" default=""/>
           <param name="depth" type="int" default="-1"/>
         </paramlist>
       </constructor>
@@ -7058,7 +7058,7 @@ depth is -1) which entails that a colour reduction has to take place.</docstring
         <autodoc>BitmapFromXPMData(PyObject listOfStrings) -&gt; Bitmap</autodoc>
         <docstring>Construct a Bitmap from a list of strings formatted as XPM data.</docstring>
         <paramlist>
-          <param name="listOfStrings" type="p.PyObject" default=""/>
+          <param name="listOfStrings" type="PyObject" default=""/>
         </paramlist>
       </constructor>
       <constructor name="BitmapFromBits" overloaded="no">
@@ -7068,7 +7068,7 @@ monochrome bitmaps (depth 1) in portable programs: in this case the bits
 parameter should contain an XBM image.  For other bit depths, the behaviour is
 platform dependent.</docstring>
         <paramlist>
-          <param name="bits" type="p.PyObject" default=""/>
+          <param name="bits" type="PyObject" default=""/>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
           <param name="depth" type="int" default="1"/>
@@ -7093,7 +7093,7 @@ platform dependent.</docstring>
         <docstring>Gets the colour depth of the bitmap. A value of 1 indicates a
 monochrome bitmap.</docstring>
       </method>
-      <method name="ConvertToImage" type="wxImage" overloaded="no">
+      <method name="ConvertToImage" type="Image" overloaded="no">
         <autodoc>ConvertToImage() -&gt; Image</autodoc>
         <docstring>Creates a platform-independent image from a platform-dependent bitmap. This
 preserves mask information so that bitmaps and images can be converted back
@@ -7104,66 +7104,66 @@ and forth without loss in that respect.</docstring>
         <docstring>Gets the associated mask (if any) which may have been loaded from a file
 or explpicitly set for the bitmap.</docstring>
       </method>
-      <method name="SetMask" type="void" overloaded="no">
+      <method name="SetMask" type="" overloaded="no">
         <autodoc>SetMask(Mask mask)</autodoc>
         <docstring>Sets the mask for this bitmap.</docstring>
         <paramlist>
-          <param name="mask" type="p.wxMask" default=""/>
+          <param name="mask" type="wxMask" default=""/>
         </paramlist>
       </method>
-      <method name="SetMaskColour" type="void" overloaded="no">
+      <method name="SetMaskColour" type="" overloaded="no">
         <autodoc>SetMaskColour(Colour colour)</autodoc>
         <docstring>Create a Mask based on a specified colour in the Bitmap.</docstring>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetSubBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetSubBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetSubBitmap(Rect rect) -&gt; Bitmap</autodoc>
         <docstring>Returns a sub bitmap of the current one as long as the rect belongs entirely
 to the bitmap. This function preserves bit depth and mask information.</docstring>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="SaveFile" type="bool" overloaded="no">
         <autodoc>SaveFile(String name, int type, Palette palette=(wxPalette *) NULL) -&gt; bool</autodoc>
         <docstring>Saves a bitmap in the named file.</docstring>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="wxBitmapType" default=""/>
-          <param name="palette" type="p.wxPalette" default="(wxPalette *) NULL"/>
+          <param name="palette" type="Palette" default="(wxPalette *) NULL"/>
         </paramlist>
       </method>
       <method name="LoadFile" type="bool" overloaded="no">
         <autodoc>LoadFile(String name, int type) -&gt; bool</autodoc>
         <docstring>Loads a bitmap from a file</docstring>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="type" type="wxBitmapType" default=""/>
         </paramlist>
       </method>
       <method name="CopyFromIcon" type="bool" overloaded="no">
         <autodoc>CopyFromIcon(Icon icon) -&gt; bool</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="wxIcon" default=""/>
         </paramlist>
       </method>
-      <method name="SetHeight" type="void" overloaded="no">
+      <method name="SetHeight" type="" overloaded="no">
         <autodoc>SetHeight(int height)</autodoc>
         <docstring>Set the height property (does not affect the bitmap data).</docstring>
         <paramlist>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int width)</autodoc>
         <docstring>Set the width property (does not affect the bitmap data).</docstring>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDepth" type="void" overloaded="no">
+      <method name="SetDepth" type="" overloaded="no">
         <autodoc>SetDepth(int depth)</autodoc>
         <docstring>Set the depth property (does not affect the bitmap data).</docstring>
         <paramlist>
@@ -7176,12 +7176,12 @@ to the bitmap. This function preserves bit depth and mask information.</docstrin
 black and the unmasked area is white. When associated with a bitmap and drawn
 in a device context, the unmasked area of the bitmap will be drawn, and the
 masked area will not be drawn.</docstring>
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Mask" overloaded="no">
         <autodoc>__init__(Bitmap bitmap) -&gt; Mask</autodoc>
         <docstring>Constructs a mask from a monochrome bitmap.</docstring>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </constructor>
       <constructor name="MaskColour" overloaded="no">
@@ -7189,17 +7189,17 @@ masked area will not be drawn.</docstring>
         <docstring>Constructs a mask from a bitmap and a colour in that bitmap that indicates the
 background.</docstring>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </constructor>
     </class>
     <class name="Icon" oldname="wxIcon" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Icon" overloaded="no">
         <autodoc>__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="flags" type="long" default=""/>
           <param name="desiredWidth" type="int" default="-1"/>
           <param name="desiredHeight" type="int" default="-1"/>
@@ -7211,19 +7211,19 @@ background.</docstring>
       <constructor name="IconFromLocation" overloaded="no">
         <autodoc>IconFromLocation(IconLocation loc) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="loc" type="r.q(const).wxIconLocation" default=""/>
+          <param name="loc" type="wxIconLocation" default=""/>
         </paramlist>
       </constructor>
       <constructor name="IconFromBitmap" overloaded="no">
         <autodoc>IconFromBitmap(Bitmap bmp) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
         </paramlist>
       </constructor>
       <constructor name="IconFromXPMData" overloaded="no">
         <autodoc>IconFromXPMData(PyObject listOfStrings) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="listOfStrings" type="p.PyObject" default=""/>
+          <param name="listOfStrings" type="PyObject" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxIcon" overloaded="no">
@@ -7232,7 +7232,7 @@ background.</docstring>
       <method name="LoadFile" type="bool" overloaded="no">
         <autodoc>LoadFile(String name, long flags) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>
@@ -7248,28 +7248,28 @@ background.</docstring>
       <method name="GetDepth" type="int" overloaded="no">
         <autodoc>GetDepth() -&gt; int</autodoc>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHeight" type="void" overloaded="no">
+      <method name="SetHeight" type="" overloaded="no">
         <autodoc>SetHeight(int h)</autodoc>
         <paramlist>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDepth" type="void" overloaded="no">
+      <method name="SetDepth" type="" overloaded="no">
         <autodoc>SetDepth(int d)</autodoc>
         <paramlist>
           <param name="d" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CopyFromBitmap" type="void" overloaded="no">
+      <method name="CopyFromBitmap" type="" overloaded="no">
         <autodoc>CopyFromBitmap(Bitmap bmp)</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
         </paramlist>
       </method>
     </class>
@@ -7277,7 +7277,7 @@ background.</docstring>
       <constructor name="IconLocation" overloaded="no">
         <autodoc>__init__(String filename=&amp;wxPyEmptyString, int num=0) -&gt; IconLocation</autodoc>
         <paramlist>
-          <param name="filename" type="p.q(const).wxString" default="&amp;wxPyEmptyString"/>
+          <param name="filename" type="String" default="&amp;wxPyEmptyString"/>
           <param name="num" type="int" default="0"/>
         </paramlist>
       </constructor>
@@ -7287,16 +7287,16 @@ background.</docstring>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
-      <method name="SetFileName" type="void" overloaded="no">
+      <method name="SetFileName" type="" overloaded="no">
         <autodoc>SetFileName(String filename)</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetFileName" type="q(const).wxString" overloaded="no">
+      <method name="GetFileName" type="String" overloaded="no">
         <autodoc>GetFileName() -&gt; String</autodoc>
       </method>
-      <method name="SetIndex" type="void" overloaded="no">
+      <method name="SetIndex" type="" overloaded="no">
         <autodoc>SetIndex(int num)</autodoc>
         <paramlist>
           <param name="num" type="int" default=""/>
@@ -7313,45 +7313,45 @@ background.</docstring>
       <constructor name="IconBundleFromFile" overloaded="no">
         <autodoc>IconBundleFromFile(String file, long type) -&gt; IconBundle</autodoc>
         <paramlist>
-          <param name="file" type="r.q(const).wxString" default=""/>
+          <param name="file" type="String" default=""/>
           <param name="type" type="long" default=""/>
         </paramlist>
       </constructor>
       <constructor name="IconBundleFromIcon" overloaded="no">
         <autodoc>IconBundleFromIcon(Icon icon) -&gt; IconBundle</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxIconBundle" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="AddIcon" type="void" overloaded="no">
+      <method name="AddIcon" type="" overloaded="no">
         <autodoc>AddIcon(Icon icon)</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>
         </paramlist>
       </method>
-      <method name="AddIconFromFile" type="void" overloaded="no">
+      <method name="AddIconFromFile" type="" overloaded="no">
         <autodoc>AddIconFromFile(String file, long type)</autodoc>
         <paramlist>
-          <param name="file" type="r.q(const).wxString" default=""/>
+          <param name="file" type="String" default=""/>
           <param name="type" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetIcon" type="q(const).wxIcon" overloaded="no">
+      <method name="GetIcon" type="Icon" overloaded="no">
         <autodoc>GetIcon(Size size) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="Cursor" oldname="wxCursor" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Cursor" overloaded="no">
         <autodoc>__init__(String cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -&gt; Cursor</autodoc>
         <paramlist>
-          <param name="cursorName" type="p.q(const).wxString" default=""/>
+          <param name="cursorName" type="String" default=""/>
           <param name="flags" type="long" default=""/>
           <param name="hotSpotX" type="int" default="0"/>
           <param name="hotSpotY" type="int" default="0"/>
@@ -7366,19 +7366,19 @@ background.</docstring>
       <constructor name="CursorFromImage" overloaded="no">
         <autodoc>CursorFromImage(Image image) -&gt; Cursor</autodoc>
         <paramlist>
-          <param name="image" type="r.q(const).wxImage" default=""/>
+          <param name="image" type="Image" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CursorFromBits" overloaded="no">
         <autodoc>CursorFromBits(PyObject bits, int width, int height, int hotSpotX=-1, 
     int hotSpotY=-1, PyObject maskBits=0) -&gt; Cursor</autodoc>
         <paramlist>
-          <param name="bits" type="p.PyObject" default=""/>
+          <param name="bits" type="PyObject" default=""/>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
           <param name="hotSpotX" type="int" default="-1"/>
           <param name="hotSpotY" type="int" default="-1"/>
-          <param name="maskBits" type="p.PyObject" default="0"/>
+          <param name="maskBits" type="PyObject" default="0"/>
         </paramlist>
       </constructor>
       <destructor name="~wxCursor" overloaded="no">
@@ -7392,7 +7392,7 @@ background.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Region" oldname="wxRegion" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Region" overloaded="no">
         <autodoc>__init__(int x=0, int y=0, int width=0, int height=0) -&gt; Region</autodoc>
         <paramlist>
@@ -7405,8 +7405,8 @@ background.</docstring>
       <constructor name="RegionFromBitmap" overloaded="no">
         <autodoc>RegionFromBitmap(Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -&gt; Region</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
-          <param name="transColour" type="r.q(const).wxColour" default="wxNullColour"/>
+          <param name="bmp" type="Bitmap" default=""/>
+          <param name="transColour" type="Colour" default="wxNullColour"/>
           <param name="tolerance" type="int" default="0"/>
         </paramlist>
       </constructor>
@@ -7414,14 +7414,14 @@ background.</docstring>
         <autodoc>RegionFromPoints(int points, Point points_array, int fillStyle=WINDING_RULE) -&gt; Region</autodoc>
         <paramlist>
           <param name="points" type="int" default=""/>
-          <param name="points_array" type="p.wxPoint" default=""/>
+          <param name="points_array" type="Point" default=""/>
           <param name="fillStyle" type="int" default="wxWINDING_RULE"/>
         </paramlist>
       </constructor>
       <destructor name="~wxRegion" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="Offset" type="bool" overloaded="no">
@@ -7441,13 +7441,13 @@ background.</docstring>
       <method name="ContainsPoint" type="wxRegionContain" overloaded="no">
         <autodoc>ContainsPoint(Point pt) -&gt; int</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="ContainsRect" type="wxRegionContain" overloaded="no">
         <autodoc>ContainsRect(Rect rect) -&gt; int</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="ContainsRectDim" type="wxRegionContain" overloaded="no">
@@ -7459,7 +7459,7 @@ background.</docstring>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetBox" type="wxRect" overloaded="no">
+      <method name="GetBox" type="Rect" overloaded="no">
         <autodoc>GetBox() -&gt; Rect</autodoc>
       </method>
       <method name="Intersect" type="bool" overloaded="no">
@@ -7474,13 +7474,13 @@ background.</docstring>
       <method name="IntersectRect" type="bool" overloaded="no">
         <autodoc>IntersectRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="IntersectRegion" type="bool" overloaded="no">
         <autodoc>IntersectRegion(Region region) -&gt; bool</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </method>
       <method name="IsEmpty" type="bool" overloaded="no">
@@ -7498,13 +7498,13 @@ background.</docstring>
       <method name="UnionRect" type="bool" overloaded="no">
         <autodoc>UnionRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="UnionRegion" type="bool" overloaded="no">
         <autodoc>UnionRegion(Region region) -&gt; bool</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </method>
       <method name="Subtract" type="bool" overloaded="no">
@@ -7519,13 +7519,13 @@ background.</docstring>
       <method name="SubtractRect" type="bool" overloaded="no">
         <autodoc>SubtractRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="SubtractRegion" type="bool" overloaded="no">
         <autodoc>SubtractRegion(Region region) -&gt; bool</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </method>
       <method name="Xor" type="bool" overloaded="no">
@@ -7540,33 +7540,33 @@ background.</docstring>
       <method name="XorRect" type="bool" overloaded="no">
         <autodoc>XorRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="XorRegion" type="bool" overloaded="no">
         <autodoc>XorRegion(Region region) -&gt; bool</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertToBitmap" type="wxBitmap" overloaded="no">
+      <method name="ConvertToBitmap" type="Bitmap" overloaded="no">
         <autodoc>ConvertToBitmap() -&gt; Bitmap</autodoc>
       </method>
       <method name="UnionBitmap" type="bool" overloaded="no">
         <autodoc>UnionBitmap(Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
-          <param name="transColour" type="r.q(const).wxColour" default="wxNullColour"/>
+          <param name="bmp" type="Bitmap" default=""/>
+          <param name="transColour" type="Colour" default="wxNullColour"/>
           <param name="tolerance" type="int" default="0"/>
         </paramlist>
       </method>
     </class>
     <class name="RegionIterator" oldname="wxRegionIterator" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="RegionIterator" overloaded="no">
         <autodoc>__init__(Region region) -&gt; RegionIterator</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxRegionIterator" overloaded="no">
@@ -7590,16 +7590,16 @@ background.</docstring>
       <method name="GetHeight" type="int" overloaded="no">
         <autodoc>GetHeight() -&gt; int</autodoc>
       </method>
-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
       <method name="HaveRects" type="bool" overloaded="no">
         <autodoc>HaveRects() -&gt; bool</autodoc>
       </method>
-      <method name="Reset" type="void" overloaded="no">
+      <method name="Reset" type="" overloaded="no">
         <autodoc>Reset()</autodoc>
       </method>
-      <method name="Next" type="void" overloaded="no">
+      <method name="Next" type="" overloaded="no">
         <autodoc>Next()</autodoc>
       </method>
       <method name="__nonzero__" type="bool" overloaded="no">
@@ -7619,13 +7619,13 @@ background.</docstring>
       <destructor name="~wxNativeFontInfo" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Init" type="void" overloaded="no">
+      <method name="Init" type="" overloaded="no">
         <autodoc>Init()</autodoc>
       </method>
-      <method name="InitFromFont" type="void" overloaded="no">
+      <method name="InitFromFont" type="" overloaded="no">
         <autodoc>InitFromFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="wxFont" default=""/>
         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">
@@ -7640,7 +7640,7 @@ background.</docstring>
       <method name="GetUnderlined" type="bool" overloaded="no">
         <autodoc>GetUnderlined() -&gt; bool</autodoc>
       </method>
-      <method name="GetFaceName" type="wxString" overloaded="no">
+      <method name="GetFaceName" type="String" overloaded="no">
         <autodoc>GetFaceName() -&gt; String</autodoc>
       </method>
       <method name="GetFamily" type="wxFontFamily" overloaded="no">
@@ -7649,43 +7649,43 @@ background.</docstring>
       <method name="GetEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>GetEncoding() -&gt; int</autodoc>
       </method>
-      <method name="SetPointSize" type="void" overloaded="no">
+      <method name="SetPointSize" type="" overloaded="no">
         <autodoc>SetPointSize(int pointsize)</autodoc>
         <paramlist>
           <param name="pointsize" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(int style)</autodoc>
         <paramlist>
           <param name="style" type="wxFontStyle" default=""/>
         </paramlist>
       </method>
-      <method name="SetWeight" type="void" overloaded="no">
+      <method name="SetWeight" type="" overloaded="no">
         <autodoc>SetWeight(int weight)</autodoc>
         <paramlist>
           <param name="weight" type="wxFontWeight" default=""/>
         </paramlist>
       </method>
-      <method name="SetUnderlined" type="void" overloaded="no">
+      <method name="SetUnderlined" type="" overloaded="no">
         <autodoc>SetUnderlined(bool underlined)</autodoc>
         <paramlist>
           <param name="underlined" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetFaceName" type="void" overloaded="no">
+      <method name="SetFaceName" type="" overloaded="no">
         <autodoc>SetFaceName(String facename)</autodoc>
         <paramlist>
-          <param name="facename" type="wxString" default=""/>
+          <param name="facename" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetFamily" type="void" overloaded="no">
+      <method name="SetFamily" type="" overloaded="no">
         <autodoc>SetFamily(int family)</autodoc>
         <paramlist>
           <param name="family" type="wxFontFamily" default=""/>
         </paramlist>
       </method>
-      <method name="SetEncoding" type="void" overloaded="no">
+      <method name="SetEncoding" type="" overloaded="no">
         <autodoc>SetEncoding(int encoding)</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
@@ -7694,22 +7694,22 @@ background.</docstring>
       <method name="FromString" type="bool" overloaded="no">
         <autodoc>FromString(String s) -&gt; bool</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="ToString" type="wxString" overloaded="no">
+      <method name="ToString" type="String" overloaded="no">
         <autodoc>ToString() -&gt; String</autodoc>
       </method>
-      <method name="__str__" type="wxString" overloaded="no">
+      <method name="__str__" type="String" overloaded="no">
         <autodoc>__str__() -&gt; String</autodoc>
       </method>
       <method name="FromUserString" type="bool" overloaded="no">
         <autodoc>FromUserString(String s) -&gt; bool</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="ToUserString" type="wxString" overloaded="no">
+      <method name="ToUserString" type="String" overloaded="no">
         <autodoc>ToUserString() -&gt; String</autodoc>
       </method>
     </class>
@@ -7720,19 +7720,19 @@ background.</docstring>
       <destructor name="~wxNativeEncodingInfo" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <property name="facename" type="wxString" readonly="no"/>
+      <property name="facename" type="String" readonly="no"/>
       <property name="encoding" type="wxFontEncoding" readonly="no"/>
       <method name="FromString" type="bool" overloaded="no">
         <autodoc>FromString(String s) -&gt; bool</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="ToString" type="wxString" overloaded="no">
+      <method name="ToString" type="String" overloaded="no">
         <autodoc>ToString() -&gt; String</autodoc>
       </method>
     </class>
-    <method name="GetNativeFontEncoding" oldname="wxGetNativeFontEncoding" type="wxNativeEncodingInfo" overloaded="no">
+    <method name="GetNativeFontEncoding" oldname="wxGetNativeFontEncoding" type="NativeEncodingInfo" overloaded="no">
       <autodoc>GetNativeFontEncoding(int encoding) -&gt; NativeEncodingInfo</autodoc>
       <paramlist>
         <param name="encoding" type="wxFontEncoding" default=""/>
@@ -7741,7 +7741,7 @@ background.</docstring>
     <method name="TestFontEncoding" oldname="wxTestFontEncoding" type="bool" overloaded="no">
       <autodoc>TestFontEncoding(NativeEncodingInfo info) -&gt; bool</autodoc>
       <paramlist>
-        <param name="info" type="r.q(const).wxNativeEncodingInfo" default=""/>
+        <param name="info" type="NativeEncodingInfo" default=""/>
       </paramlist>
     </method>
     <pythoncode>
@@ -7754,19 +7754,19 @@ background.</docstring>
       <destructor name="~wxFontMapper" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <staticmethod name="Get" type="wxFontMapper" overloaded="no">
+      <staticmethod name="Get" type="FontMapper" overloaded="no">
         <autodoc>FontMapper.Get() -&gt; FontMapper</autodoc>
       </staticmethod>
-      <staticmethod name="Set" type="wxFontMapper" overloaded="no">
+      <staticmethod name="Set" type="FontMapper" overloaded="no">
         <autodoc>FontMapper.Set(FontMapper mapper) -&gt; FontMapper</autodoc>
         <paramlist>
-          <param name="mapper" type="p.wxFontMapper" default=""/>
+          <param name="mapper" type="FontMapper" default=""/>
         </paramlist>
       </staticmethod>
       <method name="CharsetToEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>CharsetToEncoding(String charset, bool interactive=True) -&gt; int</autodoc>
         <paramlist>
-          <param name="charset" type="r.q(const).wxString" default=""/>
+          <param name="charset" type="String" default=""/>
           <param name="interactive" type="bool" default="True"/>
         </paramlist>
       </method>
@@ -7779,38 +7779,38 @@ background.</docstring>
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetEncodingName" type="wxString" overloaded="no">
+      <staticmethod name="GetEncodingName" type="String" overloaded="no">
         <autodoc>FontMapper.GetEncodingName(int encoding) -&gt; String</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetEncodingDescription" type="wxString" overloaded="no">
+      <staticmethod name="GetEncodingDescription" type="String" overloaded="no">
         <autodoc>FontMapper.GetEncodingDescription(int encoding) -&gt; String</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="SetConfig" type="void" overloaded="no">
+      <method name="SetConfig" type="" overloaded="no">
         <autodoc>SetConfig(ConfigBase config)</autodoc>
         <paramlist>
-          <param name="config" type="p.wxConfigBase" default=""/>
+          <param name="config" type="wxConfigBase" default=""/>
         </paramlist>
       </method>
-      <method name="SetConfigPath" type="void" overloaded="no">
+      <method name="SetConfigPath" type="" overloaded="no">
         <autodoc>SetConfigPath(String prefix)</autodoc>
         <paramlist>
-          <param name="prefix" type="r.q(const).wxString" default=""/>
+          <param name="prefix" type="String" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="GetDefaultConfigPath" type="q(const).wxString" overloaded="no">
+      <staticmethod name="GetDefaultConfigPath" type="String" overloaded="no">
         <autodoc>FontMapper.GetDefaultConfigPath() -&gt; String</autodoc>
       </staticmethod>
       <method name="GetAltForEncoding" type="PyObject" overloaded="no">
         <autodoc>GetAltForEncoding(int encoding, String facename=EmptyString, bool interactive=True) -&gt; PyObject</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
-          <param name="facename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="facename" type="String" default="wxPyEmptyString"/>
           <param name="interactive" type="bool" default="True"/>
         </paramlist>
       </method>
@@ -7818,19 +7818,19 @@ background.</docstring>
         <autodoc>IsEncodingAvailable(int encoding, String facename=EmptyString) -&gt; bool</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
-          <param name="facename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="facename" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="SetDialogParent" type="void" overloaded="no">
+      <method name="SetDialogParent" type="" overloaded="no">
         <autodoc>SetDialogParent(Window parent)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="SetDialogTitle" type="void" overloaded="no">
+      <method name="SetDialogTitle" type="" overloaded="no">
         <autodoc>SetDialogTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -7838,7 +7838,7 @@ background.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Font" oldname="wxFont" module="gdi">
-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>
       <constructor name="Font" overloaded="no">
         <autodoc>__init__(int pointSize, int family, int style, int weight, bool underline=False, 
     String face=EmptyString, 
@@ -7849,20 +7849,20 @@ background.</docstring>
           <param name="style" type="int" default=""/>
           <param name="weight" type="int" default=""/>
           <param name="underline" type="bool" default="False"/>
-          <param name="face" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="face" type="String" default="wxPyEmptyString"/>
           <param name="encoding" type="wxFontEncoding" default="wxFONTENCODING_DEFAULT"/>
         </paramlist>
       </constructor>
       <constructor name="FontFromNativeInfo" overloaded="no">
         <autodoc>FontFromNativeInfo(NativeFontInfo info) -&gt; Font</autodoc>
         <paramlist>
-          <param name="info" type="r.q(const).wxNativeFontInfo" default=""/>
+          <param name="info" type="NativeFontInfo" default=""/>
         </paramlist>
       </constructor>
       <constructor name="FontFromNativeInfoString" overloaded="no">
         <autodoc>FontFromNativeInfoString(String info) -&gt; Font</autodoc>
         <paramlist>
-          <param name="info" type="r.q(const).wxString" default=""/>
+          <param name="info" type="String" default=""/>
         </paramlist>
       </constructor>
       <constructor name="Font2" overloaded="no">
@@ -7872,7 +7872,7 @@ background.</docstring>
           <param name="pointSize" type="int" default=""/>
           <param name="family" type="wxFontFamily" default=""/>
           <param name="flags" type="int" default="wxFONTFLAG_DEFAULT"/>
-          <param name="face" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="face" type="String" default="wxPyEmptyString"/>
           <param name="encoding" type="wxFontEncoding" default="wxFONTENCODING_DEFAULT"/>
         </paramlist>
       </constructor>
@@ -7885,13 +7885,13 @@ background.</docstring>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Font font) -&gt; bool</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Font font) -&gt; bool</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">
@@ -7909,94 +7909,94 @@ background.</docstring>
       <method name="GetUnderlined" type="bool" overloaded="no">
         <autodoc>GetUnderlined() -&gt; bool</autodoc>
       </method>
-      <method name="GetFaceName" type="wxString" overloaded="no">
+      <method name="GetFaceName" type="String" overloaded="no">
         <autodoc>GetFaceName() -&gt; String</autodoc>
       </method>
       <method name="GetEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>GetEncoding() -&gt; int</autodoc>
       </method>
-      <method name="GetNativeFontInfo" type="q(const).wxNativeFontInfo" overloaded="no">
+      <method name="GetNativeFontInfo" type="NativeFontInfo" overloaded="no">
         <autodoc>GetNativeFontInfo() -&gt; NativeFontInfo</autodoc>
       </method>
       <method name="IsFixedWidth" type="bool" overloaded="no">
         <autodoc>IsFixedWidth() -&gt; bool</autodoc>
       </method>
-      <method name="GetNativeFontInfoDesc" type="wxString" overloaded="no">
+      <method name="GetNativeFontInfoDesc" type="String" overloaded="no">
         <autodoc>GetNativeFontInfoDesc() -&gt; String</autodoc>
       </method>
-      <method name="GetNativeFontInfoUserDesc" type="wxString" overloaded="no">
+      <method name="GetNativeFontInfoUserDesc" type="String" overloaded="no">
         <autodoc>GetNativeFontInfoUserDesc() -&gt; String</autodoc>
       </method>
-      <method name="SetPointSize" type="void" overloaded="no">
+      <method name="SetPointSize" type="" overloaded="no">
         <autodoc>SetPointSize(int pointSize)</autodoc>
         <paramlist>
           <param name="pointSize" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFamily" type="void" overloaded="no">
+      <method name="SetFamily" type="" overloaded="no">
         <autodoc>SetFamily(int family)</autodoc>
         <paramlist>
           <param name="family" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(int style)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWeight" type="void" overloaded="no">
+      <method name="SetWeight" type="" overloaded="no">
         <autodoc>SetWeight(int weight)</autodoc>
         <paramlist>
           <param name="weight" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFaceName" type="void" overloaded="no">
+      <method name="SetFaceName" type="" overloaded="no">
         <autodoc>SetFaceName(String faceName)</autodoc>
         <paramlist>
-          <param name="faceName" type="r.q(const).wxString" default=""/>
+          <param name="faceName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetUnderlined" type="void" overloaded="no">
+      <method name="SetUnderlined" type="" overloaded="no">
         <autodoc>SetUnderlined(bool underlined)</autodoc>
         <paramlist>
           <param name="underlined" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetEncoding" type="void" overloaded="no">
+      <method name="SetEncoding" type="" overloaded="no">
         <autodoc>SetEncoding(int encoding)</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </method>
-      <method name="SetNativeFontInfo" type="void" overloaded="no">
+      <method name="SetNativeFontInfo" type="" overloaded="no">
         <autodoc>SetNativeFontInfo(NativeFontInfo info)</autodoc>
         <paramlist>
-          <param name="info" type="r.q(const).wxNativeFontInfo" default=""/>
+          <param name="info" type="NativeFontInfo" default=""/>
         </paramlist>
       </method>
-      <method name="SetNativeFontInfoFromString" type="void" overloaded="no">
+      <method name="SetNativeFontInfoFromString" type="" overloaded="no">
         <autodoc>SetNativeFontInfoFromString(String info)</autodoc>
         <paramlist>
-          <param name="info" type="r.q(const).wxString" default=""/>
+          <param name="info" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetNativeFontInfoUserDesc" type="void" overloaded="no">
+      <method name="SetNativeFontInfoUserDesc" type="" overloaded="no">
         <autodoc>SetNativeFontInfoUserDesc(String info)</autodoc>
         <paramlist>
-          <param name="info" type="r.q(const).wxString" default=""/>
+          <param name="info" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetFamilyString" type="wxString" overloaded="no">
+      <method name="GetFamilyString" type="String" overloaded="no">
         <autodoc>GetFamilyString() -&gt; String</autodoc>
       </method>
-      <method name="GetStyleString" type="wxString" overloaded="no">
+      <method name="GetStyleString" type="String" overloaded="no">
         <autodoc>GetStyleString() -&gt; String</autodoc>
       </method>
-      <method name="GetWeightString" type="wxString" overloaded="no">
+      <method name="GetWeightString" type="String" overloaded="no">
         <autodoc>GetWeightString() -&gt; String</autodoc>
       </method>
-      <method name="SetNoAntiAliasing" type="void" overloaded="no">
+      <method name="SetNoAntiAliasing" type="" overloaded="no">
         <autodoc>SetNoAntiAliasing(bool no=True)</autodoc>
         <paramlist>
           <param name="no" type="bool" default="True"/>
@@ -8008,7 +8008,7 @@ background.</docstring>
       <staticmethod name="GetDefaultEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>Font.GetDefaultEncoding() -&gt; int</autodoc>
       </staticmethod>
-      <staticmethod name="SetDefaultEncoding" type="void" overloaded="no">
+      <staticmethod name="SetDefaultEncoding" type="" overloaded="no">
         <autodoc>Font.SetDefaultEncoding(int encoding)</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
@@ -8025,11 +8025,11 @@ background.</docstring>
       <destructor name="~wxPyFontEnumerator" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class, bool incref)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
           <param name="incref" type="bool" default=""/>
         </paramlist>
       </method>
@@ -8043,7 +8043,7 @@ background.</docstring>
       <method name="EnumerateEncodings" type="bool" overloaded="no">
         <autodoc>EnumerateEncodings(String facename=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="facename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="facename" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="GetEncodings" type="PyObject" overloaded="no">
@@ -8058,8 +8058,8 @@ background.</docstring>
 </pythoncode>
     <class name="LanguageInfo" oldname="wxLanguageInfo" module="gdi">
       <property name="Language" type="int" readonly="no"/>
-      <property name="CanonicalName" type="wxString" readonly="no"/>
-      <property name="Description" type="wxString" readonly="no"/>
+      <property name="CanonicalName" type="String" readonly="no"/>
+      <property name="Description" type="String" readonly="no"/>
     </class>
     <class name="Locale" oldname="wxLocale" module="gdi">
       <constructor name="Locale" overloaded="no">
@@ -8077,9 +8077,9 @@ background.</docstring>
     bool bLoadDefault=True, 
     bool bConvertEncoding=False) -&gt; bool</autodoc>
         <paramlist>
-          <param name="szName" type="r.q(const).wxString" default=""/>
-          <param name="szShort" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="szLocale" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="szName" type="String" default=""/>
+          <param name="szShort" type="String" default="wxPyEmptyString"/>
+          <param name="szLocale" type="String" default="wxPyEmptyString"/>
           <param name="bLoadDefault" type="bool" default="True"/>
           <param name="bConvertEncoding" type="bool" default="False"/>
         </paramlist>
@@ -8097,91 +8097,91 @@ background.</docstring>
       <staticmethod name="GetSystemEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>Locale.GetSystemEncoding() -&gt; int</autodoc>
       </staticmethod>
-      <staticmethod name="GetSystemEncodingName" type="wxString" overloaded="no">
+      <staticmethod name="GetSystemEncodingName" type="String" overloaded="no">
         <autodoc>Locale.GetSystemEncodingName() -&gt; String</autodoc>
       </staticmethod>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
-      <method name="GetLocale" type="wxString" overloaded="no">
+      <method name="GetLocale" type="String" overloaded="no">
         <autodoc>GetLocale() -&gt; String</autodoc>
       </method>
       <method name="GetLanguage" type="int" overloaded="no">
         <autodoc>GetLanguage() -&gt; int</autodoc>
       </method>
-      <method name="GetSysName" type="wxString" overloaded="no">
+      <method name="GetSysName" type="String" overloaded="no">
         <autodoc>GetSysName() -&gt; String</autodoc>
       </method>
-      <method name="GetCanonicalName" type="wxString" overloaded="no">
+      <method name="GetCanonicalName" type="String" overloaded="no">
         <autodoc>GetCanonicalName() -&gt; String</autodoc>
       </method>
-      <staticmethod name="AddCatalogLookupPathPrefix" type="void" overloaded="no">
+      <staticmethod name="AddCatalogLookupPathPrefix" type="" overloaded="no">
         <autodoc>Locale.AddCatalogLookupPathPrefix(String prefix)</autodoc>
         <paramlist>
-          <param name="prefix" type="r.q(const).wxString" default=""/>
+          <param name="prefix" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <method name="AddCatalog" type="bool" overloaded="no">
         <autodoc>AddCatalog(String szDomain) -&gt; bool</autodoc>
         <paramlist>
-          <param name="szDomain" type="r.q(const).wxString" default=""/>
+          <param name="szDomain" type="String" default=""/>
         </paramlist>
       </method>
       <method name="IsLoaded" type="bool" overloaded="no">
         <autodoc>IsLoaded(String szDomain) -&gt; bool</autodoc>
         <paramlist>
-          <param name="szDomain" type="r.q(const).wxString" default=""/>
+          <param name="szDomain" type="String" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="GetLanguageInfo" type="q(const).wxLanguageInfo" overloaded="no">
+      <staticmethod name="GetLanguageInfo" type="LanguageInfo" overloaded="no">
         <autodoc>Locale.GetLanguageInfo(int lang) -&gt; LanguageInfo</autodoc>
         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetLanguageName" type="wxString" overloaded="no">
+      <staticmethod name="GetLanguageName" type="String" overloaded="no">
         <autodoc>Locale.GetLanguageName(int lang) -&gt; String</autodoc>
         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="FindLanguageInfo" type="q(const).wxLanguageInfo" overloaded="no">
+      <staticmethod name="FindLanguageInfo" type="LanguageInfo" overloaded="no">
         <autodoc>Locale.FindLanguageInfo(String locale) -&gt; LanguageInfo</autodoc>
         <paramlist>
-          <param name="locale" type="r.q(const).wxString" default=""/>
+          <param name="locale" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="AddLanguage" type="void" overloaded="no">
+      <staticmethod name="AddLanguage" type="" overloaded="no">
         <autodoc>Locale.AddLanguage(LanguageInfo info)</autodoc>
         <paramlist>
-          <param name="info" type="r.q(const).wxLanguageInfo" default=""/>
+          <param name="info" type="LanguageInfo" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="GetString" type="wxString" overloaded="no">
+      <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString(String szOrigString, String szDomain=EmptyString) -&gt; String</autodoc>
         <paramlist>
-          <param name="szOrigString" type="r.q(const).wxString" default=""/>
-          <param name="szDomain" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="szOrigString" type="String" default=""/>
+          <param name="szDomain" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="GetName" type="q(const).wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
     </class>
-    <method name="GetLocale" oldname="wxGetLocale" type="wxLocale" overloaded="no">
+    <method name="GetLocale" oldname="wxGetLocale" type="Locale" overloaded="no">
       <autodoc>GetLocale() -&gt; Locale</autodoc>
     </method>
-    <method name="GetTranslation" oldname="wxGetTranslation" type="wxString" overloaded="yes">
+    <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">
       <paramlist>
-        <param name="sz" type="r.q(const).wxString" default=""/>
+        <param name="sz" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="GetTranslation" oldname="wxGetTranslation" type="wxString" overloaded="yes">
+    <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">
       <autodoc>GetTranslation(String sz) -&gt; String
 GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
       <paramlist>
-        <param name="sz1" type="r.q(const).wxString" default=""/>
-        <param name="sz2" type="r.q(const).wxString" default=""/>
+        <param name="sz1" type="String" default=""/>
+        <param name="sz2" type="String" default=""/>
         <param name="n" type="size_t" default=""/>
       </paramlist>
     </method>
@@ -8189,7 +8189,7 @@ GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="EncodingConverter" oldname="wxEncodingConverter" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="EncodingConverter" overloaded="no">
         <autodoc>__init__() -&gt; EncodingConverter</autodoc>
       </constructor>
@@ -8204,10 +8204,10 @@ GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
           <param name="method" type="int" default="wxCONVERT_STRICT"/>
         </paramlist>
       </method>
-      <method name="Convert" type="wxString" overloaded="no">
+      <method name="Convert" type="String" overloaded="no">
         <autodoc>Convert(String input) -&gt; String</autodoc>
         <paramlist>
-          <param name="input" type="r.q(const).wxString" default=""/>
+          <param name="input" type="String" default=""/>
         </paramlist>
       </method>
       <staticmethod name="GetPlatformEquivalents" type="wxFontEncodingArray" overloaded="no">
@@ -8255,14 +8255,14 @@ if wx.Platform == "__WXMSW__":
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DC" oldname="wxDC" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <destructor name="~wxDC" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="BeginDrawing" type="void" overloaded="no">
+      <method name="BeginDrawing" type="" overloaded="no">
         <autodoc>BeginDrawing()</autodoc>
       </method>
-      <method name="EndDrawing" type="void" overloaded="no">
+      <method name="EndDrawing" type="" overloaded="no">
         <autodoc>EndDrawing()</autodoc>
       </method>
       <method name="FloodFillXY" type="bool" overloaded="no">
@@ -8270,32 +8270,32 @@ if wx.Platform == "__WXMSW__":
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
           <param name="style" type="int" default="wxFLOOD_SURFACE"/>
         </paramlist>
       </method>
       <method name="FloodFill" type="bool" overloaded="no">
         <autodoc>FloodFill(Point pt, Colour col, int style=FLOOD_SURFACE) -&gt; bool</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="col" type="Colour" default=""/>
           <param name="style" type="int" default="wxFLOOD_SURFACE"/>
         </paramlist>
       </method>
-      <method name="GetPixelXY" type="wxColour" overloaded="no">
+      <method name="GetPixelXY" type="Colour" overloaded="no">
         <autodoc>GetPixelXY(int x, int y) -&gt; Colour</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPixel" type="wxColour" overloaded="no">
+      <method name="GetPixel" type="Colour" overloaded="no">
         <autodoc>GetPixel(Point pt) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawLineXY" type="void" overloaded="no">
+      <method name="DrawLineXY" type="" overloaded="no">
         <autodoc>DrawLineXY(int x1, int y1, int x2, int y2)</autodoc>
         <paramlist>
           <param name="x1" type="int" default=""/>
@@ -8304,27 +8304,27 @@ if wx.Platform == "__WXMSW__":
           <param name="y2" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawLine" type="void" overloaded="no">
+      <method name="DrawLine" type="" overloaded="no">
         <autodoc>DrawLine(Point pt1, Point pt2)</autodoc>
         <paramlist>
-          <param name="pt1" type="r.q(const).wxPoint" default=""/>
-          <param name="pt2" type="r.q(const).wxPoint" default=""/>
+          <param name="pt1" type="Point" default=""/>
+          <param name="pt2" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="CrossHairXY" type="void" overloaded="no">
+      <method name="CrossHairXY" type="" overloaded="no">
         <autodoc>CrossHairXY(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CrossHair" type="void" overloaded="no">
+      <method name="CrossHair" type="" overloaded="no">
         <autodoc>CrossHair(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawArcXY" type="void" overloaded="no">
+      <method name="DrawArcXY" type="" overloaded="no">
         <autodoc>DrawArcXY(int x1, int y1, int x2, int y2, int xc, int yc)</autodoc>
         <paramlist>
           <param name="x1" type="int" default=""/>
@@ -8335,15 +8335,15 @@ if wx.Platform == "__WXMSW__":
           <param name="yc" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawArc" type="void" overloaded="no">
+      <method name="DrawArc" type="" overloaded="no">
         <autodoc>DrawArc(Point pt1, Point pt2, Point centre)</autodoc>
         <paramlist>
-          <param name="pt1" type="r.q(const).wxPoint" default=""/>
-          <param name="pt2" type="r.q(const).wxPoint" default=""/>
-          <param name="centre" type="r.q(const).wxPoint" default=""/>
+          <param name="pt1" type="Point" default=""/>
+          <param name="pt2" type="Point" default=""/>
+          <param name="centre" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawCheckMarkXY" type="void" overloaded="no">
+      <method name="DrawCheckMarkXY" type="" overloaded="no">
         <autodoc>DrawCheckMarkXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8352,13 +8352,13 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawCheckMark" type="void" overloaded="no">
+      <method name="DrawCheckMark" type="" overloaded="no">
         <autodoc>DrawCheckMark(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipticArcXY" type="void" overloaded="no">
+      <method name="DrawEllipticArcXY" type="" overloaded="no">
         <autodoc>DrawEllipticArcXY(int x, int y, int w, int h, double sa, double ea)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8369,29 +8369,29 @@ if wx.Platform == "__WXMSW__":
           <param name="ea" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipticArc" type="void" overloaded="no">
+      <method name="DrawEllipticArc" type="" overloaded="no">
         <autodoc>DrawEllipticArc(Point pt, Size sz, double sa, double ea)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="sz" type="Size" default=""/>
           <param name="sa" type="double" default=""/>
           <param name="ea" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawPointXY" type="void" overloaded="no">
+      <method name="DrawPointXY" type="" overloaded="no">
         <autodoc>DrawPointXY(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawPoint" type="void" overloaded="no">
+      <method name="DrawPoint" type="" overloaded="no">
         <autodoc>DrawPoint(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRectangleXY" type="void" overloaded="no">
+      <method name="DrawRectangleXY" type="" overloaded="no">
         <autodoc>DrawRectangleXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8400,20 +8400,20 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRectangle" type="void" overloaded="no">
+      <method name="DrawRectangle" type="" overloaded="no">
         <autodoc>DrawRectangle(Point pt, Size sz)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRectangleRect" type="void" overloaded="no">
+      <method name="DrawRectangleRect" type="" overloaded="no">
         <autodoc>DrawRectangleRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRoundedRectangleXY" type="void" overloaded="no">
+      <method name="DrawRoundedRectangleXY" type="" overloaded="no">
         <autodoc>DrawRoundedRectangleXY(int x, int y, int width, int height, double radius)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8423,22 +8423,22 @@ if wx.Platform == "__WXMSW__":
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRoundedRectangle" type="void" overloaded="no">
+      <method name="DrawRoundedRectangle" type="" overloaded="no">
         <autodoc>DrawRoundedRectangle(Point pt, Size sz, double radius)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="sz" type="Size" default=""/>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRoundedRectangleRect" type="void" overloaded="no">
+      <method name="DrawRoundedRectangleRect" type="" overloaded="no">
         <autodoc>DrawRoundedRectangleRect(Rect r, double radius)</autodoc>
         <paramlist>
-          <param name="r" type="r.q(const).wxRect" default=""/>
+          <param name="r" type="Rect" default=""/>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawCircleXY" type="void" overloaded="no">
+      <method name="DrawCircleXY" type="" overloaded="no">
         <autodoc>DrawCircleXY(int x, int y, int radius)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8446,14 +8446,14 @@ if wx.Platform == "__WXMSW__":
           <param name="radius" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawCircle" type="void" overloaded="no">
+      <method name="DrawCircle" type="" overloaded="no">
         <autodoc>DrawCircle(Point pt, int radius)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
           <param name="radius" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipseXY" type="void" overloaded="no">
+      <method name="DrawEllipseXY" type="" overloaded="no">
         <autodoc>DrawEllipseXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8462,80 +8462,80 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipse" type="void" overloaded="no">
+      <method name="DrawEllipse" type="" overloaded="no">
         <autodoc>DrawEllipse(Point pt, Size sz)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipseRect" type="void" overloaded="no">
+      <method name="DrawEllipseRect" type="" overloaded="no">
         <autodoc>DrawEllipseRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DrawIconXY" type="void" overloaded="no">
+      <method name="DrawIconXY" type="" overloaded="no">
         <autodoc>DrawIconXY(Icon icon, int x, int y)</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawIcon" type="void" overloaded="no">
+      <method name="DrawIcon" type="" overloaded="no">
         <autodoc>DrawIcon(Icon icon, Point pt)</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="icon" type="Icon" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawBitmapXY" type="void" overloaded="no">
+      <method name="DrawBitmapXY" type="" overloaded="no">
         <autodoc>DrawBitmapXY(Bitmap bmp, int x, int y, bool useMask=False)</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
           <param name="useMask" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="DrawBitmap" type="void" overloaded="no">
+      <method name="DrawBitmap" type="" overloaded="no">
         <autodoc>DrawBitmap(Bitmap bmp, Point pt, bool useMask=False)</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
+          <param name="pt" type="Point" default=""/>
           <param name="useMask" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="DrawTextXY" type="void" overloaded="no">
+      <method name="DrawTextXY" type="" overloaded="no">
         <autodoc>DrawTextXY(String text, int x, int y)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawText" type="void" overloaded="no">
+      <method name="DrawText" type="" overloaded="no">
         <autodoc>DrawText(String text, Point pt)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="text" type="String" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRotatedTextXY" type="void" overloaded="no">
+      <method name="DrawRotatedTextXY" type="" overloaded="no">
         <autodoc>DrawRotatedTextXY(String text, int x, int y, double angle)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
           <param name="angle" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRotatedText" type="void" overloaded="no">
+      <method name="DrawRotatedText" type="" overloaded="no">
         <autodoc>DrawRotatedText(String text, Point pt, double angle)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="text" type="String" default=""/>
+          <param name="pt" type="Point" default=""/>
           <param name="angle" type="double" default=""/>
         </paramlist>
       </method>
@@ -8548,7 +8548,7 @@ if wx.Platform == "__WXMSW__":
           <param name="ydest" type="int" default=""/>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
-          <param name="source" type="p.wxDC" default=""/>
+          <param name="source" type="DC" default=""/>
           <param name="xsrc" type="int" default=""/>
           <param name="ysrc" type="int" default=""/>
           <param name="rop" type="int" default="wxCOPY"/>
@@ -8561,118 +8561,118 @@ if wx.Platform == "__WXMSW__":
         <autodoc>Blit(Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, 
     bool useMask=False, Point srcPtMask=DefaultPosition) -&gt; bool</autodoc>
         <paramlist>
-          <param name="destPt" type="r.q(const).wxPoint" default=""/>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
-          <param name="source" type="p.wxDC" default=""/>
-          <param name="srcPt" type="r.q(const).wxPoint" default=""/>
+          <param name="destPt" type="Point" default=""/>
+          <param name="sz" type="Size" default=""/>
+          <param name="source" type="DC" default=""/>
+          <param name="srcPt" type="Point" default=""/>
           <param name="rop" type="int" default="wxCOPY"/>
           <param name="useMask" type="bool" default="False"/>
-          <param name="srcPtMask" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="srcPtMask" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </method>
-      <method name="DrawLines" type="void" overloaded="no">
+      <method name="DrawLines" type="" overloaded="no">
         <autodoc>DrawLines(int points, Point points_array, int xoffset=0, int yoffset=0)</autodoc>
         <paramlist>
           <param name="points" type="int" default=""/>
-          <param name="points_array" type="p.wxPoint" default=""/>
+          <param name="points_array" type="Point" default=""/>
           <param name="xoffset" type="int" default="0"/>
           <param name="yoffset" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="DrawPolygon" type="void" overloaded="no">
+      <method name="DrawPolygon" type="" overloaded="no">
         <autodoc>DrawPolygon(int points, Point points_array, int xoffset=0, int yoffset=0, 
     int fillStyle=ODDEVEN_RULE)</autodoc>
         <paramlist>
           <param name="points" type="int" default=""/>
-          <param name="points_array" type="p.wxPoint" default=""/>
+          <param name="points_array" type="Point" default=""/>
           <param name="xoffset" type="int" default="0"/>
           <param name="yoffset" type="int" default="0"/>
           <param name="fillStyle" type="int" default="wxODDEVEN_RULE"/>
         </paramlist>
       </method>
-      <method name="DrawLabel" type="void" overloaded="no">
+      <method name="DrawLabel" type="" overloaded="no">
         <autodoc>DrawLabel(String text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
     int indexAccel=-1)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="text" type="String" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="alignment" type="int" default="wxALIGN_LEFT|wxALIGN_TOP"/>
           <param name="indexAccel" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="DrawImageLabel" type="wxRect" overloaded="no">
+      <method name="DrawImageLabel" type="Rect" overloaded="no">
         <autodoc>DrawImageLabel(String text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
     int indexAccel=-1) -&gt; Rect</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="image" type="r.q(const).wxBitmap" default=""/>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="text" type="String" default=""/>
+          <param name="image" type="Bitmap" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="alignment" type="int" default="wxALIGN_LEFT|wxALIGN_TOP"/>
           <param name="indexAccel" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="DrawSpline" type="void" overloaded="no">
+      <method name="DrawSpline" type="" overloaded="no">
         <autodoc>DrawSpline(int points, Point points_array)</autodoc>
         <paramlist>
           <param name="points" type="int" default=""/>
-          <param name="points_array" type="p.wxPoint" default=""/>
+          <param name="points_array" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="StartDoc" type="bool" overloaded="no">
         <autodoc>StartDoc(String message) -&gt; bool</autodoc>
         <paramlist>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="EndDoc" type="void" overloaded="no">
+      <method name="EndDoc" type="" overloaded="no">
         <autodoc>EndDoc()</autodoc>
       </method>
-      <method name="StartPage" type="void" overloaded="no">
+      <method name="StartPage" type="" overloaded="no">
         <autodoc>StartPage()</autodoc>
       </method>
-      <method name="EndPage" type="void" overloaded="no">
+      <method name="EndPage" type="" overloaded="no">
         <autodoc>EndPage()</autodoc>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetPen" type="void" overloaded="no">
+      <method name="SetPen" type="" overloaded="no">
         <autodoc>SetPen(Pen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="r.q(const).wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
-      <method name="SetBrush" type="void" overloaded="no">
+      <method name="SetBrush" type="" overloaded="no">
         <autodoc>SetBrush(Brush brush)</autodoc>
         <paramlist>
-          <param name="brush" type="r.q(const).wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackground" type="void" overloaded="no">
+      <method name="SetBackground" type="" overloaded="no">
         <autodoc>SetBackground(Brush brush)</autodoc>
         <paramlist>
-          <param name="brush" type="r.q(const).wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundMode" type="void" overloaded="no">
+      <method name="SetBackgroundMode" type="" overloaded="no">
         <autodoc>SetBackgroundMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPalette" type="void" overloaded="no">
+      <method name="SetPalette" type="" overloaded="no">
         <autodoc>SetPalette(Palette palette)</autodoc>
         <paramlist>
-          <param name="palette" type="r.q(const).wxPalette" default=""/>
+          <param name="palette" type="Palette" default=""/>
         </paramlist>
       </method>
-      <method name="SetClippingRegionXY" type="void" overloaded="no">
+      <method name="SetClippingRegionXY" type="" overloaded="no">
         <autodoc>SetClippingRegionXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -8681,38 +8681,38 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetClippingRegion" type="void" overloaded="no">
+      <method name="SetClippingRegion" type="" overloaded="no">
         <autodoc>SetClippingRegion(Point pt, Size sz)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetClippingRect" type="void" overloaded="no">
+      <method name="SetClippingRect" type="" overloaded="no">
         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="SetClippingRegionAsRegion" type="void" overloaded="no">
+      <method name="SetClippingRegionAsRegion" type="" overloaded="no">
         <autodoc>SetClippingRegionAsRegion(Region region)</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </method>
-      <method name="DestroyClippingRegion" type="void" overloaded="no">
+      <method name="DestroyClippingRegion" type="" overloaded="no">
         <autodoc>DestroyClippingRegion()</autodoc>
       </method>
-      <method name="GetClippingBox" type="void" overloaded="no">
+      <method name="GetClippingBox" type="" overloaded="no">
         <autodoc>GetClippingBox() -&gt; (x, y, width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetClippingRect" type="wxRect" overloaded="no">
+      <method name="GetClippingRect" type="Rect" overloaded="no">
         <autodoc>GetClippingRect() -&gt; Rect</autodoc>
       </method>
       <method name="GetCharHeight" type="int" overloaded="no">
@@ -8721,65 +8721,65 @@ if wx.Platform == "__WXMSW__":
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>
       </method>
-      <method name="GetTextExtent" type="void" overloaded="no">
+      <method name="GetTextExtent" type="" overloaded="no">
         <autodoc>GetTextExtent(wxString string) -&gt; (width, height)</autodoc>
         <docstring>Get the width and height of the text using the current font.
 Only works for single line strings.</docstring>
         <paramlist>
-          <param name="string" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="string" type="String" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetFullTextExtent" type="void" overloaded="no">
+      <method name="GetFullTextExtent" type="" overloaded="no">
         <autodoc>GetFullTextExtent(wxString string, Font font=None) -&gt;
    (width, height, descent, externalLeading)</autodoc>
         <docstring>Get the width, height, decent and leading of the text using the current or specified font.
 Only works for single line strings.</docstring>
         <paramlist>
-          <param name="string" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="font" type="p.wxFont" default="NULL"/>
+          <param name="string" type="String" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="font" type="Font" default="NULL"/>
         </paramlist>
       </method>
-      <method name="GetMultiLineTextExtent" type="void" overloaded="no">
+      <method name="GetMultiLineTextExtent" type="" overloaded="no">
         <autodoc>GetMultiLineTextExtent(wxString string, Font font=None) -&gt;
    (width, height, descent, externalLeading)</autodoc>
         <docstring>Get the width, height, decent and leading of the text using the current or specified font.
 Works for single as well as multi-line strings.</docstring>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="font" type="p.wxFont" default="NULL"/>
+          <param name="text" type="String" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="font" type="Font" default="NULL"/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
         <docstring>Get the DC size in device units.</docstring>
       </method>
-      <method name="GetSizeTuple" type="void" overloaded="no">
+      <method name="GetSizeTuple" type="" overloaded="no">
         <autodoc>GetSizeTuple() -&gt; (width, height)</autodoc>
         <docstring>Get the DC size in device units.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSizeMM" type="wxSize" overloaded="no">
+      <method name="GetSizeMM" type="Size" overloaded="no">
         <autodoc>GetSizeMM() -&gt; Size</autodoc>
         <docstring>Get the DC size in milimeters.</docstring>
       </method>
-      <method name="GetSizeMMTuple" type="void" overloaded="no">
+      <method name="GetSizeMMTuple" type="" overloaded="no">
         <autodoc>GetSizeMMTuple() -&gt; (width, height)</autodoc>
         <docstring>Get the DC size in milimeters.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="DeviceToLogicalX" type="int" overloaded="no">
@@ -8839,7 +8839,7 @@ Works for single as well as multi-line strings.</docstring>
       <method name="GetDepth" type="int" overloaded="no">
         <autodoc>GetDepth() -&gt; int</autodoc>
       </method>
-      <method name="GetPPI" type="wxSize" overloaded="no">
+      <method name="GetPPI" type="Size" overloaded="no">
         <autodoc>GetPPI() -&gt; Size</autodoc>
       </method>
       <method name="Ok" type="bool" overloaded="no">
@@ -8848,108 +8848,108 @@ Works for single as well as multi-line strings.</docstring>
       <method name="GetBackgroundMode" type="int" overloaded="no">
         <autodoc>GetBackgroundMode() -&gt; int</autodoc>
       </method>
-      <method name="GetBackground" type="q(const).wxBrush" overloaded="no">
+      <method name="GetBackground" type="Brush" overloaded="no">
         <autodoc>GetBackground() -&gt; Brush</autodoc>
       </method>
-      <method name="GetBrush" type="q(const).wxBrush" overloaded="no">
+      <method name="GetBrush" type="Brush" overloaded="no">
         <autodoc>GetBrush() -&gt; Brush</autodoc>
       </method>
-      <method name="GetFont" type="q(const).wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
-      <method name="GetPen" type="q(const).wxPen" overloaded="no">
+      <method name="GetPen" type="Pen" overloaded="no">
         <autodoc>GetPen() -&gt; Pen</autodoc>
       </method>
-      <method name="GetTextBackground" type="q(const).wxColour" overloaded="no">
+      <method name="GetTextBackground" type="Colour" overloaded="no">
         <autodoc>GetTextBackground() -&gt; Colour</autodoc>
       </method>
-      <method name="GetTextForeground" type="q(const).wxColour" overloaded="no">
+      <method name="GetTextForeground" type="Colour" overloaded="no">
         <autodoc>GetTextForeground() -&gt; Colour</autodoc>
       </method>
-      <method name="SetTextForeground" type="void" overloaded="no">
+      <method name="SetTextForeground" type="" overloaded="no">
         <autodoc>SetTextForeground(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetTextBackground" type="void" overloaded="no">
+      <method name="SetTextBackground" type="" overloaded="no">
         <autodoc>SetTextBackground(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="GetMapMode" type="int" overloaded="no">
         <autodoc>GetMapMode() -&gt; int</autodoc>
       </method>
-      <method name="SetMapMode" type="void" overloaded="no">
+      <method name="SetMapMode" type="" overloaded="no">
         <autodoc>SetMapMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetUserScale" type="void" overloaded="no">
+      <method name="GetUserScale" type="" overloaded="no">
         <autodoc>GetUserScale() -&gt; (xScale, yScale)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetUserScale" type="void" overloaded="no">
+      <method name="SetUserScale" type="" overloaded="no">
         <autodoc>SetUserScale(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetLogicalScale" type="void" overloaded="no">
+      <method name="GetLogicalScale" type="" overloaded="no">
         <autodoc>GetLogicalScale() -&gt; (xScale, yScale)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetLogicalScale" type="void" overloaded="no">
+      <method name="SetLogicalScale" type="" overloaded="no">
         <autodoc>SetLogicalScale(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetLogicalOrigin" type="wxPoint" overloaded="no">
+      <method name="GetLogicalOrigin" type="Point" overloaded="no">
         <autodoc>GetLogicalOrigin() -&gt; Point</autodoc>
       </method>
-      <method name="GetLogicalOriginTuple" type="void" overloaded="no">
+      <method name="GetLogicalOriginTuple" type="" overloaded="no">
         <autodoc>GetLogicalOriginTuple() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLogicalOrigin" type="void" overloaded="no">
+      <method name="SetLogicalOrigin" type="" overloaded="no">
         <autodoc>SetLogicalOrigin(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDeviceOrigin" type="wxPoint" overloaded="no">
+      <method name="GetDeviceOrigin" type="Point" overloaded="no">
         <autodoc>GetDeviceOrigin() -&gt; Point</autodoc>
       </method>
-      <method name="GetDeviceOriginTuple" type="void" overloaded="no">
+      <method name="GetDeviceOriginTuple" type="" overloaded="no">
         <autodoc>GetDeviceOriginTuple() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDeviceOrigin" type="void" overloaded="no">
+      <method name="SetDeviceOrigin" type="" overloaded="no">
         <autodoc>SetDeviceOrigin(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAxisOrientation" type="void" overloaded="no">
+      <method name="SetAxisOrientation" type="" overloaded="no">
         <autodoc>SetAxisOrientation(bool xLeftRight, bool yBottomUp)</autodoc>
         <paramlist>
           <param name="xLeftRight" type="bool" default=""/>
@@ -8959,13 +8959,13 @@ Works for single as well as multi-line strings.</docstring>
       <method name="GetLogicalFunction" type="int" overloaded="no">
         <autodoc>GetLogicalFunction() -&gt; int</autodoc>
       </method>
-      <method name="SetLogicalFunction" type="void" overloaded="no">
+      <method name="SetLogicalFunction" type="" overloaded="no">
         <autodoc>SetLogicalFunction(int function)</autodoc>
         <paramlist>
           <param name="function" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetOptimization" type="void" overloaded="no">
+      <method name="SetOptimization" type="" overloaded="no">
         <autodoc>SetOptimization(bool opt)</autodoc>
         <paramlist>
           <param name="opt" type="bool" default=""/>
@@ -8974,14 +8974,14 @@ Works for single as well as multi-line strings.</docstring>
       <method name="GetOptimization" type="bool" overloaded="no">
         <autodoc>GetOptimization() -&gt; bool</autodoc>
       </method>
-      <method name="CalcBoundingBox" type="void" overloaded="no">
+      <method name="CalcBoundingBox" type="" overloaded="no">
         <autodoc>CalcBoundingBox(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ResetBoundingBox" type="void" overloaded="no">
+      <method name="ResetBoundingBox" type="" overloaded="no">
         <autodoc>ResetBoundingBox()</autodoc>
       </method>
       <method name="MinX" type="int" overloaded="no">
@@ -8996,63 +8996,63 @@ Works for single as well as multi-line strings.</docstring>
       <method name="MaxY" type="int" overloaded="no">
         <autodoc>MaxY() -&gt; int</autodoc>
       </method>
-      <method name="GetBoundingBox" type="void" overloaded="no">
+      <method name="GetBoundingBox" type="" overloaded="no">
         <autodoc>GetBoundingBox() -&gt; (x1,y1, x2,y2)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="_DrawPointList" type="PyObject" overloaded="no">
         <autodoc>_DrawPointList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="pyCoords" type="p.PyObject" default=""/>
-          <param name="pyPens" type="p.PyObject" default=""/>
-          <param name="pyBrushes" type="p.PyObject" default=""/>
+          <param name="pyCoords" type="PyObject" default=""/>
+          <param name="pyPens" type="PyObject" default=""/>
+          <param name="pyBrushes" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="_DrawLineList" type="PyObject" overloaded="no">
         <autodoc>_DrawLineList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="pyCoords" type="p.PyObject" default=""/>
-          <param name="pyPens" type="p.PyObject" default=""/>
-          <param name="pyBrushes" type="p.PyObject" default=""/>
+          <param name="pyCoords" type="PyObject" default=""/>
+          <param name="pyPens" type="PyObject" default=""/>
+          <param name="pyBrushes" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="_DrawRectangleList" type="PyObject" overloaded="no">
         <autodoc>_DrawRectangleList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="pyCoords" type="p.PyObject" default=""/>
-          <param name="pyPens" type="p.PyObject" default=""/>
-          <param name="pyBrushes" type="p.PyObject" default=""/>
+          <param name="pyCoords" type="PyObject" default=""/>
+          <param name="pyPens" type="PyObject" default=""/>
+          <param name="pyBrushes" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="_DrawEllipseList" type="PyObject" overloaded="no">
         <autodoc>_DrawEllipseList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="pyCoords" type="p.PyObject" default=""/>
-          <param name="pyPens" type="p.PyObject" default=""/>
-          <param name="pyBrushes" type="p.PyObject" default=""/>
+          <param name="pyCoords" type="PyObject" default=""/>
+          <param name="pyPens" type="PyObject" default=""/>
+          <param name="pyBrushes" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="_DrawPolygonList" type="PyObject" overloaded="no">
         <autodoc>_DrawPolygonList(PyObject pyCoords, PyObject pyPens, PyObject pyBrushes) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="pyCoords" type="p.PyObject" default=""/>
-          <param name="pyPens" type="p.PyObject" default=""/>
-          <param name="pyBrushes" type="p.PyObject" default=""/>
+          <param name="pyCoords" type="PyObject" default=""/>
+          <param name="pyPens" type="PyObject" default=""/>
+          <param name="pyBrushes" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="_DrawTextList" type="PyObject" overloaded="no">
         <autodoc>_DrawTextList(PyObject textList, PyObject pyPoints, PyObject foregroundList, 
     PyObject backgroundList) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="textList" type="p.PyObject" default=""/>
-          <param name="pyPoints" type="p.PyObject" default=""/>
-          <param name="foregroundList" type="p.PyObject" default=""/>
-          <param name="backgroundList" type="p.PyObject" default=""/>
+          <param name="textList" type="PyObject" default=""/>
+          <param name="pyPoints" type="PyObject" default=""/>
+          <param name="foregroundList" type="PyObject" default=""/>
+          <param name="backgroundList" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -9060,20 +9060,20 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MemoryDC" oldname="wxMemoryDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="MemoryDC" overloaded="no">
         <autodoc>__init__() -&gt; MemoryDC</autodoc>
       </constructor>
       <constructor name="MemoryDCFromDC" overloaded="no">
         <autodoc>MemoryDCFromDC(DC oldDC) -&gt; MemoryDC</autodoc>
         <paramlist>
-          <param name="oldDC" type="p.wxDC" default=""/>
+          <param name="oldDC" type="DC" default=""/>
         </paramlist>
       </constructor>
-      <method name="SelectObject" type="void" overloaded="no">
+      <method name="SelectObject" type="" overloaded="no">
         <autodoc>SelectObject(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
     </class>
@@ -9081,32 +9081,32 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BufferedDC" oldname="wxBufferedDC" module="gdi">
-      <baseclass name="wxMemoryDC"/>
+      <baseclass name="MemoryDC"/>
       <constructor name="BufferedDC" overloaded="no">
         <autodoc>__init__(DC dc, Bitmap buffer) -&gt; BufferedDC</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default=""/>
-          <param name="buffer" type="r.q(const).wxBitmap" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="buffer" type="Bitmap" default=""/>
         </paramlist>
       </constructor>
       <constructor name="BufferedDCInternalBuffer" overloaded="no">
         <autodoc>BufferedDCInternalBuffer(DC dc, Size area) -&gt; BufferedDC</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default=""/>
-          <param name="area" type="r.q(const).wxSize" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="area" type="Size" default=""/>
         </paramlist>
       </constructor>
-      <method name="UnMask" type="void" overloaded="no">
+      <method name="UnMask" type="" overloaded="no">
         <autodoc>UnMask()</autodoc>
       </method>
     </class>
     <class name="BufferedPaintDC" oldname="wxBufferedPaintDC" module="gdi">
-      <baseclass name="wxBufferedDC"/>
+      <baseclass name="BufferedDC"/>
       <constructor name="BufferedPaintDC" overloaded="no">
         <autodoc>__init__(Window window, Bitmap buffer=NullBitmap) -&gt; BufferedPaintDC</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="buffer" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
+          <param name="window" type="Window" default=""/>
+          <param name="buffer" type="Bitmap" default="wxNullBitmap"/>
         </paramlist>
       </constructor>
     </class>
@@ -9114,20 +9114,20 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScreenDC" oldname="wxScreenDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="ScreenDC" overloaded="no">
         <autodoc>__init__() -&gt; ScreenDC</autodoc>
       </constructor>
       <method name="StartDrawingOnTopWin" type="bool" overloaded="no">
         <autodoc>StartDrawingOnTopWin(Window window) -&gt; bool</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="StartDrawingOnTop" type="bool" overloaded="no">
         <autodoc>StartDrawingOnTop(Rect rect=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="p.wxRect" default="NULL"/>
+          <param name="rect" type="Rect" default="NULL"/>
         </paramlist>
       </method>
       <method name="EndDrawingOnTop" type="bool" overloaded="no">
@@ -9138,11 +9138,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ClientDC" oldname="wxClientDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="ClientDC" overloaded="no">
         <autodoc>__init__(Window win) -&gt; ClientDC</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>
         </paramlist>
       </constructor>
     </class>
@@ -9150,11 +9150,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PaintDC" oldname="wxPaintDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="PaintDC" overloaded="no">
         <autodoc>__init__(Window win) -&gt; PaintDC</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>
         </paramlist>
       </constructor>
     </class>
@@ -9162,11 +9162,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="WindowDC" oldname="wxWindowDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="WindowDC" overloaded="no">
         <autodoc>__init__(Window win) -&gt; WindowDC</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>
         </paramlist>
       </constructor>
     </class>
@@ -9174,11 +9174,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MirrorDC" oldname="wxMirrorDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="MirrorDC" overloaded="no">
         <autodoc>__init__(DC dc, bool mirror) -&gt; MirrorDC</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="mirror" type="bool" default=""/>
         </paramlist>
       </constructor>
@@ -9187,23 +9187,23 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PostScriptDC" oldname="wxPostScriptDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="PostScriptDC" overloaded="no">
         <autodoc>__init__(wxPrintData printData) -&gt; PostScriptDC</autodoc>
         <paramlist>
-          <param name="printData" type="r.q(const).wxPrintData" default=""/>
+          <param name="printData" type="wxPrintData" default=""/>
         </paramlist>
       </constructor>
       <method name="GetPrintData" type="wxPrintData" overloaded="no">
         <autodoc>GetPrintData() -&gt; wxPrintData</autodoc>
       </method>
-      <method name="SetPrintData" type="void" overloaded="no">
+      <method name="SetPrintData" type="" overloaded="no">
         <autodoc>SetPrintData(wxPrintData data)</autodoc>
         <paramlist>
-          <param name="data" type="r.q(const).wxPrintData" default=""/>
+          <param name="data" type="wxPrintData" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="SetResolution" type="void" overloaded="no">
+      <staticmethod name="SetResolution" type="" overloaded="no">
         <autodoc>PostScriptDC.SetResolution(int ppi)</autodoc>
         <paramlist>
           <param name="ppi" type="int" default=""/>
@@ -9217,33 +9217,33 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MetaFile" oldname="wxMetaFile" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="MetaFile" overloaded="no">
         <autodoc>__init__(String filename=EmptyString) -&gt; MetaFile</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filename" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
     </class>
     <class name="MetaFileDC" oldname="wxMetaFileDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="MetaFileDC" overloaded="no">
         <autodoc>__init__(String filename=EmptyString, int width=0, int height=0, 
     String description=EmptyString) -&gt; MetaFileDC</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filename" type="String" default="wxPyEmptyString"/>
           <param name="width" type="int" default="0"/>
           <param name="height" type="int" default="0"/>
-          <param name="description" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="description" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
     </class>
     <class name="PrinterDC" oldname="wxPrinterDC" module="gdi">
-      <baseclass name="wxDC"/>
+      <baseclass name="DC"/>
       <constructor name="PrinterDC" overloaded="no">
         <autodoc>__init__(wxPrintData printData) -&gt; PrinterDC</autodoc>
         <paramlist>
-          <param name="printData" type="r.q(const).wxPrintData" default=""/>
+          <param name="printData" type="wxPrintData" default=""/>
         </paramlist>
       </constructor>
     </class>
@@ -9251,7 +9251,7 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ImageList" oldname="wxImageList" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ImageList" overloaded="no">
         <autodoc>__init__(int width, int height, int mask=True, int initialCount=1) -&gt; ImageList</autodoc>
         <paramlist>
@@ -9267,28 +9267,28 @@ Works for single as well as multi-line strings.</docstring>
       <method name="Add" type="int" overloaded="no">
         <autodoc>Add(Bitmap bitmap, Bitmap mask=NullBitmap) -&gt; int</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="mask" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="mask" type="Bitmap" default="wxNullBitmap"/>
         </paramlist>
       </method>
       <method name="AddWithColourMask" type="int" overloaded="no">
         <autodoc>AddWithColourMask(Bitmap bitmap, Colour maskColour) -&gt; int</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="maskColour" type="r.q(const).wxColour" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="maskColour" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="AddIcon" type="int" overloaded="no">
         <autodoc>AddIcon(Icon icon) -&gt; int</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>
         </paramlist>
       </method>
       <method name="Replace" type="bool" overloaded="no">
         <autodoc>Replace(int index, Bitmap bitmap) -&gt; bool</autodoc>
         <paramlist>
           <param name="index" type="int" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
       <method name="Draw" type="bool" overloaded="no">
@@ -9296,11 +9296,11 @@ Works for single as well as multi-line strings.</docstring>
     bool solidBackground=False) -&gt; bool</autodoc>
         <paramlist>
           <param name="index" type="int" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="int" default=""/>
           <param name="x" type="int" default=""/>
           <param name="flags" type="int" default="wxIMAGELIST_DRAW_NORMAL"/>
-          <param name="solidBackground" type="q(const).bool" default="False"/>
+          <param name="solidBackground" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="GetImageCount" type="int" overloaded="no">
@@ -9315,12 +9315,12 @@ Works for single as well as multi-line strings.</docstring>
       <method name="RemoveAll" type="bool" overloaded="no">
         <autodoc>RemoveAll() -&gt; bool</autodoc>
       </method>
-      <method name="GetSize" type="void" overloaded="no">
+      <method name="GetSize" type="" overloaded="no">
         <autodoc>GetSize() -&gt; (width,height)</autodoc>
         <paramlist>
           <param name="index" type="int" default=""/>
-          <param name="OUTPUT" type="r.int" default=""/>
-          <param name="OUTPUT" type="r.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
     </class>
@@ -9328,25 +9328,25 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PenList" oldname="wxPenList" module="gdi">
-      <baseclass name="wxObject"/>
-      <method name="AddPen" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="AddPen" type="" overloaded="no">
         <autodoc>AddPen(Pen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
-      <method name="FindOrCreatePen" type="wxPen" overloaded="no">
+      <method name="FindOrCreatePen" type="Pen" overloaded="no">
         <autodoc>FindOrCreatePen(Colour colour, int width, int style) -&gt; Pen</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
           <param name="width" type="int" default=""/>
           <param name="style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="RemovePen" type="void" overloaded="no">
+      <method name="RemovePen" type="" overloaded="no">
         <autodoc>RemovePen(Pen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
@@ -9354,24 +9354,24 @@ Works for single as well as multi-line strings.</docstring>
       </method>
     </class>
     <class name="BrushList" oldname="wxBrushList" module="gdi">
-      <baseclass name="wxObject"/>
-      <method name="AddBrush" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="AddBrush" type="" overloaded="no">
         <autodoc>AddBrush(Brush brush)</autodoc>
         <paramlist>
-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
         </paramlist>
       </method>
-      <method name="FindOrCreateBrush" type="wxBrush" overloaded="no">
+      <method name="FindOrCreateBrush" type="Brush" overloaded="no">
         <autodoc>FindOrCreateBrush(Colour colour, int style) -&gt; Brush</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
           <param name="style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveBrush" type="void" overloaded="no">
+      <method name="RemoveBrush" type="" overloaded="no">
         <autodoc>RemoveBrush(Brush brush)</autodoc>
         <paramlist>
-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
@@ -9379,36 +9379,36 @@ Works for single as well as multi-line strings.</docstring>
       </method>
     </class>
     <class name="ColourDatabase" oldname="wxColourDatabase" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ColourDatabase" overloaded="no">
         <autodoc>__init__() -&gt; ColourDatabase</autodoc>
       </constructor>
       <destructor name="~wxColourDatabase" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Find" type="wxColour" overloaded="no">
+      <method name="Find" type="Colour" overloaded="no">
         <autodoc>Find(String name) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindName" type="wxString" overloaded="no">
+      <method name="FindName" type="String" overloaded="no">
         <autodoc>FindName(Colour colour) -&gt; String</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="AddColour" type="void" overloaded="no">
+      <method name="AddColour" type="" overloaded="no">
         <autodoc>AddColour(String name, Colour colour)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="Append" type="void" overloaded="no">
+      <method name="Append" type="" overloaded="no">
         <autodoc>Append(String name, int red, int green, int blue)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="red" type="int" default=""/>
           <param name="green" type="int" default=""/>
           <param name="blue" type="int" default=""/>
@@ -9416,14 +9416,14 @@ Works for single as well as multi-line strings.</docstring>
       </method>
     </class>
     <class name="FontList" oldname="wxFontList" module="gdi">
-      <baseclass name="wxObject"/>
-      <method name="AddFont" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="AddFont" type="" overloaded="no">
         <autodoc>AddFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="FindOrCreateFont" type="wxFont" overloaded="no">
+      <method name="FindOrCreateFont" type="Font" overloaded="no">
         <autodoc>FindOrCreateFont(int point_size, int family, int style, int weight, 
     bool underline=False, String facename=EmptyString, 
     int encoding=FONTENCODING_DEFAULT) -&gt; Font</autodoc>
@@ -9433,14 +9433,14 @@ Works for single as well as multi-line strings.</docstring>
           <param name="style" type="int" default=""/>
           <param name="weight" type="int" default=""/>
           <param name="underline" type="bool" default="False"/>
-          <param name="facename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="facename" type="String" default="wxPyEmptyString"/>
           <param name="encoding" type="wxFontEncoding" default="wxFONTENCODING_DEFAULT"/>
         </paramlist>
       </method>
-      <method name="RemoveFont" type="void" overloaded="no">
+      <method name="RemoveFont" type="" overloaded="no">
         <autodoc>RemoveFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
@@ -9454,80 +9454,80 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Effects" oldname="wxEffects" module="gdi">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Effects" overloaded="no">
         <autodoc>__init__() -&gt; Effects</autodoc>
       </constructor>
-      <method name="GetHighlightColour" type="wxColour" overloaded="no">
+      <method name="GetHighlightColour" type="Colour" overloaded="no">
         <autodoc>GetHighlightColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetLightShadow" type="wxColour" overloaded="no">
+      <method name="GetLightShadow" type="Colour" overloaded="no">
         <autodoc>GetLightShadow() -&gt; Colour</autodoc>
       </method>
-      <method name="GetFaceColour" type="wxColour" overloaded="no">
+      <method name="GetFaceColour" type="Colour" overloaded="no">
         <autodoc>GetFaceColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetMediumShadow" type="wxColour" overloaded="no">
+      <method name="GetMediumShadow" type="Colour" overloaded="no">
         <autodoc>GetMediumShadow() -&gt; Colour</autodoc>
       </method>
-      <method name="GetDarkShadow" type="wxColour" overloaded="no">
+      <method name="GetDarkShadow" type="Colour" overloaded="no">
         <autodoc>GetDarkShadow() -&gt; Colour</autodoc>
       </method>
-      <method name="SetHighlightColour" type="void" overloaded="no">
+      <method name="SetHighlightColour" type="" overloaded="no">
         <autodoc>SetHighlightColour(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetLightShadow" type="void" overloaded="no">
+      <method name="SetLightShadow" type="" overloaded="no">
         <autodoc>SetLightShadow(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFaceColour" type="void" overloaded="no">
+      <method name="SetFaceColour" type="" overloaded="no">
         <autodoc>SetFaceColour(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetMediumShadow" type="void" overloaded="no">
+      <method name="SetMediumShadow" type="" overloaded="no">
         <autodoc>SetMediumShadow(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetDarkShadow" type="void" overloaded="no">
+      <method name="SetDarkShadow" type="" overloaded="no">
         <autodoc>SetDarkShadow(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(Colour highlightColour, Colour lightShadow, Colour faceColour, 
     Colour mediumShadow, Colour darkShadow)</autodoc>
         <paramlist>
-          <param name="highlightColour" type="r.q(const).wxColour" default=""/>
-          <param name="lightShadow" type="r.q(const).wxColour" default=""/>
-          <param name="faceColour" type="r.q(const).wxColour" default=""/>
-          <param name="mediumShadow" type="r.q(const).wxColour" default=""/>
-          <param name="darkShadow" type="r.q(const).wxColour" default=""/>
+          <param name="highlightColour" type="Colour" default=""/>
+          <param name="lightShadow" type="Colour" default=""/>
+          <param name="faceColour" type="Colour" default=""/>
+          <param name="mediumShadow" type="Colour" default=""/>
+          <param name="darkShadow" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="DrawSunkenEdge" type="void" overloaded="no">
+      <method name="DrawSunkenEdge" type="" overloaded="no">
         <autodoc>DrawSunkenEdge(DC dc, Rect rect, int borderSize=1)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="borderSize" type="int" default="1"/>
         </paramlist>
       </method>
       <method name="TileBitmap" type="bool" overloaded="no">
         <autodoc>TileBitmap(Rect rect, DC dc, Bitmap bitmap) -&gt; bool</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="bitmap" type="r.wxBitmap" default=""/>
+          <param name="rect" type="Rect" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
     </class>
@@ -9539,18 +9539,18 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Panel" oldname="wxPanel" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="Panel" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
     String name=PanelNameStr) -&gt; Panel</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTAB_TRAVERSAL|wxNO_BORDER"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PrePanel" overloaded="no">
@@ -9561,15 +9561,15 @@ Works for single as well as multi-line strings.</docstring>
     long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
     String name=PanelNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTAB_TRAVERSAL|wxNO_BORDER"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </method>
-      <method name="InitDialog" type="void" overloaded="no">
+      <method name="InitDialog" type="" overloaded="no">
         <autodoc>InitDialog()</autodoc>
       </method>
     </class>
@@ -9577,18 +9577,18 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrolledWindow" oldname="wxScrolledWindow" module="windows">
-      <baseclass name="wxPanel"/>
+      <baseclass name="Panel"/>
       <constructor name="ScrolledWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
     String name=PanelNameStr) -&gt; ScrolledWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxHSCROLL|wxVSCROLL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreScrolledWindow" overloaded="no">
@@ -9599,15 +9599,15 @@ Works for single as well as multi-line strings.</docstring>
     Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
     String name=PanelNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxHSCROLL|wxVSCROLL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </method>
-      <method name="SetScrollbars" type="void" overloaded="no">
+      <method name="SetScrollbars" type="" overloaded="no">
         <autodoc>SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, 
     int noUnitsY, int xPos=0, int yPos=0, bool noRefresh=False)</autodoc>
         <paramlist>
@@ -9620,7 +9620,7 @@ Works for single as well as multi-line strings.</docstring>
           <param name="noRefresh" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="Scroll" type="void" overloaded="no">
+      <method name="Scroll" type="" overloaded="no">
         <autodoc>Scroll(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -9633,44 +9633,44 @@ Works for single as well as multi-line strings.</docstring>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetScrollPageSize" type="void" overloaded="no">
+      <method name="SetScrollPageSize" type="" overloaded="no">
         <autodoc>SetScrollPageSize(int orient, int pageSize)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
           <param name="pageSize" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetScrollRate" type="void" overloaded="no">
+      <method name="SetScrollRate" type="" overloaded="no">
         <autodoc>SetScrollRate(int xstep, int ystep)</autodoc>
         <paramlist>
           <param name="xstep" type="int" default=""/>
           <param name="ystep" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetScrollPixelsPerUnit" type="void" overloaded="no">
+      <method name="GetScrollPixelsPerUnit" type="" overloaded="no">
         <autodoc>GetScrollPixelsPerUnit() -&gt; (xUnit, yUnit)</autodoc>
         <docstring>Get the size of one logical unit in physical units.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="EnableScrolling" type="void" overloaded="no">
+      <method name="EnableScrolling" type="" overloaded="no">
         <autodoc>EnableScrolling(bool x_scrolling, bool y_scrolling)</autodoc>
         <paramlist>
           <param name="x_scrolling" type="bool" default=""/>
           <param name="y_scrolling" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="GetViewStart" type="void" overloaded="no">
+      <method name="GetViewStart" type="" overloaded="no">
         <autodoc>GetViewStart() -&gt; (x,y)</autodoc>
         <docstring>Get the view start</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetScale" type="void" overloaded="no">
+      <method name="SetScale" type="" overloaded="no">
         <autodoc>SetScale(double xs, double ys)</autodoc>
         <paramlist>
           <param name="xs" type="double" default=""/>
@@ -9683,56 +9683,56 @@ Works for single as well as multi-line strings.</docstring>
       <method name="GetScaleY" type="double" overloaded="no">
         <autodoc>GetScaleY() -&gt; double</autodoc>
       </method>
-      <method name="CalcScrolledPosition" type="wxPoint" overloaded="yes">
+      <method name="CalcScrolledPosition" type="Point" overloaded="yes">
         <docstring>Translate between scrolled and unscrolled coordinates.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="CalcScrolledPosition" type="void" overloaded="yes">
+      <method name="CalcScrolledPosition" type="" overloaded="yes">
         <autodoc>CalcScrolledPosition(Point pt) -&gt; Point
 CalcScrolledPosition(int x, int y) -&gt; (sx, sy)</autodoc>
         <docstring>Translate between scrolled and unscrolled coordinates.</docstring>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CalcUnscrolledPosition" type="wxPoint" overloaded="yes">
+      <method name="CalcUnscrolledPosition" type="Point" overloaded="yes">
         <docstring>Translate between scrolled and unscrolled coordinates.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="CalcUnscrolledPosition" type="void" overloaded="yes">
+      <method name="CalcUnscrolledPosition" type="" overloaded="yes">
         <autodoc>CalcUnscrolledPosition(Point pt) -&gt; Point
 CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
         <docstring>Translate between scrolled and unscrolled coordinates.</docstring>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AdjustScrollbars" type="void" overloaded="no">
+      <method name="AdjustScrollbars" type="" overloaded="no">
         <autodoc>AdjustScrollbars()</autodoc>
       </method>
       <method name="CalcScrollInc" type="int" overloaded="no">
         <autodoc>CalcScrollInc(ScrollWinEvent event) -&gt; int</autodoc>
         <paramlist>
-          <param name="event" type="r.wxScrollWinEvent" default=""/>
+          <param name="event" type="ScrollWinEvent" default=""/>
         </paramlist>
       </method>
-      <method name="SetTargetWindow" type="void" overloaded="no">
+      <method name="SetTargetWindow" type="" overloaded="no">
         <autodoc>SetTargetWindow(Window target)</autodoc>
         <paramlist>
-          <param name="target" type="p.wxWindow" default=""/>
+          <param name="target" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="GetTargetWindow" type="wxWindow" overloaded="no">
+      <method name="GetTargetWindow" type="Window" overloaded="no">
         <autodoc>GetTargetWindow() -&gt; Window</autodoc>
       </method>
     </class>
@@ -9740,17 +9740,17 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TopLevelWindow" oldname="wxTopLevelWindow" module="windows">
-      <baseclass name="wxWindow"/>
-      <method name="Maximize" type="void" overloaded="no">
+      <baseclass name="Window"/>
+      <method name="Maximize" type="" overloaded="no">
         <autodoc>Maximize(bool maximize=True)</autodoc>
         <paramlist>
           <param name="maximize" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Restore" type="void" overloaded="no">
+      <method name="Restore" type="" overloaded="no">
         <autodoc>Restore()</autodoc>
       </method>
-      <method name="Iconize" type="void" overloaded="no">
+      <method name="Iconize" type="" overloaded="no">
         <autodoc>Iconize(bool iconize=True)</autodoc>
         <paramlist>
           <param name="iconize" type="bool" default="True"/>
@@ -9762,19 +9762,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="IsIconized" type="bool" overloaded="no">
         <autodoc>IsIconized() -&gt; bool</autodoc>
       </method>
-      <method name="GetIcon" type="wxIcon" overloaded="no">
+      <method name="GetIcon" type="Icon" overloaded="no">
         <autodoc>GetIcon() -&gt; Icon</autodoc>
       </method>
-      <method name="SetIcon" type="void" overloaded="no">
+      <method name="SetIcon" type="" overloaded="no">
         <autodoc>SetIcon(Icon icon)</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>
         </paramlist>
       </method>
-      <method name="SetIcons" type="void" overloaded="no">
+      <method name="SetIcons" type="" overloaded="no">
         <autodoc>SetIcons(wxIconBundle icons)</autodoc>
         <paramlist>
-          <param name="icons" type="r.q(const).wxIconBundle" default=""/>
+          <param name="icons" type="IconBundle" default=""/>
         </paramlist>
       </method>
       <method name="ShowFullScreen" type="bool" overloaded="no">
@@ -9787,19 +9787,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="IsFullScreen" type="bool" overloaded="no">
         <autodoc>IsFullScreen() -&gt; bool</autodoc>
       </method>
-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
       <method name="SetShape" type="bool" overloaded="no">
         <autodoc>SetShape(Region region) -&gt; bool</autodoc>
         <paramlist>
-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>
         </paramlist>
       </method>
     </class>
@@ -9807,19 +9807,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Frame" oldname="wxFrame" module="windows">
-      <baseclass name="wxTopLevelWindow"/>
+      <baseclass name="TopLevelWindow"/>
       <constructor name="Frame" overloaded="no">
         <autodoc>__init__(Window parent, int id, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; Frame</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreFrame" overloaded="no">
@@ -9830,28 +9830,28 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </method>
-      <method name="GetClientAreaOrigin" type="wxPoint" overloaded="no">
+      <method name="GetClientAreaOrigin" type="Point" overloaded="no">
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>
       </method>
-      <method name="SendSizeEvent" type="void" overloaded="no">
+      <method name="SendSizeEvent" type="" overloaded="no">
         <autodoc>SendSizeEvent()</autodoc>
       </method>
-      <method name="SetMenuBar" type="void" overloaded="no">
+      <method name="SetMenuBar" type="" overloaded="no">
         <autodoc>SetMenuBar(MenuBar menubar)</autodoc>
         <paramlist>
-          <param name="menubar" type="p.wxMenuBar" default=""/>
+          <param name="menubar" type="MenuBar" default=""/>
         </paramlist>
       </method>
-      <method name="GetMenuBar" type="wxMenuBar" overloaded="no">
+      <method name="GetMenuBar" type="MenuBar" overloaded="no">
         <autodoc>GetMenuBar() -&gt; MenuBar</autodoc>
       </method>
       <method name="ProcessCommand" type="bool" overloaded="no">
@@ -9867,46 +9867,46 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
           <param name="number" type="int" default="1"/>
           <param name="style" type="long" default="wxST_SIZEGRIP"/>
           <param name="winid" type="int" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStatusLineNameStr"/>
+          <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>
       </method>
       <method name="GetStatusBar" type="wxStatusBar" overloaded="no">
         <autodoc>GetStatusBar() -&gt; StatusBar</autodoc>
       </method>
-      <method name="SetStatusBar" type="void" overloaded="no">
+      <method name="SetStatusBar" type="" overloaded="no">
         <autodoc>SetStatusBar(StatusBar statBar)</autodoc>
         <paramlist>
-          <param name="statBar" type="p.wxStatusBar" default=""/>
+          <param name="statBar" type="wxStatusBar" default=""/>
         </paramlist>
       </method>
-      <method name="SetStatusText" type="void" overloaded="no">
+      <method name="SetStatusText" type="" overloaded="no">
         <autodoc>SetStatusText(String text, int number=0)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetStatusWidths" type="void" overloaded="no">
+      <method name="SetStatusWidths" type="" overloaded="no">
         <autodoc>SetStatusWidths(int widths, int widths_field)</autodoc>
         <paramlist>
           <param name="widths" type="int" default=""/>
-          <param name="widths_field" type="p.q(const).int" default=""/>
+          <param name="widths_field" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="PushStatusText" type="void" overloaded="no">
+      <method name="PushStatusText" type="" overloaded="no">
         <autodoc>PushStatusText(String text, int number=0)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="PopStatusText" type="void" overloaded="no">
+      <method name="PopStatusText" type="" overloaded="no">
         <autodoc>PopStatusText(int number=0)</autodoc>
         <paramlist>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetStatusBarPane" type="void" overloaded="no">
+      <method name="SetStatusBarPane" type="" overloaded="no">
         <autodoc>SetStatusBarPane(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -9920,29 +9920,29 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
         <paramlist>
           <param name="style" type="long" default="-1"/>
           <param name="winid" type="int" default="-1"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyToolBarNameStr"/>
+          <param name="name" type="String" default="wxPyToolBarNameStr"/>
         </paramlist>
       </method>
       <method name="GetToolBar" type="wxToolBar" overloaded="no">
         <autodoc>GetToolBar() -&gt; wxToolBar</autodoc>
       </method>
-      <method name="SetToolBar" type="void" overloaded="no">
+      <method name="SetToolBar" type="" overloaded="no">
         <autodoc>SetToolBar(wxToolBar toolbar)</autodoc>
         <paramlist>
-          <param name="toolbar" type="p.wxToolBar" default=""/>
+          <param name="toolbar" type="wxToolBar" default=""/>
         </paramlist>
       </method>
-      <method name="DoGiveHelp" type="void" overloaded="no">
+      <method name="DoGiveHelp" type="" overloaded="no">
         <autodoc>DoGiveHelp(String text, bool show)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="show" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="DoMenuUpdates" type="void" overloaded="no">
+      <method name="DoMenuUpdates" type="" overloaded="no">
         <autodoc>DoMenuUpdates(Menu menu=None)</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default="NULL"/>
+          <param name="menu" type="Menu" default="NULL"/>
         </paramlist>
       </method>
     </class>
@@ -9950,19 +9950,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Dialog" oldname="wxDialog" module="windows">
-      <baseclass name="wxTopLevelWindow"/>
+      <baseclass name="TopLevelWindow"/>
       <constructor name="Dialog" overloaded="no">
         <autodoc>__init__(Window parent, int id, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
     String name=DialogNameStr) -&gt; Dialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_DIALOG_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyDialogNameStr"/>
+          <param name="name" type="String" default="wxPyDialogNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreDialog" overloaded="no">
@@ -9973,16 +9973,16 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
     Size size=DefaultSize, long style=DEFAULT_DIALOG_STYLE, 
     String name=DialogNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_DIALOG_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyDialogNameStr"/>
+          <param name="name" type="String" default="wxPyDialogNameStr"/>
         </paramlist>
       </method>
-      <method name="SetReturnCode" type="void" overloaded="no">
+      <method name="SetReturnCode" type="" overloaded="no">
         <autodoc>SetReturnCode(int returnCode)</autodoc>
         <paramlist>
           <param name="returnCode" type="int" default=""/>
@@ -9991,19 +9991,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetReturnCode" type="int" overloaded="no">
         <autodoc>GetReturnCode() -&gt; int</autodoc>
       </method>
-      <method name="CreateTextSizer" type="wxSizer" overloaded="no">
+      <method name="CreateTextSizer" type="Sizer" overloaded="no">
         <autodoc>CreateTextSizer(String message) -&gt; Sizer</autodoc>
         <paramlist>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="CreateButtonSizer" type="wxSizer" overloaded="no">
+      <method name="CreateButtonSizer" type="Sizer" overloaded="no">
         <autodoc>CreateButtonSizer(long flags) -&gt; Sizer</autodoc>
         <paramlist>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetModal" type="void" overloaded="no">
+      <method name="SetModal" type="" overloaded="no">
         <autodoc>SetModal(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
@@ -10015,7 +10015,7 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="ShowModal" type="int" overloaded="no">
         <autodoc>ShowModal() -&gt; int</autodoc>
       </method>
-      <method name="EndModal" type="void" overloaded="no">
+      <method name="EndModal" type="" overloaded="no">
         <autodoc>EndModal(int retCode)</autodoc>
         <paramlist>
           <param name="retCode" type="int" default=""/>
@@ -10029,19 +10029,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MiniFrame" oldname="wxMiniFrame" module="windows">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="MiniFrame" overloaded="no">
         <autodoc>__init__(Window parent, int id, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; MiniFrame</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreMiniFrame" overloaded="no">
@@ -10052,13 +10052,13 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </method>
     </class>
@@ -10066,50 +10066,50 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplashScreenWindow" oldname="wxSplashScreenWindow" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="SplashScreenWindow" overloaded="no">
         <autodoc>__init__(Bitmap bitmap, Window parent, int id, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=NO_BORDER) -&gt; SplashScreenWindow</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxNO_BORDER"/>
         </paramlist>
       </constructor>
-      <method name="SetBitmap" type="void" overloaded="no">
+      <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
     </class>
     <class name="SplashScreen" oldname="wxSplashScreen" module="windows">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="SplashScreen" overloaded="no">
         <autodoc>__init__(Bitmap bitmap, long splashStyle, int milliseconds, 
     Window parent, int id, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -&gt; SplashScreen</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
           <param name="splashStyle" type="long" default=""/>
           <param name="milliseconds" type="int" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP"/>
         </paramlist>
       </constructor>
       <method name="GetSplashStyle" type="long" overloaded="no">
         <autodoc>GetSplashStyle() -&gt; long</autodoc>
       </method>
-      <method name="GetSplashWindow" type="wxSplashScreenWindow" overloaded="no">
+      <method name="GetSplashWindow" type="SplashScreenWindow" overloaded="no">
         <autodoc>GetSplashWindow() -&gt; SplashScreenWindow</autodoc>
       </method>
       <method name="GetTimeout" type="int" overloaded="no">
@@ -10120,14 +10120,14 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StatusBar" oldname="wxStatusBar" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="StatusBar" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, long style=ST_SIZEGRIP, String name=StatusLineNameStr) -&gt; StatusBar</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
           <param name="style" type="long" default="wxST_SIZEGRIP"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStatusLineNameStr"/>
+          <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreStatusBar" overloaded="no">
@@ -10136,13 +10136,13 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, long style=ST_SIZEGRIP, String name=StatusLineNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="style" type="long" default="wxST_SIZEGRIP"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStatusLineNameStr"/>
+          <param name="name" type="String" default="wxPyStatusLineNameStr"/>
         </paramlist>
       </method>
-      <method name="SetFieldsCount" type="void" overloaded="no">
+      <method name="SetFieldsCount" type="" overloaded="no">
         <autodoc>SetFieldsCount(int number=1)</autodoc>
         <paramlist>
           <param name="number" type="int" default="1"/>
@@ -10151,46 +10151,46 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetFieldsCount" type="int" overloaded="no">
         <autodoc>GetFieldsCount() -&gt; int</autodoc>
       </method>
-      <method name="SetStatusText" type="void" overloaded="no">
+      <method name="SetStatusText" type="" overloaded="no">
         <autodoc>SetStatusText(String text, int number=0)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetStatusText" type="wxString" overloaded="no">
+      <method name="GetStatusText" type="String" overloaded="no">
         <autodoc>GetStatusText(int number=0) -&gt; String</autodoc>
         <paramlist>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="PushStatusText" type="void" overloaded="no">
+      <method name="PushStatusText" type="" overloaded="no">
         <autodoc>PushStatusText(String text, int number=0)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="PopStatusText" type="void" overloaded="no">
+      <method name="PopStatusText" type="" overloaded="no">
         <autodoc>PopStatusText(int number=0)</autodoc>
         <paramlist>
           <param name="number" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetStatusWidths" type="void" overloaded="no">
+      <method name="SetStatusWidths" type="" overloaded="no">
         <autodoc>SetStatusWidths(int widths, int widths_field)</autodoc>
         <paramlist>
           <param name="widths" type="int" default=""/>
-          <param name="widths_field" type="p.q(const).int" default=""/>
+          <param name="widths_field" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetFieldRect" type="wxRect" overloaded="no">
+      <method name="GetFieldRect" type="Rect" overloaded="no">
         <autodoc>GetFieldRect(int i) -&gt; Rect</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinHeight" type="void" overloaded="no">
+      <method name="SetMinHeight" type="" overloaded="no">
         <autodoc>SetMinHeight(int height)</autodoc>
         <paramlist>
           <param name="height" type="int" default=""/>
@@ -10207,17 +10207,17 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplitterWindow" oldname="wxSplitterWindow" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="SplitterWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point point=DefaultPosition, 
     Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -&gt; SplitterWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySplitterNameStr"/>
+          <param name="name" type="String" default="wxPySplitterNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreSplitterWindow" overloaded="no">
@@ -10227,21 +10227,21 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
         <autodoc>Create(Window parent, int id, Point point=DefaultPosition, 
     Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySplitterNameStr"/>
+          <param name="name" type="String" default="wxPySplitterNameStr"/>
         </paramlist>
       </method>
-      <method name="GetWindow1" type="wxWindow" overloaded="no">
+      <method name="GetWindow1" type="Window" overloaded="no">
         <autodoc>GetWindow1() -&gt; Window</autodoc>
       </method>
-      <method name="GetWindow2" type="wxWindow" overloaded="no">
+      <method name="GetWindow2" type="Window" overloaded="no">
         <autodoc>GetWindow2() -&gt; Window</autodoc>
       </method>
-      <method name="SetSplitMode" type="void" overloaded="no">
+      <method name="SetSplitMode" type="" overloaded="no">
         <autodoc>SetSplitMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -10250,51 +10250,51 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetSplitMode" type="wxSplitMode" overloaded="no">
         <autodoc>GetSplitMode() -&gt; int</autodoc>
       </method>
-      <method name="Initialize" type="void" overloaded="no">
+      <method name="Initialize" type="" overloaded="no">
         <autodoc>Initialize(Window window)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="SplitVertically" type="bool" overloaded="no">
         <autodoc>SplitVertically(Window window1, Window window2, int sashPosition=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="window1" type="p.wxWindow" default=""/>
-          <param name="window2" type="p.wxWindow" default=""/>
+          <param name="window1" type="Window" default=""/>
+          <param name="window2" type="Window" default=""/>
           <param name="sashPosition" type="int" default="0"/>
         </paramlist>
       </method>
       <method name="SplitHorizontally" type="bool" overloaded="no">
         <autodoc>SplitHorizontally(Window window1, Window window2, int sashPosition=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="window1" type="p.wxWindow" default=""/>
-          <param name="window2" type="p.wxWindow" default=""/>
+          <param name="window1" type="Window" default=""/>
+          <param name="window2" type="Window" default=""/>
           <param name="sashPosition" type="int" default="0"/>
         </paramlist>
       </method>
       <method name="Unsplit" type="bool" overloaded="no">
         <autodoc>Unsplit(Window toRemove=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="toRemove" type="p.wxWindow" default="NULL"/>
+          <param name="toRemove" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="ReplaceWindow" type="bool" overloaded="no">
         <autodoc>ReplaceWindow(Window winOld, Window winNew) -&gt; bool</autodoc>
         <paramlist>
-          <param name="winOld" type="p.wxWindow" default=""/>
-          <param name="winNew" type="p.wxWindow" default=""/>
+          <param name="winOld" type="Window" default=""/>
+          <param name="winNew" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="IsSplit" type="bool" overloaded="no">
         <autodoc>IsSplit() -&gt; bool</autodoc>
       </method>
-      <method name="SetSashSize" type="void" overloaded="no">
+      <method name="SetSashSize" type="" overloaded="no">
         <autodoc>SetSashSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetBorderSize" type="void" overloaded="no">
+      <method name="SetBorderSize" type="" overloaded="no">
         <autodoc>SetBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
@@ -10306,7 +10306,7 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetBorderSize" type="int" overloaded="no">
         <autodoc>GetBorderSize() -&gt; int</autodoc>
       </method>
-      <method name="SetSashPosition" type="void" overloaded="no">
+      <method name="SetSashPosition" type="" overloaded="no">
         <autodoc>SetSashPosition(int position, bool redraw=True)</autodoc>
         <paramlist>
           <param name="position" type="int" default=""/>
@@ -10316,7 +10316,7 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetSashPosition" type="int" overloaded="no">
         <autodoc>GetSashPosition() -&gt; int</autodoc>
       </method>
-      <method name="SetMinimumPaneSize" type="void" overloaded="no">
+      <method name="SetMinimumPaneSize" type="" overloaded="no">
         <autodoc>SetMinimumPaneSize(int min)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>
@@ -10333,10 +10333,10 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
           <param name="tolerance" type="int" default="5"/>
         </paramlist>
       </method>
-      <method name="SizeWindows" type="void" overloaded="no">
+      <method name="SizeWindows" type="" overloaded="no">
         <autodoc>SizeWindows()</autodoc>
       </method>
-      <method name="SetNeedUpdating" type="void" overloaded="no">
+      <method name="SetNeedUpdating" type="" overloaded="no">
         <autodoc>SetNeedUpdating(bool needUpdating)</autodoc>
         <paramlist>
           <param name="needUpdating" type="bool" default=""/>
@@ -10347,15 +10347,15 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
     </class>
     <class name="SplitterEvent" oldname="wxSplitterEvent" module="windows">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="SplitterEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -&gt; SplitterEvent</autodoc>
         <paramlist>
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
-          <param name="splitter" type="p.wxSplitterWindow" default="(wxSplitterWindow *) NULL"/>
+          <param name="splitter" type="SplitterWindow" default="(wxSplitterWindow *) NULL"/>
         </paramlist>
       </constructor>
-      <method name="SetSashPosition" type="void" overloaded="no">
+      <method name="SetSashPosition" type="" overloaded="no">
         <autodoc>SetSashPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -10364,7 +10364,7 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetSashPosition" type="int" overloaded="no">
         <autodoc>GetSashPosition() -&gt; int</autodoc>
       </method>
-      <method name="GetWindowBeingRemoved" type="wxWindow" overloaded="no">
+      <method name="GetWindowBeingRemoved" type="Window" overloaded="no">
         <autodoc>GetWindowBeingRemoved() -&gt; Window</autodoc>
       </method>
       <method name="GetX" type="int" overloaded="no">
@@ -10384,18 +10384,18 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SashWindow" oldname="wxSashWindow" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="SashWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCLIP_CHILDREN|wxSW_3D, 
     String name=SashNameStr) -&gt; SashWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCLIP_CHILDREN|wxSW_3D"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySashNameStr"/>
+          <param name="name" type="String" default="wxPySashNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreSashWindow" overloaded="no">
@@ -10406,15 +10406,15 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
     long style=wxCLIP_CHILDREN|wxSW_3D, 
     String name=SashNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCLIP_CHILDREN|wxSW_3D"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySashNameStr"/>
+          <param name="name" type="String" default="wxPySashNameStr"/>
         </paramlist>
       </method>
-      <method name="SetSashVisible" type="void" overloaded="no">
+      <method name="SetSashVisible" type="" overloaded="no">
         <autodoc>SetSashVisible(int edge, bool sash)</autodoc>
         <paramlist>
           <param name="edge" type="wxSashEdgePosition" default=""/>
@@ -10427,7 +10427,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="edge" type="wxSashEdgePosition" default=""/>
         </paramlist>
       </method>
-      <method name="SetSashBorder" type="void" overloaded="no">
+      <method name="SetSashBorder" type="" overloaded="no">
         <autodoc>SetSashBorder(int edge, bool border)</autodoc>
         <paramlist>
           <param name="edge" type="wxSashEdgePosition" default=""/>
@@ -10446,7 +10446,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="edge" type="wxSashEdgePosition" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultBorderSize" type="void" overloaded="no">
+      <method name="SetDefaultBorderSize" type="" overloaded="no">
         <autodoc>SetDefaultBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
@@ -10455,7 +10455,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetDefaultBorderSize" type="int" overloaded="no">
         <autodoc>GetDefaultBorderSize() -&gt; int</autodoc>
       </method>
-      <method name="SetExtraBorderSize" type="void" overloaded="no">
+      <method name="SetExtraBorderSize" type="" overloaded="no">
         <autodoc>SetExtraBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
@@ -10464,13 +10464,13 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetExtraBorderSize" type="int" overloaded="no">
         <autodoc>GetExtraBorderSize() -&gt; int</autodoc>
       </method>
-      <method name="SetMinimumSizeX" type="void" overloaded="no">
+      <method name="SetMinimumSizeX" type="" overloaded="no">
         <autodoc>SetMinimumSizeX(int min)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinimumSizeY" type="void" overloaded="no">
+      <method name="SetMinimumSizeY" type="" overloaded="no">
         <autodoc>SetMinimumSizeY(int min)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>
@@ -10482,13 +10482,13 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetMinimumSizeY" type="int" overloaded="no">
         <autodoc>GetMinimumSizeY() -&gt; int</autodoc>
       </method>
-      <method name="SetMaximumSizeX" type="void" overloaded="no">
+      <method name="SetMaximumSizeX" type="" overloaded="no">
         <autodoc>SetMaximumSizeX(int max)</autodoc>
         <paramlist>
           <param name="max" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMaximumSizeY" type="void" overloaded="no">
+      <method name="SetMaximumSizeY" type="" overloaded="no">
         <autodoc>SetMaximumSizeY(int max)</autodoc>
         <paramlist>
           <param name="max" type="int" default=""/>
@@ -10508,12 +10508,12 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="tolerance" type="int" default="2"/>
         </paramlist>
       </method>
-      <method name="SizeWindows" type="void" overloaded="no">
+      <method name="SizeWindows" type="" overloaded="no">
         <autodoc>SizeWindows()</autodoc>
       </method>
     </class>
     <class name="SashEvent" oldname="wxSashEvent" module="windows">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="SashEvent" overloaded="no">
         <autodoc>__init__(int id=0, int edge=SASH_NONE) -&gt; SashEvent</autodoc>
         <paramlist>
@@ -10521,7 +10521,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="edge" type="wxSashEdgePosition" default="wxSASH_NONE"/>
         </paramlist>
       </constructor>
-      <method name="SetEdge" type="void" overloaded="no">
+      <method name="SetEdge" type="" overloaded="no">
         <autodoc>SetEdge(int edge)</autodoc>
         <paramlist>
           <param name="edge" type="wxSashEdgePosition" default=""/>
@@ -10530,16 +10530,16 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetEdge" type="wxSashEdgePosition" overloaded="no">
         <autodoc>GetEdge() -&gt; int</autodoc>
       </method>
-      <method name="SetDragRect" type="void" overloaded="no">
+      <method name="SetDragRect" type="" overloaded="no">
         <autodoc>SetDragRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="GetDragRect" type="wxRect" overloaded="no">
+      <method name="GetDragRect" type="Rect" overloaded="no">
         <autodoc>GetDragRect() -&gt; Rect</autodoc>
       </method>
-      <method name="SetDragStatus" type="void" overloaded="no">
+      <method name="SetDragStatus" type="" overloaded="no">
         <autodoc>SetDragStatus(int status)</autodoc>
         <paramlist>
           <param name="status" type="wxSashDragStatus" default=""/>
@@ -10557,14 +10557,14 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="QueryLayoutInfoEvent" oldname="wxQueryLayoutInfoEvent" module="windows">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="QueryLayoutInfoEvent" overloaded="no">
         <autodoc>__init__(int id=0) -&gt; QueryLayoutInfoEvent</autodoc>
         <paramlist>
           <param name="id" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="SetRequestedLength" type="void" overloaded="no">
+      <method name="SetRequestedLength" type="" overloaded="no">
         <autodoc>SetRequestedLength(int length)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>
@@ -10573,7 +10573,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetRequestedLength" type="int" overloaded="no">
         <autodoc>GetRequestedLength() -&gt; int</autodoc>
       </method>
-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
@@ -10582,16 +10582,16 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
-      <method name="SetOrientation" type="void" overloaded="no">
+      <method name="SetOrientation" type="" overloaded="no">
         <autodoc>SetOrientation(int orient)</autodoc>
         <paramlist>
           <param name="orient" type="wxLayoutOrientation" default=""/>
@@ -10600,7 +10600,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetOrientation" type="wxLayoutOrientation" overloaded="no">
         <autodoc>GetOrientation() -&gt; int</autodoc>
       </method>
-      <method name="SetAlignment" type="void" overloaded="no">
+      <method name="SetAlignment" type="" overloaded="no">
         <autodoc>SetAlignment(int align)</autodoc>
         <paramlist>
           <param name="align" type="wxLayoutAlignment" default=""/>
@@ -10611,14 +10611,14 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
     </class>
     <class name="CalculateLayoutEvent" oldname="wxCalculateLayoutEvent" module="windows">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="CalculateLayoutEvent" overloaded="no">
         <autodoc>__init__(int id=0) -&gt; CalculateLayoutEvent</autodoc>
         <paramlist>
           <param name="id" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
@@ -10627,13 +10627,13 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
-      <method name="SetRect" type="void" overloaded="no">
+      <method name="SetRect" type="" overloaded="no">
         <autodoc>SetRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
     </class>
@@ -10642,18 +10642,18 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
     EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
 </pythoncode>
     <class name="SashLayoutWindow" oldname="wxSashLayoutWindow" module="windows">
-      <baseclass name="wxSashWindow"/>
+      <baseclass name="SashWindow"/>
       <constructor name="SashLayoutWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCLIP_CHILDREN|wxSW_3D, 
     String name=SashLayoutNameStr) -&gt; SashLayoutWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCLIP_CHILDREN|wxSW_3D"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySashLayoutNameStr"/>
+          <param name="name" type="String" default="wxPySashLayoutNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreSashLayoutWindow" overloaded="no">
@@ -10664,12 +10664,12 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
     long style=wxCLIP_CHILDREN|wxSW_3D, 
     String name=SashLayoutNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCLIP_CHILDREN|wxSW_3D"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySashLayoutNameStr"/>
+          <param name="name" type="String" default="wxPySashLayoutNameStr"/>
         </paramlist>
       </method>
       <method name="GetAlignment" type="wxLayoutAlignment" overloaded="no">
@@ -10678,19 +10678,19 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetOrientation" type="wxLayoutOrientation" overloaded="no">
         <autodoc>GetOrientation() -&gt; int</autodoc>
       </method>
-      <method name="SetAlignment" type="void" overloaded="no">
+      <method name="SetAlignment" type="" overloaded="no">
         <autodoc>SetAlignment(int alignment)</autodoc>
         <paramlist>
           <param name="alignment" type="wxLayoutAlignment" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultSize" type="void" overloaded="no">
+      <method name="SetDefaultSize" type="" overloaded="no">
         <autodoc>SetDefaultSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetOrientation" type="void" overloaded="no">
+      <method name="SetOrientation" type="" overloaded="no">
         <autodoc>SetOrientation(int orientation)</autodoc>
         <paramlist>
           <param name="orientation" type="wxLayoutOrientation" default=""/>
@@ -10698,7 +10698,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
     </class>
     <class name="LayoutAlgorithm" oldname="wxLayoutAlgorithm" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="LayoutAlgorithm" overloaded="no">
         <autodoc>__init__() -&gt; LayoutAlgorithm</autodoc>
       </constructor>
@@ -10708,22 +10708,22 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="LayoutMDIFrame" type="bool" overloaded="no">
         <autodoc>LayoutMDIFrame(MDIParentFrame frame, Rect rect=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="frame" type="p.wxMDIParentFrame" default=""/>
-          <param name="rect" type="p.wxRect" default="NULL"/>
+          <param name="frame" type="wxMDIParentFrame" default=""/>
+          <param name="rect" type="Rect" default="NULL"/>
         </paramlist>
       </method>
       <method name="LayoutFrame" type="bool" overloaded="no">
         <autodoc>LayoutFrame(Frame frame, Window mainWindow=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="frame" type="p.wxFrame" default=""/>
-          <param name="mainWindow" type="p.wxWindow" default="NULL"/>
+          <param name="frame" type="Frame" default=""/>
+          <param name="mainWindow" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="LayoutWindow" type="bool" overloaded="no">
         <autodoc>LayoutWindow(Window parent, Window mainWindow=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="mainWindow" type="p.wxWindow" default="NULL"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="mainWindow" type="Window" default="NULL"/>
         </paramlist>
       </method>
     </class>
@@ -10731,11 +10731,11 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PopupWindow" oldname="wxPopupWindow" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="PopupWindow" overloaded="no">
         <autodoc>__init__(Window parent, int flags=BORDER_NONE) -&gt; PopupWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="flags" type="int" default="wxBORDER_NONE"/>
         </paramlist>
       </constructor>
@@ -10745,15 +10745,15 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int flags=BORDER_NONE) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="flags" type="int" default="wxBORDER_NONE"/>
         </paramlist>
       </method>
-      <method name="Position" type="void" overloaded="no">
+      <method name="Position" type="" overloaded="no">
         <autodoc>Position(Point ptOrigin, Size size)</autodoc>
         <paramlist>
-          <param name="ptOrigin" type="r.q(const).wxPoint" default=""/>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="ptOrigin" type="Point" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
     </class>
@@ -10761,31 +10761,31 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PopupTransientWindow" oldname="wxPyPopupTransientWindow" module="windows">
-      <baseclass name="wxPopupWindow"/>
+      <baseclass name="PopupWindow"/>
       <constructor name="wxPyPopupTransientWindow" overloaded="no">
         <autodoc>__init__(Window parent, int style=BORDER_NONE) -&gt; PopupTransientWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="style" type="int" default="wxBORDER_NONE"/>
         </paramlist>
       </constructor>
       <constructor name="PrePopupTransientWindow" overloaded="no">
         <autodoc>PrePopupTransientWindow() -&gt; PopupTransientWindow</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="Popup" type="void" overloaded="no">
+      <method name="Popup" type="" overloaded="no">
         <autodoc>Popup(Window focus=None)</autodoc>
         <paramlist>
-          <param name="focus" type="p.wxWindow" default="NULL"/>
+          <param name="focus" type="Window" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Dismiss" type="void" overloaded="no">
+      <method name="Dismiss" type="" overloaded="no">
         <autodoc>Dismiss()</autodoc>
       </method>
     </class>
@@ -10793,23 +10793,23 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TipWindow" oldname="wxTipWindow" module="windows">
-      <baseclass name="wxPyPopupTransientWindow"/>
+      <baseclass name="PopupTransientWindow"/>
       <constructor name="TipWindow" overloaded="no">
         <autodoc>__init__(Window parent, String text, int maxLength=100, Rect rectBound=None) -&gt; TipWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="maxLength" type="int" default="100"/>
-          <param name="rectBound" type="p.wxRect" default="NULL"/>
+          <param name="rectBound" type="Rect" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="SetBoundingRect" type="void" overloaded="no">
+      <method name="SetBoundingRect" type="" overloaded="no">
         <autodoc>SetBoundingRect(Rect rectBound)</autodoc>
         <paramlist>
-          <param name="rectBound" type="r.q(const).wxRect" default=""/>
+          <param name="rectBound" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="Close" type="void" overloaded="no">
+      <method name="Close" type="" overloaded="no">
         <autodoc>Close()</autodoc>
       </method>
     </class>
@@ -10817,42 +10817,42 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="VScrolledWindow" oldname="wxPyVScrolledWindow" module="windows">
-      <baseclass name="wxPanel"/>
+      <baseclass name="Panel"/>
       <constructor name="wxPyVScrolledWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=PanelNameStr) -&gt; VScrolledWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_ANY"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreVScrolledWindow" overloaded="no">
         <autodoc>PreVScrolledWindow() -&gt; VScrolledWindow</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=PanelNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_ANY"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </method>
-      <method name="SetLineCount" type="void" overloaded="no">
+      <method name="SetLineCount" type="" overloaded="no">
         <autodoc>SetLineCount(size_t count)</autodoc>
         <paramlist>
           <param name="count" type="size_t" default=""/>
@@ -10876,13 +10876,13 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="pages" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="RefreshLine" type="void" overloaded="no">
+      <method name="RefreshLine" type="" overloaded="no">
         <autodoc>RefreshLine(size_t line)</autodoc>
         <paramlist>
           <param name="line" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="RefreshLines" type="void" overloaded="no">
+      <method name="RefreshLines" type="" overloaded="no">
         <autodoc>RefreshLines(size_t from, size_t to)</autodoc>
         <paramlist>
           <param name="from" type="size_t" default=""/>
@@ -10899,10 +10899,10 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="RefreshAll" type="void" overloaded="no">
+      <method name="RefreshAll" type="" overloaded="no">
         <autodoc>RefreshAll()</autodoc>
       </method>
       <method name="GetLineCount" type="size_t" overloaded="no">
@@ -10922,39 +10922,39 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
     </class>
     <class name="VListBox" oldname="wxPyVListBox" module="windows">
-      <baseclass name="wxPyVScrolledWindow"/>
+      <baseclass name="VScrolledWindow"/>
       <constructor name="wxPyVListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -&gt; VListBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_ANY"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyVListBoxNameStr"/>
+          <param name="name" type="String" default="wxPyVListBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreVListBox" overloaded="no">
         <autodoc>PreVListBox() -&gt; VListBox</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_ANY"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyVListBoxNameStr"/>
+          <param name="name" type="String" default="wxPyVListBoxNameStr"/>
         </paramlist>
       </method>
       <method name="GetItemCount" type="size_t" overloaded="no">
@@ -10984,31 +10984,31 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="GetFirstSelected" type="int" overloaded="no">
         <autodoc>GetFirstSelected(unsigned long cookie) -&gt; int</autodoc>
         <paramlist>
-          <param name="cookie" type="r.unsigned long" default=""/>
+          <param name="cookie" type="unsigned long" default=""/>
         </paramlist>
       </method>
       <method name="GetNextSelected" type="int" overloaded="no">
         <autodoc>GetNextSelected(unsigned long cookie) -&gt; int</autodoc>
         <paramlist>
-          <param name="cookie" type="r.unsigned long" default=""/>
+          <param name="cookie" type="unsigned long" default=""/>
         </paramlist>
       </method>
-      <method name="GetMargins" type="wxPoint" overloaded="no">
+      <method name="GetMargins" type="Point" overloaded="no">
         <autodoc>GetMargins() -&gt; Point</autodoc>
       </method>
-      <method name="GetSelectionBackground" type="q(const).wxColour" overloaded="no">
+      <method name="GetSelectionBackground" type="Colour" overloaded="no">
         <autodoc>GetSelectionBackground() -&gt; Colour</autodoc>
       </method>
-      <method name="SetItemCount" type="void" overloaded="no">
+      <method name="SetItemCount" type="" overloaded="no">
         <autodoc>SetItemCount(size_t count)</autodoc>
         <paramlist>
           <param name="count" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int selection)</autodoc>
         <paramlist>
           <param name="selection" type="int" default=""/>
@@ -11028,7 +11028,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="to" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">
         <autodoc>Toggle(size_t item)</autodoc>
         <paramlist>
           <param name="item" type="size_t" default=""/>
@@ -11040,66 +11040,66 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="DeselectAll" type="bool" overloaded="no">
         <autodoc>DeselectAll() -&gt; bool</autodoc>
       </method>
-      <method name="SetMargins" type="void" overloaded="no">
+      <method name="SetMargins" type="" overloaded="no">
         <autodoc>SetMargins(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginsXY" type="void" overloaded="no">
+      <method name="SetMarginsXY" type="" overloaded="no">
         <autodoc>SetMarginsXY(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelectionBackground" type="void" overloaded="no">
+      <method name="SetSelectionBackground" type="" overloaded="no">
         <autodoc>SetSelectionBackground(Colour col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="HtmlListBox" oldname="wxPyHtmlListBox" module="windows">
-      <baseclass name="wxPyVListBox"/>
+      <baseclass name="VListBox"/>
       <constructor name="wxPyHtmlListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -&gt; HtmlListBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_ANY"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyVListBoxNameStr"/>
+          <param name="name" type="String" default="wxPyVListBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreHtmlListBox" overloaded="no">
         <autodoc>PreHtmlListBox() -&gt; HtmlListBox</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_ANY"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyVListBoxNameStr"/>
+          <param name="name" type="String" default="wxPyVListBoxNameStr"/>
         </paramlist>
       </method>
-      <method name="RefreshAll" type="void" overloaded="no">
+      <method name="RefreshAll" type="" overloaded="no">
         <autodoc>RefreshAll()</autodoc>
       </method>
-      <method name="SetItemCount" type="void" overloaded="no">
+      <method name="SetItemCount" type="" overloaded="no">
         <autodoc>SetItemCount(size_t count)</autodoc>
         <paramlist>
           <param name="count" type="size_t" default=""/>
@@ -11110,7 +11110,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TaskBarIcon" oldname="wxTaskBarIcon" module="windows">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="TaskBarIcon" overloaded="no">
         <autodoc>__init__() -&gt; TaskBarIcon</autodoc>
       </constructor>
@@ -11126,8 +11126,8 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="SetIcon" type="bool" overloaded="no">
         <autodoc>SetIcon(Icon icon, String tooltip=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
-          <param name="tooltip" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="icon" type="Icon" default=""/>
+          <param name="tooltip" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="RemoveIcon" type="bool" overloaded="no">
@@ -11136,17 +11136,17 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       <method name="PopupMenu" type="bool" overloaded="no">
         <autodoc>PopupMenu(Menu menu) -&gt; bool</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="TaskBarIconEvent" oldname="wxTaskBarIconEvent" module="windows">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="TaskBarIconEvent" overloaded="no">
         <autodoc>__init__(wxEventType evtType, TaskBarIcon tbIcon) -&gt; TaskBarIconEvent</autodoc>
         <paramlist>
           <param name="evtType" type="wxEventType" default=""/>
-          <param name="tbIcon" type="p.wxTaskBarIcon" default=""/>
+          <param name="tbIcon" type="TaskBarIcon" default=""/>
         </paramlist>
       </constructor>
     </class>
@@ -11163,7 +11163,7 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ColourData" oldname="wxColourData" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ColourData" overloaded="no">
         <autodoc>__init__() -&gt; ColourData</autodoc>
       </constructor>
@@ -11173,45 +11173,45 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       <method name="GetChooseFull" type="bool" overloaded="no">
         <autodoc>GetChooseFull() -&gt; bool</autodoc>
       </method>
-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetCustomColour" type="wxColour" overloaded="no">
+      <method name="GetCustomColour" type="Colour" overloaded="no">
         <autodoc>GetCustomColour(int i) -&gt; Colour</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetChooseFull" type="void" overloaded="no">
+      <method name="SetChooseFull" type="" overloaded="no">
         <autodoc>SetChooseFull(int flag)</autodoc>
         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetCustomColour" type="void" overloaded="no">
+      <method name="SetCustomColour" type="" overloaded="no">
         <autodoc>SetCustomColour(int i, Colour colour)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ColourDialog" oldname="wxColourDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="ColourDialog" overloaded="no">
         <autodoc>__init__(Window parent, ColourData data=None) -&gt; ColourDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="data" type="p.wxColourData" default="NULL"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="data" type="ColourData" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="GetColourData" type="wxColourData" overloaded="no">
+      <method name="GetColourData" type="ColourData" overloaded="no">
         <autodoc>GetColourData() -&gt; ColourData</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
@@ -11219,41 +11219,41 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="DirDialog" oldname="wxDirDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="DirDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message=DirSelectorPromptStr, 
     String defaultPath=EmptyString, long style=0, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     String name=DirDialogNameStr) -&gt; DirDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="message" type="r.q(const).wxString" default="wxPyDirSelectorPromptStr"/>
-          <param name="defaultPath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="message" type="String" default="wxPyDirSelectorPromptStr"/>
+          <param name="defaultPath" type="String" default="wxPyEmptyString"/>
           <param name="style" type="long" default="0"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyDirDialogNameStr"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="name" type="String" default="wxPyDirDialogNameStr"/>
         </paramlist>
       </constructor>
-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
-      <method name="GetMessage" type="wxString" overloaded="no">
+      <method name="GetMessage" type="String" overloaded="no">
         <autodoc>GetMessage() -&gt; String</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
-      <method name="SetMessage" type="void" overloaded="no">
+      <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(String message)</autodoc>
         <paramlist>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetPath" type="void" overloaded="no">
+      <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
@@ -11261,77 +11261,77 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="FileDialog" oldname="wxFileDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="FileDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message=FileSelectorPromptStr, 
     String defaultDir=EmptyString, String defaultFile=EmptyString, 
     String wildcard=FileSelectorDefaultWildcardStr, 
     long style=0, Point pos=DefaultPosition) -&gt; FileDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="message" type="r.q(const).wxString" default="wxPyFileSelectorPromptStr"/>
-          <param name="defaultDir" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="defaultFile" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="wildcard" type="r.q(const).wxString" default="wxPyFileSelectorDefaultWildcardStr"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="message" type="String" default="wxPyFileSelectorPromptStr"/>
+          <param name="defaultDir" type="String" default="wxPyEmptyString"/>
+          <param name="defaultFile" type="String" default="wxPyEmptyString"/>
+          <param name="wildcard" type="String" default="wxPyFileSelectorDefaultWildcardStr"/>
           <param name="style" type="long" default="0"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
-      <method name="SetMessage" type="void" overloaded="no">
+      <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(String message)</autodoc>
         <paramlist>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetPath" type="void" overloaded="no">
+      <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetDirectory" type="void" overloaded="no">
+      <method name="SetDirectory" type="" overloaded="no">
         <autodoc>SetDirectory(String dir)</autodoc>
         <paramlist>
-          <param name="dir" type="r.q(const).wxString" default=""/>
+          <param name="dir" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetFilename" type="void" overloaded="no">
+      <method name="SetFilename" type="" overloaded="no">
         <autodoc>SetFilename(String name)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetWildcard" type="void" overloaded="no">
+      <method name="SetWildcard" type="" overloaded="no">
         <autodoc>SetWildcard(String wildCard)</autodoc>
         <paramlist>
-          <param name="wildCard" type="r.q(const).wxString" default=""/>
+          <param name="wildCard" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetFilterIndex" type="void" overloaded="no">
+      <method name="SetFilterIndex" type="" overloaded="no">
         <autodoc>SetFilterIndex(int filterIndex)</autodoc>
         <paramlist>
           <param name="filterIndex" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetMessage" type="wxString" overloaded="no">
+      <method name="GetMessage" type="String" overloaded="no">
         <autodoc>GetMessage() -&gt; String</autodoc>
       </method>
-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
-      <method name="GetDirectory" type="wxString" overloaded="no">
+      <method name="GetDirectory" type="String" overloaded="no">
         <autodoc>GetDirectory() -&gt; String</autodoc>
       </method>
-      <method name="GetFilename" type="wxString" overloaded="no">
+      <method name="GetFilename" type="String" overloaded="no">
         <autodoc>GetFilename() -&gt; String</autodoc>
       </method>
-      <method name="GetWildcard" type="wxString" overloaded="no">
+      <method name="GetWildcard" type="String" overloaded="no">
         <autodoc>GetWildcard() -&gt; String</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
@@ -11348,25 +11348,25 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="MultiChoiceDialog" oldname="wxMultiChoiceDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="MultiChoiceDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption, int LCOUNT, 
     String choices, long style=CHOICEDLG_STYLE, 
     Point pos=DefaultPosition) -&gt; MultiChoiceDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="message" type="r.q(const).wxString" default=""/>
-          <param name="caption" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="message" type="String" default=""/>
+          <param name="caption" type="String" default=""/>
           <param name="LCOUNT" type="int" default=""/>
-          <param name="choices" type="p.wxString" default=""/>
+          <param name="choices" type="String" default=""/>
           <param name="style" type="long" default="wxCHOICEDLG_STYLE"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
-      <method name="SetSelections" type="void" overloaded="no">
+      <method name="SetSelections" type="" overloaded="no">
         <autodoc>SetSelections(wxArrayInt selections)</autodoc>
         <paramlist>
-          <param name="selections" type="r.q(const).wxArrayInt" default=""/>
+          <param name="selections" type="wxArrayInt" default=""/>
         </paramlist>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">
@@ -11374,28 +11374,28 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="SingleChoiceDialog" oldname="wxSingleChoiceDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="SingleChoiceDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption, int choices, 
     String choices_array, long style=CHOICEDLG_STYLE, 
     Point pos=DefaultPosition) -&gt; SingleChoiceDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="message" type="r.q(const).wxString" default=""/>
-          <param name="caption" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="message" type="String" default=""/>
+          <param name="caption" type="String" default=""/>
           <param name="choices" type="int" default=""/>
-          <param name="choices_array" type="p.wxString" default=""/>
+          <param name="choices_array" type="String" default=""/>
           <param name="style" type="long" default="wxCHOICEDLG_STYLE"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </method>
-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int sel)</autodoc>
         <paramlist>
           <param name="sel" type="int" default=""/>
@@ -11406,27 +11406,27 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="TextEntryDialog" oldname="wxTextEntryDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="TextEntryDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption=GetTextFromUserPromptStr, 
     String defaultValue=EmptyString, 
     long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -&gt; TextEntryDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="message" type="r.q(const).wxString" default=""/>
-          <param name="caption" type="r.q(const).wxString" default="wxPyGetTextFromUserPromptStr"/>
-          <param name="defaultValue" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="message" type="String" default=""/>
+          <param name="caption" type="String" default="wxPyGetTextFromUserPromptStr"/>
+          <param name="defaultValue" type="String" default="wxPyEmptyString"/>
           <param name="style" type="long" default="wxOK|wxCANCEL|wxCENTRE"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
@@ -11434,14 +11434,14 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="FontData" oldname="wxFontData" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="FontData" overloaded="no">
         <autodoc>__init__() -&gt; FontData</autodoc>
       </constructor>
       <destructor name="~wxFontData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="EnableEffects" type="void" overloaded="no">
+      <method name="EnableEffects" type="" overloaded="no">
         <autodoc>EnableEffects(bool enable)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default=""/>
@@ -11450,53 +11450,53 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       <method name="GetAllowSymbols" type="bool" overloaded="no">
         <autodoc>GetAllowSymbols() -&gt; bool</autodoc>
       </method>
-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetChosenFont" type="wxFont" overloaded="no">
+      <method name="GetChosenFont" type="Font" overloaded="no">
         <autodoc>GetChosenFont() -&gt; Font</autodoc>
       </method>
       <method name="GetEnableEffects" type="bool" overloaded="no">
         <autodoc>GetEnableEffects() -&gt; bool</autodoc>
       </method>
-      <method name="GetInitialFont" type="wxFont" overloaded="no">
+      <method name="GetInitialFont" type="Font" overloaded="no">
         <autodoc>GetInitialFont() -&gt; Font</autodoc>
       </method>
       <method name="GetShowHelp" type="bool" overloaded="no">
         <autodoc>GetShowHelp() -&gt; bool</autodoc>
       </method>
-      <method name="SetAllowSymbols" type="void" overloaded="no">
+      <method name="SetAllowSymbols" type="" overloaded="no">
         <autodoc>SetAllowSymbols(bool allowSymbols)</autodoc>
         <paramlist>
           <param name="allowSymbols" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetChosenFont" type="void" overloaded="no">
+      <method name="SetChosenFont" type="" overloaded="no">
         <autodoc>SetChosenFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetInitialFont" type="void" overloaded="no">
+      <method name="SetInitialFont" type="" overloaded="no">
         <autodoc>SetInitialFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetRange" type="void" overloaded="no">
+      <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int min, int max)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>
           <param name="max" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetShowHelp" type="void" overloaded="no">
+      <method name="SetShowHelp" type="" overloaded="no">
         <autodoc>SetShowHelp(bool showHelp)</autodoc>
         <paramlist>
           <param name="showHelp" type="bool" default=""/>
@@ -11504,15 +11504,15 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="FontDialog" oldname="wxFontDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="FontDialog" overloaded="no">
         <autodoc>__init__(Window parent, FontData data) -&gt; FontDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="data" type="r.q(const).wxFontData" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="data" type="FontData" default=""/>
         </paramlist>
       </constructor>
-      <method name="GetFontData" type="wxFontData" overloaded="no">
+      <method name="GetFontData" type="FontData" overloaded="no">
         <autodoc>GetFontData() -&gt; FontData</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
@@ -11520,17 +11520,17 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="MessageDialog" oldname="wxMessageDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="MessageDialog" overloaded="no">
         <autodoc>__init__(Window parent, String message, String caption=MessageBoxCaptionStr, 
     long style=wxOK|wxCANCEL|wxCENTRE, 
     Point pos=DefaultPosition) -&gt; MessageDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="message" type="r.q(const).wxString" default=""/>
-          <param name="caption" type="r.q(const).wxString" default="wxPyMessageBoxCaptionStr"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="message" type="String" default=""/>
+          <param name="caption" type="String" default="wxPyMessageBoxCaptionStr"/>
           <param name="style" type="long" default="wxOK|wxCANCEL|wxCENTRE"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
       <method name="ShowModal" type="int" overloaded="no">
@@ -11538,15 +11538,15 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
       </method>
     </class>
     <class name="ProgressDialog" oldname="wxProgressDialog" module="windows">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="ProgressDialog" overloaded="no">
         <autodoc>__init__(String title, String message, int maximum=100, Window parent=None, 
     int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -&gt; ProgressDialog</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="message" type="String" default=""/>
           <param name="maximum" type="int" default="100"/>
-          <param name="parent" type="p.wxWindow" default="NULL"/>
+          <param name="parent" type="Window" default="NULL"/>
           <param name="style" type="int" default="wxPD_AUTO_HIDE|wxPD_APP_MODAL"/>
         </paramlist>
       </constructor>
@@ -11554,10 +11554,10 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
         <autodoc>Update(int value, String newmsg=EmptyString) -&gt; bool</autodoc>
         <paramlist>
           <param name="value" type="int" default=""/>
-          <param name="newmsg" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="newmsg" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="Resume" type="void" overloaded="no">
+      <method name="Resume" type="" overloaded="no">
         <autodoc>Resume()</autodoc>
       </method>
     </class>
@@ -11576,7 +11576,7 @@ EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 </pythoncode>
     <class name="FindDialogEvent" oldname="wxFindDialogEvent" module="windows">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="FindDialogEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; FindDialogEvent</autodoc>
         <paramlist>
@@ -11587,36 +11587,36 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
-      <method name="GetFindString" type="q(const).wxString" overloaded="no">
+      <method name="GetFindString" type="String" overloaded="no">
         <autodoc>GetFindString() -&gt; String</autodoc>
       </method>
-      <method name="GetReplaceString" type="q(const).wxString" overloaded="no">
+      <method name="GetReplaceString" type="String" overloaded="no">
         <autodoc>GetReplaceString() -&gt; String</autodoc>
       </method>
       <method name="GetDialog" type="wxFindReplaceDialog" overloaded="no">
         <autodoc>GetDialog() -&gt; FindReplaceDialog</autodoc>
       </method>
-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFindString" type="void" overloaded="no">
+      <method name="SetFindString" type="" overloaded="no">
         <autodoc>SetFindString(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetReplaceString" type="void" overloaded="no">
+      <method name="SetReplaceString" type="" overloaded="no">
         <autodoc>SetReplaceString(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FindReplaceData" oldname="wxFindReplaceData" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="FindReplaceData" overloaded="no">
         <autodoc>__init__(int flags=0) -&gt; FindReplaceData</autodoc>
         <paramlist>
@@ -11626,43 +11626,43 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <destructor name="~wxFindReplaceData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="GetFindString" type="q(const).wxString" overloaded="no">
+      <method name="GetFindString" type="String" overloaded="no">
         <autodoc>GetFindString() -&gt; String</autodoc>
       </method>
-      <method name="GetReplaceString" type="q(const).wxString" overloaded="no">
+      <method name="GetReplaceString" type="String" overloaded="no">
         <autodoc>GetReplaceString() -&gt; String</autodoc>
       </method>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFindString" type="void" overloaded="no">
+      <method name="SetFindString" type="" overloaded="no">
         <autodoc>SetFindString(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetReplaceString" type="void" overloaded="no">
+      <method name="SetReplaceString" type="" overloaded="no">
         <autodoc>SetReplaceString(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FindReplaceDialog" oldname="wxFindReplaceDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="FindReplaceDialog" overloaded="no">
         <autodoc>__init__(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; FindReplaceDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="data" type="p.wxFindReplaceData" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="data" type="FindReplaceData" default=""/>
+          <param name="title" type="String" default=""/>
           <param name="style" type="int" default="0"/>
         </paramlist>
       </constructor>
@@ -11673,19 +11673,19 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
         <autodoc>Create(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="data" type="p.wxFindReplaceData" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="data" type="FindReplaceData" default=""/>
+          <param name="title" type="String" default=""/>
           <param name="style" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetData" type="q(const).wxFindReplaceData" overloaded="no">
+      <method name="GetData" type="FindReplaceData" overloaded="no">
         <autodoc>GetData() -&gt; FindReplaceData</autodoc>
       </method>
-      <method name="SetData" type="void" overloaded="no">
+      <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(FindReplaceData data)</autodoc>
         <paramlist>
-          <param name="data" type="p.wxFindReplaceData" default=""/>
+          <param name="data" type="FindReplaceData" default=""/>
         </paramlist>
       </method>
     </class>
@@ -11693,19 +11693,19 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MDIParentFrame" oldname="wxMDIParentFrame" module="windows">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="MDIParentFrame" overloaded="no">
         <autodoc>__init__(Window parent, int id, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
     String name=FrameNameStr) -&gt; MDIParentFrame</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreMDIParentFrame" overloaded="no">
@@ -11716,25 +11716,25 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
     Size size=DefaultSize, long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
     String name=FrameNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </method>
-      <method name="ActivateNext" type="void" overloaded="no">
+      <method name="ActivateNext" type="" overloaded="no">
         <autodoc>ActivateNext()</autodoc>
       </method>
-      <method name="ActivatePrevious" type="void" overloaded="no">
+      <method name="ActivatePrevious" type="" overloaded="no">
         <autodoc>ActivatePrevious()</autodoc>
       </method>
-      <method name="ArrangeIcons" type="void" overloaded="no">
+      <method name="ArrangeIcons" type="" overloaded="no">
         <autodoc>ArrangeIcons()</autodoc>
       </method>
-      <method name="Cascade" type="void" overloaded="no">
+      <method name="Cascade" type="" overloaded="no">
         <autodoc>Cascade()</autodoc>
       </method>
       <method name="GetActiveChild" type="wxMDIChildFrame" overloaded="no">
@@ -11743,27 +11743,27 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetClientWindow" type="wxMDIClientWindow" overloaded="no">
         <autodoc>GetClientWindow() -&gt; MDIClientWindow</autodoc>
       </method>
-      <method name="GetToolBar" type="wxWindow" overloaded="no">
+      <method name="GetToolBar" type="Window" overloaded="no">
         <autodoc>GetToolBar() -&gt; Window</autodoc>
       </method>
-      <method name="Tile" type="void" overloaded="no">
+      <method name="Tile" type="" overloaded="no">
         <autodoc>Tile()</autodoc>
       </method>
     </class>
     <class name="MDIChildFrame" oldname="wxMDIChildFrame" module="windows">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="MDIChildFrame" overloaded="no">
         <autodoc>__init__(MDIParentFrame parent, int id, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; MDIChildFrame</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxMDIParentFrame" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="MDIParentFrame" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreMDIChildFrame" overloaded="no">
@@ -11774,34 +11774,34 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxMDIParentFrame" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="MDIParentFrame" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </method>
-      <method name="Activate" type="void" overloaded="no">
+      <method name="Activate" type="" overloaded="no">
         <autodoc>Activate()</autodoc>
       </method>
-      <method name="Maximize" type="void" overloaded="no">
+      <method name="Maximize" type="" overloaded="no">
         <autodoc>Maximize(bool maximize)</autodoc>
         <paramlist>
           <param name="maximize" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Restore" type="void" overloaded="no">
+      <method name="Restore" type="" overloaded="no">
         <autodoc>Restore()</autodoc>
       </method>
     </class>
     <class name="MDIClientWindow" oldname="wxMDIClientWindow" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="MDIClientWindow" overloaded="no">
         <autodoc>__init__(MDIParentFrame parent, long style=0) -&gt; MDIClientWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxMDIParentFrame" default=""/>
+          <param name="parent" type="MDIParentFrame" default=""/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
@@ -11811,7 +11811,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(MDIParentFrame parent, long style=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxMDIParentFrame" default=""/>
+          <param name="parent" type="MDIParentFrame" default=""/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </method>
@@ -11820,27 +11820,27 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyWindow" oldname="wxPyWindow" module="windows">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="PyWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; PyWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoMoveWindow" type="void" overloaded="no">
+      <method name="base_DoMoveWindow" type="" overloaded="no">
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -11849,7 +11849,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetSize" type="void" overloaded="no">
+      <method name="base_DoSetSize" type="" overloaded="no">
         <autodoc>base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -11859,48 +11859,48 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
-      <method name="base_DoSetClientSize" type="void" overloaded="no">
+      <method name="base_DoSetClientSize" type="" overloaded="no">
         <autodoc>base_DoSetClientSize(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetVirtualSize" type="void" overloaded="no">
+      <method name="base_DoSetVirtualSize" type="" overloaded="no">
         <autodoc>base_DoSetVirtualSize(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetSize" type="void" overloaded="no">
+      <method name="base_DoGetSize" type="" overloaded="no">
         <autodoc>base_DoGetSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetClientSize" type="void" overloaded="no">
+      <method name="base_DoGetClientSize" type="" overloaded="no">
         <autodoc>base_DoGetClientSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetPosition" type="void" overloaded="no">
+      <method name="base_DoGetPosition" type="" overloaded="no">
         <autodoc>base_DoGetPosition() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetVirtualSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetVirtualSize" type="Size" overloaded="no">
         <autodoc>base_DoGetVirtualSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_DoGetBestSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetBestSize" type="Size" overloaded="no">
         <autodoc>base_DoGetBestSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_InitDialog" type="void" overloaded="no">
+      <method name="base_InitDialog" type="" overloaded="no">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">
@@ -11918,44 +11918,44 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="base_AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>base_AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
-      <method name="base_GetMaxSize" type="wxSize" overloaded="no">
+      <method name="base_GetMaxSize" type="Size" overloaded="no">
         <autodoc>base_GetMaxSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_AddChild" type="void" overloaded="no">
+      <method name="base_AddChild" type="" overloaded="no">
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">
         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyPanel" oldname="wxPyPanel" module="windows">
-      <baseclass name="wxPanel"/>
+      <baseclass name="Panel"/>
       <constructor name="PyPanel" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; PyPanel</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoMoveWindow" type="void" overloaded="no">
+      <method name="base_DoMoveWindow" type="" overloaded="no">
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -11964,7 +11964,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetSize" type="void" overloaded="no">
+      <method name="base_DoSetSize" type="" overloaded="no">
         <autodoc>base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -11974,48 +11974,48 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
-      <method name="base_DoSetClientSize" type="void" overloaded="no">
+      <method name="base_DoSetClientSize" type="" overloaded="no">
         <autodoc>base_DoSetClientSize(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetVirtualSize" type="void" overloaded="no">
+      <method name="base_DoSetVirtualSize" type="" overloaded="no">
         <autodoc>base_DoSetVirtualSize(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetSize" type="void" overloaded="no">
+      <method name="base_DoGetSize" type="" overloaded="no">
         <autodoc>base_DoGetSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetClientSize" type="void" overloaded="no">
+      <method name="base_DoGetClientSize" type="" overloaded="no">
         <autodoc>base_DoGetClientSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetPosition" type="void" overloaded="no">
+      <method name="base_DoGetPosition" type="" overloaded="no">
         <autodoc>base_DoGetPosition() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetVirtualSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetVirtualSize" type="Size" overloaded="no">
         <autodoc>base_DoGetVirtualSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_DoGetBestSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetBestSize" type="Size" overloaded="no">
         <autodoc>base_DoGetBestSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_InitDialog" type="void" overloaded="no">
+      <method name="base_InitDialog" type="" overloaded="no">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">
@@ -12033,19 +12033,19 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="base_AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>base_AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
-      <method name="base_GetMaxSize" type="wxSize" overloaded="no">
+      <method name="base_GetMaxSize" type="Size" overloaded="no">
         <autodoc>base_GetMaxSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_AddChild" type="void" overloaded="no">
+      <method name="base_AddChild" type="" overloaded="no">
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">
         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
     </class>
@@ -12053,7 +12053,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PrintData" oldname="wxPrintData" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="PrintData" overloaded="no">
         <autodoc>__init__() -&gt; PrintData</autodoc>
       </constructor>
@@ -12072,7 +12072,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
-      <method name="GetPrinterName" type="q(const).wxString" overloaded="no">
+      <method name="GetPrinterName" type="String" overloaded="no">
         <autodoc>GetPrinterName() -&gt; String</autodoc>
       </method>
       <method name="GetColour" type="bool" overloaded="no">
@@ -12084,79 +12084,79 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetPaperId" type="wxPaperSize" overloaded="no">
         <autodoc>GetPaperId() -&gt; int</autodoc>
       </method>
-      <method name="GetPaperSize" type="q(const).wxSize" overloaded="no">
+      <method name="GetPaperSize" type="Size" overloaded="no">
         <autodoc>GetPaperSize() -&gt; Size</autodoc>
       </method>
       <method name="GetQuality" type="int" overloaded="no">
         <autodoc>GetQuality() -&gt; int</autodoc>
       </method>
-      <method name="SetNoCopies" type="void" overloaded="no">
+      <method name="SetNoCopies" type="" overloaded="no">
         <autodoc>SetNoCopies(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCollate" type="void" overloaded="no">
+      <method name="SetCollate" type="" overloaded="no">
         <autodoc>SetCollate(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetOrientation" type="void" overloaded="no">
+      <method name="SetOrientation" type="" overloaded="no">
         <autodoc>SetOrientation(int orient)</autodoc>
         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterName" type="void" overloaded="no">
+      <method name="SetPrinterName" type="" overloaded="no">
         <autodoc>SetPrinterName(String name)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(bool colour)</autodoc>
         <paramlist>
           <param name="colour" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetDuplex" type="void" overloaded="no">
+      <method name="SetDuplex" type="" overloaded="no">
         <autodoc>SetDuplex(int duplex)</autodoc>
         <paramlist>
           <param name="duplex" type="wxDuplexMode" default=""/>
         </paramlist>
       </method>
-      <method name="SetPaperId" type="void" overloaded="no">
+      <method name="SetPaperId" type="" overloaded="no">
         <autodoc>SetPaperId(int sizeId)</autodoc>
         <paramlist>
           <param name="sizeId" type="wxPaperSize" default=""/>
         </paramlist>
       </method>
-      <method name="SetPaperSize" type="void" overloaded="no">
+      <method name="SetPaperSize" type="" overloaded="no">
         <autodoc>SetPaperSize(Size sz)</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetQuality" type="void" overloaded="no">
+      <method name="SetQuality" type="" overloaded="no">
         <autodoc>SetQuality(int quality)</autodoc>
         <paramlist>
           <param name="quality" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrinterCommand" type="q(const).wxString" overloaded="no">
+      <method name="GetPrinterCommand" type="String" overloaded="no">
         <autodoc>GetPrinterCommand() -&gt; String</autodoc>
       </method>
-      <method name="GetPrinterOptions" type="q(const).wxString" overloaded="no">
+      <method name="GetPrinterOptions" type="String" overloaded="no">
         <autodoc>GetPrinterOptions() -&gt; String</autodoc>
       </method>
-      <method name="GetPreviewCommand" type="q(const).wxString" overloaded="no">
+      <method name="GetPreviewCommand" type="String" overloaded="no">
         <autodoc>GetPreviewCommand() -&gt; String</autodoc>
       </method>
-      <method name="GetFilename" type="q(const).wxString" overloaded="no">
+      <method name="GetFilename" type="String" overloaded="no">
         <autodoc>GetFilename() -&gt; String</autodoc>
       </method>
-      <method name="GetFontMetricPath" type="q(const).wxString" overloaded="no">
+      <method name="GetFontMetricPath" type="String" overloaded="no">
         <autodoc>GetFontMetricPath() -&gt; String</autodoc>
       </method>
       <method name="GetPrinterScaleX" type="double" overloaded="no">
@@ -12174,75 +12174,75 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetPrintMode" type="wxPrintMode" overloaded="no">
         <autodoc>GetPrintMode() -&gt; int</autodoc>
       </method>
-      <method name="SetPrinterCommand" type="void" overloaded="no">
+      <method name="SetPrinterCommand" type="" overloaded="no">
         <autodoc>SetPrinterCommand(String command)</autodoc>
         <paramlist>
-          <param name="command" type="r.q(const).wxString" default=""/>
+          <param name="command" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterOptions" type="void" overloaded="no">
+      <method name="SetPrinterOptions" type="" overloaded="no">
         <autodoc>SetPrinterOptions(String options)</autodoc>
         <paramlist>
-          <param name="options" type="r.q(const).wxString" default=""/>
+          <param name="options" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetPreviewCommand" type="void" overloaded="no">
+      <method name="SetPreviewCommand" type="" overloaded="no">
         <autodoc>SetPreviewCommand(String command)</autodoc>
         <paramlist>
-          <param name="command" type="r.q(const).wxString" default=""/>
+          <param name="command" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetFilename" type="void" overloaded="no">
+      <method name="SetFilename" type="" overloaded="no">
         <autodoc>SetFilename(String filename)</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetFontMetricPath" type="void" overloaded="no">
+      <method name="SetFontMetricPath" type="" overloaded="no">
         <autodoc>SetFontMetricPath(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterScaleX" type="void" overloaded="no">
+      <method name="SetPrinterScaleX" type="" overloaded="no">
         <autodoc>SetPrinterScaleX(double x)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterScaleY" type="void" overloaded="no">
+      <method name="SetPrinterScaleY" type="" overloaded="no">
         <autodoc>SetPrinterScaleY(double y)</autodoc>
         <paramlist>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterScaling" type="void" overloaded="no">
+      <method name="SetPrinterScaling" type="" overloaded="no">
         <autodoc>SetPrinterScaling(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterTranslateX" type="void" overloaded="no">
+      <method name="SetPrinterTranslateX" type="" overloaded="no">
         <autodoc>SetPrinterTranslateX(long x)</autodoc>
         <paramlist>
           <param name="x" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterTranslateY" type="void" overloaded="no">
+      <method name="SetPrinterTranslateY" type="" overloaded="no">
         <autodoc>SetPrinterTranslateY(long y)</autodoc>
         <paramlist>
           <param name="y" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrinterTranslation" type="void" overloaded="no">
+      <method name="SetPrinterTranslation" type="" overloaded="no">
         <autodoc>SetPrinterTranslation(long x, long y)</autodoc>
         <paramlist>
           <param name="x" type="long" default=""/>
           <param name="y" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrintMode" type="void" overloaded="no">
+      <method name="SetPrintMode" type="" overloaded="no">
         <autodoc>SetPrintMode(int printMode)</autodoc>
         <paramlist>
           <param name="printMode" type="wxPrintMode" default=""/>
@@ -12250,38 +12250,38 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="PageSetupDialogData" oldname="wxPageSetupDialogData" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="PageSetupDialogData" overloaded="no">
         <autodoc>__init__() -&gt; PageSetupDialogData</autodoc>
       </constructor>
       <destructor name="~wxPageSetupDialogData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="EnableHelp" type="void" overloaded="no">
+      <method name="EnableHelp" type="" overloaded="no">
         <autodoc>EnableHelp(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnableMargins" type="void" overloaded="no">
+      <method name="EnableMargins" type="" overloaded="no">
         <autodoc>EnableMargins(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnableOrientation" type="void" overloaded="no">
+      <method name="EnableOrientation" type="" overloaded="no">
         <autodoc>EnableOrientation(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnablePaper" type="void" overloaded="no">
+      <method name="EnablePaper" type="" overloaded="no">
         <autodoc>EnablePaper(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnablePrinter" type="void" overloaded="no">
+      <method name="EnablePrinter" type="" overloaded="no">
         <autodoc>EnablePrinter(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
@@ -12308,95 +12308,95 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetDefaultInfo" type="bool" overloaded="no">
         <autodoc>GetDefaultInfo() -&gt; bool</autodoc>
       </method>
-      <method name="GetMarginTopLeft" type="wxPoint" overloaded="no">
+      <method name="GetMarginTopLeft" type="Point" overloaded="no">
         <autodoc>GetMarginTopLeft() -&gt; Point</autodoc>
       </method>
-      <method name="GetMarginBottomRight" type="wxPoint" overloaded="no">
+      <method name="GetMarginBottomRight" type="Point" overloaded="no">
         <autodoc>GetMarginBottomRight() -&gt; Point</autodoc>
       </method>
-      <method name="GetMinMarginTopLeft" type="wxPoint" overloaded="no">
+      <method name="GetMinMarginTopLeft" type="Point" overloaded="no">
         <autodoc>GetMinMarginTopLeft() -&gt; Point</autodoc>
       </method>
-      <method name="GetMinMarginBottomRight" type="wxPoint" overloaded="no">
+      <method name="GetMinMarginBottomRight" type="Point" overloaded="no">
         <autodoc>GetMinMarginBottomRight() -&gt; Point</autodoc>
       </method>
       <method name="GetPaperId" type="wxPaperSize" overloaded="no">
         <autodoc>GetPaperId() -&gt; int</autodoc>
       </method>
-      <method name="GetPaperSize" type="wxSize" overloaded="no">
+      <method name="GetPaperSize" type="Size" overloaded="no">
         <autodoc>GetPaperSize() -&gt; Size</autodoc>
       </method>
-      <method name="GetPrintData" type="wxPrintData" overloaded="no">
+      <method name="GetPrintData" type="PrintData" overloaded="no">
         <autodoc>GetPrintData() -&gt; PrintData</autodoc>
       </method>
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
-      <method name="SetDefaultInfo" type="void" overloaded="no">
+      <method name="SetDefaultInfo" type="" overloaded="no">
         <autodoc>SetDefaultInfo(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultMinMargins" type="void" overloaded="no">
+      <method name="SetDefaultMinMargins" type="" overloaded="no">
         <autodoc>SetDefaultMinMargins(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginTopLeft" type="void" overloaded="no">
+      <method name="SetMarginTopLeft" type="" overloaded="no">
         <autodoc>SetMarginTopLeft(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginBottomRight" type="void" overloaded="no">
+      <method name="SetMarginBottomRight" type="" overloaded="no">
         <autodoc>SetMarginBottomRight(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinMarginTopLeft" type="void" overloaded="no">
+      <method name="SetMinMarginTopLeft" type="" overloaded="no">
         <autodoc>SetMinMarginTopLeft(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinMarginBottomRight" type="void" overloaded="no">
+      <method name="SetMinMarginBottomRight" type="" overloaded="no">
         <autodoc>SetMinMarginBottomRight(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetPaperId" type="void" overloaded="no">
+      <method name="SetPaperId" type="" overloaded="no">
         <autodoc>SetPaperId(int id)</autodoc>
         <paramlist>
           <param name="id" type="wxPaperSize" default=""/>
         </paramlist>
       </method>
-      <method name="SetPaperSize" type="void" overloaded="no">
+      <method name="SetPaperSize" type="" overloaded="no">
         <autodoc>SetPaperSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrintData" type="void" overloaded="no">
+      <method name="SetPrintData" type="" overloaded="no">
         <autodoc>SetPrintData(PrintData printData)</autodoc>
         <paramlist>
-          <param name="printData" type="r.q(const).wxPrintData" default=""/>
+          <param name="printData" type="PrintData" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PageSetupDialog" oldname="wxPageSetupDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="PageSetupDialog" overloaded="no">
         <autodoc>__init__(Window parent, PageSetupDialogData data=None) -&gt; PageSetupDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="data" type="p.wxPageSetupDialogData" default="NULL"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="data" type="PageSetupDialogData" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="GetPageSetupData" type="wxPageSetupDialogData" overloaded="no">
+      <method name="GetPageSetupData" type="PageSetupDialogData" overloaded="no">
         <autodoc>GetPageSetupData() -&gt; PageSetupDialogData</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
@@ -12404,7 +12404,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="PrintDialogData" oldname="wxPrintDialogData" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="PrintDialogData" overloaded="no">
         <autodoc>__init__() -&gt; PrintDialogData</autodoc>
       </constructor>
@@ -12441,85 +12441,85 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetSetupDialog" type="bool" overloaded="no">
         <autodoc>GetSetupDialog() -&gt; bool</autodoc>
       </method>
-      <method name="SetFromPage" type="void" overloaded="no">
+      <method name="SetFromPage" type="" overloaded="no">
         <autodoc>SetFromPage(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetToPage" type="void" overloaded="no">
+      <method name="SetToPage" type="" overloaded="no">
         <autodoc>SetToPage(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinPage" type="void" overloaded="no">
+      <method name="SetMinPage" type="" overloaded="no">
         <autodoc>SetMinPage(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMaxPage" type="void" overloaded="no">
+      <method name="SetMaxPage" type="" overloaded="no">
         <autodoc>SetMaxPage(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetNoCopies" type="void" overloaded="no">
+      <method name="SetNoCopies" type="" overloaded="no">
         <autodoc>SetNoCopies(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAllPages" type="void" overloaded="no">
+      <method name="SetAllPages" type="" overloaded="no">
         <autodoc>SetAllPages(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetCollate" type="void" overloaded="no">
+      <method name="SetCollate" type="" overloaded="no">
         <autodoc>SetCollate(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrintToFile" type="void" overloaded="no">
+      <method name="SetPrintToFile" type="" overloaded="no">
         <autodoc>SetPrintToFile(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetSetupDialog" type="void" overloaded="no">
+      <method name="SetSetupDialog" type="" overloaded="no">
         <autodoc>SetSetupDialog(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnablePrintToFile" type="void" overloaded="no">
+      <method name="EnablePrintToFile" type="" overloaded="no">
         <autodoc>EnablePrintToFile(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnableSelection" type="void" overloaded="no">
+      <method name="EnableSelection" type="" overloaded="no">
         <autodoc>EnableSelection(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnablePageNumbers" type="void" overloaded="no">
+      <method name="EnablePageNumbers" type="" overloaded="no">
         <autodoc>EnablePageNumbers(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnableHelp" type="void" overloaded="no">
+      <method name="EnableHelp" type="" overloaded="no">
         <autodoc>EnableHelp(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
@@ -12540,29 +12540,29 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
-      <method name="GetPrintData" type="wxPrintData" overloaded="no">
+      <method name="GetPrintData" type="PrintData" overloaded="no">
         <autodoc>GetPrintData() -&gt; PrintData</autodoc>
       </method>
-      <method name="SetPrintData" type="void" overloaded="no">
+      <method name="SetPrintData" type="" overloaded="no">
         <autodoc>SetPrintData(PrintData printData)</autodoc>
         <paramlist>
-          <param name="printData" type="r.q(const).wxPrintData" default=""/>
+          <param name="printData" type="PrintData" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PrintDialog" oldname="wxPrintDialog" module="windows">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="PrintDialog" overloaded="no">
         <autodoc>__init__(Window parent, PrintDialogData data=None) -&gt; PrintDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="data" type="p.wxPrintDialogData" default="NULL"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="data" type="PrintDialogData" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="GetPrintDialogData" type="wxPrintDialogData" overloaded="no">
+      <method name="GetPrintDialogData" type="PrintDialogData" overloaded="no">
         <autodoc>GetPrintDialogData() -&gt; PrintDialogData</autodoc>
       </method>
-      <method name="GetPrintDC" type="wxDC" overloaded="no">
+      <method name="GetPrintDC" type="DC" overloaded="no">
         <autodoc>GetPrintDC() -&gt; DC</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
@@ -12570,52 +12570,52 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="Printer" oldname="wxPrinter" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Printer" overloaded="no">
         <autodoc>__init__(PrintDialogData data=None) -&gt; Printer</autodoc>
         <paramlist>
-          <param name="data" type="p.wxPrintDialogData" default="NULL"/>
+          <param name="data" type="PrintDialogData" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxPrinter" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="CreateAbortWindow" type="void" overloaded="no">
+      <method name="CreateAbortWindow" type="" overloaded="no">
         <autodoc>CreateAbortWindow(Window parent, Printout printout)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="printout" type="p.wxPyPrintout" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="printout" type="wxPyPrintout" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrintDialogData" type="wxPrintDialogData" overloaded="no">
+      <method name="GetPrintDialogData" type="PrintDialogData" overloaded="no">
         <autodoc>GetPrintDialogData() -&gt; PrintDialogData</autodoc>
       </method>
       <method name="Print" type="bool" overloaded="no">
         <autodoc>Print(Window parent, Printout printout, int prompt=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="printout" type="p.wxPyPrintout" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="printout" type="wxPyPrintout" default=""/>
           <param name="prompt" type="int" default="True"/>
         </paramlist>
       </method>
-      <method name="PrintDialog" type="wxDC" overloaded="no">
+      <method name="PrintDialog" type="DC" overloaded="no">
         <autodoc>PrintDialog(Window parent) -&gt; DC</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="ReportError" type="void" overloaded="no">
+      <method name="ReportError" type="" overloaded="no">
         <autodoc>ReportError(Window parent, Printout printout, String message)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="printout" type="p.wxPyPrintout" default=""/>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="printout" type="wxPyPrintout" default=""/>
+          <param name="message" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Setup" type="bool" overloaded="no">
         <autodoc>Setup(Window parent) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="GetAbort" type="bool" overloaded="no">
@@ -12626,92 +12626,92 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </staticmethod>
     </class>
     <class name="Printout" oldname="wxPyPrintout" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="wxPyPrintout" overloaded="no">
         <autodoc>__init__(String title=PrintoutTitleStr) -&gt; Printout</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default="wxPyPrintoutTitleStr"/>
+          <param name="title" type="String" default="wxPyPrintoutTitleStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
-      <method name="GetDC" type="wxDC" overloaded="no">
+      <method name="GetDC" type="DC" overloaded="no">
         <autodoc>GetDC() -&gt; DC</autodoc>
       </method>
-      <method name="SetDC" type="void" overloaded="no">
+      <method name="SetDC" type="" overloaded="no">
         <autodoc>SetDC(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="SetPageSizePixels" type="void" overloaded="no">
+      <method name="SetPageSizePixels" type="" overloaded="no">
         <autodoc>SetPageSizePixels(int w, int h)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPageSizePixels" type="void" overloaded="no">
+      <method name="GetPageSizePixels" type="" overloaded="no">
         <autodoc>GetPageSizePixels() -&gt; (w, h)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPageSizeMM" type="void" overloaded="no">
+      <method name="SetPageSizeMM" type="" overloaded="no">
         <autodoc>SetPageSizeMM(int w, int h)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPageSizeMM" type="void" overloaded="no">
+      <method name="GetPageSizeMM" type="" overloaded="no">
         <autodoc>GetPageSizeMM() -&gt; (w, h)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPPIScreen" type="void" overloaded="no">
+      <method name="SetPPIScreen" type="" overloaded="no">
         <autodoc>SetPPIScreen(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPPIScreen" type="void" overloaded="no">
+      <method name="GetPPIScreen" type="" overloaded="no">
         <autodoc>GetPPIScreen() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPPIPrinter" type="void" overloaded="no">
+      <method name="SetPPIPrinter" type="" overloaded="no">
         <autodoc>SetPPIPrinter(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetPPIPrinter" type="void" overloaded="no">
+      <method name="GetPPIPrinter" type="" overloaded="no">
         <autodoc>GetPPIPrinter() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="IsPreview" type="bool" overloaded="no">
         <autodoc>IsPreview() -&gt; bool</autodoc>
       </method>
-      <method name="SetIsPreview" type="void" overloaded="no">
+      <method name="SetIsPreview" type="" overloaded="no">
         <autodoc>SetIsPreview(bool p)</autodoc>
         <paramlist>
           <param name="p" type="bool" default=""/>
@@ -12724,16 +12724,16 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="endPage" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndDocument" type="void" overloaded="no">
+      <method name="base_OnEndDocument" type="" overloaded="no">
         <autodoc>base_OnEndDocument()</autodoc>
       </method>
-      <method name="base_OnBeginPrinting" type="void" overloaded="no">
+      <method name="base_OnBeginPrinting" type="" overloaded="no">
         <autodoc>base_OnBeginPrinting()</autodoc>
       </method>
-      <method name="base_OnEndPrinting" type="void" overloaded="no">
+      <method name="base_OnEndPrinting" type="" overloaded="no">
         <autodoc>base_OnEndPrinting()</autodoc>
       </method>
-      <method name="base_OnPreparePrinting" type="void" overloaded="no">
+      <method name="base_OnPreparePrinting" type="" overloaded="no">
         <autodoc>base_OnPreparePrinting()</autodoc>
       </method>
       <method name="base_HasPage" type="bool" overloaded="no">
@@ -12742,55 +12742,55 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="page" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_GetPageInfo" type="void" overloaded="no">
+      <method name="base_GetPageInfo" type="" overloaded="no">
         <autodoc>base_GetPageInfo() -&gt; (minPage, maxPage, pageFrom, pageTo)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PreviewCanvas" oldname="wxPreviewCanvas" module="windows">
-      <baseclass name="wxScrolledWindow"/>
+      <baseclass name="ScrolledWindow"/>
       <constructor name="PreviewCanvas" overloaded="no">
         <autodoc>__init__(PrintPreview preview, Window parent, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     String name=PreviewCanvasNameStr) -&gt; PreviewCanvas</autodoc>
         <paramlist>
-          <param name="preview" type="p.wxPrintPreview" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="preview" type="wxPrintPreview" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPreviewCanvasNameStr"/>
+          <param name="name" type="String" default="wxPyPreviewCanvasNameStr"/>
         </paramlist>
       </constructor>
     </class>
     <class name="PreviewFrame" oldname="wxPreviewFrame" module="windows">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="PreviewFrame" overloaded="no">
         <autodoc>__init__(PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, 
     long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -&gt; PreviewFrame</autodoc>
         <paramlist>
-          <param name="preview" type="p.wxPrintPreview" default=""/>
-          <param name="parent" type="p.wxFrame" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="preview" type="wxPrintPreview" default=""/>
+          <param name="parent" type="Frame" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </constructor>
-      <method name="Initialize" type="void" overloaded="no">
+      <method name="Initialize" type="" overloaded="no">
         <autodoc>Initialize()</autodoc>
       </method>
-      <method name="CreateControlBar" type="void" overloaded="no">
+      <method name="CreateControlBar" type="" overloaded="no">
         <autodoc>CreateControlBar()</autodoc>
       </method>
-      <method name="CreateCanvas" type="void" overloaded="no">
+      <method name="CreateCanvas" type="" overloaded="no">
         <autodoc>CreateCanvas()</autodoc>
       </method>
       <method name="GetControlBar" type="wxPreviewControlBar" overloaded="no">
@@ -12798,25 +12798,25 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="PreviewControlBar" oldname="wxPreviewControlBar" module="windows">
-      <baseclass name="wxPanel"/>
+      <baseclass name="Panel"/>
       <constructor name="PreviewControlBar" overloaded="no">
         <autodoc>__init__(PrintPreview preview, long buttons, Window parent, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=TAB_TRAVERSAL, String name=PanelNameStr) -&gt; PreviewControlBar</autodoc>
         <paramlist>
-          <param name="preview" type="p.wxPrintPreview" default=""/>
+          <param name="preview" type="wxPrintPreview" default=""/>
           <param name="buttons" type="long" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTAB_TRAVERSAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
       <method name="GetZoomControl" type="int" overloaded="no">
         <autodoc>GetZoomControl() -&gt; int</autodoc>
       </method>
-      <method name="SetZoomControl" type="void" overloaded="no">
+      <method name="SetZoomControl" type="" overloaded="no">
         <autodoc>SetZoomControl(int zoom)</autodoc>
         <paramlist>
           <param name="zoom" type="int" default=""/>
@@ -12825,30 +12825,30 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetPrintPreview" type="wxPrintPreview" overloaded="no">
         <autodoc>GetPrintPreview() -&gt; PrintPreview</autodoc>
       </method>
-      <method name="OnNext" type="void" overloaded="no">
+      <method name="OnNext" type="" overloaded="no">
         <autodoc>OnNext()</autodoc>
       </method>
-      <method name="OnPrevious" type="void" overloaded="no">
+      <method name="OnPrevious" type="" overloaded="no">
         <autodoc>OnPrevious()</autodoc>
       </method>
-      <method name="OnFirst" type="void" overloaded="no">
+      <method name="OnFirst" type="" overloaded="no">
         <autodoc>OnFirst()</autodoc>
       </method>
-      <method name="OnLast" type="void" overloaded="no">
+      <method name="OnLast" type="" overloaded="no">
         <autodoc>OnLast()</autodoc>
       </method>
-      <method name="OnGoto" type="void" overloaded="no">
+      <method name="OnGoto" type="" overloaded="no">
         <autodoc>OnGoto()</autodoc>
       </method>
     </class>
     <class name="PrintPreview" oldname="wxPrintPreview" module="windows">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="PrintPreview" overloaded="no">
         <autodoc>__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -&gt; PrintPreview</autodoc>
         <paramlist>
-          <param name="printout" type="p.wxPyPrintout" default=""/>
-          <param name="printoutForPrinting" type="p.wxPyPrintout" default=""/>
-          <param name="data" type="p.wxPrintData" default="NULL"/>
+          <param name="printout" type="Printout" default=""/>
+          <param name="printoutForPrinting" type="Printout" default=""/>
+          <param name="data" type="PrintData" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="SetCurrentPage" type="bool" overloaded="no">
@@ -12860,48 +12860,48 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetCurrentPage" type="int" overloaded="no">
         <autodoc>GetCurrentPage() -&gt; int</autodoc>
       </method>
-      <method name="SetPrintout" type="void" overloaded="no">
+      <method name="SetPrintout" type="" overloaded="no">
         <autodoc>SetPrintout(Printout printout)</autodoc>
         <paramlist>
-          <param name="printout" type="p.wxPyPrintout" default=""/>
+          <param name="printout" type="Printout" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrintout" type="wxPyPrintout" overloaded="no">
+      <method name="GetPrintout" type="Printout" overloaded="no">
         <autodoc>GetPrintout() -&gt; Printout</autodoc>
       </method>
-      <method name="GetPrintoutForPrinting" type="wxPyPrintout" overloaded="no">
+      <method name="GetPrintoutForPrinting" type="Printout" overloaded="no">
         <autodoc>GetPrintoutForPrinting() -&gt; Printout</autodoc>
       </method>
-      <method name="SetFrame" type="void" overloaded="no">
+      <method name="SetFrame" type="" overloaded="no">
         <autodoc>SetFrame(Frame frame)</autodoc>
         <paramlist>
-          <param name="frame" type="p.wxFrame" default=""/>
+          <param name="frame" type="Frame" default=""/>
         </paramlist>
       </method>
-      <method name="SetCanvas" type="void" overloaded="no">
+      <method name="SetCanvas" type="" overloaded="no">
         <autodoc>SetCanvas(PreviewCanvas canvas)</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="GetFrame" type="wxFrame" overloaded="no">
+      <method name="GetFrame" type="Frame" overloaded="no">
         <autodoc>GetFrame() -&gt; Frame</autodoc>
       </method>
-      <method name="GetCanvas" type="wxPreviewCanvas" overloaded="no">
+      <method name="GetCanvas" type="PreviewCanvas" overloaded="no">
         <autodoc>GetCanvas() -&gt; PreviewCanvas</autodoc>
       </method>
       <method name="PaintPage" type="bool" overloaded="no">
         <autodoc>PaintPage(PreviewCanvas canvas, DC dc) -&gt; bool</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
       <method name="DrawBlankPage" type="bool" overloaded="no">
         <autodoc>DrawBlankPage(PreviewCanvas canvas, DC dc) -&gt; bool</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
       <method name="RenderPage" type="bool" overloaded="no">
@@ -12910,16 +12910,16 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="pageNum" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AdjustScrollbars" type="void" overloaded="no">
+      <method name="AdjustScrollbars" type="" overloaded="no">
         <autodoc>AdjustScrollbars(PreviewCanvas canvas)</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrintDialogData" type="wxPrintDialogData" overloaded="no">
+      <method name="GetPrintDialogData" type="PrintDialogData" overloaded="no">
         <autodoc>GetPrintDialogData() -&gt; PrintDialogData</autodoc>
       </method>
-      <method name="SetZoom" type="void" overloaded="no">
+      <method name="SetZoom" type="" overloaded="no">
         <autodoc>SetZoom(int percent)</autodoc>
         <paramlist>
           <param name="percent" type="int" default=""/>
@@ -12937,7 +12937,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
-      <method name="SetOk" type="void" overloaded="no">
+      <method name="SetOk" type="" overloaded="no">
         <autodoc>SetOk(bool ok)</autodoc>
         <paramlist>
           <param name="ok" type="bool" default=""/>
@@ -12949,25 +12949,25 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="interactive" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="DetermineScaling" type="void" overloaded="no">
+      <method name="DetermineScaling" type="" overloaded="no">
         <autodoc>DetermineScaling()</autodoc>
       </method>
     </class>
     <class name="PyPrintPreview" oldname="wxPyPrintPreview" module="windows">
-      <baseclass name="wxPrintPreview"/>
+      <baseclass name="PrintPreview"/>
       <constructor name="PyPrintPreview" overloaded="no">
         <autodoc>__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -&gt; PyPrintPreview</autodoc>
         <paramlist>
-          <param name="printout" type="p.wxPyPrintout" default=""/>
-          <param name="printoutForPrinting" type="p.wxPyPrintout" default=""/>
-          <param name="data" type="p.wxPrintData" default="NULL"/>
+          <param name="printout" type="Printout" default=""/>
+          <param name="printoutForPrinting" type="Printout" default=""/>
+          <param name="data" type="PrintData" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="base_SetCurrentPage" type="bool" overloaded="no">
@@ -12979,15 +12979,15 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="base_PaintPage" type="bool" overloaded="no">
         <autodoc>base_PaintPage(PreviewCanvas canvas, DC dc) -&gt; bool</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
       <method name="base_DrawBlankPage" type="bool" overloaded="no">
         <autodoc>base_DrawBlankPage(PreviewCanvas canvas, DC dc) -&gt; bool</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
       <method name="base_RenderPage" type="bool" overloaded="no">
@@ -12996,7 +12996,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="pageNum" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetZoom" type="void" overloaded="no">
+      <method name="base_SetZoom" type="" overloaded="no">
         <autodoc>base_SetZoom(int percent)</autodoc>
         <paramlist>
           <param name="percent" type="int" default=""/>
@@ -13008,88 +13008,88 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="interactive" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="base_DetermineScaling" type="void" overloaded="no">
+      <method name="base_DetermineScaling" type="" overloaded="no">
         <autodoc>base_DetermineScaling()</autodoc>
       </method>
     </class>
     <class name="PyPreviewFrame" oldname="wxPyPreviewFrame" module="windows">
-      <baseclass name="wxPreviewFrame"/>
+      <baseclass name="PreviewFrame"/>
       <constructor name="PyPreviewFrame" overloaded="no">
         <autodoc>__init__(PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
     Size size=DefaultSize, 
     long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -&gt; PyPreviewFrame</autodoc>
         <paramlist>
-          <param name="preview" type="p.wxPrintPreview" default=""/>
-          <param name="parent" type="p.wxFrame" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="preview" type="PrintPreview" default=""/>
+          <param name="parent" type="Frame" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDEFAULT_FRAME_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyFrameNameStr"/>
+          <param name="name" type="String" default="wxPyFrameNameStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetPreviewCanvas" type="void" overloaded="no">
+      <method name="SetPreviewCanvas" type="" overloaded="no">
         <autodoc>SetPreviewCanvas(PreviewCanvas canvas)</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="SetControlBar" type="void" overloaded="no">
+      <method name="SetControlBar" type="" overloaded="no">
         <autodoc>SetControlBar(PreviewControlBar bar)</autodoc>
         <paramlist>
-          <param name="bar" type="p.wxPreviewControlBar" default=""/>
+          <param name="bar" type="PreviewControlBar" default=""/>
         </paramlist>
       </method>
-      <method name="base_Initialize" type="void" overloaded="no">
+      <method name="base_Initialize" type="" overloaded="no">
         <autodoc>base_Initialize()</autodoc>
       </method>
-      <method name="base_CreateCanvas" type="void" overloaded="no">
+      <method name="base_CreateCanvas" type="" overloaded="no">
         <autodoc>base_CreateCanvas()</autodoc>
       </method>
-      <method name="base_CreateControlBar" type="void" overloaded="no">
+      <method name="base_CreateControlBar" type="" overloaded="no">
         <autodoc>base_CreateControlBar()</autodoc>
       </method>
     </class>
     <class name="PyPreviewControlBar" oldname="wxPyPreviewControlBar" module="windows">
-      <baseclass name="wxPreviewControlBar"/>
+      <baseclass name="PreviewControlBar"/>
       <constructor name="PyPreviewControlBar" overloaded="no">
         <autodoc>__init__(PrintPreview preview, long buttons, Window parent, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; PyPreviewControlBar</autodoc>
         <paramlist>
-          <param name="preview" type="p.wxPrintPreview" default=""/>
+          <param name="preview" type="PrintPreview" default=""/>
           <param name="buttons" type="long" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrintPreview" type="void" overloaded="no">
+      <method name="SetPrintPreview" type="" overloaded="no">
         <autodoc>SetPrintPreview(PrintPreview preview)</autodoc>
         <paramlist>
-          <param name="preview" type="p.wxPrintPreview" default=""/>
+          <param name="preview" type="PrintPreview" default=""/>
         </paramlist>
       </method>
-      <method name="base_CreateButtons" type="void" overloaded="no">
+      <method name="base_CreateButtons" type="" overloaded="no">
         <autodoc>base_CreateButtons()</autodoc>
       </method>
-      <method name="base_SetZoomControl" type="void" overloaded="no">
+      <method name="base_SetZoomControl" type="" overloaded="no">
         <autodoc>base_SetZoomControl(int zoom)</autodoc>
         <paramlist>
           <param name="zoom" type="int" default=""/>
@@ -13119,21 +13119,21 @@ indeed almost any other window.</docstring>
  Events
      EVT_BUTTON:    Sent when the button is clicked.
 </refdoc>
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="Button" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=ButtonNameStr) -&gt; Button</autodoc>
         <docstring>Create and show a button.</docstring>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyButtonNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreButton" overloaded="no">
@@ -13146,27 +13146,27 @@ indeed almost any other window.</docstring>
     Validator validator=DefaultValidator, String name=ButtonNameStr) -&gt; bool</autodoc>
         <docstring>Acutally create the GUI Button for 2-phase creation.</docstring>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyButtonNameStr"/>
         </paramlist>
       </method>
-      <method name="SetDefault" type="void" overloaded="no">
+      <method name="SetDefault" type="" overloaded="no">
         <autodoc>SetDefault()</autodoc>
         <docstring>This sets the button to be the default item for the panel or dialog box.</docstring>
       </method>
-      <staticmethod name="GetDefaultSize" type="wxSize" overloaded="no">
+      <staticmethod name="GetDefaultSize" type="Size" overloaded="no">
         <autodoc>Button.GetDefaultSize() -&gt; Size</autodoc>
       </staticmethod>
     </class>
     <class name="BitmapButton" oldname="wxBitmapButton" module="controls">
       <docstring>A Buttont that contains a bitmap.</docstring>
-      <baseclass name="wxButton"/>
+      <baseclass name="Button"/>
       <constructor name="BitmapButton" overloaded="no">
         <autodoc>__init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW, 
@@ -13174,14 +13174,14 @@ indeed almost any other window.</docstring>
     String name=ButtonNameStr) -&gt; BitmapButton</autodoc>
         <docstring>Create and show a button.</docstring>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxBU_AUTODRAW"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyButtonNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreBitmapButton" overloaded="no">
@@ -13195,62 +13195,62 @@ indeed almost any other window.</docstring>
     String name=ButtonNameStr) -&gt; bool</autodoc>
         <docstring>Acutally create the GUI BitmapButton for 2-phase creation.</docstring>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxBU_AUTODRAW"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyButtonNameStr"/>
         </paramlist>
       </method>
-      <method name="GetBitmapLabel" type="wxBitmap" overloaded="no">
+      <method name="GetBitmapLabel" type="Bitmap" overloaded="no">
         <autodoc>GetBitmapLabel() -&gt; Bitmap</autodoc>
         <docstring>Returns the label bitmap (the one passed to the constructor).</docstring>
       </method>
-      <method name="GetBitmapDisabled" type="wxBitmap" overloaded="no">
+      <method name="GetBitmapDisabled" type="Bitmap" overloaded="no">
         <autodoc>GetBitmapDisabled() -&gt; Bitmap</autodoc>
         <docstring>Returns the bitmap for the disabled state.</docstring>
       </method>
-      <method name="GetBitmapFocus" type="wxBitmap" overloaded="no">
+      <method name="GetBitmapFocus" type="Bitmap" overloaded="no">
         <autodoc>GetBitmapFocus() -&gt; Bitmap</autodoc>
         <docstring>Returns the bitmap for the focused state.</docstring>
       </method>
-      <method name="GetBitmapSelected" type="wxBitmap" overloaded="no">
+      <method name="GetBitmapSelected" type="Bitmap" overloaded="no">
         <autodoc>GetBitmapSelected() -&gt; Bitmap</autodoc>
         <docstring>Returns the bitmap for the selected state.</docstring>
       </method>
-      <method name="SetBitmapDisabled" type="void" overloaded="no">
+      <method name="SetBitmapDisabled" type="" overloaded="no">
         <autodoc>SetBitmapDisabled(Bitmap bitmap)</autodoc>
         <docstring>Sets the bitmap for the disabled button appearance.</docstring>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetBitmapFocus" type="void" overloaded="no">
+      <method name="SetBitmapFocus" type="" overloaded="no">
         <autodoc>SetBitmapFocus(Bitmap bitmap)</autodoc>
         <docstring>Sets the bitmap for the button appearance when it has the keyboard focus.</docstring>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetBitmapSelected" type="void" overloaded="no">
+      <method name="SetBitmapSelected" type="" overloaded="no">
         <autodoc>SetBitmapSelected(Bitmap bitmap)</autodoc>
         <docstring>Sets the bitmap for the selected (depressed) button appearance.</docstring>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetBitmapLabel" type="void" overloaded="no">
+      <method name="SetBitmapLabel" type="" overloaded="no">
         <autodoc>SetBitmapLabel(Bitmap bitmap)</autodoc>
         <docstring>Sets the bitmap label for the button.  This is the bitmap used for the
 unselected state, and for all other states if no other bitmaps are provided.</docstring>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetMargins" type="void" overloaded="no">
+      <method name="SetMargins" type="" overloaded="no">
         <autodoc>SetMargins(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -13268,20 +13268,20 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckBox" oldname="wxCheckBox" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="CheckBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; CheckBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyCheckBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyCheckBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreCheckBox" overloaded="no">
@@ -13292,14 +13292,14 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyCheckBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyCheckBoxNameStr"/>
         </paramlist>
       </method>
       <method name="GetValue" type="bool" overloaded="no">
@@ -13308,16 +13308,16 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(bool state)</autodoc>
         <paramlist>
-          <param name="state" type="q(const).bool" default=""/>
+          <param name="state" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Get3StateValue" type="wxCheckBoxState" overloaded="no">
         <autodoc>Get3StateValue() -&gt; int</autodoc>
       </method>
-      <method name="Set3StateValue" type="void" overloaded="no">
+      <method name="Set3StateValue" type="" overloaded="no">
         <autodoc>Set3StateValue(int state)</autodoc>
         <paramlist>
           <param name="state" type="wxCheckBoxState" default=""/>
@@ -13334,22 +13334,22 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Choice" oldname="wxChoice" module="controls">
-      <baseclass name="wxControlWithItems"/>
+      <baseclass name="ControlWithItems"/>
       <constructor name="Choice" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     int choices=0, String choices_array=None, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ChoiceNameStr) -&gt; Choice</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyChoiceNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyChoiceNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreChoice" overloaded="no">
@@ -13361,43 +13361,43 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     long style=0, Validator validator=DefaultValidator, 
     String name=ChoiceNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyChoiceNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyChoiceNameStr"/>
         </paramlist>
       </method>
       <method name="GetColumns" type="int" overloaded="no">
         <autodoc>GetColumns() -&gt; int</autodoc>
       </method>
-      <method name="SetColumns" type="void" overloaded="no">
+      <method name="SetColumns" type="" overloaded="no">
         <autodoc>SetColumns(int n=1)</autodoc>
         <paramlist>
-          <param name="n" type="q(const).int" default="1"/>
+          <param name="n" type="int" default="1"/>
         </paramlist>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>
         <paramlist>
-          <param name="n" type="q(const).int" default=""/>
+          <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetStringSelection" type="void" overloaded="no">
+      <method name="SetStringSelection" type="" overloaded="no">
         <autodoc>SetStringSelection(String string)</autodoc>
         <paramlist>
-          <param name="string" type="r.q(const).wxString" default=""/>
+          <param name="string" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetString" type="void" overloaded="no">
+      <method name="SetString" type="" overloaded="no">
         <autodoc>SetString(int n, String s)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -13405,8 +13405,8 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ComboBox" oldname="wxComboBox" module="controls">
-      <baseclass name="wxControl"/>
-      <baseclass name="wxItemContainer"/>
+      <baseclass name="Control"/>
+      <baseclass name="ItemContainer"/>
       <constructor name="ComboBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
     Size size=DefaultSize, 
@@ -13414,16 +13414,16 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     long style=0, Validator validator=DefaultValidator, 
     String name=ComboBoxNameStr) -&gt; ComboBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyComboBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyComboBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreComboBox" overloaded="no">
@@ -13436,37 +13436,37 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     long style=0, Validator validator=DefaultValidator, 
     String name=ComboBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyComboBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyComboBoxNameStr"/>
         </paramlist>
       </method>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>
       </method>
-      <method name="Cut" type="void" overloaded="no">
+      <method name="Cut" type="" overloaded="no">
         <autodoc>Cut()</autodoc>
       </method>
-      <method name="Paste" type="void" overloaded="no">
+      <method name="Paste" type="" overloaded="no">
         <autodoc>Paste()</autodoc>
       </method>
-      <method name="SetInsertionPoint" type="void" overloaded="no">
+      <method name="SetInsertionPoint" type="" overloaded="no">
         <autodoc>SetInsertionPoint(long pos)</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
@@ -13478,37 +13478,37 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="GetLastPosition" type="long" overloaded="no">
         <autodoc>GetLastPosition() -&gt; long</autodoc>
       </method>
-      <method name="Replace" type="void" overloaded="no">
+      <method name="Replace" type="" overloaded="no">
         <autodoc>Replace(long from, long to, String value)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMark" type="void" overloaded="no">
+      <method name="SetMark" type="" overloaded="no">
         <autodoc>SetMark(long from, long to)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetEditable" type="void" overloaded="no">
+      <method name="SetEditable" type="" overloaded="no">
         <autodoc>SetEditable(bool editable)</autodoc>
         <paramlist>
           <param name="editable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetInsertionPointEnd" type="void" overloaded="no">
+      <method name="SetInsertionPointEnd" type="" overloaded="no">
         <autodoc>SetInsertionPointEnd()</autodoc>
       </method>
-      <method name="Remove" type="void" overloaded="no">
+      <method name="Remove" type="" overloaded="no">
         <autodoc>Remove(long from, long to)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
@@ -13520,21 +13520,21 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Gauge" oldname="wxGauge" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="Gauge" overloaded="no">
         <autodoc>__init__(Window parent, int id, int range, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=GA_HORIZONTAL, 
     Validator validator=DefaultValidator, 
     String name=GaugeNameStr) -&gt; Gauge</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="range" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxGA_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyGaugeNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyGaugeNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreGauge" overloaded="no">
@@ -13546,17 +13546,17 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     Validator validator=DefaultValidator, 
     String name=GaugeNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="range" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxGA_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyGaugeNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyGaugeNameStr"/>
         </paramlist>
       </method>
-      <method name="SetRange" type="void" overloaded="no">
+      <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int range)</autodoc>
         <paramlist>
           <param name="range" type="int" default=""/>
@@ -13565,7 +13565,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="GetRange" type="int" overloaded="no">
         <autodoc>GetRange() -&gt; int</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -13577,7 +13577,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="IsVertical" type="bool" overloaded="no">
         <autodoc>IsVertical() -&gt; bool</autodoc>
       </method>
-      <method name="SetShadowWidth" type="void" overloaded="no">
+      <method name="SetShadowWidth" type="" overloaded="no">
         <autodoc>SetShadowWidth(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
@@ -13586,7 +13586,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="GetShadowWidth" type="int" overloaded="no">
         <autodoc>GetShadowWidth() -&gt; int</autodoc>
       </method>
-      <method name="SetBezelFace" type="void" overloaded="no">
+      <method name="SetBezelFace" type="" overloaded="no">
         <autodoc>SetBezelFace(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
@@ -13600,19 +13600,19 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticBox" oldname="wxStaticBox" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="StaticBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     String name=StaticBoxNameStr) -&gt; StaticBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticBoxNameStr"/>
+          <param name="name" type="String" default="wxPyStaticBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreStaticBox" overloaded="no">
@@ -13623,13 +13623,13 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     Size size=DefaultSize, long style=0, 
     String name=StaticBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticBoxNameStr"/>
+          <param name="name" type="String" default="wxPyStaticBoxNameStr"/>
         </paramlist>
       </method>
     </class>
@@ -13637,18 +13637,18 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticLine" oldname="wxStaticLine" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="StaticLine" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=LI_HORIZONTAL, 
     String name=StaticTextNameStr) -&gt; StaticLine</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLI_HORIZONTAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticTextNameStr"/>
+          <param name="name" type="String" default="wxPyStaticTextNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreStaticLine" overloaded="no">
@@ -13659,12 +13659,12 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     long style=LI_HORIZONTAL, 
     String name=StaticTextNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLI_HORIZONTAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticTextNameStr"/>
+          <param name="name" type="String" default="wxPyStaticTextNameStr"/>
         </paramlist>
       </method>
       <method name="IsVertical" type="bool" overloaded="no">
@@ -13678,19 +13678,19 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticText" oldname="wxStaticText" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="StaticText" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     String name=StaticTextNameStr) -&gt; StaticText</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticTextNameStr"/>
+          <param name="name" type="String" default="wxPyStaticTextNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreStaticText" overloaded="no">
@@ -13701,13 +13701,13 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     Size size=DefaultSize, long style=0, 
     String name=StaticTextNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticTextNameStr"/>
+          <param name="name" type="String" default="wxPyStaticTextNameStr"/>
         </paramlist>
       </method>
     </class>
@@ -13715,19 +13715,19 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticBitmap" oldname="wxStaticBitmap" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="StaticBitmap" overloaded="no">
         <autodoc>__init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     String name=StaticBitmapNameStr) -&gt; StaticBitmap</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticBitmapNameStr"/>
+          <param name="name" type="String" default="wxPyStaticBitmapNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreStaticBitmap" overloaded="no">
@@ -13738,28 +13738,28 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     Size size=DefaultSize, long style=0, 
     String name=StaticBitmapNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyStaticBitmapNameStr"/>
+          <param name="name" type="String" default="wxPyStaticBitmapNameStr"/>
         </paramlist>
       </method>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
-      <method name="SetBitmap" type="void" overloaded="no">
+      <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetIcon" type="void" overloaded="no">
+      <method name="SetIcon" type="" overloaded="no">
         <autodoc>SetIcon(Icon icon)</autodoc>
         <paramlist>
-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>
         </paramlist>
       </method>
     </class>
@@ -13767,22 +13767,22 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListBox" oldname="wxListBox" module="controls">
-      <baseclass name="wxControlWithItems"/>
+      <baseclass name="ControlWithItems"/>
       <constructor name="ListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     int choices=0, String choices_array=None, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; ListBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreListBox" overloaded="no">
@@ -13794,36 +13794,36 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListBoxNameStr"/>
         </paramlist>
       </method>
-      <method name="Insert" type="void" overloaded="no">
+      <method name="Insert" type="" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxString" default=""/>
+          <param name="item" type="String" default=""/>
           <param name="pos" type="int" default=""/>
-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="clientData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="InsertItems" type="void" overloaded="no">
+      <method name="InsertItems" type="" overloaded="no">
         <autodoc>InsertItems(wxArrayString items, int pos)</autodoc>
         <paramlist>
-          <param name="items" type="r.q(const).wxArrayString" default=""/>
+          <param name="items" type="wxArrayString" default=""/>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(wxArrayString items)</autodoc>
         <paramlist>
-          <param name="items" type="r.q(const).wxArrayString" default=""/>
+          <param name="items" type="wxArrayString" default=""/>
         </paramlist>
       </method>
       <method name="IsSelected" type="bool" overloaded="no">
@@ -13832,26 +13832,26 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n, bool select=True)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
           <param name="select" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Select" type="void" overloaded="no">
+      <method name="Select" type="" overloaded="no">
         <autodoc>Select(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Deselect" type="void" overloaded="no">
+      <method name="Deselect" type="" overloaded="no">
         <autodoc>Deselect(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DeselectAll" type="void" overloaded="no">
+      <method name="DeselectAll" type="" overloaded="no">
         <autodoc>DeselectAll(int itemToLeaveSelected=-1)</autodoc>
         <paramlist>
           <param name="itemToLeaveSelected" type="int" default="-1"/>
@@ -13860,35 +13860,35 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="SetStringSelection" type="bool" overloaded="no">
         <autodoc>SetStringSelection(String s, bool select=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
           <param name="select" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">
         <autodoc>GetSelections() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetFirstItem" type="void" overloaded="no">
+      <method name="SetFirstItem" type="" overloaded="no">
         <autodoc>SetFirstItem(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFirstItemStr" type="void" overloaded="no">
+      <method name="SetFirstItemStr" type="" overloaded="no">
         <autodoc>SetFirstItemStr(String s)</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="EnsureVisible" type="void" overloaded="no">
+      <method name="EnsureVisible" type="" overloaded="no">
         <autodoc>EnsureVisible(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AppendAndEnsureVisible" type="void" overloaded="no">
+      <method name="AppendAndEnsureVisible" type="" overloaded="no">
         <autodoc>AppendAndEnsureVisible(String s)</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
       <method name="IsSorted" type="bool" overloaded="no">
@@ -13899,22 +13899,22 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckListBox" oldname="wxCheckListBox" module="controls">
-      <baseclass name="wxListBox"/>
+      <baseclass name="ListBox"/>
       <constructor name="CheckListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     int choices=0, String choices_array=None, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; CheckListBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreCheckListBox" overloaded="no">
@@ -13926,15 +13926,15 @@ unselected state, and for all other states if no other bitmaps are provided.</do
     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListBoxNameStr"/>
         </paramlist>
       </method>
       <method name="IsChecked" type="bool" overloaded="no">
@@ -13943,7 +13943,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="index" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Check" type="void" overloaded="no">
+      <method name="Check" type="" overloaded="no">
         <autodoc>Check(int index, int check=True)</autodoc>
         <paramlist>
           <param name="index" type="int" default=""/>
@@ -13956,7 +13956,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="HitTestXY" type="int" overloaded="no">
@@ -13977,59 +13977,59 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont, 
     int alignment=TEXT_ALIGNMENT_DEFAULT) -&gt; TextAttr</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
-          <param name="colBack" type="r.q(const).wxColour" default="wxNullColour"/>
-          <param name="font" type="r.q(const).wxFont" default="wxNullFont"/>
+          <param name="colText" type="Colour" default=""/>
+          <param name="colBack" type="Colour" default="wxNullColour"/>
+          <param name="font" type="Font" default="wxNullFont"/>
           <param name="alignment" type="wxTextAttrAlignment" default="wxTEXT_ALIGNMENT_DEFAULT"/>
         </paramlist>
       </constructor>
-      <method name="Init" type="void" overloaded="no">
+      <method name="Init" type="" overloaded="no">
         <autodoc>Init()</autodoc>
       </method>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font, long flags=TEXT_ATTR_FONT)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
           <param name="flags" type="long" default="wxTEXT_ATTR_FONT"/>
         </paramlist>
       </method>
-      <method name="SetAlignment" type="void" overloaded="no">
+      <method name="SetAlignment" type="" overloaded="no">
         <autodoc>SetAlignment(int alignment)</autodoc>
         <paramlist>
           <param name="alignment" type="wxTextAttrAlignment" default=""/>
         </paramlist>
       </method>
-      <method name="SetTabs" type="void" overloaded="no">
+      <method name="SetTabs" type="" overloaded="no">
         <autodoc>SetTabs(wxArrayInt tabs)</autodoc>
         <paramlist>
-          <param name="tabs" type="r.q(const).wxArrayInt" default=""/>
+          <param name="tabs" type="wxArrayInt" default=""/>
         </paramlist>
       </method>
-      <method name="SetLeftIndent" type="void" overloaded="no">
+      <method name="SetLeftIndent" type="" overloaded="no">
         <autodoc>SetLeftIndent(int indent)</autodoc>
         <paramlist>
           <param name="indent" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRightIndent" type="void" overloaded="no">
+      <method name="SetRightIndent" type="" overloaded="no">
         <autodoc>SetRightIndent(int indent)</autodoc>
         <paramlist>
           <param name="indent" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(long flags)</autodoc>
         <paramlist>
           <param name="flags" type="long" default=""/>
@@ -14062,19 +14062,19 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="flag" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetTextColour" type="q(const).wxColour" overloaded="no">
+      <method name="GetTextColour" type="Colour" overloaded="no">
         <autodoc>GetTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetBackgroundColour" type="q(const).wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetFont" type="q(const).wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
       <method name="GetAlignment" type="wxTextAttrAlignment" overloaded="no">
         <autodoc>GetAlignment() -&gt; int</autodoc>
       </method>
-      <method name="GetTabs" type="q(const).wxArrayInt" overloaded="no">
+      <method name="GetTabs" type="wxArrayInt" overloaded="no">
         <autodoc>GetTabs() -&gt; wxArrayInt</autodoc>
       </method>
       <method name="GetLeftIndent" type="long" overloaded="no">
@@ -14089,31 +14089,31 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="IsDefault" type="bool" overloaded="no">
         <autodoc>IsDefault() -&gt; bool</autodoc>
       </method>
-      <staticmethod name="Combine" type="wxTextAttr" overloaded="no">
+      <staticmethod name="Combine" type="TextAttr" overloaded="no">
         <autodoc>TextAttr.Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -&gt; TextAttr</autodoc>
         <paramlist>
-          <param name="attr" type="r.q(const).wxTextAttr" default=""/>
-          <param name="attrDef" type="r.q(const).wxTextAttr" default=""/>
-          <param name="text" type="p.q(const).wxTextCtrl" default=""/>
+          <param name="attr" type="TextAttr" default=""/>
+          <param name="attrDef" type="TextAttr" default=""/>
+          <param name="text" type="wxTextCtrl" default=""/>
         </paramlist>
       </staticmethod>
     </class>
     <class name="TextCtrl" oldname="wxTextCtrl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="TextCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
     Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=TextCtrlNameStr) -&gt; TextCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTextCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyTextCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreTextCtrl" overloaded="no">
@@ -14125,26 +14125,26 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
     long style=0, Validator validator=DefaultValidator, 
     String name=TextCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTextCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyTextCtrlNameStr"/>
         </paramlist>
       </method>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetRange" type="wxString" overloaded="no">
+      <method name="GetRange" type="String" overloaded="no">
         <autodoc>GetRange(long from, long to) -&gt; String</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
@@ -14157,7 +14157,7 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="lineNo" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetLineText" type="wxString" overloaded="no">
+      <method name="GetLineText" type="String" overloaded="no">
         <autodoc>GetLineText(long lineNo) -&gt; String</autodoc>
         <paramlist>
           <param name="lineNo" type="long" default=""/>
@@ -14178,29 +14178,29 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="IsMultiLine" type="bool" overloaded="no">
         <autodoc>IsMultiLine() -&gt; bool</autodoc>
       </method>
-      <method name="GetSelection" type="void" overloaded="no">
+      <method name="GetSelection" type="" overloaded="no">
         <autodoc>GetSelection() -&gt; (from, to)</autodoc>
         <docstring>If the return values from and to are the same, there is no selection.</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.long" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
-      <method name="Replace" type="void" overloaded="no">
+      <method name="Replace" type="" overloaded="no">
         <autodoc>Replace(long from, long to, String value)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Remove" type="void" overloaded="no">
+      <method name="Remove" type="" overloaded="no">
         <autodoc>Remove(long from, long to)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
@@ -14210,43 +14210,43 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="LoadFile" type="bool" overloaded="no">
         <autodoc>LoadFile(String file) -&gt; bool</autodoc>
         <paramlist>
-          <param name="file" type="r.q(const).wxString" default=""/>
+          <param name="file" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SaveFile" type="bool" overloaded="no">
         <autodoc>SaveFile(String file=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="file" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="file" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="MarkDirty" type="void" overloaded="no">
+      <method name="MarkDirty" type="" overloaded="no">
         <autodoc>MarkDirty()</autodoc>
       </method>
-      <method name="DiscardEdits" type="void" overloaded="no">
+      <method name="DiscardEdits" type="" overloaded="no">
         <autodoc>DiscardEdits()</autodoc>
       </method>
-      <method name="SetMaxLength" type="void" overloaded="no">
+      <method name="SetMaxLength" type="" overloaded="no">
         <autodoc>SetMaxLength(unsigned long len)</autodoc>
         <paramlist>
           <param name="len" type="unsigned long" default=""/>
         </paramlist>
       </method>
-      <method name="WriteText" type="void" overloaded="no">
+      <method name="WriteText" type="" overloaded="no">
         <autodoc>WriteText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AppendText" type="void" overloaded="no">
+      <method name="AppendText" type="" overloaded="no">
         <autodoc>AppendText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="EmulateKeyPress" type="bool" overloaded="no">
         <autodoc>EmulateKeyPress(KeyEvent event) -&gt; bool</autodoc>
         <paramlist>
-          <param name="event" type="r.q(const).wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
       <method name="SetStyle" type="bool" overloaded="no">
@@ -14254,23 +14254,23 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
         <paramlist>
           <param name="start" type="long" default=""/>
           <param name="end" type="long" default=""/>
-          <param name="style" type="r.q(const).wxTextAttr" default=""/>
+          <param name="style" type="TextAttr" default=""/>
         </paramlist>
       </method>
       <method name="GetStyle" type="bool" overloaded="no">
         <autodoc>GetStyle(long position, TextAttr style) -&gt; bool</autodoc>
         <paramlist>
           <param name="position" type="long" default=""/>
-          <param name="style" type="r.wxTextAttr" default=""/>
+          <param name="style" type="TextAttr" default=""/>
         </paramlist>
       </method>
       <method name="SetDefaultStyle" type="bool" overloaded="no">
         <autodoc>SetDefaultStyle(TextAttr style) -&gt; bool</autodoc>
         <paramlist>
-          <param name="style" type="r.q(const).wxTextAttr" default=""/>
+          <param name="style" type="TextAttr" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultStyle" type="q(const).wxTextAttr" overloaded="no">
+      <method name="GetDefaultStyle" type="TextAttr" overloaded="no">
         <autodoc>GetDefaultStyle() -&gt; TextAttr</autodoc>
       </method>
       <method name="XYToPosition" type="long" overloaded="no">
@@ -14280,27 +14280,27 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="y" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="PositionToXY" type="void" overloaded="no">
+      <method name="PositionToXY" type="" overloaded="no">
         <autodoc>PositionToXY(long pos) -&gt; (x, y)</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="ShowPosition" type="void" overloaded="no">
+      <method name="ShowPosition" type="" overloaded="no">
         <autodoc>ShowPosition(long pos)</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>
       </method>
-      <method name="Cut" type="void" overloaded="no">
+      <method name="Cut" type="" overloaded="no">
         <autodoc>Cut()</autodoc>
       </method>
-      <method name="Paste" type="void" overloaded="no">
+      <method name="Paste" type="" overloaded="no">
         <autodoc>Paste()</autodoc>
       </method>
       <method name="CanCopy" type="bool" overloaded="no">
@@ -14312,10 +14312,10 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="CanPaste" type="bool" overloaded="no">
         <autodoc>CanPaste() -&gt; bool</autodoc>
       </method>
-      <method name="Undo" type="void" overloaded="no">
+      <method name="Undo" type="" overloaded="no">
         <autodoc>Undo()</autodoc>
       </method>
-      <method name="Redo" type="void" overloaded="no">
+      <method name="Redo" type="" overloaded="no">
         <autodoc>Redo()</autodoc>
       </method>
       <method name="CanUndo" type="bool" overloaded="no">
@@ -14324,13 +14324,13 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="CanRedo" type="bool" overloaded="no">
         <autodoc>CanRedo() -&gt; bool</autodoc>
       </method>
-      <method name="SetInsertionPoint" type="void" overloaded="no">
+      <method name="SetInsertionPoint" type="" overloaded="no">
         <autodoc>SetInsertionPoint(long pos)</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetInsertionPointEnd" type="void" overloaded="no">
+      <method name="SetInsertionPointEnd" type="" overloaded="no">
         <autodoc>SetInsertionPointEnd()</autodoc>
       </method>
       <method name="GetInsertionPoint" type="long" overloaded="no">
@@ -14339,29 +14339,29 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="GetLastPosition" type="long" overloaded="no">
         <autodoc>GetLastPosition() -&gt; long</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(long from, long to)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SelectAll" type="void" overloaded="no">
+      <method name="SelectAll" type="" overloaded="no">
         <autodoc>SelectAll()</autodoc>
       </method>
-      <method name="SetEditable" type="void" overloaded="no">
+      <method name="SetEditable" type="" overloaded="no">
         <autodoc>SetEditable(bool editable)</autodoc>
         <paramlist>
           <param name="editable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="write" type="void" overloaded="no">
+      <method name="write" type="" overloaded="no">
         <autodoc>write(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetString" type="wxString" overloaded="no">
+      <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString(long from, long to) -&gt; String</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
@@ -14370,17 +14370,17 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       </method>
     </class>
     <class name="TextUrlEvent" oldname="wxTextUrlEvent" module="controls">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="TextUrlEvent" overloaded="no">
         <autodoc>__init__(int winid, MouseEvent evtMouse, long start, long end) -&gt; TextUrlEvent</autodoc>
         <paramlist>
           <param name="winid" type="int" default=""/>
-          <param name="evtMouse" type="r.q(const).wxMouseEvent" default=""/>
+          <param name="evtMouse" type="MouseEvent" default=""/>
           <param name="start" type="long" default=""/>
           <param name="end" type="long" default=""/>
         </paramlist>
       </constructor>
-      <method name="GetMouseEvent" type="q(const).wxMouseEvent" overloaded="no">
+      <method name="GetMouseEvent" type="MouseEvent" overloaded="no">
         <autodoc>GetMouseEvent() -&gt; MouseEvent</autodoc>
       </method>
       <method name="GetURLStart" type="long" overloaded="no">
@@ -14400,19 +14400,19 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrollBar" oldname="wxScrollBar" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="ScrollBar" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=SB_HORIZONTAL, 
     Validator validator=DefaultValidator, String name=ScrollBarNameStr) -&gt; ScrollBar</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSB_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyScrollBarNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyScrollBarNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreScrollBar" overloaded="no">
@@ -14423,13 +14423,13 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
     Size size=DefaultSize, long style=SB_HORIZONTAL, 
     Validator validator=DefaultValidator, String name=ScrollBarNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSB_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyScrollBarNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyScrollBarNameStr"/>
         </paramlist>
       </method>
       <method name="GetThumbPosition" type="int" overloaded="no">
@@ -14447,13 +14447,13 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
       <method name="IsVertical" type="bool" overloaded="no">
         <autodoc>IsVertical() -&gt; bool</autodoc>
       </method>
-      <method name="SetThumbPosition" type="void" overloaded="no">
+      <method name="SetThumbPosition" type="" overloaded="no">
         <autodoc>SetThumbPosition(int viewStart)</autodoc>
         <paramlist>
           <param name="viewStart" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetScrollbar" type="void" overloaded="no">
+      <method name="SetScrollbar" type="" overloaded="no">
         <autodoc>SetScrollbar(int position, int thumbSize, int range, int pageSize, 
     bool refresh=True)</autodoc>
         <paramlist>
@@ -14469,18 +14469,18 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SpinButton" oldname="wxSpinButton" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="SpinButton" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=SP_HORIZONTAL, 
     String name=SPIN_BUTTON_NAME) -&gt; SpinButton</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_HORIZONTAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySPIN_BUTTON_NAME"/>
+          <param name="name" type="String" default="wxPySPIN_BUTTON_NAME"/>
         </paramlist>
       </constructor>
       <constructor name="PreSpinButton" overloaded="no">
@@ -14491,12 +14491,12 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
     Size size=DefaultSize, long style=SP_HORIZONTAL, 
     String name=SPIN_BUTTON_NAME) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_HORIZONTAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySPIN_BUTTON_NAME"/>
+          <param name="name" type="String" default="wxPySPIN_BUTTON_NAME"/>
         </paramlist>
       </method>
       <method name="GetValue" type="int" overloaded="no">
@@ -14508,25 +14508,25 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
       <method name="GetMax" type="int" overloaded="no">
         <autodoc>GetMax() -&gt; int</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMin" type="void" overloaded="no">
+      <method name="SetMin" type="" overloaded="no">
         <autodoc>SetMin(int minVal)</autodoc>
         <paramlist>
           <param name="minVal" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMax" type="void" overloaded="no">
+      <method name="SetMax" type="" overloaded="no">
         <autodoc>SetMax(int maxVal)</autodoc>
         <paramlist>
           <param name="maxVal" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRange" type="void" overloaded="no">
+      <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int minVal, int maxVal)</autodoc>
         <paramlist>
           <param name="minVal" type="int" default=""/>
@@ -14538,23 +14538,23 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
       </method>
     </class>
     <class name="SpinCtrl" oldname="wxSpinCtrl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="SpinCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, String value=EmptyString, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=SP_ARROW_KEYS, int min=0, int max=100, 
     int initial=0, String name=SpinCtrlNameStr) -&gt; SpinCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_ARROW_KEYS"/>
           <param name="min" type="int" default="0"/>
           <param name="max" type="int" default="100"/>
           <param name="initial" type="int" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySpinCtrlNameStr"/>
+          <param name="name" type="String" default="wxPySpinCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreSpinCtrl" overloaded="no">
@@ -14566,34 +14566,34 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
     long style=SP_ARROW_KEYS, int min=0, int max=100, 
     int initial=0, String name=SpinCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_ARROW_KEYS"/>
           <param name="min" type="int" default="0"/>
           <param name="max" type="int" default="100"/>
           <param name="initial" type="int" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySpinCtrlNameStr"/>
+          <param name="name" type="String" default="wxPySpinCtrlNameStr"/>
         </paramlist>
       </method>
       <method name="GetValue" type="int" overloaded="no">
         <autodoc>GetValue() -&gt; int</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(int value)</autodoc>
         <paramlist>
           <param name="value" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetValueString" type="void" overloaded="no">
+      <method name="SetValueString" type="" overloaded="no">
         <autodoc>SetValueString(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetRange" type="void" overloaded="no">
+      <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int minVal, int maxVal)</autodoc>
         <paramlist>
           <param name="minVal" type="int" default=""/>
@@ -14606,7 +14606,7 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
       <method name="GetMax" type="int" overloaded="no">
         <autodoc>GetMax() -&gt; int</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(long from, long to)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>
@@ -14621,7 +14621,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="RadioBox" oldname="wxRadioBox" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="RadioBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point point=DefaultPosition, 
     Size size=DefaultSize, int choices=0, 
@@ -14629,17 +14629,17 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; RadioBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyRadioBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyRadioBoxNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreRadioBox" overloaded="no">
@@ -14652,20 +14652,20 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyRadioBoxNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyRadioBoxNameStr"/>
         </paramlist>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -14674,13 +14674,13 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </method>
-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
       <method name="SetStringSelection" type="bool" overloaded="no">
         <autodoc>SetStringSelection(String s) -&gt; bool</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
@@ -14689,30 +14689,30 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="FindString" type="int" overloaded="no">
         <autodoc>FindString(String s) -&gt; int</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetString" type="wxString" overloaded="no">
+      <method name="GetString" type="String" overloaded="no">
         <autodoc>GetString(int n) -&gt; String</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetString" type="void" overloaded="no">
+      <method name="SetString" type="" overloaded="no">
         <autodoc>SetString(int n, String label)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="EnableItem" type="void" overloaded="no">
+      <method name="EnableItem" type="" overloaded="no">
         <autodoc>EnableItem(int n, bool enable=True)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="ShowItem" type="void" overloaded="no">
+      <method name="ShowItem" type="" overloaded="no">
         <autodoc>ShowItem(int n, bool show=True)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -14738,20 +14738,20 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="RadioButton" oldname="wxRadioButton" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="RadioButton" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=RadioButtonNameStr) -&gt; RadioButton</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyRadioButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyRadioButtonNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreRadioButton" overloaded="no">
@@ -14762,20 +14762,20 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=RadioButtonNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyRadioButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyRadioButtonNameStr"/>
         </paramlist>
       </method>
       <method name="GetValue" type="bool" overloaded="no">
         <autodoc>GetValue() -&gt; bool</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(bool value)</autodoc>
         <paramlist>
           <param name="value" type="bool" default=""/>
@@ -14786,23 +14786,23 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Slider" oldname="wxSlider" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="Slider" overloaded="no">
         <autodoc>__init__(Window parent, int id, int value, int minValue, int maxValue, 
     Point point=DefaultPosition, Size size=DefaultSize, 
     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; Slider</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="value" type="int" default=""/>
           <param name="minValue" type="int" default=""/>
           <param name="maxValue" type="int" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySliderNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPySliderNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreSlider" overloaded="no">
@@ -14814,28 +14814,28 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
           <param name="value" type="int" default=""/>
           <param name="minValue" type="int" default=""/>
           <param name="maxValue" type="int" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="point" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySliderNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPySliderNameStr"/>
         </paramlist>
       </method>
       <method name="GetValue" type="int" overloaded="no">
         <autodoc>GetValue() -&gt; int</autodoc>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(int value)</autodoc>
         <paramlist>
           <param name="value" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRange" type="void" overloaded="no">
+      <method name="SetRange" type="" overloaded="no">
         <autodoc>SetRange(int minValue, int maxValue)</autodoc>
         <paramlist>
           <param name="minValue" type="int" default=""/>
@@ -14848,25 +14848,25 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetMax" type="int" overloaded="no">
         <autodoc>GetMax() -&gt; int</autodoc>
       </method>
-      <method name="SetMin" type="void" overloaded="no">
+      <method name="SetMin" type="" overloaded="no">
         <autodoc>SetMin(int minValue)</autodoc>
         <paramlist>
           <param name="minValue" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMax" type="void" overloaded="no">
+      <method name="SetMax" type="" overloaded="no">
         <autodoc>SetMax(int maxValue)</autodoc>
         <paramlist>
           <param name="maxValue" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLineSize" type="void" overloaded="no">
+      <method name="SetLineSize" type="" overloaded="no">
         <autodoc>SetLineSize(int lineSize)</autodoc>
         <paramlist>
           <param name="lineSize" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPageSize" type="void" overloaded="no">
+      <method name="SetPageSize" type="" overloaded="no">
         <autodoc>SetPageSize(int pageSize)</autodoc>
         <paramlist>
           <param name="pageSize" type="int" default=""/>
@@ -14878,7 +14878,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetPageSize" type="int" overloaded="no">
         <autodoc>GetPageSize() -&gt; int</autodoc>
       </method>
-      <method name="SetThumbLength" type="void" overloaded="no">
+      <method name="SetThumbLength" type="" overloaded="no">
         <autodoc>SetThumbLength(int lenPixels)</autodoc>
         <paramlist>
           <param name="lenPixels" type="int" default=""/>
@@ -14887,7 +14887,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetThumbLength" type="int" overloaded="no">
         <autodoc>GetThumbLength() -&gt; int</autodoc>
       </method>
-      <method name="SetTickFreq" type="void" overloaded="no">
+      <method name="SetTickFreq" type="" overloaded="no">
         <autodoc>SetTickFreq(int n, int pos)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -14897,16 +14897,16 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetTickFreq" type="int" overloaded="no">
         <autodoc>GetTickFreq() -&gt; int</autodoc>
       </method>
-      <method name="ClearTicks" type="void" overloaded="no">
+      <method name="ClearTicks" type="" overloaded="no">
         <autodoc>ClearTicks()</autodoc>
       </method>
-      <method name="SetTick" type="void" overloaded="no">
+      <method name="SetTick" type="" overloaded="no">
         <autodoc>SetTick(int tickPos)</autodoc>
         <paramlist>
           <param name="tickPos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ClearSel" type="void" overloaded="no">
+      <method name="ClearSel" type="" overloaded="no">
         <autodoc>ClearSel()</autodoc>
       </method>
       <method name="GetSelEnd" type="int" overloaded="no">
@@ -14915,7 +14915,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetSelStart" type="int" overloaded="no">
         <autodoc>GetSelStart() -&gt; int</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int min, int max)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>
@@ -14930,20 +14930,20 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     EVT_TOGGLEBUTTON = wx.PyEventBinder( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 1)
 </pythoncode>
     <class name="ToggleButton" oldname="wxToggleButton" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="ToggleButton" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=ToggleButtonNameStr) -&gt; ToggleButton</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyToggleButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyToggleButtonNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreToggleButton" overloaded="no">
@@ -14954,17 +14954,17 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=ToggleButtonNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyToggleButtonNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyToggleButtonNameStr"/>
         </paramlist>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(bool value)</autodoc>
         <paramlist>
           <param name="value" type="bool" default=""/>
@@ -14973,10 +14973,10 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetValue" type="bool" overloaded="no">
         <autodoc>GetValue() -&gt; bool</autodoc>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -14984,11 +14984,11 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BookCtrl" oldname="wxBookCtrl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <method name="GetPageCount" type="size_t" overloaded="no">
         <autodoc>GetPageCount() -&gt; size_t</autodoc>
       </method>
-      <method name="GetPage" type="wxWindow" overloaded="no">
+      <method name="GetPage" type="Window" overloaded="no">
         <autodoc>GetPage(size_t n) -&gt; Window</autodoc>
         <paramlist>
           <param name="n" type="size_t" default=""/>
@@ -15001,28 +15001,28 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
         <autodoc>SetPageText(size_t n, String strText) -&gt; bool</autodoc>
         <paramlist>
           <param name="n" type="size_t" default=""/>
-          <param name="strText" type="r.q(const).wxString" default=""/>
+          <param name="strText" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetPageText" type="wxString" overloaded="no">
+      <method name="GetPageText" type="String" overloaded="no">
         <autodoc>GetPageText(size_t n) -&gt; String</autodoc>
         <paramlist>
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetImageList" type="void" overloaded="no">
+      <method name="SetImageList" type="" overloaded="no">
         <autodoc>SetImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">
         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="GetImageList" type="wxImageList" overloaded="no">
+      <method name="GetImageList" type="ImageList" overloaded="no">
         <autodoc>GetImageList() -&gt; ImageList</autodoc>
       </method>
       <method name="GetPageImage" type="int" overloaded="no">
@@ -15038,16 +15038,16 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
           <param name="imageId" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPageSize" type="void" overloaded="no">
+      <method name="SetPageSize" type="" overloaded="no">
         <autodoc>SetPageSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="CalcSizeFromPage" type="wxSize" overloaded="no">
+      <method name="CalcSizeFromPage" type="Size" overloaded="no">
         <autodoc>CalcSizeFromPage(Size sizePage) -&gt; Size</autodoc>
         <paramlist>
-          <param name="sizePage" type="r.q(const).wxSize" default=""/>
+          <param name="sizePage" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="DeletePage" type="bool" overloaded="no">
@@ -15068,8 +15068,8 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="AddPage" type="bool" overloaded="no">
         <autodoc>AddPage(Window page, String text, bool select=False, int imageId=-1) -&gt; bool</autodoc>
         <paramlist>
-          <param name="page" type="p.wxWindow" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="page" type="Window" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="select" type="bool" default="False"/>
           <param name="imageId" type="int" default="-1"/>
         </paramlist>
@@ -15079,8 +15079,8 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     int imageId=-1) -&gt; bool</autodoc>
         <paramlist>
           <param name="n" type="size_t" default=""/>
-          <param name="page" type="p.wxWindow" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="page" type="Window" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="select" type="bool" default="False"/>
           <param name="imageId" type="int" default="-1"/>
         </paramlist>
@@ -15091,7 +15091,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="AdvanceSelection" type="void" overloaded="no">
+      <method name="AdvanceSelection" type="" overloaded="no">
         <autodoc>AdvanceSelection(bool forward=True)</autodoc>
         <paramlist>
           <param name="forward" type="bool" default="True"/>
@@ -15099,7 +15099,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       </method>
     </class>
     <class name="BookCtrlEvent" oldname="wxBookCtrlEvent" module="controls">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="BookCtrlEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
     int nOldSel=-1) -&gt; BookCtrlEvent</autodoc>
@@ -15113,7 +15113,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int nSel)</autodoc>
         <paramlist>
           <param name="nSel" type="int" default=""/>
@@ -15122,7 +15122,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetOldSelection" type="int" overloaded="no">
         <autodoc>GetOldSelection() -&gt; int</autodoc>
       </method>
-      <method name="SetOldSelection" type="void" overloaded="no">
+      <method name="SetOldSelection" type="" overloaded="no">
         <autodoc>SetOldSelection(int nOldSel)</autodoc>
         <paramlist>
           <param name="nOldSel" type="int" default=""/>
@@ -15133,17 +15133,17 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Notebook" oldname="wxNotebook" module="controls">
-      <baseclass name="wxBookCtrl"/>
+      <baseclass name="BookCtrl"/>
       <constructor name="Notebook" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=NOTEBOOK_NAME) -&gt; Notebook</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyNOTEBOOK_NAME"/>
+          <param name="name" type="String" default="wxPyNOTEBOOK_NAME"/>
         </paramlist>
       </constructor>
       <constructor name="PreNotebook" overloaded="no">
@@ -15153,46 +15153,46 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=NOTEBOOK_NAME) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyNOTEBOOK_NAME"/>
+          <param name="name" type="String" default="wxPyNOTEBOOK_NAME"/>
         </paramlist>
       </method>
       <method name="GetRowCount" type="int" overloaded="no">
         <autodoc>GetRowCount() -&gt; int</autodoc>
       </method>
-      <method name="SetPadding" type="void" overloaded="no">
+      <method name="SetPadding" type="" overloaded="no">
         <autodoc>SetPadding(Size padding)</autodoc>
         <paramlist>
-          <param name="padding" type="r.q(const).wxSize" default=""/>
+          <param name="padding" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetTabSize" type="void" overloaded="no">
+      <method name="SetTabSize" type="" overloaded="no">
         <autodoc>SetTabSize(Size sz)</autodoc>
         <paramlist>
-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>
         </paramlist>
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; (tab, where)</autodoc>
         <docstring>Returns the tab which is hit, and flags indicating where using wxNB_HITTEST_ flags.</docstring>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
+          <param name="pt" type="Point" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="CalcSizeFromPage" type="wxSize" overloaded="no">
+      <method name="CalcSizeFromPage" type="Size" overloaded="no">
         <autodoc>CalcSizeFromPage(Size sizePage) -&gt; Size</autodoc>
         <paramlist>
-          <param name="sizePage" type="r.q(const).wxSize" default=""/>
+          <param name="sizePage" type="Size" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="NotebookEvent" oldname="wxNotebookEvent" module="controls">
-      <baseclass name="wxBookCtrlEvent"/>
+      <baseclass name="BookCtrlEvent"/>
       <constructor name="NotebookEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
     int nOldSel=-1) -&gt; NotebookEvent</autodoc>
@@ -15244,17 +15244,17 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Listbook" oldname="wxListbook" module="controls">
-      <baseclass name="wxBookCtrl"/>
+      <baseclass name="BookCtrl"/>
       <constructor name="Listbook" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=EmptyString) -&gt; Listbook</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="name" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
       <constructor name="PreListbook" overloaded="no">
@@ -15264,12 +15264,12 @@ class NotebookPage(wx.Panel):
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="name" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="IsVertical" type="bool" overloaded="no">
@@ -15277,7 +15277,7 @@ class NotebookPage(wx.Panel):
       </method>
     </class>
     <class name="ListbookEvent" oldname="wxListbookEvent" module="controls">
-      <baseclass name="wxBookCtrlEvent"/>
+      <baseclass name="BookCtrlEvent"/>
       <constructor name="ListbookEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
     int nOldSel=-1) -&gt; ListbookEvent</autodoc>
@@ -15297,38 +15297,38 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BookCtrlSizer" oldname="wxBookCtrlSizer" module="controls">
-      <baseclass name="wxSizer"/>
+      <baseclass name="Sizer"/>
       <constructor name="BookCtrlSizer" overloaded="no">
         <autodoc>__init__(BookCtrl nb) -&gt; BookCtrlSizer</autodoc>
         <paramlist>
-          <param name="nb" type="p.wxBookCtrl" default=""/>
+          <param name="nb" type="BookCtrl" default=""/>
         </paramlist>
       </constructor>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
-      <method name="GetControl" type="wxBookCtrl" overloaded="no">
+      <method name="GetControl" type="BookCtrl" overloaded="no">
         <autodoc>GetControl() -&gt; BookCtrl</autodoc>
       </method>
     </class>
     <class name="NotebookSizer" oldname="wxNotebookSizer" module="controls">
-      <baseclass name="wxSizer"/>
+      <baseclass name="Sizer"/>
       <constructor name="NotebookSizer" overloaded="no">
         <autodoc>__init__(Notebook nb) -&gt; NotebookSizer</autodoc>
         <paramlist>
-          <param name="nb" type="p.wxNotebook" default=""/>
+          <param name="nb" type="Notebook" default=""/>
         </paramlist>
       </constructor>
-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">
         <autodoc>RecalcSizes()</autodoc>
       </method>
-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
-      <method name="GetNotebook" type="wxNotebook" overloaded="no">
+      <method name="GetNotebook" type="Notebook" overloaded="no">
         <autodoc>GetNotebook() -&gt; Notebook</autodoc>
       </method>
     </class>
@@ -15336,11 +15336,11 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ToolBarToolBase" oldname="wxToolBarToolBase" module="controls">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
-      <method name="GetControl" type="wxControl" overloaded="no">
+      <method name="GetControl" type="Control" overloaded="no">
         <autodoc>GetControl() -&gt; Control</autodoc>
       </method>
       <method name="GetToolBar" type="wxToolBarBase" overloaded="no">
@@ -15370,22 +15370,22 @@ class NotebookPage(wx.Panel):
       <method name="CanBeToggled" type="bool" overloaded="no">
         <autodoc>CanBeToggled() -&gt; bool</autodoc>
       </method>
-      <method name="GetNormalBitmap" type="q(const).wxBitmap" overloaded="no">
+      <method name="GetNormalBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetNormalBitmap() -&gt; Bitmap</autodoc>
       </method>
-      <method name="GetDisabledBitmap" type="q(const).wxBitmap" overloaded="no">
+      <method name="GetDisabledBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetDisabledBitmap() -&gt; Bitmap</autodoc>
       </method>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
-      <method name="GetShortHelp" type="wxString" overloaded="no">
+      <method name="GetShortHelp" type="String" overloaded="no">
         <autodoc>GetShortHelp() -&gt; String</autodoc>
       </method>
-      <method name="GetLongHelp" type="wxString" overloaded="no">
+      <method name="GetLongHelp" type="String" overloaded="no">
         <autodoc>GetLongHelp() -&gt; String</autodoc>
       </method>
       <method name="Enable" type="bool" overloaded="no">
@@ -15394,7 +15394,7 @@ class NotebookPage(wx.Panel):
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">
         <autodoc>Toggle()</autodoc>
       </method>
       <method name="SetToggle" type="bool" overloaded="no">
@@ -15406,71 +15406,71 @@ class NotebookPage(wx.Panel):
       <method name="SetShortHelp" type="bool" overloaded="no">
         <autodoc>SetShortHelp(String help) -&gt; bool</autodoc>
         <paramlist>
-          <param name="help" type="r.q(const).wxString" default=""/>
+          <param name="help" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SetLongHelp" type="bool" overloaded="no">
         <autodoc>SetLongHelp(String help) -&gt; bool</autodoc>
         <paramlist>
-          <param name="help" type="r.q(const).wxString" default=""/>
+          <param name="help" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetNormalBitmap" type="void" overloaded="no">
+      <method name="SetNormalBitmap" type="" overloaded="no">
         <autodoc>SetNormalBitmap(Bitmap bmp)</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetDisabledBitmap" type="void" overloaded="no">
+      <method name="SetDisabledBitmap" type="" overloaded="no">
         <autodoc>SetDisabledBitmap(Bitmap bmp)</autodoc>
         <paramlist>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">
         <autodoc>Detach()</autodoc>
       </method>
-      <method name="Attach" type="void" overloaded="no">
+      <method name="Attach" type="" overloaded="no">
         <autodoc>Attach(ToolBarBase tbar)</autodoc>
         <paramlist>
-          <param name="tbar" type="p.wxToolBarBase" default=""/>
+          <param name="tbar" type="wxToolBarBase" default=""/>
         </paramlist>
       </method>
       <method name="GetClientData" type="PyObject" overloaded="no">
         <autodoc>GetClientData() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetClientData" type="void" overloaded="no">
+      <method name="SetClientData" type="" overloaded="no">
         <autodoc>SetClientData(PyObject clientData)</autodoc>
         <paramlist>
-          <param name="clientData" type="p.PyObject" default=""/>
+          <param name="clientData" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ToolBarBase" oldname="wxToolBarBase" module="controls">
-      <baseclass name="wxControl"/>
-      <method name="DoAddTool" type="wxToolBarToolBase" overloaded="no">
+      <baseclass name="Control"/>
+      <method name="DoAddTool" type="ToolBarToolBase" overloaded="no">
         <autodoc>DoAddTool(int id, String label, Bitmap bitmap, Bitmap bmpDisabled=wxNullBitmap, 
     int kind=ITEM_NORMAL, String shortHelp=EmptyString, 
     String longHelp=EmptyString, 
     PyObject clientData=None) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="bmpDisabled" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
+          <param name="label" type="String" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="bmpDisabled" type="Bitmap" default="wxNullBitmap"/>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
-          <param name="shortHelp" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="longHelp" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="shortHelp" type="String" default="wxPyEmptyString"/>
+          <param name="longHelp" type="String" default="wxPyEmptyString"/>
+          <param name="clientData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="DoInsertTool" type="wxToolBarToolBase" overloaded="no">
+      <method name="DoInsertTool" type="ToolBarToolBase" overloaded="no">
         <autodoc>DoInsertTool(size_t pos, int id, String label, Bitmap bitmap, Bitmap bmpDisabled=wxNullBitmap, 
     int kind=ITEM_NORMAL, 
     String shortHelp=EmptyString, String longHelp=EmptyString, 
@@ -15478,57 +15478,57 @@ class NotebookPage(wx.Panel):
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-          <param name="bmpDisabled" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
+          <param name="label" type="String" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
+          <param name="bmpDisabled" type="Bitmap" default="wxNullBitmap"/>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
-          <param name="shortHelp" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="longHelp" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="shortHelp" type="String" default="wxPyEmptyString"/>
+          <param name="longHelp" type="String" default="wxPyEmptyString"/>
+          <param name="clientData" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="AddToolItem" type="wxToolBarToolBase" overloaded="no">
+      <method name="AddToolItem" type="ToolBarToolBase" overloaded="no">
         <autodoc>AddToolItem(ToolBarToolBase tool) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
-          <param name="tool" type="p.wxToolBarToolBase" default=""/>
+          <param name="tool" type="ToolBarToolBase" default=""/>
         </paramlist>
       </method>
-      <method name="InsertToolItem" type="wxToolBarToolBase" overloaded="no">
+      <method name="InsertToolItem" type="ToolBarToolBase" overloaded="no">
         <autodoc>InsertToolItem(size_t pos, ToolBarToolBase tool) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
-          <param name="tool" type="p.wxToolBarToolBase" default=""/>
+          <param name="tool" type="ToolBarToolBase" default=""/>
         </paramlist>
       </method>
-      <method name="AddControl" type="wxToolBarToolBase" overloaded="no">
+      <method name="AddControl" type="ToolBarToolBase" overloaded="no">
         <autodoc>AddControl(Control control) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
-          <param name="control" type="p.wxControl" default=""/>
+          <param name="control" type="Control" default=""/>
         </paramlist>
       </method>
-      <method name="InsertControl" type="wxToolBarToolBase" overloaded="no">
+      <method name="InsertControl" type="ToolBarToolBase" overloaded="no">
         <autodoc>InsertControl(size_t pos, Control control) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
-          <param name="control" type="p.wxControl" default=""/>
+          <param name="control" type="Control" default=""/>
         </paramlist>
       </method>
-      <method name="FindControl" type="wxControl" overloaded="no">
+      <method name="FindControl" type="Control" overloaded="no">
         <autodoc>FindControl(int id) -&gt; Control</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AddSeparator" type="wxToolBarToolBase" overloaded="no">
+      <method name="AddSeparator" type="ToolBarToolBase" overloaded="no">
         <autodoc>AddSeparator() -&gt; ToolBarToolBase</autodoc>
       </method>
-      <method name="InsertSeparator" type="wxToolBarToolBase" overloaded="no">
+      <method name="InsertSeparator" type="ToolBarToolBase" overloaded="no">
         <autodoc>InsertSeparator(size_t pos) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveTool" type="wxToolBarToolBase" overloaded="no">
+      <method name="RemoveTool" type="ToolBarToolBase" overloaded="no">
         <autodoc>RemoveTool(int id) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -15546,27 +15546,27 @@ class NotebookPage(wx.Panel):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ClearTools" type="void" overloaded="no">
+      <method name="ClearTools" type="" overloaded="no">
         <autodoc>ClearTools()</autodoc>
       </method>
       <method name="Realize" type="bool" overloaded="no">
         <autodoc>Realize() -&gt; bool</autodoc>
       </method>
-      <method name="EnableTool" type="void" overloaded="no">
+      <method name="EnableTool" type="" overloaded="no">
         <autodoc>EnableTool(int id, bool enable)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="ToggleTool" type="void" overloaded="no">
+      <method name="ToggleTool" type="" overloaded="no">
         <autodoc>ToggleTool(int id, bool toggle)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="toggle" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetToggle" type="void" overloaded="no">
+      <method name="SetToggle" type="" overloaded="no">
         <autodoc>SetToggle(int id, bool toggle)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -15579,11 +15579,11 @@ class NotebookPage(wx.Panel):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolClientData" type="void" overloaded="no">
+      <method name="SetToolClientData" type="" overloaded="no">
         <autodoc>SetToolClientData(int id, PyObject clientData)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="clientData" type="p.PyObject" default=""/>
+          <param name="clientData" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetToolPos" type="int" overloaded="no">
@@ -15604,61 +15604,61 @@ class NotebookPage(wx.Panel):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolShortHelp" type="void" overloaded="no">
+      <method name="SetToolShortHelp" type="" overloaded="no">
         <autodoc>SetToolShortHelp(int id, String helpString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="helpString" type="r.q(const).wxString" default=""/>
+          <param name="helpString" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetToolShortHelp" type="wxString" overloaded="no">
+      <method name="GetToolShortHelp" type="String" overloaded="no">
         <autodoc>GetToolShortHelp(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolLongHelp" type="void" overloaded="no">
+      <method name="SetToolLongHelp" type="" overloaded="no">
         <autodoc>SetToolLongHelp(int id, String helpString)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="helpString" type="r.q(const).wxString" default=""/>
+          <param name="helpString" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetToolLongHelp" type="wxString" overloaded="no">
+      <method name="GetToolLongHelp" type="String" overloaded="no">
         <autodoc>GetToolLongHelp(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginsXY" type="void" overloaded="no">
+      <method name="SetMarginsXY" type="" overloaded="no">
         <autodoc>SetMarginsXY(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMargins" type="void" overloaded="no">
+      <method name="SetMargins" type="" overloaded="no">
         <autodoc>SetMargins(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolPacking" type="void" overloaded="no">
+      <method name="SetToolPacking" type="" overloaded="no">
         <autodoc>SetToolPacking(int packing)</autodoc>
         <paramlist>
           <param name="packing" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolSeparation" type="void" overloaded="no">
+      <method name="SetToolSeparation" type="" overloaded="no">
         <autodoc>SetToolSeparation(int separation)</autodoc>
         <paramlist>
           <param name="separation" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetToolMargins" type="wxSize" overloaded="no">
+      <method name="GetToolMargins" type="Size" overloaded="no">
         <autodoc>GetToolMargins() -&gt; Size</autodoc>
       </method>
-      <method name="GetMargins" type="wxSize" overloaded="no">
+      <method name="GetMargins" type="Size" overloaded="no">
         <autodoc>GetMargins() -&gt; Size</autodoc>
       </method>
       <method name="GetToolPacking" type="int" overloaded="no">
@@ -15667,13 +15667,13 @@ class NotebookPage(wx.Panel):
       <method name="GetToolSeparation" type="int" overloaded="no">
         <autodoc>GetToolSeparation() -&gt; int</autodoc>
       </method>
-      <method name="SetRows" type="void" overloaded="no">
+      <method name="SetRows" type="" overloaded="no">
         <autodoc>SetRows(int nRows)</autodoc>
         <paramlist>
           <param name="nRows" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMaxRowsCols" type="void" overloaded="no">
+      <method name="SetMaxRowsCols" type="" overloaded="no">
         <autodoc>SetMaxRowsCols(int rows, int cols)</autodoc>
         <paramlist>
           <param name="rows" type="int" default=""/>
@@ -15686,26 +15686,26 @@ class NotebookPage(wx.Panel):
       <method name="GetMaxCols" type="int" overloaded="no">
         <autodoc>GetMaxCols() -&gt; int</autodoc>
       </method>
-      <method name="SetToolBitmapSize" type="void" overloaded="no">
+      <method name="SetToolBitmapSize" type="" overloaded="no">
         <autodoc>SetToolBitmapSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetToolBitmapSize" type="wxSize" overloaded="no">
+      <method name="GetToolBitmapSize" type="Size" overloaded="no">
         <autodoc>GetToolBitmapSize() -&gt; Size</autodoc>
       </method>
-      <method name="GetToolSize" type="wxSize" overloaded="no">
+      <method name="GetToolSize" type="Size" overloaded="no">
         <autodoc>GetToolSize() -&gt; Size</autodoc>
       </method>
-      <method name="FindToolForPosition" type="wxToolBarToolBase" overloaded="no">
+      <method name="FindToolForPosition" type="ToolBarToolBase" overloaded="no">
         <autodoc>FindToolForPosition(int x, int y) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="FindById" type="wxToolBarToolBase" overloaded="no">
+      <method name="FindById" type="ToolBarToolBase" overloaded="no">
         <autodoc>FindById(int toolid) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="toolid" type="int" default=""/>
@@ -15716,18 +15716,18 @@ class NotebookPage(wx.Panel):
       </method>
     </class>
     <class name="ToolBar" oldname="wxToolBar" module="controls">
-      <baseclass name="wxToolBarBase"/>
+      <baseclass name="ToolBarBase"/>
       <constructor name="ToolBar" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxNO_BORDER|wxTB_HORIZONTAL, 
     String name=wxPyToolBarNameStr) -&gt; ToolBar</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxNO_BORDER|wxTB_HORIZONTAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyToolBarNameStr"/>
+          <param name="name" type="String" default="wxPyToolBarNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreToolBar" overloaded="no">
@@ -15738,15 +15738,15 @@ class NotebookPage(wx.Panel):
     long style=wxNO_BORDER|wxTB_HORIZONTAL, 
     String name=wxPyToolBarNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxNO_BORDER|wxTB_HORIZONTAL"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyToolBarNameStr"/>
+          <param name="name" type="String" default="wxPyToolBarNameStr"/>
         </paramlist>
       </method>
-      <method name="FindToolForPosition" type="wxToolBarToolBase" overloaded="no">
+      <method name="FindToolForPosition" type="ToolBarToolBase" overloaded="no">
         <autodoc>FindToolForPosition(int x, int y) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -15765,27 +15765,27 @@ class NotebookPage(wx.Panel):
         <autodoc>__init__(Colour colText=wxNullColour, Colour colBack=wxNullColour, 
     Font font=wxNullFont) -&gt; ListItemAttr</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default="wxNullColour"/>
-          <param name="colBack" type="r.q(const).wxColour" default="wxNullColour"/>
-          <param name="font" type="r.q(const).wxFont" default="wxNullFont"/>
+          <param name="colText" type="Colour" default="wxNullColour"/>
+          <param name="colBack" type="Colour" default="wxNullColour"/>
+          <param name="font" type="Font" default="wxNullFont"/>
         </paramlist>
       </constructor>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="HasTextColour" type="bool" overloaded="no">
@@ -15797,16 +15797,16 @@ class NotebookPage(wx.Panel):
       <method name="HasFont" type="bool" overloaded="no">
         <autodoc>HasFont() -&gt; bool</autodoc>
       </method>
-      <method name="GetTextColour" type="wxColour" overloaded="no">
+      <method name="GetTextColour" type="Colour" overloaded="no">
         <autodoc>GetTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
@@ -15814,95 +15814,95 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListItem" oldname="wxListItem" module="controls">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ListItem" overloaded="no">
         <autodoc>__init__() -&gt; ListItem</autodoc>
       </constructor>
       <destructor name="~wxListItem" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
-      <method name="ClearAttributes" type="void" overloaded="no">
+      <method name="ClearAttributes" type="" overloaded="no">
         <autodoc>ClearAttributes()</autodoc>
       </method>
-      <method name="SetMask" type="void" overloaded="no">
+      <method name="SetMask" type="" overloaded="no">
         <autodoc>SetMask(long mask)</autodoc>
         <paramlist>
           <param name="mask" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(long id)</autodoc>
         <paramlist>
           <param name="id" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetColumn" type="void" overloaded="no">
+      <method name="SetColumn" type="" overloaded="no">
         <autodoc>SetColumn(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetState" type="void" overloaded="no">
+      <method name="SetState" type="" overloaded="no">
         <autodoc>SetState(long state)</autodoc>
         <paramlist>
           <param name="state" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetStateMask" type="void" overloaded="no">
+      <method name="SetStateMask" type="" overloaded="no">
         <autodoc>SetStateMask(long stateMask)</autodoc>
         <paramlist>
           <param name="stateMask" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetImage" type="void" overloaded="no">
+      <method name="SetImage" type="" overloaded="no">
         <autodoc>SetImage(int image)</autodoc>
         <paramlist>
           <param name="image" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetData" type="void" overloaded="no">
+      <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(long data)</autodoc>
         <paramlist>
           <param name="data" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAlign" type="void" overloaded="no">
+      <method name="SetAlign" type="" overloaded="no">
         <autodoc>SetAlign(int align)</autodoc>
         <paramlist>
           <param name="align" type="wxListColumnFormat" default=""/>
         </paramlist>
       </method>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="GetMask" type="long" overloaded="no">
@@ -15917,7 +15917,7 @@ class NotebookPage(wx.Panel):
       <method name="GetState" type="long" overloaded="no">
         <autodoc>GetState() -&gt; long</autodoc>
       </method>
-      <method name="GetText" type="q(const).wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetImage" type="int" overloaded="no">
@@ -15932,19 +15932,19 @@ class NotebookPage(wx.Panel):
       <method name="GetAlign" type="wxListColumnFormat" overloaded="no">
         <autodoc>GetAlign() -&gt; int</autodoc>
       </method>
-      <method name="GetAttributes" type="wxListItemAttr" overloaded="no">
+      <method name="GetAttributes" type="ListItemAttr" overloaded="no">
         <autodoc>GetAttributes() -&gt; ListItemAttr</autodoc>
       </method>
       <method name="HasAttributes" type="bool" overloaded="no">
         <autodoc>HasAttributes() -&gt; bool</autodoc>
       </method>
-      <method name="GetTextColour" type="wxColour" overloaded="no">
+      <method name="GetTextColour" type="Colour" overloaded="no">
         <autodoc>GetTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
       <property name="m_mask" type="long" readonly="no"/>
@@ -15952,7 +15952,7 @@ class NotebookPage(wx.Panel):
       <property name="m_col" type="int" readonly="no"/>
       <property name="m_state" type="long" readonly="no"/>
       <property name="m_stateMask" type="long" readonly="no"/>
-      <property name="m_text" type="wxString" readonly="no"/>
+      <property name="m_text" type="String" readonly="no"/>
       <property name="m_image" type="int" readonly="no"/>
       <property name="m_data" type="long" readonly="no"/>
       <property name="m_format" type="int" readonly="no"/>
@@ -15962,7 +15962,7 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListEvent" oldname="wxListEvent" module="controls">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="ListEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; ListEvent</autodoc>
         <paramlist>
@@ -15974,8 +15974,8 @@ class NotebookPage(wx.Panel):
       <property name="m_oldItemIndex" type="long" readonly="no"/>
       <property name="m_itemIndex" type="long" readonly="no"/>
       <property name="m_col" type="int" readonly="no"/>
-      <property name="m_pointDrag" type="wxPoint" readonly="no"/>
-      <property name="m_item" type="wxListItem" readonly="yes"/>
+      <property name="m_pointDrag" type="Point" readonly="no"/>
+      <property name="m_item" type="ListItem" readonly="yes"/>
       <method name="GetKeyCode" type="int" overloaded="no">
         <autodoc>GetKeyCode() -&gt; int</autodoc>
       </method>
@@ -15985,13 +15985,13 @@ class NotebookPage(wx.Panel):
       <method name="GetColumn" type="int" overloaded="no">
         <autodoc>GetColumn() -&gt; int</autodoc>
       </method>
-      <method name="GetPoint" type="wxPoint" overloaded="no">
+      <method name="GetPoint" type="Point" overloaded="no">
         <autodoc>GetPoint() -&gt; Point</autodoc>
       </method>
-      <method name="GetLabel" type="q(const).wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
-      <method name="GetText" type="q(const).wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetImage" type="int" overloaded="no">
@@ -16003,7 +16003,7 @@ class NotebookPage(wx.Panel):
       <method name="GetMask" type="long" overloaded="no">
         <autodoc>GetMask() -&gt; long</autodoc>
       </method>
-      <method name="GetItem" type="q(const).wxListItem" overloaded="no">
+      <method name="GetItem" type="ListItem" overloaded="no">
         <autodoc>GetItem() -&gt; ListItem</autodoc>
       </method>
       <method name="GetCacheFrom" type="long" overloaded="no">
@@ -16015,7 +16015,7 @@ class NotebookPage(wx.Panel):
       <method name="IsEditCancelled" type="bool" overloaded="no">
         <autodoc>IsEditCancelled() -&gt; bool</autodoc>
       </method>
-      <method name="SetEditCanceled" type="void" overloaded="no">
+      <method name="SetEditCanceled" type="" overloaded="no">
         <autodoc>SetEditCanceled(bool editCancelled)</autodoc>
         <paramlist>
           <param name="editCancelled" type="bool" default=""/>
@@ -16051,19 +16051,19 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListCtrl" oldname="wxPyListCtrl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="wxPyListCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_ICON, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; ListCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLC_ICON"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreListCtrl" overloaded="no">
@@ -16074,35 +16074,35 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
     Size size=DefaultSize, long style=LC_ICON, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLC_ICON"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListCtrlNameStr"/>
         </paramlist>
       </method>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="SetForegroundColour" type="bool" overloaded="no">
         <autodoc>SetForegroundColour(Colour col) -&gt; bool</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="SetBackgroundColour" type="bool" overloaded="no">
         <autodoc>SetBackgroundColour(Colour col) -&gt; bool</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetColumn" type="wxListItem" overloaded="no">
+      <method name="GetColumn" type="ListItem" overloaded="no">
         <autodoc>GetColumn(int col) -&gt; ListItem</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
@@ -16112,7 +16112,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <autodoc>SetColumn(int col, ListItem item) -&gt; bool</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
-          <param name="item" type="r.wxListItem" default=""/>
+          <param name="item" type="ListItem" default=""/>
         </paramlist>
       </method>
       <method name="GetColumnWidth" type="int" overloaded="no">
@@ -16131,10 +16131,10 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
       <method name="GetCountPerPage" type="int" overloaded="no">
         <autodoc>GetCountPerPage() -&gt; int</autodoc>
       </method>
-      <method name="GetViewRect" type="wxRect" overloaded="no">
+      <method name="GetViewRect" type="Rect" overloaded="no">
         <autodoc>GetViewRect() -&gt; Rect</autodoc>
       </method>
-      <method name="GetItem" type="wxListItem" overloaded="no">
+      <method name="GetItem" type="ListItem" overloaded="no">
         <autodoc>GetItem(long itemId, int col=0) -&gt; ListItem</autodoc>
         <paramlist>
           <param name="itemId" type="long" default=""/>
@@ -16144,7 +16144,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
       <method name="SetItem" type="bool" overloaded="no">
         <autodoc>SetItem(ListItem info) -&gt; bool</autodoc>
         <paramlist>
-          <param name="info" type="r.wxListItem" default=""/>
+          <param name="info" type="ListItem" default=""/>
         </paramlist>
       </method>
       <method name="SetStringItem" type="long" overloaded="no">
@@ -16152,7 +16152,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <paramlist>
           <param name="index" type="long" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
           <param name="imageId" type="int" default="-1"/>
         </paramlist>
       </method>
@@ -16179,17 +16179,17 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="selImage" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemText" type="wxString" overloaded="no">
+      <method name="GetItemText" type="String" overloaded="no">
         <autodoc>GetItemText(long item) -&gt; String</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemText" type="void" overloaded="no">
+      <method name="SetItemText" type="" overloaded="no">
         <autodoc>SetItemText(long item, String str)</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetItemData" type="long" overloaded="no">
@@ -16205,13 +16205,13 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="data" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemPosition" type="wxPoint" overloaded="no">
+      <method name="GetItemPosition" type="Point" overloaded="no">
         <autodoc>GetItemPosition(long item) -&gt; Point</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemRect" type="wxRect" overloaded="no">
+      <method name="GetItemRect" type="Rect" overloaded="no">
         <autodoc>GetItemRect(long item, int code=LIST_RECT_BOUNDS) -&gt; Rect</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
@@ -16222,7 +16222,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <autodoc>SetItemPosition(long item, Point pos) -&gt; bool</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetItemCount" type="int" overloaded="no">
@@ -16231,10 +16231,10 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
       <method name="GetColumnCount" type="int" overloaded="no">
         <autodoc>GetColumnCount() -&gt; int</autodoc>
       </method>
-      <method name="GetItemSpacing" type="wxSize" overloaded="no">
+      <method name="GetItemSpacing" type="Size" overloaded="no">
         <autodoc>GetItemSpacing() -&gt; Size</autodoc>
       </method>
-      <method name="SetItemSpacing" type="void" overloaded="no">
+      <method name="SetItemSpacing" type="" overloaded="no">
         <autodoc>SetItemSpacing(int spacing, bool isSmall=False)</autodoc>
         <paramlist>
           <param name="spacing" type="int" default=""/>
@@ -16244,26 +16244,26 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
       <method name="GetSelectedItemCount" type="int" overloaded="no">
         <autodoc>GetSelectedItemCount() -&gt; int</autodoc>
       </method>
-      <method name="GetTextColour" type="wxColour" overloaded="no">
+      <method name="GetTextColour" type="Colour" overloaded="no">
         <autodoc>GetTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="GetTopItem" type="long" overloaded="no">
         <autodoc>GetTopItem() -&gt; long</autodoc>
       </method>
-      <method name="SetSingleStyle" type="void" overloaded="no">
+      <method name="SetSingleStyle" type="" overloaded="no">
         <autodoc>SetSingleStyle(long style, bool add=True)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
           <param name="add" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetWindowStyleFlag" type="void" overloaded="no">
+      <method name="SetWindowStyleFlag" type="" overloaded="no">
         <autodoc>SetWindowStyleFlag(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
@@ -16277,36 +16277,36 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="state" type="int" default="wxLIST_STATE_DONTCARE"/>
         </paramlist>
       </method>
-      <method name="GetImageList" type="wxImageList" overloaded="no">
+      <method name="GetImageList" type="ImageList" overloaded="no">
         <autodoc>GetImageList(int which) -&gt; ImageList</autodoc>
         <paramlist>
           <param name="which" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetImageList" type="void" overloaded="no">
+      <method name="SetImageList" type="" overloaded="no">
         <autodoc>SetImageList(ImageList imageList, int which)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
           <param name="which" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">
         <autodoc>AssignImageList(ImageList imageList, int which)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
           <param name="which" type="int" default=""/>
         </paramlist>
       </method>
       <method name="IsVirtual" type="bool" overloaded="no">
         <autodoc>IsVirtual() -&gt; bool</autodoc>
       </method>
-      <method name="RefreshItem" type="void" overloaded="no">
+      <method name="RefreshItem" type="" overloaded="no">
         <autodoc>RefreshItem(long item)</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="RefreshItems" type="void" overloaded="no">
+      <method name="RefreshItems" type="" overloaded="no">
         <autodoc>RefreshItems(long itemFrom, long itemTo)</autodoc>
         <paramlist>
           <param name="itemFrom" type="long" default=""/>
@@ -16337,10 +16337,10 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
       <method name="DeleteAllColumns" type="bool" overloaded="no">
         <autodoc>DeleteAllColumns() -&gt; bool</autodoc>
       </method>
-      <method name="ClearAll" type="void" overloaded="no">
+      <method name="ClearAll" type="" overloaded="no">
         <autodoc>ClearAll()</autodoc>
       </method>
-      <method name="EditLabel" type="void" overloaded="no">
+      <method name="EditLabel" type="" overloaded="no">
         <autodoc>EditLabel(long item)</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
@@ -16356,7 +16356,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <autodoc>FindItem(long start, String str, bool partial=False) -&gt; long</autodoc>
         <paramlist>
           <param name="start" type="long" default=""/>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
           <param name="partial" type="bool" default="False"/>
         </paramlist>
       </method>
@@ -16371,7 +16371,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <autodoc>FindItemAtPos(long start, Point pt, int direction) -&gt; long</autodoc>
         <paramlist>
           <param name="start" type="long" default=""/>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
           <param name="direction" type="int" default=""/>
         </paramlist>
       </method>
@@ -16380,21 +16380,21 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <docstring>Determines which item (if any) is at the specified point,
 giving details in the second return value (see wxLIST_HITTEST_... flags.)</docstring>
         <paramlist>
-          <param name="point" type="r.q(const).wxPoint" default=""/>
-          <param name="OUTPUT" type="r.int" default=""/>
+          <param name="point" type="Point" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="InsertItem" type="long" overloaded="no">
         <autodoc>InsertItem(ListItem info) -&gt; long</autodoc>
         <paramlist>
-          <param name="info" type="r.wxListItem" default=""/>
+          <param name="info" type="ListItem" default=""/>
         </paramlist>
       </method>
       <method name="InsertStringItem" type="long" overloaded="no">
         <autodoc>InsertStringItem(long index, String label) -&gt; long</autodoc>
         <paramlist>
           <param name="index" type="long" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
       <method name="InsertImageItem" type="long" overloaded="no">
@@ -16408,7 +16408,7 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
         <autodoc>InsertImageStringItem(long index, String label, int imageIndex) -&gt; long</autodoc>
         <paramlist>
           <param name="index" type="long" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
           <param name="imageIndex" type="int" default=""/>
         </paramlist>
       </method>
@@ -16416,7 +16416,7 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
         <autodoc>InsertColumnInfo(long col, ListItem info) -&gt; long</autodoc>
         <paramlist>
           <param name="col" type="long" default=""/>
-          <param name="info" type="r.wxListItem" default=""/>
+          <param name="info" type="ListItem" default=""/>
         </paramlist>
       </method>
       <method name="InsertColumn" type="long" overloaded="no">
@@ -16424,12 +16424,12 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
     int width=-1) -&gt; long</autodoc>
         <paramlist>
           <param name="col" type="long" default=""/>
-          <param name="heading" type="r.q(const).wxString" default=""/>
+          <param name="heading" type="String" default=""/>
           <param name="format" type="int" default="wxLIST_FORMAT_LEFT"/>
           <param name="width" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="SetItemCount" type="void" overloaded="no">
+      <method name="SetItemCount" type="" overloaded="no">
         <autodoc>SetItemCount(long count)</autodoc>
         <paramlist>
           <param name="count" type="long" default=""/>
@@ -16442,27 +16442,27 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
           <param name="dy" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemTextColour" type="void" overloaded="no">
+      <method name="SetItemTextColour" type="" overloaded="no">
         <autodoc>SetItemTextColour(long item, Colour col)</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemTextColour" type="wxColour" overloaded="no">
+      <method name="GetItemTextColour" type="Colour" overloaded="no">
         <autodoc>GetItemTextColour(long item) -&gt; Colour</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemBackgroundColour" type="void" overloaded="no">
+      <method name="SetItemBackgroundColour" type="" overloaded="no">
         <autodoc>SetItemBackgroundColour(long item, Colour col)</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetItemBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetItemBackgroundColour(long item) -&gt; Colour</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>
@@ -16471,10 +16471,10 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
       <method name="SortItems" type="bool" overloaded="no">
         <autodoc>SortItems(PyObject func) -&gt; bool</autodoc>
         <paramlist>
-          <param name="func" type="p.PyObject" default=""/>
+          <param name="func" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetMainWindow" type="wxWindow" overloaded="no">
+      <method name="GetMainWindow" type="Window" overloaded="no">
         <autodoc>GetMainWindow() -&gt; Window</autodoc>
       </method>
     </class>
@@ -16482,19 +16482,19 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListView" oldname="wxListView" module="controls">
-      <baseclass name="wxPyListCtrl"/>
+      <baseclass name="ListCtrl"/>
       <constructor name="ListView" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_REPORT, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; ListView</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLC_REPORT"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreListView" overloaded="no">
@@ -16505,23 +16505,23 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
     Size size=DefaultSize, long style=LC_REPORT, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLC_REPORT"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyListCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyListCtrlNameStr"/>
         </paramlist>
       </method>
-      <method name="Select" type="void" overloaded="no">
+      <method name="Select" type="" overloaded="no">
         <autodoc>Select(long n, bool on=True)</autodoc>
         <paramlist>
           <param name="n" type="long" default=""/>
           <param name="on" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Focus" type="void" overloaded="no">
+      <method name="Focus" type="" overloaded="no">
         <autodoc>Focus(long index)</autodoc>
         <paramlist>
           <param name="index" type="long" default=""/>
@@ -16545,14 +16545,14 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetColumnImage" type="void" overloaded="no">
+      <method name="SetColumnImage" type="" overloaded="no">
         <autodoc>SetColumnImage(int col, int image)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
           <param name="image" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ClearColumnImage" type="void" overloaded="no">
+      <method name="ClearColumnImage" type="" overloaded="no">
         <autodoc>ClearColumnImage(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
@@ -16578,13 +16578,13 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(TreeItemId other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="p.q(const).wxTreeItemId" default=""/>
+          <param name="other" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(TreeItemId other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="p.q(const).wxTreeItemId" default=""/>
+          <param name="other" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <property name="m_pItem" type="wxTreeItemIdValue" readonly="no"/>
@@ -16593,28 +16593,28 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
       <constructor name="wxPyTreeItemData" overloaded="no">
         <autodoc>__init__(PyObject obj=None) -&gt; TreeItemData</autodoc>
         <paramlist>
-          <param name="obj" type="p.PyObject" default="NULL"/>
+          <param name="obj" type="PyObject" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetData" type="PyObject" overloaded="no">
         <autodoc>GetData() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetData" type="void" overloaded="no">
+      <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(PyObject obj)</autodoc>
         <paramlist>
-          <param name="obj" type="p.PyObject" default=""/>
+          <param name="obj" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetId" type="q(const).wxTreeItemId" overloaded="no">
+      <method name="GetId" type="TreeItemId" overloaded="no">
         <autodoc>GetId() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(TreeItemId id)</autodoc>
         <paramlist>
-          <param name="id" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="id" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
@@ -16645,7 +16645,7 @@ EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLI
 EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,   1)
 </pythoncode>
     <class name="TreeEvent" oldname="wxTreeEvent" module="controls">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="TreeEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; TreeEvent</autodoc>
         <paramlist>
@@ -16653,67 +16653,67 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
           <param name="id" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="GetItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetItem" type="TreeItemId" overloaded="no">
         <autodoc>GetItem() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="SetItem" type="void" overloaded="no">
+      <method name="SetItem" type="" overloaded="no">
         <autodoc>SetItem(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetOldItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetOldItem" type="TreeItemId" overloaded="no">
         <autodoc>GetOldItem() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="SetOldItem" type="void" overloaded="no">
+      <method name="SetOldItem" type="" overloaded="no">
         <autodoc>SetOldItem(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetPoint" type="wxPoint" overloaded="no">
+      <method name="GetPoint" type="Point" overloaded="no">
         <autodoc>GetPoint() -&gt; Point</autodoc>
       </method>
-      <method name="SetPoint" type="void" overloaded="no">
+      <method name="SetPoint" type="" overloaded="no">
         <autodoc>SetPoint(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="GetKeyEvent" type="q(const).wxKeyEvent" overloaded="no">
+      <method name="GetKeyEvent" type="KeyEvent" overloaded="no">
         <autodoc>GetKeyEvent() -&gt; KeyEvent</autodoc>
       </method>
       <method name="GetKeyCode" type="int" overloaded="no">
         <autodoc>GetKeyCode() -&gt; int</autodoc>
       </method>
-      <method name="SetKeyEvent" type="void" overloaded="no">
+      <method name="SetKeyEvent" type="" overloaded="no">
         <autodoc>SetKeyEvent(KeyEvent evt)</autodoc>
         <paramlist>
-          <param name="evt" type="r.q(const).wxKeyEvent" default=""/>
+          <param name="evt" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="GetLabel" type="q(const).wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">
         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">
         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>
-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>
         </paramlist>
       </method>
       <method name="IsEditCancelled" type="bool" overloaded="no">
         <autodoc>IsEditCancelled() -&gt; bool</autodoc>
       </method>
-      <method name="SetEditCanceled" type="void" overloaded="no">
+      <method name="SetEditCanceled" type="" overloaded="no">
         <autodoc>SetEditCanceled(bool editCancelled)</autodoc>
         <paramlist>
           <param name="editCancelled" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetToolTip" type="void" overloaded="no">
+      <method name="SetToolTip" type="" overloaded="no">
         <autodoc>SetToolTip(String toolTip)</autodoc>
         <paramlist>
-          <param name="toolTip" type="r.q(const).wxString" default=""/>
+          <param name="toolTip" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -16721,20 +16721,20 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TreeCtrl" oldname="wxPyTreeCtrl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="wxPyTreeCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeCtrlNameStr) -&gt; TreeCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTR_DEFAULT_STYLE"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTreeCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyTreeCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreTreeCtrl" overloaded="no">
@@ -16746,20 +16746,20 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
     Validator validator=DefaultValidator, 
     String name=TreeCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTR_DEFAULT_STYLE"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTreeCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyTreeCtrlNameStr"/>
         </paramlist>
       </method>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="size_t" overloaded="no">
@@ -16768,7 +16768,7 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
       <method name="GetIndent" type="unsigned int" overloaded="no">
         <autodoc>GetIndent() -&gt; unsigned int</autodoc>
       </method>
-      <method name="SetIndent" type="void" overloaded="no">
+      <method name="SetIndent" type="" overloaded="no">
         <autodoc>SetIndent(unsigned int indent)</autodoc>
         <paramlist>
           <param name="indent" type="unsigned int" default=""/>
@@ -16777,381 +16777,381 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
       <method name="GetSpacing" type="unsigned int" overloaded="no">
         <autodoc>GetSpacing() -&gt; unsigned int</autodoc>
       </method>
-      <method name="SetSpacing" type="void" overloaded="no">
+      <method name="SetSpacing" type="" overloaded="no">
         <autodoc>SetSpacing(unsigned int spacing)</autodoc>
         <paramlist>
           <param name="spacing" type="unsigned int" default=""/>
         </paramlist>
       </method>
-      <method name="GetImageList" type="wxImageList" overloaded="no">
+      <method name="GetImageList" type="ImageList" overloaded="no">
         <autodoc>GetImageList() -&gt; ImageList</autodoc>
       </method>
-      <method name="GetStateImageList" type="wxImageList" overloaded="no">
+      <method name="GetStateImageList" type="ImageList" overloaded="no">
         <autodoc>GetStateImageList() -&gt; ImageList</autodoc>
       </method>
-      <method name="SetImageList" type="void" overloaded="no">
+      <method name="SetImageList" type="" overloaded="no">
         <autodoc>SetImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="SetStateImageList" type="void" overloaded="no">
+      <method name="SetStateImageList" type="" overloaded="no">
         <autodoc>SetStateImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">
         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AssignStateImageList" type="void" overloaded="no">
+      <method name="AssignStateImageList" type="" overloaded="no">
         <autodoc>AssignStateImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemText" type="wxString" overloaded="no">
+      <method name="GetItemText" type="String" overloaded="no">
         <autodoc>GetItemText(TreeItemId item) -&gt; String</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetItemImage" type="int" overloaded="no">
         <autodoc>GetItemImage(TreeItemId item, int which=TreeItemIcon_Normal) -&gt; int</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="which" type="wxTreeItemIcon" default="wxTreeItemIcon_Normal"/>
         </paramlist>
       </method>
-      <method name="GetItemData" type="wxPyTreeItemData" overloaded="no">
+      <method name="GetItemData" type="TreeItemData" overloaded="no">
         <autodoc>GetItemData(TreeItemId item) -&gt; TreeItemData</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetItemPyData" type="PyObject" overloaded="no">
         <autodoc>GetItemPyData(TreeItemId item) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemTextColour" type="wxColour" overloaded="no">
+      <method name="GetItemTextColour" type="Colour" overloaded="no">
         <autodoc>GetItemTextColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetItemBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetItemBackgroundColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemFont" type="wxFont" overloaded="no">
+      <method name="GetItemFont" type="Font" overloaded="no">
         <autodoc>GetItemFont(TreeItemId item) -&gt; Font</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemText" type="void" overloaded="no">
+      <method name="SetItemText" type="" overloaded="no">
         <autodoc>SetItemText(TreeItemId item, String text)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemImage" type="void" overloaded="no">
+      <method name="SetItemImage" type="" overloaded="no">
         <autodoc>SetItemImage(TreeItemId item, int image, int which=TreeItemIcon_Normal)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="image" type="int" default=""/>
           <param name="which" type="wxTreeItemIcon" default="wxTreeItemIcon_Normal"/>
         </paramlist>
       </method>
-      <method name="SetItemData" type="void" overloaded="no">
+      <method name="SetItemData" type="" overloaded="no">
         <autodoc>SetItemData(TreeItemId item, TreeItemData data)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="data" type="p.wxPyTreeItemData" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="data" type="TreeItemData" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemPyData" type="void" overloaded="no">
+      <method name="SetItemPyData" type="" overloaded="no">
         <autodoc>SetItemPyData(TreeItemId item, PyObject obj)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="obj" type="p.PyObject" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="obj" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemHasChildren" type="void" overloaded="no">
+      <method name="SetItemHasChildren" type="" overloaded="no">
         <autodoc>SetItemHasChildren(TreeItemId item, bool has=True)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="has" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetItemBold" type="void" overloaded="no">
+      <method name="SetItemBold" type="" overloaded="no">
         <autodoc>SetItemBold(TreeItemId item, bool bold=True)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="bold" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetItemTextColour" type="void" overloaded="no">
+      <method name="SetItemTextColour" type="" overloaded="no">
         <autodoc>SetItemTextColour(TreeItemId item, Colour col)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemBackgroundColour" type="void" overloaded="no">
+      <method name="SetItemBackgroundColour" type="" overloaded="no">
         <autodoc>SetItemBackgroundColour(TreeItemId item, Colour col)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemFont" type="void" overloaded="no">
+      <method name="SetItemFont" type="" overloaded="no">
         <autodoc>SetItemFont(TreeItemId item, Font font)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="IsVisible" type="bool" overloaded="no">
         <autodoc>IsVisible(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="ItemHasChildren" type="bool" overloaded="no">
         <autodoc>ItemHasChildren(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsExpanded" type="bool" overloaded="no">
         <autodoc>IsExpanded(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsSelected" type="bool" overloaded="no">
         <autodoc>IsSelected(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsBold" type="bool" overloaded="no">
         <autodoc>IsBold(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetChildrenCount" type="size_t" overloaded="no">
         <autodoc>GetChildrenCount(TreeItemId item, bool recursively=True) -&gt; size_t</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="recursively" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="GetRootItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetRootItem" type="TreeItemId" overloaded="no">
         <autodoc>GetRootItem() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="GetSelection" type="wxTreeItemId" overloaded="no">
+      <method name="GetSelection" type="TreeItemId" overloaded="no">
         <autodoc>GetSelection() -&gt; TreeItemId</autodoc>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">
         <autodoc>GetSelections() -&gt; PyObject</autodoc>
       </method>
-      <method name="GetItemParent" type="wxTreeItemId" overloaded="no">
+      <method name="GetItemParent" type="TreeItemId" overloaded="no">
         <autodoc>GetItemParent(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstChild" type="PyObject" overloaded="no">
         <autodoc>GetFirstChild(TreeItemId item) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetNextChild" type="PyObject" overloaded="no">
         <autodoc>GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="cookie" type="r.wxTreeItemIdValue" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="cookie" type="wxTreeItemIdValue" default=""/>
         </paramlist>
       </method>
-      <method name="GetLastChild" type="wxTreeItemId" overloaded="no">
+      <method name="GetLastChild" type="TreeItemId" overloaded="no">
         <autodoc>GetLastChild(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetNextSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetNextSibling" type="TreeItemId" overloaded="no">
         <autodoc>GetNextSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrevSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevSibling" type="TreeItemId" overloaded="no">
         <autodoc>GetPrevSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetFirstVisibleItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetFirstVisibleItem" type="TreeItemId" overloaded="no">
         <autodoc>GetFirstVisibleItem() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="GetNextVisible" type="wxTreeItemId" overloaded="no">
+      <method name="GetNextVisible" type="TreeItemId" overloaded="no">
         <autodoc>GetNextVisible(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrevVisible" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevVisible" type="TreeItemId" overloaded="no">
         <autodoc>GetPrevVisible(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="AddRoot" type="wxTreeItemId" overloaded="no">
+      <method name="AddRoot" type="TreeItemId" overloaded="no">
         <autodoc>AddRoot(String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="PrependItem" type="wxTreeItemId" overloaded="no">
+      <method name="PrependItem" type="TreeItemId" overloaded="no">
         <autodoc>PrependItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 
     TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="InsertItem" type="wxTreeItemId" overloaded="no">
+      <method name="InsertItem" type="TreeItemId" overloaded="no">
         <autodoc>InsertItem(TreeItemId parent, TreeItemId idPrevious, String text, 
     int image=-1, int selectedImage=-1, TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="idPrevious" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
+          <param name="idPrevious" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="InsertItemBefore" type="wxTreeItemId" overloaded="no">
+      <method name="InsertItemBefore" type="TreeItemId" overloaded="no">
         <autodoc>InsertItemBefore(TreeItemId parent, size_t index, String text, int image=-1, 
     int selectedImage=-1, TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
           <param name="index" type="size_t" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="AppendItem" type="wxTreeItemId" overloaded="no">
+      <method name="AppendItem" type="TreeItemId" overloaded="no">
         <autodoc>AppendItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 
     TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Delete" type="void" overloaded="no">
+      <method name="Delete" type="" overloaded="no">
         <autodoc>Delete(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteChildren" type="void" overloaded="no">
+      <method name="DeleteChildren" type="" overloaded="no">
         <autodoc>DeleteChildren(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteAllItems" type="void" overloaded="no">
+      <method name="DeleteAllItems" type="" overloaded="no">
         <autodoc>DeleteAllItems()</autodoc>
       </method>
-      <method name="Expand" type="void" overloaded="no">
+      <method name="Expand" type="" overloaded="no">
         <autodoc>Expand(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Collapse" type="void" overloaded="no">
+      <method name="Collapse" type="" overloaded="no">
         <autodoc>Collapse(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="CollapseAndReset" type="void" overloaded="no">
+      <method name="CollapseAndReset" type="" overloaded="no">
         <autodoc>CollapseAndReset(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">
         <autodoc>Toggle(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Unselect" type="void" overloaded="no">
+      <method name="Unselect" type="" overloaded="no">
         <autodoc>Unselect()</autodoc>
       </method>
-      <method name="UnselectAll" type="void" overloaded="no">
+      <method name="UnselectAll" type="" overloaded="no">
         <autodoc>UnselectAll()</autodoc>
       </method>
-      <method name="SelectItem" type="void" overloaded="no">
+      <method name="SelectItem" type="" overloaded="no">
         <autodoc>SelectItem(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="EnsureVisible" type="void" overloaded="no">
+      <method name="EnsureVisible" type="" overloaded="no">
         <autodoc>EnsureVisible(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="ScrollTo" type="void" overloaded="no">
+      <method name="ScrollTo" type="" overloaded="no">
         <autodoc>ScrollTo(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="EditLabel" type="void" overloaded="no">
+      <method name="EditLabel" type="" overloaded="no">
         <autodoc>EditLabel(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetEditControl" type="wxTextCtrl" overloaded="no">
+      <method name="GetEditControl" type="TextCtrl" overloaded="no">
         <autodoc>GetEditControl() -&gt; TextCtrl</autodoc>
       </method>
-      <method name="SortChildren" type="void" overloaded="no">
+      <method name="SortChildren" type="" overloaded="no">
         <autodoc>SortChildren(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="HitTest" type="wxTreeItemId" overloaded="no">
+      <method name="HitTest" type="TreeItemId" overloaded="no">
         <autodoc>HitTest(Point point) -&gt; (item, where)</autodoc>
         <docstring>Determine which item (if any) belongs the given point.  The
 coordinates specified are relative to the client area of tree ctrl
@@ -17159,14 +17159,14 @@ and the where return value is set to a bitmask of wxTREE_HITTEST_xxx
 constants.
 </docstring>
         <paramlist>
-          <param name="point" type="r.q(const).wxPoint" default=""/>
-          <param name="OUTPUT" type="r.int" default=""/>
+          <param name="point" type="Point" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetBoundingRect" type="PyObject" overloaded="no">
         <autodoc>GetBoundingRect(TreeItemId item, bool textOnly=False) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="textOnly" type="bool" default="False"/>
         </paramlist>
       </method>
@@ -17175,7 +17175,7 @@ constants.
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="GenericDirCtrl" oldname="wxGenericDirCtrl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="GenericDirCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, String dir=DirDialogDefaultFolderStr, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
@@ -17183,15 +17183,15 @@ constants.
     String filter=EmptyString, 
     int defaultFilter=0, String name=TreeCtrlNameStr) -&gt; GenericDirCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="dir" type="r.q(const).wxString" default="wxPyDirDialogDefaultFolderStr"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="dir" type="String" default="wxPyDirDialogDefaultFolderStr"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER"/>
-          <param name="filter" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filter" type="String" default="wxPyEmptyString"/>
           <param name="defaultFilter" type="int" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTreeCtrlNameStr"/>
+          <param name="name" type="String" default="wxPyTreeCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreGenericDirCtrl" overloaded="no">
@@ -17204,45 +17204,45 @@ constants.
     String filter=EmptyString, 
     int defaultFilter=0, String name=TreeCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="dir" type="r.q(const).wxString" default="wxPyDirDialogDefaultFolderStr"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="dir" type="String" default="wxPyDirDialogDefaultFolderStr"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER"/>
-          <param name="filter" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filter" type="String" default="wxPyEmptyString"/>
           <param name="defaultFilter" type="int" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTreeCtrlNameStr"/>
+          <param name="name" type="String" default="wxPyTreeCtrlNameStr"/>
         </paramlist>
       </method>
       <method name="ExpandPath" type="bool" overloaded="no">
         <autodoc>ExpandPath(String path) -&gt; bool</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultPath" type="wxString" overloaded="no">
+      <method name="GetDefaultPath" type="String" overloaded="no">
         <autodoc>GetDefaultPath() -&gt; String</autodoc>
       </method>
-      <method name="SetDefaultPath" type="void" overloaded="no">
+      <method name="SetDefaultPath" type="" overloaded="no">
         <autodoc>SetDefaultPath(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
-      <method name="GetFilePath" type="wxString" overloaded="no">
+      <method name="GetFilePath" type="String" overloaded="no">
         <autodoc>GetFilePath() -&gt; String</autodoc>
       </method>
-      <method name="SetPath" type="void" overloaded="no">
+      <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="ShowHidden" type="void" overloaded="no">
+      <method name="ShowHidden" type="" overloaded="no">
         <autodoc>ShowHidden(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -17251,62 +17251,62 @@ constants.
       <method name="GetShowHidden" type="bool" overloaded="no">
         <autodoc>GetShowHidden() -&gt; bool</autodoc>
       </method>
-      <method name="GetFilter" type="wxString" overloaded="no">
+      <method name="GetFilter" type="String" overloaded="no">
         <autodoc>GetFilter() -&gt; String</autodoc>
       </method>
-      <method name="SetFilter" type="void" overloaded="no">
+      <method name="SetFilter" type="" overloaded="no">
         <autodoc>SetFilter(String filter)</autodoc>
         <paramlist>
-          <param name="filter" type="r.q(const).wxString" default=""/>
+          <param name="filter" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetFilterIndex" type="int" overloaded="no">
         <autodoc>GetFilterIndex() -&gt; int</autodoc>
       </method>
-      <method name="SetFilterIndex" type="void" overloaded="no">
+      <method name="SetFilterIndex" type="" overloaded="no">
         <autodoc>SetFilterIndex(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetRootId" type="wxTreeItemId" overloaded="no">
+      <method name="GetRootId" type="TreeItemId" overloaded="no">
         <autodoc>GetRootId() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="GetTreeCtrl" type="wxPyTreeCtrl" overloaded="no">
+      <method name="GetTreeCtrl" type="TreeCtrl" overloaded="no">
         <autodoc>GetTreeCtrl() -&gt; TreeCtrl</autodoc>
       </method>
       <method name="GetFilterListCtrl" type="wxDirFilterListCtrl" overloaded="no">
         <autodoc>GetFilterListCtrl() -&gt; DirFilterListCtrl</autodoc>
       </method>
-      <method name="FindChild" type="wxTreeItemId" overloaded="no">
+      <method name="FindChild" type="TreeItemId" overloaded="no">
         <autodoc>FindChild(wxTreeItemId parentId, wxString path) -&gt; (item, done)</autodoc>
         <docstring>Find the child that matches the first part of 'path'.  E.g. if a child path is
 "/usr" and 'path' is "/usr/include" then the child for /usr is returned.
 If the path string has been used (we're at the leaf), done is set to True
 </docstring>
         <paramlist>
-          <param name="parentId" type="wxTreeItemId" default=""/>
-          <param name="path" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="r.bool" default=""/>
+          <param name="parentId" type="TreeItemId" default=""/>
+          <param name="path" type="String" default=""/>
+          <param name="OUTPUT" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="DoResize" type="void" overloaded="no">
+      <method name="DoResize" type="" overloaded="no">
         <autodoc>DoResize()</autodoc>
       </method>
-      <method name="ReCreateTree" type="void" overloaded="no">
+      <method name="ReCreateTree" type="" overloaded="no">
         <autodoc>ReCreateTree()</autodoc>
       </method>
     </class>
     <class name="DirFilterListCtrl" oldname="wxDirFilterListCtrl" module="controls">
-      <baseclass name="wxChoice"/>
+      <baseclass name="Choice"/>
       <constructor name="DirFilterListCtrl" overloaded="no">
         <autodoc>__init__(GenericDirCtrl parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0) -&gt; DirFilterListCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxGenericDirCtrl" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="GenericDirCtrl" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
@@ -17317,17 +17317,17 @@ If the path string has been used (we're at the leaf), done is set to True
         <autodoc>Create(GenericDirCtrl parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxGenericDirCtrl" default=""/>
-          <param name="id" type="q(const).int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="GenericDirCtrl" default=""/>
+          <param name="id" type="int" default="-1"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </method>
-      <method name="FillFilterList" type="void" overloaded="no">
+      <method name="FillFilterList" type="" overloaded="no">
         <autodoc>FillFilterList(String filter, int defaultFilter)</autodoc>
         <paramlist>
-          <param name="filter" type="r.q(const).wxString" default=""/>
+          <param name="filter" type="String" default=""/>
           <param name="defaultFilter" type="int" default=""/>
         </paramlist>
       </method>
@@ -17336,29 +17336,29 @@ If the path string has been used (we're at the leaf), done is set to True
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyControl" oldname="wxPyControl" module="controls">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="PyControl" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; PyControl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="id" type="q(const).int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="id" type="int" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyControlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyControlNameStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoMoveWindow" type="void" overloaded="no">
+      <method name="base_DoMoveWindow" type="" overloaded="no">
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -17367,7 +17367,7 @@ If the path string has been used (we're at the leaf), done is set to True
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetSize" type="void" overloaded="no">
+      <method name="base_DoSetSize" type="" overloaded="no">
         <autodoc>base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -17377,48 +17377,48 @@ If the path string has been used (we're at the leaf), done is set to True
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
-      <method name="base_DoSetClientSize" type="void" overloaded="no">
+      <method name="base_DoSetClientSize" type="" overloaded="no">
         <autodoc>base_DoSetClientSize(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetVirtualSize" type="void" overloaded="no">
+      <method name="base_DoSetVirtualSize" type="" overloaded="no">
         <autodoc>base_DoSetVirtualSize(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetSize" type="void" overloaded="no">
+      <method name="base_DoGetSize" type="" overloaded="no">
         <autodoc>base_DoGetSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetClientSize" type="void" overloaded="no">
+      <method name="base_DoGetClientSize" type="" overloaded="no">
         <autodoc>base_DoGetClientSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetPosition" type="void" overloaded="no">
+      <method name="base_DoGetPosition" type="" overloaded="no">
         <autodoc>base_DoGetPosition() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetVirtualSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetVirtualSize" type="Size" overloaded="no">
         <autodoc>base_DoGetVirtualSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_DoGetBestSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetBestSize" type="Size" overloaded="no">
         <autodoc>base_DoGetBestSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_InitDialog" type="void" overloaded="no">
+      <method name="base_InitDialog" type="" overloaded="no">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">
@@ -17436,19 +17436,19 @@ If the path string has been used (we're at the leaf), done is set to True
       <method name="base_AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>base_AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
-      <method name="base_GetMaxSize" type="wxSize" overloaded="no">
+      <method name="base_GetMaxSize" type="Size" overloaded="no">
         <autodoc>base_GetMaxSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_AddChild" type="void" overloaded="no">
+      <method name="base_AddChild" type="" overloaded="no">
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">
         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
     </class>
@@ -17462,49 +17462,49 @@ EVT_DETAILED_HELP = wx.PyEventBinder( wxEVT_DETAILED_HELP, 1)
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 </pythoncode>
     <class name="HelpEvent" oldname="wxHelpEvent" module="controls">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="HelpEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -&gt; HelpEvent</autodoc>
         <paramlist>
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
           <param name="winid" type="int" default="0"/>
-          <param name="pt" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pt" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </constructor>
-      <method name="GetPosition" type="q(const).wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="GetLink" type="q(const).wxString" overloaded="no">
+      <method name="GetLink" type="String" overloaded="no">
         <autodoc>GetLink() -&gt; String</autodoc>
       </method>
-      <method name="SetLink" type="void" overloaded="no">
+      <method name="SetLink" type="" overloaded="no">
         <autodoc>SetLink(String link)</autodoc>
         <paramlist>
-          <param name="link" type="r.q(const).wxString" default=""/>
+          <param name="link" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetTarget" type="q(const).wxString" overloaded="no">
+      <method name="GetTarget" type="String" overloaded="no">
         <autodoc>GetTarget() -&gt; String</autodoc>
       </method>
-      <method name="SetTarget" type="void" overloaded="no">
+      <method name="SetTarget" type="" overloaded="no">
         <autodoc>SetTarget(String target)</autodoc>
         <paramlist>
-          <param name="target" type="r.q(const).wxString" default=""/>
+          <param name="target" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ContextHelp" oldname="wxContextHelp" module="controls">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ContextHelp" overloaded="no">
         <autodoc>__init__(Window window=None, bool doNow=True) -&gt; ContextHelp</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default="NULL"/>
+          <param name="window" type="Window" default="NULL"/>
           <param name="doNow" type="bool" default="True"/>
         </paramlist>
       </constructor>
@@ -17514,7 +17514,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <method name="BeginContextHelp" type="bool" overloaded="no">
         <autodoc>BeginContextHelp(Window window=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default="NULL"/>
+          <param name="window" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <method name="EndContextHelp" type="bool" overloaded="no">
@@ -17522,61 +17522,61 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </method>
     </class>
     <class name="ContextHelpButton" oldname="wxContextHelpButton" module="controls">
-      <baseclass name="wxBitmapButton"/>
+      <baseclass name="BitmapButton"/>
       <constructor name="ContextHelpButton" overloaded="no">
         <autodoc>__init__(Window parent, int id=ID_CONTEXT_HELP, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW) -&gt; ContextHelpButton</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="wxID_CONTEXT_HELP"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxBU_AUTODRAW"/>
         </paramlist>
       </constructor>
     </class>
     <class name="HelpProvider" oldname="wxHelpProvider" module="controls">
-      <staticmethod name="Set" type="wxHelpProvider" overloaded="no">
+      <staticmethod name="Set" type="HelpProvider" overloaded="no">
         <autodoc>HelpProvider.Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
         <paramlist>
-          <param name="helpProvider" type="p.wxHelpProvider" default=""/>
+          <param name="helpProvider" type="HelpProvider" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Get" type="wxHelpProvider" overloaded="no">
+      <staticmethod name="Get" type="HelpProvider" overloaded="no">
         <autodoc>HelpProvider.Get() -&gt; HelpProvider</autodoc>
       </staticmethod>
-      <method name="GetHelp" type="wxString" overloaded="no">
+      <method name="GetHelp" type="String" overloaded="no">
         <autodoc>GetHelp(Window window) -&gt; String</autodoc>
         <paramlist>
-          <param name="window" type="p.q(const).wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="ShowHelp" type="bool" overloaded="no">
         <autodoc>ShowHelp(Window window) -&gt; bool</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="AddHelp" type="void" overloaded="no">
+      <method name="AddHelp" type="" overloaded="no">
         <autodoc>AddHelp(Window window, String text)</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="window" type="Window" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AddHelpById" type="void" overloaded="no">
+      <method name="AddHelpById" type="" overloaded="no">
         <autodoc>AddHelpById(int id, String text)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
     <class name="SimpleHelpProvider" oldname="wxSimpleHelpProvider" module="controls">
-      <baseclass name="wxHelpProvider"/>
+      <baseclass name="HelpProvider"/>
       <constructor name="SimpleHelpProvider" overloaded="no">
         <autodoc>__init__() -&gt; SimpleHelpProvider</autodoc>
       </constructor>
@@ -17585,67 +17585,67 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DragImage" oldname="wxGenericDragImage" module="controls">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="wxGenericDragImage" overloaded="no">
         <autodoc>__init__(Bitmap image, Cursor cursor=wxNullCursor) -&gt; DragImage</autodoc>
         <paramlist>
-          <param name="image" type="r.q(const).wxBitmap" default=""/>
-          <param name="cursor" type="r.q(const).wxCursor" default="wxNullCursor"/>
+          <param name="image" type="Bitmap" default=""/>
+          <param name="cursor" type="Cursor" default="wxNullCursor"/>
         </paramlist>
       </constructor>
       <constructor name="DragIcon" overloaded="no">
         <autodoc>DragIcon(Icon image, Cursor cursor=wxNullCursor) -&gt; DragImage</autodoc>
         <paramlist>
-          <param name="image" type="r.q(const).wxIcon" default=""/>
-          <param name="cursor" type="r.q(const).wxCursor" default="wxNullCursor"/>
+          <param name="image" type="Icon" default=""/>
+          <param name="cursor" type="Cursor" default="wxNullCursor"/>
         </paramlist>
       </constructor>
       <constructor name="DragString" overloaded="no">
         <autodoc>DragString(String str, Cursor cursor=wxNullCursor) -&gt; DragImage</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
-          <param name="cursor" type="r.q(const).wxCursor" default="wxNullCursor"/>
+          <param name="str" type="String" default=""/>
+          <param name="cursor" type="Cursor" default="wxNullCursor"/>
         </paramlist>
       </constructor>
       <constructor name="DragTreeItem" overloaded="no">
         <autodoc>DragTreeItem(TreeCtrl treeCtrl, TreeItemId id) -&gt; DragImage</autodoc>
         <paramlist>
-          <param name="treeCtrl" type="r.q(const).wxPyTreeCtrl" default=""/>
-          <param name="id" type="r.wxTreeItemId" default=""/>
+          <param name="treeCtrl" type="TreeCtrl" default=""/>
+          <param name="id" type="TreeItemId" default=""/>
         </paramlist>
       </constructor>
       <constructor name="DragListItem" overloaded="no">
         <autodoc>DragListItem(ListCtrl listCtrl, long id) -&gt; DragImage</autodoc>
         <paramlist>
-          <param name="listCtrl" type="r.q(const).wxPyListCtrl" default=""/>
+          <param name="listCtrl" type="ListCtrl" default=""/>
           <param name="id" type="long" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxGenericDragImage" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetBackingBitmap" type="void" overloaded="no">
+      <method name="SetBackingBitmap" type="" overloaded="no">
         <autodoc>SetBackingBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="p.wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
       <method name="BeginDrag" type="bool" overloaded="no">
         <autodoc>BeginDrag(Point hotspot, Window window, bool fullScreen=False, 
     Rect rect=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="hotspot" type="r.q(const).wxPoint" default=""/>
-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="hotspot" type="Point" default=""/>
+          <param name="window" type="Window" default=""/>
           <param name="fullScreen" type="bool" default="False"/>
-          <param name="rect" type="p.wxRect" default="NULL"/>
+          <param name="rect" type="Rect" default="NULL"/>
         </paramlist>
       </method>
       <method name="BeginDragBounded" type="bool" overloaded="no">
         <autodoc>BeginDragBounded(Point hotspot, Window window, Window boundingWindow) -&gt; bool</autodoc>
         <paramlist>
-          <param name="hotspot" type="r.q(const).wxPoint" default=""/>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="boundingWindow" type="p.wxWindow" default=""/>
+          <param name="hotspot" type="Point" default=""/>
+          <param name="window" type="Window" default=""/>
+          <param name="boundingWindow" type="Window" default=""/>
         </paramlist>
       </method>
       <method name="EndDrag" type="bool" overloaded="no">
@@ -17654,7 +17654,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <method name="Move" type="bool" overloaded="no">
         <autodoc>Move(Point pt) -&gt; bool</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="Show" type="bool" overloaded="no">
@@ -17663,33 +17663,33 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <method name="Hide" type="bool" overloaded="no">
         <autodoc>Hide() -&gt; bool</autodoc>
       </method>
-      <method name="GetImageRect" type="wxRect" overloaded="no">
+      <method name="GetImageRect" type="Rect" overloaded="no">
         <autodoc>GetImageRect(Point pos) -&gt; Rect</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="DoDrawImage" type="bool" overloaded="no">
         <autodoc>DoDrawImage(DC dc, Point pos) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="UpdateBackingFromWindow" type="bool" overloaded="no">
         <autodoc>UpdateBackingFromWindow(DC windowDC, MemoryDC destDC, Rect sourceRect, Rect destRect) -&gt; bool</autodoc>
         <paramlist>
-          <param name="windowDC" type="r.wxDC" default=""/>
-          <param name="destDC" type="r.wxMemoryDC" default=""/>
-          <param name="sourceRect" type="r.q(const).wxRect" default=""/>
-          <param name="destRect" type="r.q(const).wxRect" default=""/>
+          <param name="windowDC" type="DC" default=""/>
+          <param name="destDC" type="MemoryDC" default=""/>
+          <param name="sourceRect" type="Rect" default=""/>
+          <param name="destRect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="RedrawImage" type="bool" overloaded="no">
         <autodoc>RedrawImage(Point oldPos, Point newPos, bool eraseOld, bool drawNew) -&gt; bool</autodoc>
         <paramlist>
-          <param name="oldPos" type="r.q(const).wxPoint" default=""/>
-          <param name="newPos" type="r.q(const).wxPoint" default=""/>
+          <param name="oldPos" type="Point" default=""/>
+          <param name="newPos" type="Point" default=""/>
           <param name="eraseOld" type="bool" default=""/>
           <param name="drawNew" type="bool" default=""/>
         </paramlist>
@@ -17703,13 +17703,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SystemSettings" oldname="wxSystemSettings" module="misc">
-      <staticmethod name="GetColour" type="wxColour" overloaded="no">
+      <staticmethod name="GetColour" type="Colour" overloaded="no">
         <autodoc>SystemSettings.GetColour(int index) -&gt; Colour</autodoc>
         <paramlist>
           <param name="index" type="wxSystemColour" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetFont" type="wxFont" overloaded="no">
+      <staticmethod name="GetFont" type="Font" overloaded="no">
         <autodoc>SystemSettings.GetFont(int index) -&gt; Font</autodoc>
         <paramlist>
           <param name="index" type="wxSystemFont" default=""/>
@@ -17730,7 +17730,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <staticmethod name="GetScreenType" type="wxSystemScreenType" overloaded="no">
         <autodoc>SystemSettings.GetScreenType() -&gt; int</autodoc>
       </staticmethod>
-      <staticmethod name="SetScreenType" type="void" overloaded="no">
+      <staticmethod name="SetScreenType" type="" overloaded="no">
         <autodoc>SystemSettings.SetScreenType(int screen)</autodoc>
         <paramlist>
           <param name="screen" type="wxSystemScreenType" default=""/>
@@ -17738,40 +17738,40 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </staticmethod>
     </class>
     <class name="SystemOptions" oldname="wxSystemOptions" module="misc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="SystemOptions" overloaded="no">
         <autodoc>__init__() -&gt; SystemOptions</autodoc>
       </constructor>
-      <staticmethod name="SetOption" type="void" overloaded="no">
+      <staticmethod name="SetOption" type="" overloaded="no">
         <autodoc>SystemOptions.SetOption(String name, String value)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetOptionInt" type="void" overloaded="no">
+      <staticmethod name="SetOptionInt" type="" overloaded="no">
         <autodoc>SystemOptions.SetOptionInt(String name, int value)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="value" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetOption" type="wxString" overloaded="no">
+      <staticmethod name="GetOption" type="String" overloaded="no">
         <autodoc>SystemOptions.GetOption(String name) -&gt; String</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetOptionInt" type="int" overloaded="no">
         <autodoc>SystemOptions.GetOptionInt(String name) -&gt; int</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasOption" type="bool" overloaded="no">
         <autodoc>SystemOptions.HasOption(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </staticmethod>
     </class>
@@ -17781,7 +17781,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     <method name="NewId" oldname="wxNewId" type="long" overloaded="no">
       <autodoc>NewId() -&gt; long</autodoc>
     </method>
-    <method name="RegisterId" oldname="wxRegisterId" type="void" overloaded="no">
+    <method name="RegisterId" oldname="wxRegisterId" type="" overloaded="no">
       <autodoc>RegisterId(long id)</autodoc>
       <paramlist>
         <param name="id" type="long" default=""/>
@@ -17790,10 +17790,10 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     <method name="GetCurrentId" oldname="wxGetCurrentId" type="long" overloaded="no">
       <autodoc>GetCurrentId() -&gt; long</autodoc>
     </method>
-    <method name="Bell" oldname="wxBell" type="void" overloaded="no">
+    <method name="Bell" oldname="wxBell" type="" overloaded="no">
       <autodoc>Bell()</autodoc>
     </method>
-    <method name="EndBusyCursor" oldname="wxEndBusyCursor" type="void" overloaded="no">
+    <method name="EndBusyCursor" oldname="wxEndBusyCursor" type="" overloaded="no">
       <autodoc>EndBusyCursor()</autodoc>
     </method>
     <method name="GetElapsedTime" oldname="wxGetElapsedTime" type="long" overloaded="no">
@@ -17802,36 +17802,36 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <param name="resetTimer" type="bool" default="True"/>
       </paramlist>
     </method>
-    <method name="GetMousePosition" oldname="wxGetMousePosition" type="void" overloaded="no">
+    <method name="GetMousePosition" oldname="wxGetMousePosition" type="" overloaded="no">
       <autodoc>GetMousePosition() -&gt; (x,y)</autodoc>
       <paramlist>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
       </paramlist>
     </method>
     <method name="IsBusy" oldname="wxIsBusy" type="bool" overloaded="no">
       <autodoc>IsBusy() -&gt; bool</autodoc>
     </method>
-    <method name="Now" oldname="wxNow" type="wxString" overloaded="no">
+    <method name="Now" oldname="wxNow" type="String" overloaded="no">
       <autodoc>Now() -&gt; String</autodoc>
     </method>
     <method name="Shell" oldname="wxShell" type="bool" overloaded="no">
       <autodoc>Shell(String command=EmptyString) -&gt; bool</autodoc>
       <paramlist>
-        <param name="command" type="r.q(const).wxString" default="wxPyEmptyString"/>
+        <param name="command" type="String" default="wxPyEmptyString"/>
       </paramlist>
     </method>
-    <method name="StartTimer" oldname="wxStartTimer" type="void" overloaded="no">
+    <method name="StartTimer" oldname="wxStartTimer" type="" overloaded="no">
       <autodoc>StartTimer()</autodoc>
     </method>
     <method name="GetOsVersion" oldname="wxGetOsVersion" type="int" overloaded="no">
       <autodoc>GetOsVersion() -&gt; (platform, major, minor)</autodoc>
       <paramlist>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
       </paramlist>
     </method>
-    <method name="GetOsDescription" oldname="wxGetOsDescription" type="wxString" overloaded="no">
+    <method name="GetOsDescription" oldname="wxGetOsDescription" type="String" overloaded="no">
       <autodoc>GetOsDescription() -&gt; String</autodoc>
     </method>
     <method name="GetFreeMemory" oldname="wxGetFreeMemory" type="long" overloaded="no">
@@ -17843,61 +17843,61 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <param name="wFlags" type="wxShutdownFlags" default=""/>
       </paramlist>
     </method>
-    <method name="Sleep" oldname="wxSleep" type="void" overloaded="no">
+    <method name="Sleep" oldname="wxSleep" type="" overloaded="no">
       <autodoc>Sleep(int secs)</autodoc>
       <paramlist>
         <param name="secs" type="int" default=""/>
       </paramlist>
     </method>
-    <method name="Usleep" oldname="wxUsleep" type="void" overloaded="no">
+    <method name="Usleep" oldname="wxUsleep" type="" overloaded="no">
       <autodoc>Usleep(unsigned long milliseconds)</autodoc>
       <paramlist>
         <param name="milliseconds" type="unsigned long" default=""/>
       </paramlist>
     </method>
-    <method name="EnableTopLevelWindows" oldname="wxEnableTopLevelWindows" type="void" overloaded="no">
+    <method name="EnableTopLevelWindows" oldname="wxEnableTopLevelWindows" type="" overloaded="no">
       <autodoc>EnableTopLevelWindows(bool enable)</autodoc>
       <paramlist>
         <param name="enable" type="bool" default=""/>
       </paramlist>
     </method>
-    <method name="StripMenuCodes" oldname="wxStripMenuCodes" type="wxString" overloaded="no">
+    <method name="StripMenuCodes" oldname="wxStripMenuCodes" type="String" overloaded="no">
       <autodoc>StripMenuCodes(String in) -&gt; String</autodoc>
       <paramlist>
-        <param name="in" type="r.q(const).wxString" default=""/>
+        <param name="in" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="GetEmailAddress" oldname="wxGetEmailAddress" type="wxString" overloaded="no">
+    <method name="GetEmailAddress" oldname="wxGetEmailAddress" type="String" overloaded="no">
       <autodoc>GetEmailAddress() -&gt; String</autodoc>
     </method>
-    <method name="GetHostName" oldname="wxGetHostName" type="wxString" overloaded="no">
+    <method name="GetHostName" oldname="wxGetHostName" type="String" overloaded="no">
       <autodoc>GetHostName() -&gt; String</autodoc>
     </method>
-    <method name="GetFullHostName" oldname="wxGetFullHostName" type="wxString" overloaded="no">
+    <method name="GetFullHostName" oldname="wxGetFullHostName" type="String" overloaded="no">
       <autodoc>GetFullHostName() -&gt; String</autodoc>
     </method>
-    <method name="GetUserId" oldname="wxGetUserId" type="wxString" overloaded="no">
+    <method name="GetUserId" oldname="wxGetUserId" type="String" overloaded="no">
       <autodoc>GetUserId() -&gt; String</autodoc>
     </method>
-    <method name="GetUserName" oldname="wxGetUserName" type="wxString" overloaded="no">
+    <method name="GetUserName" oldname="wxGetUserName" type="String" overloaded="no">
       <autodoc>GetUserName() -&gt; String</autodoc>
     </method>
-    <method name="GetHomeDir" oldname="wxGetHomeDir" type="wxString" overloaded="no">
+    <method name="GetHomeDir" oldname="wxGetHomeDir" type="String" overloaded="no">
       <autodoc>GetHomeDir() -&gt; String</autodoc>
     </method>
-    <method name="GetUserHome" oldname="wxGetUserHome" type="wxString" overloaded="no">
+    <method name="GetUserHome" oldname="wxGetUserHome" type="String" overloaded="no">
       <autodoc>GetUserHome(String user=EmptyString) -&gt; String</autodoc>
       <paramlist>
-        <param name="user" type="r.q(const).wxString" default="wxPyEmptyString"/>
+        <param name="user" type="String" default="wxPyEmptyString"/>
       </paramlist>
     </method>
     <method name="GetProcessId" oldname="wxGetProcessId" type="unsigned long" overloaded="no">
       <autodoc>GetProcessId() -&gt; unsigned long</autodoc>
     </method>
-    <method name="Trap" oldname="wxTrap" type="void" overloaded="no">
+    <method name="Trap" oldname="wxTrap" type="" overloaded="no">
       <autodoc>Trap()</autodoc>
     </method>
-    <method name="FileSelector" oldname="wxFileSelector" type="wxString" overloaded="no">
+    <method name="FileSelector" oldname="wxFileSelector" type="String" overloaded="no">
       <autodoc>FileSelector(String message=FileSelectorPromptStr, String default_path=EmptyString, 
     String default_filename=EmptyString, 
     String default_extension=EmptyString, 
@@ -17905,83 +17905,83 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     int flags=0, Window parent=None, int x=-1, 
     int y=-1) -&gt; String</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default="wxPyFileSelectorPromptStr"/>
-        <param name="default_path" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="default_filename" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="default_extension" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="wildcard" type="r.q(const).wxString" default="wxPyFileSelectorDefaultWildcardStr"/>
+        <param name="message" type="String" default="wxPyFileSelectorPromptStr"/>
+        <param name="default_path" type="String" default="wxPyEmptyString"/>
+        <param name="default_filename" type="String" default="wxPyEmptyString"/>
+        <param name="default_extension" type="String" default="wxPyEmptyString"/>
+        <param name="wildcard" type="String" default="wxPyFileSelectorDefaultWildcardStr"/>
         <param name="flags" type="int" default="0"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="parent" type="Window" default="NULL"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
       </paramlist>
     </method>
-    <method name="LoadFileSelector" oldname="wxLoadFileSelector" type="wxString" overloaded="no">
+    <method name="LoadFileSelector" oldname="wxLoadFileSelector" type="String" overloaded="no">
       <autodoc>LoadFileSelector(String what, String extension, String default_name=EmptyString, 
     Window parent=None) -&gt; String</autodoc>
       <paramlist>
-        <param name="what" type="r.q(const).wxString" default=""/>
-        <param name="extension" type="r.q(const).wxString" default=""/>
-        <param name="default_name" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="what" type="String" default=""/>
+        <param name="extension" type="String" default=""/>
+        <param name="default_name" type="String" default="wxPyEmptyString"/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="SaveFileSelector" oldname="wxSaveFileSelector" type="wxString" overloaded="no">
+    <method name="SaveFileSelector" oldname="wxSaveFileSelector" type="String" overloaded="no">
       <autodoc>SaveFileSelector(String what, String extension, String default_name=EmptyString, 
     Window parent=None) -&gt; String</autodoc>
       <paramlist>
-        <param name="what" type="r.q(const).wxString" default=""/>
-        <param name="extension" type="r.q(const).wxString" default=""/>
-        <param name="default_name" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="what" type="String" default=""/>
+        <param name="extension" type="String" default=""/>
+        <param name="default_name" type="String" default="wxPyEmptyString"/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="DirSelector" oldname="wxDirSelector" type="wxString" overloaded="no">
+    <method name="DirSelector" oldname="wxDirSelector" type="String" overloaded="no">
       <autodoc>DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 
     long style=DD_DEFAULT_STYLE, 
     Point pos=DefaultPosition, Window parent=None) -&gt; String</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default="wxPyDirSelectorPromptStr"/>
-        <param name="defaultPath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+        <param name="message" type="String" default="wxPyDirSelectorPromptStr"/>
+        <param name="defaultPath" type="String" default="wxPyEmptyString"/>
         <param name="style" type="long" default="wxDD_DEFAULT_STYLE"/>
-        <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="pos" type="Point" default="wxDefaultPosition"/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="GetTextFromUser" oldname="wxGetTextFromUser" type="wxString" overloaded="no">
+    <method name="GetTextFromUser" oldname="wxGetTextFromUser" type="String" overloaded="no">
       <autodoc>GetTextFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
     Window parent=None, 
     int x=-1, int y=-1, bool centre=True) -&gt; String</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default=""/>
-        <param name="caption" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="default_value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="message" type="String" default=""/>
+        <param name="caption" type="String" default="wxPyEmptyString"/>
+        <param name="default_value" type="String" default="wxPyEmptyString"/>
+        <param name="parent" type="Window" default="NULL"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
         <param name="centre" type="bool" default="True"/>
       </paramlist>
     </method>
-    <method name="GetPasswordFromUser" oldname="wxGetPasswordFromUser" type="wxString" overloaded="no">
+    <method name="GetPasswordFromUser" oldname="wxGetPasswordFromUser" type="String" overloaded="no">
       <autodoc>GetPasswordFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
     Window parent=None) -&gt; String</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default=""/>
-        <param name="caption" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="default_value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="message" type="String" default=""/>
+        <param name="caption" type="String" default="wxPyEmptyString"/>
+        <param name="default_value" type="String" default="wxPyEmptyString"/>
+        <param name="parent" type="Window" default="NULL"/>
       </paramlist>
     </method>
-    <method name="GetSingleChoice" oldname="wxGetSingleChoice" type="wxString" overloaded="no">
+    <method name="GetSingleChoice" oldname="wxGetSingleChoice" type="String" overloaded="no">
       <autodoc>GetSingleChoice(String message, String caption, int choices, String choices_array, 
     Window parent=None, int x=-1, 
     int y=-1, bool centre=True, int width=150, int height=200) -&gt; String</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default=""/>
-        <param name="caption" type="r.q(const).wxString" default=""/>
+        <param name="message" type="String" default=""/>
+        <param name="caption" type="String" default=""/>
         <param name="choices" type="int" default=""/>
-        <param name="choices_array" type="p.wxString" default=""/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="choices_array" type="String" default=""/>
+        <param name="parent" type="Window" default="NULL"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
         <param name="centre" type="bool" default="True"/>
@@ -17994,11 +17994,11 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     Window parent=None, int x=-1, 
     int y=-1, bool centre=True, int width=150, int height=200) -&gt; int</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default=""/>
-        <param name="caption" type="r.q(const).wxString" default=""/>
+        <param name="message" type="String" default=""/>
+        <param name="caption" type="String" default=""/>
         <param name="choices" type="int" default=""/>
-        <param name="choices_array" type="p.wxString" default=""/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="choices_array" type="String" default=""/>
+        <param name="parent" type="Window" default="NULL"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
         <param name="centre" type="bool" default="True"/>
@@ -18011,10 +18011,10 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     Window parent=None, int x=-1, 
     int y=-1) -&gt; int</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default=""/>
-        <param name="caption" type="r.q(const).wxString" default="wxPyEmptyString"/>
+        <param name="message" type="String" default=""/>
+        <param name="caption" type="String" default="wxPyEmptyString"/>
         <param name="style" type="int" default="wxOK|wxCENTRE"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
+        <param name="parent" type="Window" default="NULL"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
       </paramlist>
@@ -18024,14 +18024,14 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     long min=0, long max=100, Window parent=None, 
     Point pos=DefaultPosition) -&gt; long</autodoc>
       <paramlist>
-        <param name="message" type="r.q(const).wxString" default=""/>
-        <param name="prompt" type="r.q(const).wxString" default=""/>
-        <param name="caption" type="r.q(const).wxString" default=""/>
+        <param name="message" type="String" default=""/>
+        <param name="prompt" type="String" default=""/>
+        <param name="caption" type="String" default=""/>
         <param name="value" type="long" default=""/>
         <param name="min" type="long" default="0"/>
         <param name="max" type="long" default="100"/>
-        <param name="parent" type="p.wxWindow" default="NULL"/>
-        <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+        <param name="parent" type="Window" default="NULL"/>
+        <param name="pos" type="Point" default="wxDefaultPosition"/>
       </paramlist>
     </method>
     <method name="ColourDisplay" oldname="wxColourDisplay" type="bool" overloaded="no">
@@ -18043,69 +18043,69 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     <method name="GetDisplayDepth" oldname="wxGetDisplayDepth" type="int" overloaded="no">
       <autodoc>GetDisplayDepth() -&gt; int</autodoc>
     </method>
-    <method name="DisplaySize" oldname="wxDisplaySize" type="void" overloaded="no">
+    <method name="DisplaySize" oldname="wxDisplaySize" type="" overloaded="no">
       <autodoc>DisplaySize() -&gt; (width, height)</autodoc>
       <paramlist>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
       </paramlist>
     </method>
-    <method name="GetDisplaySize" oldname="wxGetDisplaySize" type="wxSize" overloaded="no">
+    <method name="GetDisplaySize" oldname="wxGetDisplaySize" type="Size" overloaded="no">
       <autodoc>GetDisplaySize() -&gt; Size</autodoc>
     </method>
-    <method name="DisplaySizeMM" oldname="wxDisplaySizeMM" type="void" overloaded="no">
+    <method name="DisplaySizeMM" oldname="wxDisplaySizeMM" type="" overloaded="no">
       <autodoc>DisplaySizeMM() -&gt; (width, height)</autodoc>
       <paramlist>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
       </paramlist>
     </method>
-    <method name="GetDisplaySizeMM" oldname="wxGetDisplaySizeMM" type="wxSize" overloaded="no">
+    <method name="GetDisplaySizeMM" oldname="wxGetDisplaySizeMM" type="Size" overloaded="no">
       <autodoc>GetDisplaySizeMM() -&gt; Size</autodoc>
     </method>
-    <method name="ClientDisplayRect" oldname="wxClientDisplayRect" type="void" overloaded="no">
+    <method name="ClientDisplayRect" oldname="wxClientDisplayRect" type="" overloaded="no">
       <autodoc>ClientDisplayRect() -&gt; (x, y, width, height)</autodoc>
       <paramlist>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
-        <param name="OUTPUT" type="p.int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
+        <param name="OUTPUT" type="int" default=""/>
       </paramlist>
     </method>
-    <method name="GetClientDisplayRect" oldname="wxGetClientDisplayRect" type="wxRect" overloaded="no">
+    <method name="GetClientDisplayRect" oldname="wxGetClientDisplayRect" type="Rect" overloaded="no">
       <autodoc>GetClientDisplayRect() -&gt; Rect</autodoc>
     </method>
-    <method name="SetCursor" oldname="wxSetCursor" type="void" overloaded="no">
+    <method name="SetCursor" oldname="wxSetCursor" type="" overloaded="no">
       <autodoc>SetCursor(Cursor cursor)</autodoc>
       <paramlist>
-        <param name="cursor" type="r.wxCursor" default=""/>
+        <param name="cursor" type="Cursor" default=""/>
       </paramlist>
     </method>
-    <method name="BeginBusyCursor" oldname="wxBeginBusyCursor" type="void" overloaded="no">
+    <method name="BeginBusyCursor" oldname="wxBeginBusyCursor" type="" overloaded="no">
       <autodoc>BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)</autodoc>
       <paramlist>
-        <param name="cursor" type="p.wxCursor" default="wxHOURGLASS_CURSOR"/>
+        <param name="cursor" type="Cursor" default="wxHOURGLASS_CURSOR"/>
       </paramlist>
     </method>
-    <method name="GetActiveWindow" oldname="wxGetActiveWindow" type="wxWindow" overloaded="no">
+    <method name="GetActiveWindow" oldname="wxGetActiveWindow" type="Window" overloaded="no">
       <autodoc>GetActiveWindow() -&gt; Window</autodoc>
     </method>
-    <method name="GenericFindWindowAtPoint" oldname="wxGenericFindWindowAtPoint" type="wxWindow" overloaded="no">
+    <method name="GenericFindWindowAtPoint" oldname="wxGenericFindWindowAtPoint" type="Window" overloaded="no">
       <autodoc>GenericFindWindowAtPoint(Point pt) -&gt; Window</autodoc>
       <paramlist>
-        <param name="pt" type="r.q(const).wxPoint" default=""/>
+        <param name="pt" type="Point" default=""/>
       </paramlist>
     </method>
-    <method name="FindWindowAtPoint" oldname="wxFindWindowAtPoint" type="wxWindow" overloaded="no">
+    <method name="FindWindowAtPoint" oldname="wxFindWindowAtPoint" type="Window" overloaded="no">
       <autodoc>FindWindowAtPoint(Point pt) -&gt; Window</autodoc>
       <paramlist>
-        <param name="pt" type="r.q(const).wxPoint" default=""/>
+        <param name="pt" type="Point" default=""/>
       </paramlist>
     </method>
-    <method name="GetTopLevelParent" oldname="wxGetTopLevelParent" type="wxWindow" overloaded="no">
+    <method name="GetTopLevelParent" oldname="wxGetTopLevelParent" type="Window" overloaded="no">
       <autodoc>GetTopLevelParent(Window win) -&gt; Window</autodoc>
       <paramlist>
-        <param name="win" type="p.wxWindow" default=""/>
+        <param name="win" type="Window" default=""/>
       </paramlist>
     </method>
     <method name="GetKeyState" oldname="wxGetKeyState" type="bool" overloaded="no">
@@ -18114,13 +18114,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <param name="key" type="wxKeyCode" default=""/>
       </paramlist>
     </method>
-    <method name="WakeUpMainThread" oldname="wxWakeUpMainThread" type="void" overloaded="no">
+    <method name="WakeUpMainThread" oldname="wxWakeUpMainThread" type="" overloaded="no">
       <autodoc>WakeUpMainThread()</autodoc>
     </method>
-    <method name="MutexGuiEnter" oldname="wxMutexGuiEnter" type="void" overloaded="no">
+    <method name="MutexGuiEnter" oldname="wxMutexGuiEnter" type="" overloaded="no">
       <autodoc>MutexGuiEnter()</autodoc>
     </method>
-    <method name="MutexGuiLeave" oldname="wxMutexGuiLeave" type="void" overloaded="no">
+    <method name="MutexGuiLeave" oldname="wxMutexGuiLeave" type="" overloaded="no">
       <autodoc>MutexGuiLeave()</autodoc>
     </method>
     <class name="MutexGuiLocker" oldname="wxMutexGuiLocker" module="misc">
@@ -18138,32 +18138,32 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ToolTip" oldname="wxToolTip" module="misc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ToolTip" overloaded="no">
         <autodoc>__init__(String tip) -&gt; ToolTip</autodoc>
         <paramlist>
-          <param name="tip" type="r.q(const).wxString" default=""/>
+          <param name="tip" type="String" default=""/>
         </paramlist>
       </constructor>
-      <method name="SetTip" type="void" overloaded="no">
+      <method name="SetTip" type="" overloaded="no">
         <autodoc>SetTip(String tip)</autodoc>
         <paramlist>
-          <param name="tip" type="r.q(const).wxString" default=""/>
+          <param name="tip" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetTip" type="wxString" overloaded="no">
+      <method name="GetTip" type="String" overloaded="no">
         <autodoc>GetTip() -&gt; String</autodoc>
       </method>
-      <method name="GetWindow" type="wxWindow" overloaded="no">
+      <method name="GetWindow" type="Window" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
-      <staticmethod name="Enable" type="void" overloaded="no">
+      <staticmethod name="Enable" type="" overloaded="no">
         <autodoc>ToolTip.Enable(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetDelay" type="void" overloaded="no">
+      <staticmethod name="SetDelay" type="" overloaded="no">
         <autodoc>ToolTip.SetDelay(long milliseconds)</autodoc>
         <paramlist>
           <param name="milliseconds" type="long" default=""/>
@@ -18174,8 +18174,8 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <constructor name="Caret" overloaded="no">
         <autodoc>__init__(Window window, Size size) -&gt; Caret</autodoc>
         <paramlist>
-          <param name="window" type="p.wxWindow" default=""/>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="window" type="Window" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxCaret" overloaded="no">
@@ -18187,69 +18187,69 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <method name="IsVisible" type="bool" overloaded="no">
         <autodoc>IsVisible() -&gt; bool</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
-      <method name="GetPositionTuple" type="void" overloaded="no">
+      <method name="GetPositionTuple" type="" overloaded="no">
         <autodoc>GetPositionTuple() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
-      <method name="GetSizeTuple" type="void" overloaded="no">
+      <method name="GetSizeTuple" type="" overloaded="no">
         <autodoc>GetSizeTuple() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetWindow" type="wxWindow" overloaded="no">
+      <method name="GetWindow" type="Window" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
-      <method name="MoveXY" type="void" overloaded="no">
+      <method name="MoveXY" type="" overloaded="no">
         <autodoc>MoveXY(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Move" type="void" overloaded="no">
+      <method name="Move" type="" overloaded="no">
         <autodoc>Move(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetSizeWH" type="void" overloaded="no">
+      <method name="SetSizeWH" type="" overloaded="no">
         <autodoc>SetSizeWH(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="Show" type="void" overloaded="no">
+      <method name="Show" type="" overloaded="no">
         <autodoc>Show(int show=True)</autodoc>
         <paramlist>
           <param name="show" type="int" default="True"/>
         </paramlist>
       </method>
-      <method name="Hide" type="void" overloaded="no">
+      <method name="Hide" type="" overloaded="no">
         <autodoc>Hide()</autodoc>
       </method>
     </class>
     <method name="Caret_GetBlinkTime" oldname="wxCaret_GetBlinkTime" type="int" overloaded="no">
       <autodoc>Caret_GetBlinkTime() -&gt; int</autodoc>
     </method>
-    <method name="Caret_SetBlinkTime" oldname="wxCaret_SetBlinkTime" type="void" overloaded="no">
+    <method name="Caret_SetBlinkTime" oldname="wxCaret_SetBlinkTime" type="" overloaded="no">
       <autodoc>Caret_SetBlinkTime(int milliseconds)</autodoc>
       <paramlist>
         <param name="milliseconds" type="int" default=""/>
@@ -18259,7 +18259,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <constructor name="BusyCursor" overloaded="no">
         <autodoc>__init__(Cursor cursor=wxHOURGLASS_CURSOR) -&gt; BusyCursor</autodoc>
         <paramlist>
-          <param name="cursor" type="p.wxCursor" default="wxHOURGLASS_CURSOR"/>
+          <param name="cursor" type="Cursor" default="wxHOURGLASS_CURSOR"/>
         </paramlist>
       </constructor>
       <destructor name="~wxBusyCursor" overloaded="no">
@@ -18270,7 +18270,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <constructor name="WindowDisabler" overloaded="no">
         <autodoc>__init__(Window winToSkip=None) -&gt; WindowDisabler</autodoc>
         <paramlist>
-          <param name="winToSkip" type="p.wxWindow" default="NULL"/>
+          <param name="winToSkip" type="Window" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxWindowDisabler" overloaded="no">
@@ -18278,11 +18278,11 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </destructor>
     </class>
     <class name="BusyInfo" oldname="wxBusyInfo" module="misc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="BusyInfo" overloaded="no">
         <autodoc>__init__(String message) -&gt; BusyInfo</autodoc>
         <paramlist>
-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxBusyInfo" overloaded="no">
@@ -18293,16 +18293,16 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <constructor name="StopWatch" overloaded="no">
         <autodoc>__init__() -&gt; StopWatch</autodoc>
       </constructor>
-      <method name="Start" type="void" overloaded="no">
+      <method name="Start" type="" overloaded="no">
         <autodoc>Start(long t0=0)</autodoc>
         <paramlist>
           <param name="t0" type="long" default="0"/>
         </paramlist>
       </method>
-      <method name="Pause" type="void" overloaded="no">
+      <method name="Pause" type="" overloaded="no">
         <autodoc>Pause()</autodoc>
       </method>
-      <method name="Resume" type="void" overloaded="no">
+      <method name="Resume" type="" overloaded="no">
         <autodoc>Resume()</autodoc>
       </method>
       <method name="Time" type="long" overloaded="no">
@@ -18310,7 +18310,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </method>
     </class>
     <class name="FileHistory" oldname="wxFileHistory" module="misc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="FileHistory" overloaded="no">
         <autodoc>__init__(int maxFiles=9) -&gt; FileHistory</autodoc>
         <paramlist>
@@ -18320,13 +18320,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <destructor name="~wxFileHistory" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="AddFileToHistory" type="void" overloaded="no">
+      <method name="AddFileToHistory" type="" overloaded="no">
         <autodoc>AddFileToHistory(String file)</autodoc>
         <paramlist>
-          <param name="file" type="r.q(const).wxString" default=""/>
+          <param name="file" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveFileFromHistory" type="void" overloaded="no">
+      <method name="RemoveFileFromHistory" type="" overloaded="no">
         <autodoc>RemoveFileFromHistory(int i)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
@@ -18335,40 +18335,40 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <method name="GetMaxFiles" type="int" overloaded="no">
         <autodoc>GetMaxFiles() -&gt; int</autodoc>
       </method>
-      <method name="UseMenu" type="void" overloaded="no">
+      <method name="UseMenu" type="" overloaded="no">
         <autodoc>UseMenu(Menu menu)</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveMenu" type="void" overloaded="no">
+      <method name="RemoveMenu" type="" overloaded="no">
         <autodoc>RemoveMenu(Menu menu)</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>
         </paramlist>
       </method>
-      <method name="Load" type="void" overloaded="no">
+      <method name="Load" type="" overloaded="no">
         <autodoc>Load(ConfigBase config)</autodoc>
         <paramlist>
-          <param name="config" type="r.wxConfigBase" default=""/>
+          <param name="config" type="wxConfigBase" default=""/>
         </paramlist>
       </method>
-      <method name="Save" type="void" overloaded="no">
+      <method name="Save" type="" overloaded="no">
         <autodoc>Save(ConfigBase config)</autodoc>
         <paramlist>
-          <param name="config" type="r.wxConfigBase" default=""/>
+          <param name="config" type="wxConfigBase" default=""/>
         </paramlist>
       </method>
-      <method name="AddFilesToMenu" type="void" overloaded="no">
+      <method name="AddFilesToMenu" type="" overloaded="no">
         <autodoc>AddFilesToMenu()</autodoc>
       </method>
-      <method name="AddFilesToThisMenu" type="void" overloaded="no">
+      <method name="AddFilesToThisMenu" type="" overloaded="no">
         <autodoc>AddFilesToThisMenu(Menu menu)</autodoc>
         <paramlist>
-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>
         </paramlist>
       </method>
-      <method name="GetHistoryFile" type="wxString" overloaded="no">
+      <method name="GetHistoryFile" type="String" overloaded="no">
         <autodoc>GetHistoryFile(int i) -&gt; String</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
@@ -18382,8 +18382,8 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <constructor name="SingleInstanceChecker" overloaded="no">
         <autodoc>__init__(String name, String path=EmptyString) -&gt; SingleInstanceChecker</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="path" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="name" type="String" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
       <constructor name="PreSingleInstanceChecker" overloaded="no">
@@ -18395,19 +18395,19 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(String name, String path=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="path" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="name" type="String" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="IsAnotherRunning" type="bool" overloaded="no">
         <autodoc>IsAnotherRunning() -&gt; bool</autodoc>
       </method>
     </class>
-    <method name="DrawWindowOnDC" oldname="wxDrawWindowOnDC" type="void" overloaded="no">
+    <method name="DrawWindowOnDC" oldname="wxDrawWindowOnDC" type="" overloaded="no">
       <autodoc>DrawWindowOnDC(Window window, DC dc, int method)</autodoc>
       <paramlist>
-        <param name="window" type="p.wxWindow" default=""/>
-        <param name="dc" type="r.q(const).wxDC" default=""/>
+        <param name="window" type="Window" default=""/>
+        <param name="dc" type="DC" default=""/>
         <param name="method" type="int" default=""/>
       </paramlist>
     </method>
@@ -18418,47 +18418,47 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <destructor name="~wxTipProvider" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="GetTip" type="wxString" overloaded="no">
+      <method name="GetTip" type="String" overloaded="no">
         <autodoc>GetTip() -&gt; String</autodoc>
       </method>
       <method name="GetCurrentTip" type="size_t" overloaded="no">
         <autodoc>GetCurrentTip() -&gt; size_t</autodoc>
       </method>
-      <method name="PreprocessTip" type="wxString" overloaded="no">
+      <method name="PreprocessTip" type="String" overloaded="no">
         <autodoc>PreprocessTip(String tip) -&gt; String</autodoc>
         <paramlist>
-          <param name="tip" type="r.q(const).wxString" default=""/>
+          <param name="tip" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyTipProvider" oldname="wxPyTipProvider" module="misc">
-      <baseclass name="wxTipProvider"/>
+      <baseclass name="TipProvider"/>
       <constructor name="PyTipProvider" overloaded="no">
         <autodoc>__init__(size_t currentTip) -&gt; PyTipProvider</autodoc>
         <paramlist>
           <param name="currentTip" type="size_t" default=""/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
     <method name="ShowTip" oldname="wxShowTip" type="bool" overloaded="no">
       <autodoc>ShowTip(Window parent, TipProvider tipProvider, bool showAtStartup=True) -&gt; bool</autodoc>
       <paramlist>
-        <param name="parent" type="p.wxWindow" default=""/>
-        <param name="tipProvider" type="p.wxTipProvider" default=""/>
+        <param name="parent" type="Window" default=""/>
+        <param name="tipProvider" type="TipProvider" default=""/>
         <param name="showAtStartup" type="bool" default="True"/>
       </paramlist>
     </method>
-    <method name="CreateFileTipProvider" oldname="wxCreateFileTipProvider" type="wxTipProvider" overloaded="no">
+    <method name="CreateFileTipProvider" oldname="wxCreateFileTipProvider" type="TipProvider" overloaded="no">
       <autodoc>CreateFileTipProvider(String filename, size_t currentTip) -&gt; TipProvider</autodoc>
       <paramlist>
-        <param name="filename" type="r.q(const).wxString" default=""/>
+        <param name="filename" type="String" default=""/>
         <param name="currentTip" type="size_t" default=""/>
       </paramlist>
     </method>
@@ -18466,28 +18466,28 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Timer" oldname="wxPyTimer" module="misc">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="wxPyTimer" overloaded="no">
         <autodoc>__init__(EvtHandler owner=None, int id=-1) -&gt; Timer</autodoc>
         <paramlist>
-          <param name="owner" type="p.wxEvtHandler" default="NULL"/>
+          <param name="owner" type="EvtHandler" default="NULL"/>
           <param name="id" type="int" default="-1"/>
         </paramlist>
       </constructor>
       <destructor name="~wxPyTimer" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetOwner" type="void" overloaded="no">
+      <method name="SetOwner" type="" overloaded="no">
         <autodoc>SetOwner(EvtHandler owner, int id=-1)</autodoc>
         <paramlist>
-          <param name="owner" type="p.wxEvtHandler" default=""/>
+          <param name="owner" type="EvtHandler" default=""/>
           <param name="id" type="int" default="-1"/>
         </paramlist>
       </method>
@@ -18498,7 +18498,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
           <param name="oneShot" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="Stop" type="void" overloaded="no">
+      <method name="Stop" type="" overloaded="no">
         <autodoc>Stop()</autodoc>
       </method>
       <method name="IsRunning" type="bool" overloaded="no">
@@ -18530,7 +18530,7 @@ EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
                    
 </pythoncode>
     <class name="TimerEvent" oldname="wxTimerEvent" module="misc">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="TimerEvent" overloaded="no">
         <autodoc>__init__(int timerid=0, int interval=0) -&gt; TimerEvent</autodoc>
         <paramlist>
@@ -18545,14 +18545,14 @@ EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
     <class name="TimerRunner" oldname="wxTimerRunner" module="misc">
       <constructor name="TimerRunner" overloaded="yes">
         <paramlist>
-          <param name="timer" type="r.wxTimer" default=""/>
+          <param name="timer" type="wxTimer" default=""/>
         </paramlist>
       </constructor>
       <constructor name="TimerRunner" overloaded="yes">
         <autodoc>__init__(wxTimer timer) -&gt; TimerRunner
 __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodoc>
         <paramlist>
-          <param name="timer" type="r.wxTimer" default=""/>
+          <param name="timer" type="wxTimer" default=""/>
           <param name="milli" type="int" default=""/>
           <param name="oneShot" type="bool" default="False"/>
         </paramlist>
@@ -18560,7 +18560,7 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
       <destructor name="~wxTimerRunner" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Start" type="void" overloaded="no">
+      <method name="Start" type="" overloaded="no">
         <autodoc>Start(int milli, bool oneShot=False)</autodoc>
         <paramlist>
           <param name="milli" type="int" default=""/>
@@ -18584,78 +18584,78 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
           <param name="doIt" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="OnLog" type="void" overloaded="no">
+      <staticmethod name="OnLog" type="" overloaded="no">
         <autodoc>Log.OnLog(wxLogLevel level, wxChar szString, time_t t)</autodoc>
         <paramlist>
           <param name="level" type="wxLogLevel" default=""/>
-          <param name="szString" type="p.q(const).wxChar" default=""/>
+          <param name="szString" type="wxChar" default=""/>
           <param name="t" type="time_t" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="Flush" type="void" overloaded="no">
+      <method name="Flush" type="" overloaded="no">
         <autodoc>Flush()</autodoc>
       </method>
-      <staticmethod name="FlushActive" type="void" overloaded="no">
+      <staticmethod name="FlushActive" type="" overloaded="no">
         <autodoc>Log.FlushActive()</autodoc>
       </staticmethod>
-      <staticmethod name="GetActiveTarget" type="wxLog" overloaded="no">
+      <staticmethod name="GetActiveTarget" type="Log" overloaded="no">
         <autodoc>Log.GetActiveTarget() -&gt; Log</autodoc>
       </staticmethod>
-      <staticmethod name="SetActiveTarget" type="wxLog" overloaded="no">
+      <staticmethod name="SetActiveTarget" type="Log" overloaded="no">
         <autodoc>Log.SetActiveTarget(Log pLogger) -&gt; Log</autodoc>
         <paramlist>
-          <param name="pLogger" type="p.wxLog" default=""/>
+          <param name="pLogger" type="Log" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Suspend" type="void" overloaded="no">
+      <staticmethod name="Suspend" type="" overloaded="no">
         <autodoc>Log.Suspend()</autodoc>
       </staticmethod>
-      <staticmethod name="Resume" type="void" overloaded="no">
+      <staticmethod name="Resume" type="" overloaded="no">
         <autodoc>Log.Resume()</autodoc>
       </staticmethod>
-      <staticmethod name="SetVerbose" type="void" overloaded="no">
+      <staticmethod name="SetVerbose" type="" overloaded="no">
         <autodoc>Log.SetVerbose(bool bVerbose=True)</autodoc>
         <paramlist>
           <param name="bVerbose" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="SetLogLevel" type="void" overloaded="no">
+      <staticmethod name="SetLogLevel" type="" overloaded="no">
         <autodoc>Log.SetLogLevel(wxLogLevel logLevel)</autodoc>
         <paramlist>
           <param name="logLevel" type="wxLogLevel" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="DontCreateOnDemand" type="void" overloaded="no">
+      <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
         <autodoc>Log.DontCreateOnDemand()</autodoc>
       </staticmethod>
-      <staticmethod name="SetTraceMask" type="void" overloaded="no">
+      <staticmethod name="SetTraceMask" type="" overloaded="no">
         <autodoc>Log.SetTraceMask(wxTraceMask ulMask)</autodoc>
         <paramlist>
           <param name="ulMask" type="wxTraceMask" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="AddTraceMask" type="void" overloaded="no">
+      <staticmethod name="AddTraceMask" type="" overloaded="no">
         <autodoc>Log.AddTraceMask(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="RemoveTraceMask" type="void" overloaded="no">
+      <staticmethod name="RemoveTraceMask" type="" overloaded="no">
         <autodoc>Log.RemoveTraceMask(String str)</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="ClearTraceMasks" type="void" overloaded="no">
+      <staticmethod name="ClearTraceMasks" type="" overloaded="no">
         <autodoc>Log.ClearTraceMasks()</autodoc>
       </staticmethod>
-      <staticmethod name="GetTraceMasks" type="q(const).wxArrayString" overloaded="no">
+      <staticmethod name="GetTraceMasks" type="wxArrayString" overloaded="no">
         <autodoc>Log.GetTraceMasks() -&gt; wxArrayString</autodoc>
       </staticmethod>
-      <staticmethod name="SetTimestamp" type="void" overloaded="no">
+      <staticmethod name="SetTimestamp" type="" overloaded="no">
         <autodoc>Log.SetTimestamp(wxChar ts)</autodoc>
         <paramlist>
-          <param name="ts" type="p.q(const).wxChar" default=""/>
+          <param name="ts" type="wxChar" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetVerbose" type="bool" overloaded="no">
@@ -18667,70 +18667,70 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
       <staticmethod name="IsAllowedTraceMask" type="bool" overloaded="no">
         <autodoc>Log.IsAllowedTraceMask(wxChar mask) -&gt; bool</autodoc>
         <paramlist>
-          <param name="mask" type="p.q(const).wxChar" default=""/>
+          <param name="mask" type="wxChar" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetLogLevel" type="wxLogLevel" overloaded="no">
         <autodoc>Log.GetLogLevel() -&gt; wxLogLevel</autodoc>
       </staticmethod>
-      <staticmethod name="GetTimestamp" type="q(const).wxChar" overloaded="no">
+      <staticmethod name="GetTimestamp" type="wxChar" overloaded="no">
         <autodoc>Log.GetTimestamp() -&gt; wxChar</autodoc>
       </staticmethod>
-      <staticmethod name="TimeStamp" type="wxString" overloaded="no">
+      <staticmethod name="TimeStamp" type="String" overloaded="no">
         <autodoc>Log.TimeStamp() -&gt; String</autodoc>
       </staticmethod>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
     <class name="LogStderr" oldname="wxLogStderr" module="misc">
-      <baseclass name="wxLog"/>
+      <baseclass name="Log"/>
       <constructor name="LogStderr" overloaded="no">
         <autodoc>__init__() -&gt; LogStderr</autodoc>
       </constructor>
     </class>
     <class name="LogTextCtrl" oldname="wxLogTextCtrl" module="misc">
-      <baseclass name="wxLog"/>
+      <baseclass name="Log"/>
       <constructor name="LogTextCtrl" overloaded="no">
         <autodoc>__init__(wxTextCtrl pTextCtrl) -&gt; LogTextCtrl</autodoc>
         <paramlist>
-          <param name="pTextCtrl" type="p.wxTextCtrl" default=""/>
+          <param name="pTextCtrl" type="TextCtrl" default=""/>
         </paramlist>
       </constructor>
     </class>
     <class name="LogGui" oldname="wxLogGui" module="misc">
-      <baseclass name="wxLog"/>
+      <baseclass name="Log"/>
       <constructor name="LogGui" overloaded="no">
         <autodoc>__init__() -&gt; LogGui</autodoc>
       </constructor>
     </class>
     <class name="LogWindow" oldname="wxLogWindow" module="misc">
-      <baseclass name="wxLog"/>
+      <baseclass name="Log"/>
       <constructor name="LogWindow" overloaded="no">
         <autodoc>__init__(wxFrame pParent, String szTitle, bool bShow=True, bool bPassToOld=True) -&gt; LogWindow</autodoc>
         <paramlist>
-          <param name="pParent" type="p.wxFrame" default=""/>
-          <param name="szTitle" type="r.q(const).wxString" default=""/>
+          <param name="pParent" type="Frame" default=""/>
+          <param name="szTitle" type="String" default=""/>
           <param name="bShow" type="bool" default="True"/>
           <param name="bPassToOld" type="bool" default="True"/>
         </paramlist>
       </constructor>
-      <method name="Show" type="void" overloaded="no">
+      <method name="Show" type="" overloaded="no">
         <autodoc>Show(bool bShow=True)</autodoc>
         <paramlist>
           <param name="bShow" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="GetFrame" type="wxFrame" overloaded="no">
+      <method name="GetFrame" type="Frame" overloaded="no">
         <autodoc>GetFrame() -&gt; wxFrame</autodoc>
       </method>
-      <method name="GetOldLog" type="wxLog" overloaded="no">
+      <method name="GetOldLog" type="Log" overloaded="no">
         <autodoc>GetOldLog() -&gt; Log</autodoc>
       </method>
       <method name="IsPassingMessages" type="bool" overloaded="no">
         <autodoc>IsPassingMessages() -&gt; bool</autodoc>
       </method>
-      <method name="PassMessages" type="void" overloaded="no">
+      <method name="PassMessages" type="" overloaded="no">
         <autodoc>PassMessages(bool bDoPass)</autodoc>
         <paramlist>
           <param name="bDoPass" type="bool" default=""/>
@@ -18738,20 +18738,20 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
       </method>
     </class>
     <class name="LogChain" oldname="wxLogChain" module="misc">
-      <baseclass name="wxLog"/>
+      <baseclass name="Log"/>
       <constructor name="LogChain" overloaded="no">
         <autodoc>__init__(Log logger) -&gt; LogChain</autodoc>
         <paramlist>
-          <param name="logger" type="p.wxLog" default=""/>
+          <param name="logger" type="Log" default=""/>
         </paramlist>
       </constructor>
-      <method name="SetLog" type="void" overloaded="no">
+      <method name="SetLog" type="" overloaded="no">
         <autodoc>SetLog(Log logger)</autodoc>
         <paramlist>
-          <param name="logger" type="p.wxLog" default=""/>
+          <param name="logger" type="Log" default=""/>
         </paramlist>
       </method>
-      <method name="PassMessages" type="void" overloaded="no">
+      <method name="PassMessages" type="" overloaded="no">
         <autodoc>PassMessages(bool bDoPass)</autodoc>
         <paramlist>
           <param name="bDoPass" type="bool" default=""/>
@@ -18760,106 +18760,106 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
       <method name="IsPassingMessages" type="bool" overloaded="no">
         <autodoc>IsPassingMessages() -&gt; bool</autodoc>
       </method>
-      <method name="GetOldLog" type="wxLog" overloaded="no">
+      <method name="GetOldLog" type="Log" overloaded="no">
         <autodoc>GetOldLog() -&gt; Log</autodoc>
       </method>
     </class>
     <method name="SysErrorCode" oldname="wxSysErrorCode" type="unsigned long" overloaded="no">
       <autodoc>SysErrorCode() -&gt; unsigned long</autodoc>
     </method>
-    <method name="SysErrorMsg" oldname="wxSysErrorMsg" type="q(const).wxString" overloaded="no">
+    <method name="SysErrorMsg" oldname="wxSysErrorMsg" type="String" overloaded="no">
       <autodoc>SysErrorMsg(unsigned long nErrCode=0) -&gt; String</autodoc>
       <paramlist>
         <param name="nErrCode" type="unsigned long" default="0"/>
       </paramlist>
     </method>
-    <method name="LogFatalError" oldname="wxLogFatalError" type="void" overloaded="no">
+    <method name="LogFatalError" oldname="wxLogFatalError" type="" overloaded="no">
       <autodoc>LogFatalError(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogError" oldname="wxLogError" type="void" overloaded="no">
+    <method name="LogError" oldname="wxLogError" type="" overloaded="no">
       <autodoc>LogError(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogWarning" oldname="wxLogWarning" type="void" overloaded="no">
+    <method name="LogWarning" oldname="wxLogWarning" type="" overloaded="no">
       <autodoc>LogWarning(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogMessage" oldname="wxLogMessage" type="void" overloaded="no">
+    <method name="LogMessage" oldname="wxLogMessage" type="" overloaded="no">
       <autodoc>LogMessage(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogInfo" oldname="wxLogInfo" type="void" overloaded="no">
+    <method name="LogInfo" oldname="wxLogInfo" type="" overloaded="no">
       <autodoc>LogInfo(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogDebug" oldname="wxLogDebug" type="void" overloaded="no">
+    <method name="LogDebug" oldname="wxLogDebug" type="" overloaded="no">
       <autodoc>LogDebug(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogVerbose" oldname="wxLogVerbose" type="void" overloaded="no">
+    <method name="LogVerbose" oldname="wxLogVerbose" type="" overloaded="no">
       <autodoc>LogVerbose(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogStatus" oldname="wxLogStatus" type="void" overloaded="no">
+    <method name="LogStatus" oldname="wxLogStatus" type="" overloaded="no">
       <autodoc>LogStatus(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogStatusFrame" oldname="wxLogStatus" type="void" overloaded="no">
+    <method name="LogStatusFrame" oldname="wxLogStatus" type="" overloaded="no">
       <autodoc>LogStatusFrame(wxFrame pFrame, String msg)</autodoc>
       <paramlist>
-        <param name="pFrame" type="p.wxFrame" default=""/>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="pFrame" type="Frame" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogSysError" oldname="wxLogSysError" type="void" overloaded="no">
+    <method name="LogSysError" oldname="wxLogSysError" type="" overloaded="no">
       <autodoc>LogSysError(String msg)</autodoc>
       <paramlist>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogTrace" oldname="wxLogTrace" type="void" overloaded="yes">
+    <method name="LogTrace" oldname="wxLogTrace" type="" overloaded="yes">
       <paramlist>
         <param name="mask" type="unsigned long" default=""/>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogTrace" oldname="wxLogTrace" type="void" overloaded="yes">
+    <method name="LogTrace" oldname="wxLogTrace" type="" overloaded="yes">
       <autodoc>LogTrace(unsigned long mask, String msg)
 LogTrace(String mask, String msg)</autodoc>
       <paramlist>
-        <param name="mask" type="r.q(const).wxString" default=""/>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="mask" type="String" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="LogGeneric" oldname="wxLogGeneric" type="void" overloaded="no">
+    <method name="LogGeneric" oldname="wxLogGeneric" type="" overloaded="no">
       <autodoc>LogGeneric(unsigned long level, String msg)</autodoc>
       <paramlist>
         <param name="level" type="unsigned long" default=""/>
-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>
       </paramlist>
     </method>
-    <method name="SafeShowMessage" oldname="wxSafeShowMessage" type="void" overloaded="no">
+    <method name="SafeShowMessage" oldname="wxSafeShowMessage" type="" overloaded="no">
       <autodoc>SafeShowMessage(String title, String text)</autodoc>
       <paramlist>
-        <param name="title" type="r.q(const).wxString" default=""/>
-        <param name="text" type="r.q(const).wxString" default=""/>
+        <param name="title" type="String" default=""/>
+        <param name="text" type="String" default=""/>
       </paramlist>
     </method>
     <class name="LogNull" oldname="wxLogNull" module="misc">
@@ -18871,15 +18871,15 @@ LogTrace(String mask, String msg)</autodoc>
       </destructor>
     </class>
     <class name="PyLog" oldname="wxPyLog" module="misc">
-      <baseclass name="wxLog"/>
+      <baseclass name="Log"/>
       <constructor name="PyLog" overloaded="no">
         <autodoc>__init__() -&gt; PyLog</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -18887,11 +18887,11 @@ LogTrace(String mask, String msg)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Process" oldname="wxPyProcess" module="misc">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="wxPyProcess" overloaded="no">
         <autodoc>__init__(EvtHandler parent=None, int id=-1) -&gt; Process</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxEvtHandler" default="NULL"/>
+          <param name="parent" type="EvtHandler" default="NULL"/>
           <param name="id" type="int" default="-1"/>
         </paramlist>
       </constructor>
@@ -18908,34 +18908,34 @@ LogTrace(String mask, String msg)</autodoc>
           <param name="pid" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Open" type="wxPyProcess" overloaded="no">
+      <staticmethod name="Open" type="Process" overloaded="no">
         <autodoc>Process.Open(String cmd, int flags=EXEC_ASYNC) -&gt; Process</autodoc>
         <paramlist>
-          <param name="cmd" type="r.q(const).wxString" default=""/>
+          <param name="cmd" type="String" default=""/>
           <param name="flags" type="int" default="wxEXEC_ASYNC"/>
         </paramlist>
       </staticmethod>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnTerminate" type="void" overloaded="no">
+      <method name="base_OnTerminate" type="" overloaded="no">
         <autodoc>base_OnTerminate(int pid, int status)</autodoc>
         <paramlist>
           <param name="pid" type="int" default=""/>
           <param name="status" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Redirect" type="void" overloaded="no">
+      <method name="Redirect" type="" overloaded="no">
         <autodoc>Redirect()</autodoc>
       </method>
       <method name="IsRedirected" type="bool" overloaded="no">
         <autodoc>IsRedirected() -&gt; bool</autodoc>
       </method>
-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">
         <autodoc>Detach()</autodoc>
       </method>
       <method name="GetInputStream" type="wxInputStream" overloaded="no">
@@ -18944,10 +18944,10 @@ LogTrace(String mask, String msg)</autodoc>
       <method name="GetErrorStream" type="wxInputStream" overloaded="no">
         <autodoc>GetErrorStream() -&gt; InputStream</autodoc>
       </method>
-      <method name="GetOutputStream" type="wxOutputStream" overloaded="no">
+      <method name="GetOutputStream" type="OutputStream" overloaded="no">
         <autodoc>GetOutputStream() -&gt; OutputStream</autodoc>
       </method>
-      <method name="CloseOutput" type="void" overloaded="no">
+      <method name="CloseOutput" type="" overloaded="no">
         <autodoc>CloseOutput()</autodoc>
       </method>
       <method name="IsInputOpened" type="bool" overloaded="no">
@@ -18961,7 +18961,7 @@ LogTrace(String mask, String msg)</autodoc>
       </method>
     </class>
     <class name="ProcessEvent" oldname="wxProcessEvent" module="misc">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="ProcessEvent" overloaded="no">
         <autodoc>__init__(int id=0, int pid=0, int exitcode=0) -&gt; ProcessEvent</autodoc>
         <paramlist>
@@ -18985,9 +18985,9 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
     <method name="Execute" oldname="wxExecute" type="long" overloaded="no">
       <autodoc>Execute(String command, int flags=EXEC_ASYNC, Process process=None) -&gt; long</autodoc>
       <paramlist>
-        <param name="command" type="r.q(const).wxString" default=""/>
+        <param name="command" type="String" default=""/>
         <param name="flags" type="int" default="wxEXEC_ASYNC"/>
-        <param name="process" type="p.wxPyProcess" default="NULL"/>
+        <param name="process" type="Process" default="NULL"/>
       </paramlist>
     </method>
     <pythoncode>
@@ -19003,7 +19003,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       <destructor name="~wxJoystick" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetZPosition" type="int" overloaded="no">
@@ -19030,7 +19030,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       <method name="GetMovementThreshold" type="int" overloaded="no">
         <autodoc>GetMovementThreshold() -&gt; int</autodoc>
       </method>
-      <method name="SetMovementThreshold" type="void" overloaded="no">
+      <method name="SetMovementThreshold" type="" overloaded="no">
         <autodoc>SetMovementThreshold(int threshold)</autodoc>
         <paramlist>
           <param name="threshold" type="int" default=""/>
@@ -19048,7 +19048,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       <method name="GetProductId" type="int" overloaded="no">
         <autodoc>GetProductId() -&gt; int</autodoc>
       </method>
-      <method name="GetProductName" type="wxString" overloaded="no">
+      <method name="GetProductName" type="String" overloaded="no">
         <autodoc>GetProductName() -&gt; String</autodoc>
       </method>
       <method name="GetXMin" type="int" overloaded="no">
@@ -19129,7 +19129,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       <method name="SetCapture" type="bool" overloaded="no">
         <autodoc>SetCapture(Window win, int pollingFreq=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>
           <param name="pollingFreq" type="int" default="0"/>
         </paramlist>
       </method>
@@ -19138,7 +19138,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       </method>
     </class>
     <class name="JoystickEvent" oldname="wxJoystickEvent" module="misc">
-      <baseclass name="wxEvent"/>
+      <baseclass name="Event"/>
       <constructor name="JoystickEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, 
     int change=0) -&gt; JoystickEvent</autodoc>
@@ -19149,12 +19149,12 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
           <param name="change" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <property name="m_pos" type="wxPoint" readonly="no"/>
+      <property name="m_pos" type="Point" readonly="no"/>
       <property name="m_zPosition" type="int" readonly="no"/>
       <property name="m_buttonChange" type="int" readonly="no"/>
       <property name="m_buttonState" type="int" readonly="no"/>
       <property name="m_joyStick" type="int" readonly="no"/>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetZPosition" type="int" overloaded="no">
@@ -19169,31 +19169,31 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       <method name="GetJoystick" type="int" overloaded="no">
         <autodoc>GetJoystick() -&gt; int</autodoc>
       </method>
-      <method name="SetJoystick" type="void" overloaded="no">
+      <method name="SetJoystick" type="" overloaded="no">
         <autodoc>SetJoystick(int stick)</autodoc>
         <paramlist>
           <param name="stick" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetButtonState" type="void" overloaded="no">
+      <method name="SetButtonState" type="" overloaded="no">
         <autodoc>SetButtonState(int state)</autodoc>
         <paramlist>
           <param name="state" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetButtonChange" type="void" overloaded="no">
+      <method name="SetButtonChange" type="" overloaded="no">
         <autodoc>SetButtonChange(int change)</autodoc>
         <paramlist>
           <param name="change" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetZPosition" type="void" overloaded="no">
+      <method name="SetZPosition" type="" overloaded="no">
         <autodoc>SetZPosition(int zPos)</autodoc>
         <paramlist>
           <param name="zPos" type="int" default=""/>
@@ -19247,14 +19247,14 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <constructor name="Wave" overloaded="no">
         <autodoc>__init__(String fileName, bool isResource=False) -&gt; Wave</autodoc>
         <paramlist>
-          <param name="fileName" type="r.q(const).wxString" default=""/>
+          <param name="fileName" type="String" default=""/>
           <param name="isResource" type="bool" default="False"/>
         </paramlist>
       </constructor>
       <constructor name="WaveData" overloaded="no">
         <autodoc>WaveData(String data) -&gt; Wave</autodoc>
         <paramlist>
-          <param name="data" type="r.q(const).wxString" default=""/>
+          <param name="data" type="String" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxWave" overloaded="no">
@@ -19278,16 +19278,16 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <constructor name="FileTypeInfo" overloaded="no">
         <autodoc>__init__(String mimeType, String openCmd, String printCmd, String desc) -&gt; FileTypeInfo</autodoc>
         <paramlist>
-          <param name="mimeType" type="r.q(const).wxString" default=""/>
-          <param name="openCmd" type="r.q(const).wxString" default=""/>
-          <param name="printCmd" type="r.q(const).wxString" default=""/>
-          <param name="desc" type="r.q(const).wxString" default=""/>
+          <param name="mimeType" type="String" default=""/>
+          <param name="openCmd" type="String" default=""/>
+          <param name="printCmd" type="String" default=""/>
+          <param name="desc" type="String" default=""/>
         </paramlist>
       </constructor>
       <constructor name="FileTypeInfoSequence" overloaded="no">
         <autodoc>FileTypeInfoSequence(wxArrayString sArray) -&gt; FileTypeInfo</autodoc>
         <paramlist>
-          <param name="sArray" type="r.q(const).wxArrayString" default=""/>
+          <param name="sArray" type="wxArrayString" default=""/>
         </paramlist>
       </constructor>
       <constructor name="NullFileTypeInfo" overloaded="no">
@@ -19296,41 +19296,41 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <method name="IsValid" type="bool" overloaded="no">
         <autodoc>IsValid() -&gt; bool</autodoc>
       </method>
-      <method name="SetIcon" type="void" overloaded="no">
+      <method name="SetIcon" type="" overloaded="no">
         <autodoc>SetIcon(String iconFile, int iconIndex=0)</autodoc>
         <paramlist>
-          <param name="iconFile" type="r.q(const).wxString" default=""/>
+          <param name="iconFile" type="String" default=""/>
           <param name="iconIndex" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetShortDesc" type="void" overloaded="no">
+      <method name="SetShortDesc" type="" overloaded="no">
         <autodoc>SetShortDesc(String shortDesc)</autodoc>
         <paramlist>
-          <param name="shortDesc" type="r.q(const).wxString" default=""/>
+          <param name="shortDesc" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetMimeType" type="q(const).wxString" overloaded="no">
+      <method name="GetMimeType" type="String" overloaded="no">
         <autodoc>GetMimeType() -&gt; String</autodoc>
       </method>
-      <method name="GetOpenCommand" type="q(const).wxString" overloaded="no">
+      <method name="GetOpenCommand" type="String" overloaded="no">
         <autodoc>GetOpenCommand() -&gt; String</autodoc>
       </method>
-      <method name="GetPrintCommand" type="q(const).wxString" overloaded="no">
+      <method name="GetPrintCommand" type="String" overloaded="no">
         <autodoc>GetPrintCommand() -&gt; String</autodoc>
       </method>
-      <method name="GetShortDesc" type="q(const).wxString" overloaded="no">
+      <method name="GetShortDesc" type="String" overloaded="no">
         <autodoc>GetShortDesc() -&gt; String</autodoc>
       </method>
-      <method name="GetDescription" type="q(const).wxString" overloaded="no">
+      <method name="GetDescription" type="String" overloaded="no">
         <autodoc>GetDescription() -&gt; String</autodoc>
       </method>
-      <method name="GetExtensions" type="q(const).wxArrayString" overloaded="no">
+      <method name="GetExtensions" type="wxArrayString" overloaded="no">
         <autodoc>GetExtensions() -&gt; wxArrayString</autodoc>
       </method>
       <method name="GetExtensionsCount" type="int" overloaded="no">
         <autodoc>GetExtensionsCount() -&gt; int</autodoc>
       </method>
-      <method name="GetIconFile" type="q(const).wxString" overloaded="no">
+      <method name="GetIconFile" type="String" overloaded="no">
         <autodoc>GetIconFile() -&gt; String</autodoc>
       </method>
       <method name="GetIconIndex" type="int" overloaded="no">
@@ -19341,7 +19341,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <constructor name="FileType" overloaded="no">
         <autodoc>__init__(FileTypeInfo ftInfo) -&gt; FileType</autodoc>
         <paramlist>
-          <param name="ftInfo" type="r.q(const).wxFileTypeInfo" default=""/>
+          <param name="ftInfo" type="FileTypeInfo" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxFileType" overloaded="no">
@@ -19356,7 +19356,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <method name="GetExtensions" type="PyObject" overloaded="no">
         <autodoc>GetExtensions() -&gt; PyObject</autodoc>
       </method>
-      <method name="GetIcon" type="wxIcon" overloaded="no">
+      <method name="GetIcon" type="Icon" overloaded="no">
         <autodoc>GetIcon() -&gt; Icon</autodoc>
       </method>
       <method name="GetIconInfo" type="PyObject" overloaded="no">
@@ -19368,48 +19368,48 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <method name="GetOpenCommand" type="PyObject" overloaded="no">
         <autodoc>GetOpenCommand(String filename, String mimetype=EmptyString) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filename" type="String" default=""/>
+          <param name="mimetype" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="GetPrintCommand" type="PyObject" overloaded="no">
         <autodoc>GetPrintCommand(String filename, String mimetype=EmptyString) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filename" type="String" default=""/>
+          <param name="mimetype" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="GetAllCommands" type="PyObject" overloaded="no">
         <autodoc>GetAllCommands(String filename, String mimetype=EmptyString) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="filename" type="String" default=""/>
+          <param name="mimetype" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="SetCommand" type="bool" overloaded="no">
         <autodoc>SetCommand(String cmd, String verb, bool overwriteprompt=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="cmd" type="r.q(const).wxString" default=""/>
-          <param name="verb" type="r.q(const).wxString" default=""/>
+          <param name="cmd" type="String" default=""/>
+          <param name="verb" type="String" default=""/>
           <param name="overwriteprompt" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="SetDefaultIcon" type="bool" overloaded="no">
         <autodoc>SetDefaultIcon(String cmd=EmptyString, int index=0) -&gt; bool</autodoc>
         <paramlist>
-          <param name="cmd" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="cmd" type="String" default="wxPyEmptyString"/>
           <param name="index" type="int" default="0"/>
         </paramlist>
       </method>
       <method name="Unassociate" type="bool" overloaded="no">
         <autodoc>Unassociate() -&gt; bool</autodoc>
       </method>
-      <staticmethod name="ExpandCommand" type="wxString" overloaded="no">
+      <staticmethod name="ExpandCommand" type="String" overloaded="no">
         <autodoc>FileType.ExpandCommand(String command, String filename, String mimetype=EmptyString) -&gt; String</autodoc>
         <paramlist>
-          <param name="command" type="r.q(const).wxString" default=""/>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="mimetype" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="command" type="String" default=""/>
+          <param name="filename" type="String" default=""/>
+          <param name="mimetype" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </staticmethod>
     </class>
@@ -19423,64 +19423,64 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <staticmethod name="IsOfType" type="bool" overloaded="no">
         <autodoc>MimeTypesManager.IsOfType(String mimeType, String wildcard) -&gt; bool</autodoc>
         <paramlist>
-          <param name="mimeType" type="r.q(const).wxString" default=""/>
-          <param name="wildcard" type="r.q(const).wxString" default=""/>
+          <param name="mimeType" type="String" default=""/>
+          <param name="wildcard" type="String" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="Initialize" type="void" overloaded="no">
+      <method name="Initialize" type="" overloaded="no">
         <autodoc>Initialize(int mailcapStyle=MAILCAP_ALL, String extraDir=EmptyString)</autodoc>
         <paramlist>
           <param name="mailcapStyle" type="int" default="wxMAILCAP_ALL"/>
-          <param name="extraDir" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="extraDir" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="ClearData" type="void" overloaded="no">
+      <method name="ClearData" type="" overloaded="no">
         <autodoc>ClearData()</autodoc>
       </method>
-      <method name="GetFileTypeFromExtension" type="wxFileType" overloaded="no">
+      <method name="GetFileTypeFromExtension" type="FileType" overloaded="no">
         <autodoc>GetFileTypeFromExtension(String ext) -&gt; FileType</autodoc>
         <paramlist>
-          <param name="ext" type="r.q(const).wxString" default=""/>
+          <param name="ext" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetFileTypeFromMimeType" type="wxFileType" overloaded="no">
+      <method name="GetFileTypeFromMimeType" type="FileType" overloaded="no">
         <autodoc>GetFileTypeFromMimeType(String mimeType) -&gt; FileType</autodoc>
         <paramlist>
-          <param name="mimeType" type="r.q(const).wxString" default=""/>
+          <param name="mimeType" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ReadMailcap" type="bool" overloaded="no">
         <autodoc>ReadMailcap(String filename, bool fallback=False) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
           <param name="fallback" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="ReadMimeTypes" type="bool" overloaded="no">
         <autodoc>ReadMimeTypes(String filename) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
       <method name="EnumAllFileTypes" type="PyObject" overloaded="no">
         <autodoc>EnumAllFileTypes() -&gt; PyObject</autodoc>
       </method>
-      <method name="AddFallback" type="void" overloaded="no">
+      <method name="AddFallback" type="" overloaded="no">
         <autodoc>AddFallback(FileTypeInfo ft)</autodoc>
         <paramlist>
-          <param name="ft" type="r.q(const).wxFileTypeInfo" default=""/>
+          <param name="ft" type="FileTypeInfo" default=""/>
         </paramlist>
       </method>
-      <method name="Associate" type="wxFileType" overloaded="no">
+      <method name="Associate" type="FileType" overloaded="no">
         <autodoc>Associate(FileTypeInfo ftInfo) -&gt; FileType</autodoc>
         <paramlist>
-          <param name="ftInfo" type="r.q(const).wxFileTypeInfo" default=""/>
+          <param name="ftInfo" type="FileTypeInfo" default=""/>
         </paramlist>
       </method>
       <method name="Unassociate" type="bool" overloaded="no">
         <autodoc>Unassociate(FileType ft) -&gt; bool</autodoc>
         <paramlist>
-          <param name="ft" type="p.wxFileType" default=""/>
+          <param name="ft" type="FileType" default=""/>
         </paramlist>
       </method>
     </class>
@@ -19491,18 +19491,18 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <constructor name="wxPyArtProvider" overloaded="no">
         <autodoc>__init__() -&gt; ArtProvider</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="PushProvider" type="void" overloaded="no">
+      <staticmethod name="PushProvider" type="" overloaded="no">
         <autodoc>ArtProvider.PushProvider(ArtProvider provider)</autodoc>
         <docstring>Add new provider to the top of providers stack.</docstring>
         <paramlist>
-          <param name="provider" type="p.wxPyArtProvider" default=""/>
+          <param name="provider" type="ArtProvider" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PopProvider" type="bool" overloaded="no">
@@ -19514,30 +19514,30 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         <docstring>Remove provider. The provider must have been added previously!
 The provider is _not_ deleted.</docstring>
         <paramlist>
-          <param name="provider" type="p.wxPyArtProvider" default=""/>
+          <param name="provider" type="ArtProvider" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetBitmap" type="wxBitmap" overloaded="no">
+      <staticmethod name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>ArtProvider.GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Bitmap</autodoc>
         <docstring>Query the providers for bitmap with given ID and return it. Return
 wx.NullBitmap if no provider provides it.</docstring>
         <paramlist>
-          <param name="id" type="r.q(const).wxString" default=""/>
-          <param name="client" type="r.q(const).wxString" default="wxPyART_OTHER"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="id" type="String" default=""/>
+          <param name="client" type="String" default="wxPyART_OTHER"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetIcon" type="wxIcon" overloaded="no">
+      <staticmethod name="GetIcon" type="Icon" overloaded="no">
         <autodoc>ArtProvider.GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Icon</autodoc>
         <docstring>Query the providers for icon with given ID and return it. Return
 wx.NullIcon if no provider provides it.</docstring>
         <paramlist>
-          <param name="id" type="r.q(const).wxString" default=""/>
-          <param name="client" type="r.q(const).wxString" default="wxPyART_OTHER"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="id" type="String" default=""/>
+          <param name="client" type="String" default="wxPyART_OTHER"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
         </paramlist>
       </staticmethod>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
@@ -19548,31 +19548,31 @@ wx.NullIcon if no provider provides it.</docstring>
       <destructor name="~wxConfigBase" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <staticmethod name="Set" type="wxConfigBase" overloaded="no">
+      <staticmethod name="Set" type="ConfigBase" overloaded="no">
         <autodoc>ConfigBase.Set(ConfigBase pConfig) -&gt; ConfigBase</autodoc>
         <paramlist>
-          <param name="pConfig" type="p.wxConfigBase" default=""/>
+          <param name="pConfig" type="ConfigBase" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Get" type="wxConfigBase" overloaded="no">
+      <staticmethod name="Get" type="ConfigBase" overloaded="no">
         <autodoc>ConfigBase.Get(bool createOnDemand=True) -&gt; ConfigBase</autodoc>
         <paramlist>
           <param name="createOnDemand" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Create" type="wxConfigBase" overloaded="no">
+      <staticmethod name="Create" type="ConfigBase" overloaded="no">
         <autodoc>ConfigBase.Create() -&gt; ConfigBase</autodoc>
       </staticmethod>
-      <staticmethod name="DontCreateOnDemand" type="void" overloaded="no">
+      <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
         <autodoc>ConfigBase.DontCreateOnDemand()</autodoc>
       </staticmethod>
-      <method name="SetPath" type="void" overloaded="no">
+      <method name="SetPath" type="" overloaded="no">
         <autodoc>SetPath(String strPath)</autodoc>
         <paramlist>
-          <param name="strPath" type="r.q(const).wxString" default=""/>
+          <param name="strPath" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetPath" type="q(const).wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">
         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
       <method name="GetFirstGroup" type="PyObject" overloaded="no">
@@ -19608,80 +19608,80 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="HasGroup" type="bool" overloaded="no">
         <autodoc>HasGroup(String strName) -&gt; bool</autodoc>
         <paramlist>
-          <param name="strName" type="r.q(const).wxString" default=""/>
+          <param name="strName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="HasEntry" type="bool" overloaded="no">
         <autodoc>HasEntry(String strName) -&gt; bool</autodoc>
         <paramlist>
-          <param name="strName" type="r.q(const).wxString" default=""/>
+          <param name="strName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="Exists" type="bool" overloaded="no">
         <autodoc>Exists(String strName) -&gt; bool</autodoc>
         <paramlist>
-          <param name="strName" type="r.q(const).wxString" default=""/>
+          <param name="strName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetEntryType" type="wxConfigBase::EntryType" overloaded="no">
         <autodoc>GetEntryType(String name) -&gt; int</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Read" type="wxString" overloaded="no">
+      <method name="Read" type="String" overloaded="no">
         <autodoc>Read(String key, String defaultVal=EmptyString) -&gt; String</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
-          <param name="defaultVal" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="key" type="String" default=""/>
+          <param name="defaultVal" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="ReadInt" type="long" overloaded="no">
         <autodoc>ReadInt(String key, long defaultVal=0) -&gt; long</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="defaultVal" type="long" default="0"/>
         </paramlist>
       </method>
       <method name="ReadFloat" type="double" overloaded="no">
         <autodoc>ReadFloat(String key, double defaultVal=0.0) -&gt; double</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="defaultVal" type="double" default="0.0"/>
         </paramlist>
       </method>
       <method name="ReadBool" type="bool" overloaded="no">
         <autodoc>ReadBool(String key, bool defaultVal=False) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="defaultVal" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="Write" type="bool" overloaded="no">
         <autodoc>Write(String key, String value) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
       <method name="WriteInt" type="bool" overloaded="no">
         <autodoc>WriteInt(String key, long value) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="value" type="long" default=""/>
         </paramlist>
       </method>
       <method name="WriteFloat" type="bool" overloaded="no">
         <autodoc>WriteFloat(String key, double value) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="value" type="double" default=""/>
         </paramlist>
       </method>
       <method name="WriteBool" type="bool" overloaded="no">
         <autodoc>WriteBool(String key, bool value) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
@@ -19694,28 +19694,28 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="RenameEntry" type="bool" overloaded="no">
         <autodoc>RenameEntry(String oldName, String newName) -&gt; bool</autodoc>
         <paramlist>
-          <param name="oldName" type="r.q(const).wxString" default=""/>
-          <param name="newName" type="r.q(const).wxString" default=""/>
+          <param name="oldName" type="String" default=""/>
+          <param name="newName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="RenameGroup" type="bool" overloaded="no">
         <autodoc>RenameGroup(String oldName, String newName) -&gt; bool</autodoc>
         <paramlist>
-          <param name="oldName" type="r.q(const).wxString" default=""/>
-          <param name="newName" type="r.q(const).wxString" default=""/>
+          <param name="oldName" type="String" default=""/>
+          <param name="newName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteEntry" type="bool" overloaded="no">
         <autodoc>DeleteEntry(String key, bool bDeleteGroupIfEmpty=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
           <param name="bDeleteGroupIfEmpty" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="DeleteGroup" type="bool" overloaded="no">
         <autodoc>DeleteGroup(String key) -&gt; bool</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteAll" type="bool" overloaded="no">
@@ -19724,13 +19724,13 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="IsExpandingEnvVars" type="bool" overloaded="no">
         <autodoc>IsExpandingEnvVars() -&gt; bool</autodoc>
       </method>
-      <method name="SetExpandEnvVars" type="void" overloaded="no">
+      <method name="SetExpandEnvVars" type="" overloaded="no">
         <autodoc>SetExpandEnvVars(bool bDoIt=True)</autodoc>
         <paramlist>
           <param name="bDoIt" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetRecordDefaults" type="void" overloaded="no">
+      <method name="SetRecordDefaults" type="" overloaded="no">
         <autodoc>SetRecordDefaults(bool bDoIt=True)</autodoc>
         <paramlist>
           <param name="bDoIt" type="bool" default="True"/>
@@ -19739,31 +19739,31 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="IsRecordingDefaults" type="bool" overloaded="no">
         <autodoc>IsRecordingDefaults() -&gt; bool</autodoc>
       </method>
-      <method name="ExpandEnvVars" type="wxString" overloaded="no">
+      <method name="ExpandEnvVars" type="String" overloaded="no">
         <autodoc>ExpandEnvVars(String str) -&gt; String</autodoc>
         <paramlist>
-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetAppName" type="wxString" overloaded="no">
+      <method name="GetAppName" type="String" overloaded="no">
         <autodoc>GetAppName() -&gt; String</autodoc>
       </method>
-      <method name="GetVendorName" type="wxString" overloaded="no">
+      <method name="GetVendorName" type="String" overloaded="no">
         <autodoc>GetVendorName() -&gt; String</autodoc>
       </method>
-      <method name="SetAppName" type="void" overloaded="no">
+      <method name="SetAppName" type="" overloaded="no">
         <autodoc>SetAppName(String appName)</autodoc>
         <paramlist>
-          <param name="appName" type="r.q(const).wxString" default=""/>
+          <param name="appName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetVendorName" type="void" overloaded="no">
+      <method name="SetVendorName" type="" overloaded="no">
         <autodoc>SetVendorName(String vendorName)</autodoc>
         <paramlist>
-          <param name="vendorName" type="r.q(const).wxString" default=""/>
+          <param name="vendorName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
@@ -19777,28 +19777,28 @@ wx.NullIcon if no provider provides it.</docstring>
       <constructor name="ConfigPathChanger" overloaded="no">
         <autodoc>__init__(ConfigBase pContainer, String strEntry) -&gt; ConfigPathChanger</autodoc>
         <paramlist>
-          <param name="pContainer" type="p.q(const).wxConfigBase" default=""/>
-          <param name="strEntry" type="r.q(const).wxString" default=""/>
+          <param name="pContainer" type="ConfigBase" default=""/>
+          <param name="strEntry" type="String" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxConfigPathChanger" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Name" type="q(const).wxString" overloaded="no">
+      <method name="Name" type="String" overloaded="no">
         <autodoc>Name() -&gt; String</autodoc>
       </method>
     </class>
     <class name="Config" oldname="wxConfig" module="misc">
-      <baseclass name="wxConfigBase"/>
+      <baseclass name="ConfigBase"/>
       <constructor name="Config" overloaded="no">
         <autodoc>__init__(String appName=EmptyString, String vendorName=EmptyString, 
     String localFilename=EmptyString, String globalFilename=EmptyString, 
     long style=0) -&gt; Config</autodoc>
         <paramlist>
-          <param name="appName" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="vendorName" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="localFilename" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="globalFilename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="appName" type="String" default="wxPyEmptyString"/>
+          <param name="vendorName" type="String" default="wxPyEmptyString"/>
+          <param name="localFilename" type="String" default="wxPyEmptyString"/>
+          <param name="globalFilename" type="String" default="wxPyEmptyString"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
@@ -19807,16 +19807,16 @@ wx.NullIcon if no provider provides it.</docstring>
       </destructor>
     </class>
     <class name="FileConfig" oldname="wxFileConfig" module="misc">
-      <baseclass name="wxConfigBase"/>
+      <baseclass name="ConfigBase"/>
       <constructor name="FileConfig" overloaded="no">
         <autodoc>__init__(String appName=EmptyString, String vendorName=EmptyString, 
     String localFilename=EmptyString, String globalFilename=EmptyString, 
     long style=0) -&gt; FileConfig</autodoc>
         <paramlist>
-          <param name="appName" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="vendorName" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="localFilename" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="globalFilename" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="appName" type="String" default="wxPyEmptyString"/>
+          <param name="vendorName" type="String" default="wxPyEmptyString"/>
+          <param name="localFilename" type="String" default="wxPyEmptyString"/>
+          <param name="globalFilename" type="String" default="wxPyEmptyString"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
@@ -19824,10 +19824,10 @@ wx.NullIcon if no provider provides it.</docstring>
         <autodoc>__del__()</autodoc>
       </destructor>
     </class>
-    <method name="ExpandEnvVars" oldname="wxExpandEnvVars" type="wxString" overloaded="no">
+    <method name="ExpandEnvVars" oldname="wxExpandEnvVars" type="String" overloaded="no">
       <autodoc>ExpandEnvVars(String sz) -&gt; String</autodoc>
       <paramlist>
-        <param name="sz" type="r.q(const).wxString" default=""/>
+        <param name="sz" type="String" default=""/>
       </paramlist>
     </method>
     <pythoncode>
@@ -19874,7 +19874,7 @@ wx.NullIcon if no provider provides it.</docstring>
       <destructor name="~wxDateTime" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <staticmethod name="SetCountry" type="void" overloaded="no">
+      <staticmethod name="SetCountry" type="" overloaded="no">
         <autodoc>DateTime.SetCountry(int country)</autodoc>
         <paramlist>
           <param name="country" type="wxDateTime::Country" default=""/>
@@ -19935,26 +19935,26 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetMonthName" type="wxString" overloaded="no">
+      <staticmethod name="GetMonthName" type="String" overloaded="no">
         <autodoc>DateTime.GetMonthName(int month, int flags=Name_Full) -&gt; String</autodoc>
         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="flags" type="wxDateTime::NameFlags" default="wxDateTime::Name_Full"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetWeekDayName" type="wxString" overloaded="no">
+      <staticmethod name="GetWeekDayName" type="String" overloaded="no">
         <autodoc>DateTime.GetWeekDayName(int weekday, int flags=Name_Full) -&gt; String</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
           <param name="flags" type="wxDateTime::NameFlags" default="wxDateTime::Name_Full"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetAmPmStrings" type="void" overloaded="no">
+      <staticmethod name="GetAmPmStrings" type="" overloaded="no">
         <autodoc>GetAmPmStrings() -&gt; (am, pm)</autodoc>
         <docstring>Get the AM and PM strings in the current locale (may be empty)</docstring>
         <paramlist>
-          <param name="OUTPUT" type="p.wxString" default=""/>
-          <param name="OUTPUT" type="p.wxString" default=""/>
+          <param name="OUTPUT" type="String" default=""/>
+          <param name="OUTPUT" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="IsDSTApplicable" type="bool" overloaded="no">
@@ -19964,45 +19964,45 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetBeginDST" type="wxDateTime" overloaded="no">
+      <staticmethod name="GetBeginDST" type="DateTime" overloaded="no">
         <autodoc>DateTime.GetBeginDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="GetEndDST" type="wxDateTime" overloaded="no">
+      <staticmethod name="GetEndDST" type="DateTime" overloaded="no">
         <autodoc>DateTime.GetEndDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Now" type="wxDateTime" overloaded="no">
+      <staticmethod name="Now" type="DateTime" overloaded="no">
         <autodoc>DateTime.Now() -&gt; DateTime</autodoc>
       </staticmethod>
-      <staticmethod name="UNow" type="wxDateTime" overloaded="no">
+      <staticmethod name="UNow" type="DateTime" overloaded="no">
         <autodoc>DateTime.UNow() -&gt; DateTime</autodoc>
       </staticmethod>
-      <staticmethod name="Today" type="wxDateTime" overloaded="no">
+      <staticmethod name="Today" type="DateTime" overloaded="no">
         <autodoc>DateTime.Today() -&gt; DateTime</autodoc>
       </staticmethod>
-      <method name="SetToCurrent" type="wxDateTime" overloaded="no">
+      <method name="SetToCurrent" type="DateTime" overloaded="no">
         <autodoc>SetToCurrent() -&gt; DateTime</autodoc>
       </method>
-      <method name="SetTimeT" type="wxDateTime" overloaded="no">
+      <method name="SetTimeT" type="DateTime" overloaded="no">
         <autodoc>SetTimeT(time_t timet) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="timet" type="time_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetJDN" type="wxDateTime" overloaded="no">
+      <method name="SetJDN" type="DateTime" overloaded="no">
         <autodoc>SetJDN(double jdn) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="jdn" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetHMS" type="wxDateTime" overloaded="no">
+      <method name="SetHMS" type="DateTime" overloaded="no">
         <autodoc>SetHMS(int hour, int minute=0, int second=0, int millisec=0) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="hour" type="int" default=""/>
@@ -20011,7 +20011,7 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="millisec" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="Set" type="wxDateTime" overloaded="no">
+      <method name="Set" type="DateTime" overloaded="no">
         <autodoc>Set(int day, int month=Inv_Month, int year=Inv_Year, int hour=0, 
     int minute=0, int second=0, int millisec=0) -&gt; DateTime</autodoc>
         <paramlist>
@@ -20024,84 +20024,84 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="millisec" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="ResetTime" type="wxDateTime" overloaded="no">
+      <method name="ResetTime" type="DateTime" overloaded="no">
         <autodoc>ResetTime() -&gt; DateTime</autodoc>
       </method>
-      <method name="SetYear" type="wxDateTime" overloaded="no">
+      <method name="SetYear" type="DateTime" overloaded="no">
         <autodoc>SetYear(int year) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="year" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMonth" type="wxDateTime" overloaded="no">
+      <method name="SetMonth" type="DateTime" overloaded="no">
         <autodoc>SetMonth(int month) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
         </paramlist>
       </method>
-      <method name="SetDay" type="wxDateTime" overloaded="no">
+      <method name="SetDay" type="DateTime" overloaded="no">
         <autodoc>SetDay(int day) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="day" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHour" type="wxDateTime" overloaded="no">
+      <method name="SetHour" type="DateTime" overloaded="no">
         <autodoc>SetHour(int hour) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="hour" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinute" type="wxDateTime" overloaded="no">
+      <method name="SetMinute" type="DateTime" overloaded="no">
         <autodoc>SetMinute(int minute) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="minute" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSecond" type="wxDateTime" overloaded="no">
+      <method name="SetSecond" type="DateTime" overloaded="no">
         <autodoc>SetSecond(int second) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="second" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMillisecond" type="wxDateTime" overloaded="no">
+      <method name="SetMillisecond" type="DateTime" overloaded="no">
         <autodoc>SetMillisecond(int millisecond) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="millisecond" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetToWeekDayInSameWeek" type="wxDateTime" overloaded="no">
+      <method name="SetToWeekDayInSameWeek" type="DateTime" overloaded="no">
         <autodoc>SetToWeekDayInSameWeek(int weekday, int flags=Monday_First) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
         </paramlist>
       </method>
-      <method name="GetWeekDayInSameWeek" type="wxDateTime" overloaded="no">
+      <method name="GetWeekDayInSameWeek" type="DateTime" overloaded="no">
         <autodoc>GetWeekDayInSameWeek(int weekday, int flags=Monday_First) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
         </paramlist>
       </method>
-      <method name="SetToNextWeekDay" type="wxDateTime" overloaded="no">
+      <method name="SetToNextWeekDay" type="DateTime" overloaded="no">
         <autodoc>SetToNextWeekDay(int weekday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
         </paramlist>
       </method>
-      <method name="GetNextWeekDay" type="wxDateTime" overloaded="no">
+      <method name="GetNextWeekDay" type="DateTime" overloaded="no">
         <autodoc>GetNextWeekDay(int weekday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
         </paramlist>
       </method>
-      <method name="SetToPrevWeekDay" type="wxDateTime" overloaded="no">
+      <method name="SetToPrevWeekDay" type="DateTime" overloaded="no">
         <autodoc>SetToPrevWeekDay(int weekday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrevWeekDay" type="wxDateTime" overloaded="no">
+      <method name="GetPrevWeekDay" type="DateTime" overloaded="no">
         <autodoc>GetPrevWeekDay(int weekday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
@@ -20124,7 +20124,7 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </method>
-      <method name="GetLastWeekDay" type="wxDateTime" overloaded="no">
+      <method name="GetLastWeekDay" type="DateTime" overloaded="no">
         <autodoc>GetLastWeekDay(int weekday, int month=Inv_Month, int year=Inv_Year) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>
@@ -20140,7 +20140,7 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
         </paramlist>
       </method>
-      <method name="GetWeek" type="wxDateTime" overloaded="no">
+      <method name="GetWeek" type="DateTime" overloaded="no">
         <autodoc>GetWeek(int numWeek, int weekday=Mon, int flags=Monday_First) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="numWeek" type="int" default=""/>
@@ -20148,27 +20148,27 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
         </paramlist>
       </method>
-      <method name="SetToLastMonthDay" type="wxDateTime" overloaded="no">
+      <method name="SetToLastMonthDay" type="DateTime" overloaded="no">
         <autodoc>SetToLastMonthDay(int month=Inv_Month, int year=Inv_Year) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="month" type="wxDateTime::Month" default="wxDateTime::Inv_Month"/>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </method>
-      <method name="GetLastMonthDay" type="wxDateTime" overloaded="no">
+      <method name="GetLastMonthDay" type="DateTime" overloaded="no">
         <autodoc>GetLastMonthDay(int month=Inv_Month, int year=Inv_Year) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="month" type="wxDateTime::Month" default="wxDateTime::Inv_Month"/>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </method>
-      <method name="SetToYearDay" type="wxDateTime" overloaded="no">
+      <method name="SetToYearDay" type="DateTime" overloaded="no">
         <autodoc>SetToYearDay(int yday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="yday" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetYearDay" type="wxDateTime" overloaded="no">
+      <method name="GetYearDay" type="DateTime" overloaded="no">
         <autodoc>GetYearDay(int yday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="yday" type="int" default=""/>
@@ -20189,27 +20189,27 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="GetRataDie" type="double" overloaded="no">
         <autodoc>GetRataDie() -&gt; double</autodoc>
       </method>
-      <method name="ToTimezone" type="wxDateTime" overloaded="no">
+      <method name="ToTimezone" type="DateTime" overloaded="no">
         <autodoc>ToTimezone(wxDateTime::TimeZone tz, bool noDST=False) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default=""/>
+          <param name="tz" type="wxDateTime::TimeZone" default=""/>
           <param name="noDST" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="MakeTimezone" type="wxDateTime" overloaded="no">
+      <method name="MakeTimezone" type="DateTime" overloaded="no">
         <autodoc>MakeTimezone(wxDateTime::TimeZone tz, bool noDST=False) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default=""/>
+          <param name="tz" type="wxDateTime::TimeZone" default=""/>
           <param name="noDST" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="ToGMT" type="wxDateTime" overloaded="no">
+      <method name="ToGMT" type="DateTime" overloaded="no">
         <autodoc>ToGMT(bool noDST=False) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="noDST" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="MakeGMT" type="wxDateTime" overloaded="no">
+      <method name="MakeGMT" type="DateTime" overloaded="no">
         <autodoc>MakeGMT(bool noDST=False) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="noDST" type="bool" default="False"/>
@@ -20230,69 +20230,69 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="GetYear" type="int" overloaded="no">
         <autodoc>GetYear(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetMonth" type="wxDateTime::Month" overloaded="no">
         <autodoc>GetMonth(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetDay" type="int" overloaded="no">
         <autodoc>GetDay(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetWeekDay" type="wxDateTime::WeekDay" overloaded="no">
         <autodoc>GetWeekDay(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetHour" type="int" overloaded="no">
         <autodoc>GetHour(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetMinute" type="int" overloaded="no">
         <autodoc>GetMinute(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetSecond" type="int" overloaded="no">
         <autodoc>GetSecond(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetMillisecond" type="int" overloaded="no">
         <autodoc>GetMillisecond(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetDayOfYear" type="int" overloaded="no">
         <autodoc>GetDayOfYear(wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetWeekOfYear" type="int" overloaded="no">
         <autodoc>GetWeekOfYear(int flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="GetWeekOfMonth" type="int" overloaded="no">
         <autodoc>GetWeekOfMonth(int flags=Monday_First, wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; int</autodoc>
         <paramlist>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
       <method name="IsWorkDay" type="bool" overloaded="no">
@@ -20304,223 +20304,223 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="IsEqualTo" type="bool" overloaded="no">
         <autodoc>IsEqualTo(DateTime datetime) -&gt; bool</autodoc>
         <paramlist>
-          <param name="datetime" type="r.q(const).wxDateTime" default=""/>
+          <param name="datetime" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsEarlierThan" type="bool" overloaded="no">
         <autodoc>IsEarlierThan(DateTime datetime) -&gt; bool</autodoc>
         <paramlist>
-          <param name="datetime" type="r.q(const).wxDateTime" default=""/>
+          <param name="datetime" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsLaterThan" type="bool" overloaded="no">
         <autodoc>IsLaterThan(DateTime datetime) -&gt; bool</autodoc>
         <paramlist>
-          <param name="datetime" type="r.q(const).wxDateTime" default=""/>
+          <param name="datetime" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsStrictlyBetween" type="bool" overloaded="no">
         <autodoc>IsStrictlyBetween(DateTime t1, DateTime t2) -&gt; bool</autodoc>
         <paramlist>
-          <param name="t1" type="r.q(const).wxDateTime" default=""/>
-          <param name="t2" type="r.q(const).wxDateTime" default=""/>
+          <param name="t1" type="DateTime" default=""/>
+          <param name="t2" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsBetween" type="bool" overloaded="no">
         <autodoc>IsBetween(DateTime t1, DateTime t2) -&gt; bool</autodoc>
         <paramlist>
-          <param name="t1" type="r.q(const).wxDateTime" default=""/>
-          <param name="t2" type="r.q(const).wxDateTime" default=""/>
+          <param name="t1" type="DateTime" default=""/>
+          <param name="t2" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsSameDate" type="bool" overloaded="no">
         <autodoc>IsSameDate(DateTime dt) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dt" type="r.q(const).wxDateTime" default=""/>
+          <param name="dt" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsSameTime" type="bool" overloaded="no">
         <autodoc>IsSameTime(DateTime dt) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dt" type="r.q(const).wxDateTime" default=""/>
+          <param name="dt" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="IsEqualUpTo" type="bool" overloaded="no">
         <autodoc>IsEqualUpTo(DateTime dt, TimeSpan ts) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dt" type="r.q(const).wxDateTime" default=""/>
-          <param name="ts" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="dt" type="DateTime" default=""/>
+          <param name="ts" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="AddTS" type="wxDateTime" overloaded="no">
+      <method name="AddTS" type="DateTime" overloaded="no">
         <autodoc>AddTS(TimeSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="AddDS" type="wxDateTime" overloaded="no">
+      <method name="AddDS" type="DateTime" overloaded="no">
         <autodoc>AddDS(DateSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxDateSpan" default=""/>
+          <param name="diff" type="wxDateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="SubtractTS" type="wxDateTime" overloaded="no">
+      <method name="SubtractTS" type="DateTime" overloaded="no">
         <autodoc>SubtractTS(TimeSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="SubtractDS" type="wxDateTime" overloaded="no">
+      <method name="SubtractDS" type="DateTime" overloaded="no">
         <autodoc>SubtractDS(DateSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxDateSpan" default=""/>
+          <param name="diff" type="wxDateSpan" default=""/>
         </paramlist>
       </method>
       <method name="Subtract" type="wxTimeSpan" overloaded="no">
         <autodoc>Subtract(DateTime dt) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="dt" type="r.q(const).wxDateTime" default=""/>
+          <param name="dt" type="DateTime" default=""/>
         </paramlist>
       </method>
-      <method name="__iadd__" type="wxDateTime" overloaded="yes">
+      <method name="__iadd__" type="DateTime" overloaded="yes">
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__iadd__" type="wxDateTime" overloaded="yes">
+      <method name="__iadd__" type="DateTime" overloaded="yes">
         <autodoc>__iadd__(TimeSpan diff) -&gt; DateTime
 __iadd__(DateSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxDateSpan" default=""/>
+          <param name="diff" type="wxDateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__isub__" type="wxDateTime" overloaded="yes">
+      <method name="__isub__" type="DateTime" overloaded="yes">
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__isub__" type="wxDateTime" overloaded="yes">
+      <method name="__isub__" type="DateTime" overloaded="yes">
         <autodoc>__isub__(TimeSpan diff) -&gt; DateTime
 __isub__(DateSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxDateSpan" default=""/>
+          <param name="diff" type="wxDateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxDateTime" overloaded="yes">
+      <method name="__add__" type="DateTime" overloaded="yes">
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxDateTime" overloaded="yes">
+      <method name="__add__" type="DateTime" overloaded="yes">
         <autodoc>__add__(TimeSpan other) -&gt; DateTime
 __add__(DateSpan other) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="wxDateSpan" default=""/>
         </paramlist>
       </method>
       <method name="__sub__" type="wxTimeSpan" overloaded="yes">
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxDateTime" overloaded="yes">
+      <method name="__sub__" type="DateTime" overloaded="yes">
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="wxTimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxDateTime" overloaded="yes">
+      <method name="__sub__" type="DateTime" overloaded="yes">
         <autodoc>__sub__(DateTime other) -&gt; TimeSpan
 __sub__(TimeSpan other) -&gt; DateTime
 __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="wxDateSpan" default=""/>
         </paramlist>
       </method>
       <method name="__lt__" type="bool" overloaded="no">
         <autodoc>__lt__(DateTime other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="__le__" type="bool" overloaded="no">
         <autodoc>__le__(DateTime other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="__gt__" type="bool" overloaded="no">
         <autodoc>__gt__(DateTime other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="__ge__" type="bool" overloaded="no">
         <autodoc>__ge__(DateTime other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(DateTime other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(DateTime other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateTime" default=""/>
+          <param name="other" type="DateTime" default=""/>
         </paramlist>
       </method>
       <method name="ParseRfc822Date" type="int" overloaded="no">
         <autodoc>ParseRfc822Date(String date) -&gt; int</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxString" default=""/>
+          <param name="date" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ParseFormat" type="int" overloaded="no">
         <autodoc>ParseFormat(String date, String format=DateFormatStr, DateTime dateDef=wxDefaultDateTime) -&gt; int</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxString" default=""/>
-          <param name="format" type="r.q(const).wxString" default="wxPyDateFormatStr"/>
-          <param name="dateDef" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
+          <param name="date" type="String" default=""/>
+          <param name="format" type="String" default="wxPyDateFormatStr"/>
+          <param name="dateDef" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>
       <method name="ParseDateTime" type="int" overloaded="no">
         <autodoc>ParseDateTime(String datetime) -&gt; int</autodoc>
         <paramlist>
-          <param name="datetime" type="r.q(const).wxString" default=""/>
+          <param name="datetime" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ParseDate" type="int" overloaded="no">
         <autodoc>ParseDate(String date) -&gt; int</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxString" default=""/>
+          <param name="date" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ParseTime" type="int" overloaded="no">
         <autodoc>ParseTime(String time) -&gt; int</autodoc>
         <paramlist>
-          <param name="time" type="r.q(const).wxString" default=""/>
+          <param name="time" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Format" type="wxString" overloaded="no">
+      <method name="Format" type="String" overloaded="no">
         <autodoc>Format(String format=DateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -&gt; String</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxString" default="wxPyDateFormatStr"/>
-          <param name="tz" type="r.q(const).wxDateTime::TimeZone" default="LOCAL_TZ"/>
+          <param name="format" type="String" default="wxPyDateFormatStr"/>
+          <param name="tz" type="wxDateTime::TimeZone" default="LOCAL_TZ"/>
         </paramlist>
       </method>
-      <method name="FormatDate" type="wxString" overloaded="no">
+      <method name="FormatDate" type="String" overloaded="no">
         <autodoc>FormatDate() -&gt; String</autodoc>
       </method>
-      <method name="FormatTime" type="wxString" overloaded="no">
+      <method name="FormatTime" type="String" overloaded="no">
         <autodoc>FormatTime() -&gt; String</autodoc>
       </method>
-      <method name="FormatISODate" type="wxString" overloaded="no">
+      <method name="FormatISODate" type="String" overloaded="no">
         <autodoc>FormatISODate() -&gt; String</autodoc>
       </method>
-      <method name="FormatISOTime" type="wxString" overloaded="no">
+      <method name="FormatISOTime" type="String" overloaded="no">
         <autodoc>FormatISOTime() -&gt; String</autodoc>
       </method>
     </class>
@@ -20537,115 +20537,115 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <destructor name="~wxTimeSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <staticmethod name="Seconds" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Seconds" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Seconds(long sec) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="sec" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Second" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Second" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Second() -&gt; TimeSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Minutes" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Minutes" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Minutes(long min) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="min" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Minute" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Minute" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Minute() -&gt; TimeSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Hours" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Hours" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Hours(long hours) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="hours" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Hour" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Hour" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Hour() -&gt; TimeSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Days" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Days" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Days(long days) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Day" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Day" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Day() -&gt; TimeSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Weeks" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Weeks" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Weeks(long days) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Week" type="wxTimeSpan" overloaded="no">
+      <staticmethod name="Week" type="TimeSpan" overloaded="no">
         <autodoc>TimeSpan.Week() -&gt; TimeSpan</autodoc>
       </staticmethod>
-      <method name="Add" type="wxTimeSpan" overloaded="no">
+      <method name="Add" type="TimeSpan" overloaded="no">
         <autodoc>Add(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="TimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="Subtract" type="wxTimeSpan" overloaded="no">
+      <method name="Subtract" type="TimeSpan" overloaded="no">
         <autodoc>Subtract(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="TimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="Multiply" type="wxTimeSpan" overloaded="no">
+      <method name="Multiply" type="TimeSpan" overloaded="no">
         <autodoc>Multiply(int n) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Neg" type="wxTimeSpan" overloaded="no">
+      <method name="Neg" type="TimeSpan" overloaded="no">
         <autodoc>Neg() -&gt; TimeSpan</autodoc>
       </method>
-      <method name="Abs" type="wxTimeSpan" overloaded="no">
+      <method name="Abs" type="TimeSpan" overloaded="no">
         <autodoc>Abs() -&gt; TimeSpan</autodoc>
       </method>
-      <method name="__iadd__" type="wxTimeSpan" overloaded="no">
+      <method name="__iadd__" type="TimeSpan" overloaded="no">
         <autodoc>__iadd__(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="TimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__isub__" type="wxTimeSpan" overloaded="no">
+      <method name="__isub__" type="TimeSpan" overloaded="no">
         <autodoc>__isub__(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="TimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__imul__" type="wxTimeSpan" overloaded="no">
+      <method name="__imul__" type="TimeSpan" overloaded="no">
         <autodoc>__imul__(int n) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="__neg__" type="wxTimeSpan" overloaded="no">
+      <method name="__neg__" type="TimeSpan" overloaded="no">
         <autodoc>__neg__() -&gt; TimeSpan</autodoc>
       </method>
-      <method name="__add__" type="wxTimeSpan" overloaded="no">
+      <method name="__add__" type="TimeSpan" overloaded="no">
         <autodoc>__add__(TimeSpan other) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxTimeSpan" overloaded="no">
+      <method name="__sub__" type="TimeSpan" overloaded="no">
         <autodoc>__sub__(TimeSpan other) -&gt; TimeSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__mul__" type="wxTimeSpan" overloaded="no">
+      <method name="__mul__" type="TimeSpan" overloaded="no">
         <autodoc>__mul__(int n) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="__rmul__" type="wxTimeSpan" overloaded="no">
+      <method name="__rmul__" type="TimeSpan" overloaded="no">
         <autodoc>__rmul__(int n) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -20654,37 +20654,37 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="__lt__" type="bool" overloaded="no">
         <autodoc>__lt__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="__le__" type="bool" overloaded="no">
         <autodoc>__le__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="__gt__" type="bool" overloaded="no">
         <autodoc>__gt__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="__ge__" type="bool" overloaded="no">
         <autodoc>__ge__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="IsNull" type="bool" overloaded="no">
@@ -20699,19 +20699,19 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="IsEqualTo" type="bool" overloaded="no">
         <autodoc>IsEqualTo(TimeSpan ts) -&gt; bool</autodoc>
         <paramlist>
-          <param name="ts" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="ts" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="IsLongerThan" type="bool" overloaded="no">
         <autodoc>IsLongerThan(TimeSpan ts) -&gt; bool</autodoc>
         <paramlist>
-          <param name="ts" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="ts" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="IsShorterThan" type="bool" overloaded="no">
         <autodoc>IsShorterThan(TimeSpan t) -&gt; bool</autodoc>
         <paramlist>
-          <param name="t" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="t" type="TimeSpan" default=""/>
         </paramlist>
       </method>
       <method name="GetWeeks" type="int" overloaded="no">
@@ -20732,10 +20732,10 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="GetMilliseconds" type="wxLongLong" overloaded="no">
         <autodoc>GetMilliseconds() -&gt; wxLongLong</autodoc>
       </method>
-      <method name="Format" type="wxString" overloaded="no">
+      <method name="Format" type="String" overloaded="no">
         <autodoc>Format(String format=TimeSpanFormatStr) -&gt; String</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxString" default="wxPyTimeSpanFormatStr"/>
+          <param name="format" type="String" default="wxPyTimeSpanFormatStr"/>
         </paramlist>
       </method>
     </class>
@@ -20752,61 +20752,61 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <destructor name="~wxDateSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <staticmethod name="Days" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Days" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Days(int days) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="days" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Day" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Day" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Day() -&gt; DateSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Weeks" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Weeks" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Weeks(int weeks) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="weeks" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Week" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Week" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Week() -&gt; DateSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Months" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Months" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Months(int mon) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="mon" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Month" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Month" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Month() -&gt; DateSpan</autodoc>
       </staticmethod>
-      <staticmethod name="Years" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Years" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Years(int years) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="years" type="int" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="Year" type="wxDateSpan" overloaded="no">
+      <staticmethod name="Year" type="DateSpan" overloaded="no">
         <autodoc>DateSpan.Year() -&gt; DateSpan</autodoc>
       </staticmethod>
-      <method name="SetYears" type="wxDateSpan" overloaded="no">
+      <method name="SetYears" type="DateSpan" overloaded="no">
         <autodoc>SetYears(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMonths" type="wxDateSpan" overloaded="no">
+      <method name="SetMonths" type="DateSpan" overloaded="no">
         <autodoc>SetMonths(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWeeks" type="wxDateSpan" overloaded="no">
+      <method name="SetWeeks" type="DateSpan" overloaded="no">
         <autodoc>SetWeeks(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDays" type="wxDateSpan" overloaded="no">
+      <method name="SetDays" type="DateSpan" overloaded="no">
         <autodoc>SetDays(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -20827,67 +20827,67 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="GetTotalDays" type="int" overloaded="no">
         <autodoc>GetTotalDays() -&gt; int</autodoc>
       </method>
-      <method name="Add" type="wxDateSpan" overloaded="no">
+      <method name="Add" type="DateSpan" overloaded="no">
         <autodoc>Add(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="Subtract" type="wxDateSpan" overloaded="no">
+      <method name="Subtract" type="DateSpan" overloaded="no">
         <autodoc>Subtract(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="Neg" type="wxDateSpan" overloaded="no">
+      <method name="Neg" type="DateSpan" overloaded="no">
         <autodoc>Neg() -&gt; DateSpan</autodoc>
       </method>
-      <method name="Multiply" type="wxDateSpan" overloaded="no">
+      <method name="Multiply" type="DateSpan" overloaded="no">
         <autodoc>Multiply(int factor) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="factor" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="__iadd__" type="wxDateSpan" overloaded="no">
+      <method name="__iadd__" type="DateSpan" overloaded="no">
         <autodoc>__iadd__(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__isub__" type="wxDateSpan" overloaded="no">
+      <method name="__isub__" type="DateSpan" overloaded="no">
         <autodoc>__isub__(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__neg__" type="wxDateSpan" overloaded="no">
+      <method name="__neg__" type="DateSpan" overloaded="no">
         <autodoc>__neg__() -&gt; DateSpan</autodoc>
       </method>
-      <method name="__imul__" type="wxDateSpan" overloaded="no">
+      <method name="__imul__" type="DateSpan" overloaded="no">
         <autodoc>__imul__(int factor) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="factor" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="__add__" type="wxDateSpan" overloaded="no">
+      <method name="__add__" type="DateSpan" overloaded="no">
         <autodoc>__add__(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__sub__" type="wxDateSpan" overloaded="no">
+      <method name="__sub__" type="DateSpan" overloaded="no">
         <autodoc>__sub__(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
-      <method name="__mul__" type="wxDateSpan" overloaded="no">
+      <method name="__mul__" type="DateSpan" overloaded="no">
         <autodoc>__mul__(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="__rmul__" type="wxDateSpan" overloaded="no">
+      <method name="__rmul__" type="DateSpan" overloaded="no">
         <autodoc>__rmul__(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -20896,13 +20896,13 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(DateSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(DateSpan other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxDateSpan" default=""/>
+          <param name="other" type="DateSpan" default=""/>
         </paramlist>
       </method>
     </class>
@@ -20931,7 +20931,7 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <constructor name="CustomDataFormat" overloaded="no">
         <autodoc>CustomDataFormat(String format) -&gt; DataFormat</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>
         </paramlist>
       </constructor>
       <destructor name="~wxDataFormat" overloaded="no">
@@ -20951,17 +20951,17 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <autodoc>__eq__(int format) -&gt; bool
 __eq__(DataFormat format) -&gt; bool</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="yes">
         <autodoc>__ne__(int format) -&gt; bool
 __ne__(DataFormat format) -&gt; bool</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
-      <method name="SetType" type="void" overloaded="no">
+      <method name="SetType" type="" overloaded="no">
         <autodoc>SetType(int format)</autodoc>
         <paramlist>
           <param name="format" type="wxDataFormatId" default=""/>
@@ -20970,13 +20970,13 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="GetType" type="wxDataFormatId" overloaded="no">
         <autodoc>GetType() -&gt; int</autodoc>
       </method>
-      <method name="GetId" type="wxString" overloaded="no">
+      <method name="GetId" type="String" overloaded="no">
         <autodoc>GetId() -&gt; String</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(String format)</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -20984,7 +20984,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <destructor name="~wxDataObject" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="GetPreferredFormat" type="wxDataFormat" overloaded="no">
+      <method name="GetPreferredFormat" type="DataFormat" overloaded="no">
         <autodoc>GetPreferredFormat(int dir=Get) -&gt; DataFormat</autodoc>
         <paramlist>
           <param name="dir" type="wxDataObject::Direction" default="wxDataObject::Get"/>
@@ -20999,184 +20999,184 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="IsSupported" type="bool" overloaded="no">
         <autodoc>IsSupported(DataFormat format, int dir=Get) -&gt; bool</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
           <param name="dir" type="wxDataObject::Direction" default="wxDataObject::Get"/>
         </paramlist>
       </method>
       <method name="GetDataSize" type="size_t" overloaded="no">
         <autodoc>GetDataSize(DataFormat format) -&gt; size_t</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
-      <method name="GetAllFormats" type="void" overloaded="no">
+      <method name="GetAllFormats" type="" overloaded="no">
         <autodoc>GetAllFormats(DataFormat formats, int dir=Get)</autodoc>
         <paramlist>
-          <param name="formats" type="p.wxDataFormat" default=""/>
+          <param name="formats" type="DataFormat" default=""/>
           <param name="dir" type="wxDataObject::Direction" default="wxDataObject::Get"/>
         </paramlist>
       </method>
       <method name="GetDataHere" type="bool" overloaded="no">
         <autodoc>GetDataHere(DataFormat format, void buf) -&gt; bool</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
-          <param name="buf" type="p.void" default=""/>
+          <param name="format" type="DataFormat" default=""/>
+          <param name="buf" type="" default=""/>
         </paramlist>
       </method>
       <method name="SetData" type="bool" overloaded="no">
         <autodoc>SetData(DataFormat format, size_t len, void buf) -&gt; bool</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
           <param name="len" type="size_t" default=""/>
-          <param name="buf" type="p.q(const).void" default=""/>
+          <param name="buf" type="" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="DataObjectSimple" oldname="wxDataObjectSimple" module="misc">
-      <baseclass name="wxDataObject"/>
+      <baseclass name="DataObject"/>
       <constructor name="DataObjectSimple" overloaded="no">
         <autodoc>__init__(DataFormat format=FormatInvalid) -&gt; DataObjectSimple</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default="wxFormatInvalid"/>
+          <param name="format" type="DataFormat" default="wxFormatInvalid"/>
         </paramlist>
       </constructor>
-      <method name="GetFormat" type="q(const).wxDataFormat" overloaded="no">
+      <method name="GetFormat" type="DataFormat" overloaded="no">
         <autodoc>GetFormat() -&gt; DataFormat</autodoc>
       </method>
-      <method name="SetFormat" type="void" overloaded="no">
+      <method name="SetFormat" type="" overloaded="no">
         <autodoc>SetFormat(DataFormat format)</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyDataObjectSimple" oldname="wxPyDataObjectSimple" module="misc">
-      <baseclass name="wxDataObjectSimple"/>
+      <baseclass name="DataObjectSimple"/>
       <constructor name="PyDataObjectSimple" overloaded="no">
         <autodoc>__init__(DataFormat format=FormatInvalid) -&gt; PyDataObjectSimple</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default="wxFormatInvalid"/>
+          <param name="format" type="DataFormat" default="wxFormatInvalid"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="DataObjectComposite" oldname="wxDataObjectComposite" module="misc">
-      <baseclass name="wxDataObject"/>
+      <baseclass name="DataObject"/>
       <constructor name="DataObjectComposite" overloaded="no">
         <autodoc>__init__() -&gt; DataObjectComposite</autodoc>
       </constructor>
-      <method name="Add" type="void" overloaded="no">
+      <method name="Add" type="" overloaded="no">
         <autodoc>Add(DataObjectSimple dataObject, int preferred=False)</autodoc>
         <paramlist>
-          <param name="dataObject" type="p.wxDataObjectSimple" default=""/>
+          <param name="dataObject" type="DataObjectSimple" default=""/>
           <param name="preferred" type="int" default="False"/>
         </paramlist>
       </method>
     </class>
     <class name="TextDataObject" oldname="wxTextDataObject" module="misc">
-      <baseclass name="wxDataObjectSimple"/>
+      <baseclass name="DataObjectSimple"/>
       <constructor name="TextDataObject" overloaded="no">
         <autodoc>__init__(String text=EmptyString) -&gt; TextDataObject</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
       <method name="GetTextLength" type="size_t" overloaded="no">
         <autodoc>GetTextLength() -&gt; size_t</autodoc>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyTextDataObject" oldname="wxPyTextDataObject" module="misc">
-      <baseclass name="wxTextDataObject"/>
+      <baseclass name="TextDataObject"/>
       <constructor name="PyTextDataObject" overloaded="no">
         <autodoc>__init__(String text=EmptyString) -&gt; PyTextDataObject</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="BitmapDataObject" oldname="wxBitmapDataObject" module="misc">
-      <baseclass name="wxDataObjectSimple"/>
+      <baseclass name="DataObjectSimple"/>
       <constructor name="BitmapDataObject" overloaded="no">
         <autodoc>__init__(Bitmap bitmap=wxNullBitmap) -&gt; BitmapDataObject</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
         </paramlist>
       </constructor>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
-      <method name="SetBitmap" type="void" overloaded="no">
+      <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyBitmapDataObject" oldname="wxPyBitmapDataObject" module="misc">
-      <baseclass name="wxBitmapDataObject"/>
+      <baseclass name="BitmapDataObject"/>
       <constructor name="PyBitmapDataObject" overloaded="no">
         <autodoc>__init__(Bitmap bitmap=wxNullBitmap) -&gt; PyBitmapDataObject</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FileDataObject" oldname="wxFileDataObject" module="misc">
-      <baseclass name="wxDataObjectSimple"/>
+      <baseclass name="DataObjectSimple"/>
       <constructor name="FileDataObject" overloaded="no">
         <autodoc>__init__() -&gt; FileDataObject</autodoc>
       </constructor>
-      <method name="GetFilenames" type="q(const).wxArrayString" overloaded="no">
+      <method name="GetFilenames" type="wxArrayString" overloaded="no">
         <autodoc>GetFilenames() -&gt; wxArrayString</autodoc>
       </method>
     </class>
     <class name="CustomDataObject" oldname="wxCustomDataObject" module="misc">
-      <baseclass name="wxDataObjectSimple"/>
+      <baseclass name="DataObjectSimple"/>
       <constructor name="CustomDataObject" overloaded="no">
         <autodoc>__init__(DataFormat format=FormatInvalid) -&gt; CustomDataObject</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default="wxFormatInvalid"/>
+          <param name="format" type="DataFormat" default="wxFormatInvalid"/>
         </paramlist>
       </constructor>
-      <method name="TakeData" type="void" overloaded="no">
+      <method name="TakeData" type="" overloaded="no">
         <autodoc>TakeData(PyObject data)</autodoc>
         <paramlist>
-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="SetData" type="bool" overloaded="no">
         <autodoc>SetData(PyObject data) -&gt; bool</autodoc>
         <paramlist>
-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetSize" type="size_t" overloaded="no">
@@ -21187,22 +21187,22 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="URLDataObject" oldname="wxURLDataObject" module="misc">
-      <baseclass name="wxDataObjectComposite"/>
+      <baseclass name="DataObjectComposite"/>
       <constructor name="URLDataObject" overloaded="no">
         <autodoc>__init__() -&gt; URLDataObject</autodoc>
       </constructor>
-      <method name="GetURL" type="wxString" overloaded="no">
+      <method name="GetURL" type="String" overloaded="no">
         <autodoc>GetURL() -&gt; String</autodoc>
       </method>
-      <method name="SetURL" type="void" overloaded="no">
+      <method name="SetURL" type="" overloaded="no">
         <autodoc>SetURL(String url)</autodoc>
         <paramlist>
-          <param name="url" type="r.q(const).wxString" default=""/>
+          <param name="url" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="MetafileDataObject" oldname="wxMetafileDataObject" module="misc">
-      <baseclass name="wxDataObjectSimple"/>
+      <baseclass name="DataObjectSimple"/>
       <constructor name="MetafileDataObject" overloaded="no">
         <autodoc>__init__() -&gt; MetafileDataObject</autodoc>
       </constructor>
@@ -21221,37 +21221,37 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
         <autodoc>__init__(Window win=None, Icon copy=wxNullIcon, Icon move=wxNullIcon, 
     Icon none=wxNullIcon) -&gt; DropSource</autodoc>
         <paramlist>
-          <param name="win" type="p.wxWindow" default="NULL"/>
-          <param name="copy" type="r.q(const).wxIcon" default="wxNullIcon"/>
-          <param name="move" type="r.q(const).wxIcon" default="wxNullIcon"/>
-          <param name="none" type="r.q(const).wxIcon" default="wxNullIcon"/>
+          <param name="win" type="Window" default="NULL"/>
+          <param name="copy" type="Icon" default="wxNullIcon"/>
+          <param name="move" type="Icon" default="wxNullIcon"/>
+          <param name="none" type="Icon" default="wxNullIcon"/>
         </paramlist>
       </constructor>
       <destructor name="~wxPyDropSource" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class, int incref)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
           <param name="incref" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetData" type="void" overloaded="no">
+      <method name="SetData" type="" overloaded="no">
         <autodoc>SetData(DataObject data)</autodoc>
         <paramlist>
-          <param name="data" type="r.wxDataObject" default=""/>
+          <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetDataObject" type="wxDataObject" overloaded="no">
+      <method name="GetDataObject" type="DataObject" overloaded="no">
         <autodoc>GetDataObject() -&gt; DataObject</autodoc>
       </method>
-      <method name="SetCursor" type="void" overloaded="no">
+      <method name="SetCursor" type="" overloaded="no">
         <autodoc>SetCursor(int res, Cursor cursor)</autodoc>
         <paramlist>
           <param name="res" type="wxDragResult" default=""/>
-          <param name="cursor" type="r.q(const).wxCursor" default=""/>
+          <param name="cursor" type="Cursor" default=""/>
         </paramlist>
       </method>
       <method name="DoDragDrop" type="wxDragResult" overloaded="no">
@@ -21271,26 +21271,26 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <constructor name="PyDropTarget" overloaded="no">
         <autodoc>PyDropTarget(DataObject dataObject=None) -&gt; DropTarget</autodoc>
         <paramlist>
-          <param name="dataObject" type="p.wxDataObject" default="NULL"/>
+          <param name="dataObject" type="DataObject" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxPyDropTarget" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetDataObject" type="wxDataObject" overloaded="no">
+      <method name="GetDataObject" type="DataObject" overloaded="no">
         <autodoc>GetDataObject() -&gt; DataObject</autodoc>
       </method>
-      <method name="SetDataObject" type="void" overloaded="no">
+      <method name="SetDataObject" type="" overloaded="no">
         <autodoc>SetDataObject(DataObject dataObject)</autodoc>
         <paramlist>
-          <param name="dataObject" type="p.wxDataObject" default=""/>
+          <param name="dataObject" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="base_OnEnter" type="wxDragResult" overloaded="no">
@@ -21309,7 +21309,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
           <param name="def" type="wxDragResult" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeave" type="void" overloaded="no">
+      <method name="base_OnLeave" type="" overloaded="no">
         <autodoc>base_OnLeave()</autodoc>
       </method>
       <method name="base_OnDrop" type="bool" overloaded="no">
@@ -21325,15 +21325,15 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     </class>
     <pythoncode> PyDropTarget = DropTarget </pythoncode>
     <class name="TextDropTarget" oldname="wxPyTextDropTarget" module="misc">
-      <baseclass name="wxPyDropTarget"/>
+      <baseclass name="DropTarget"/>
       <constructor name="wxPyTextDropTarget" overloaded="no">
         <autodoc>__init__() -&gt; TextDropTarget</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="base_OnEnter" type="wxDragResult" overloaded="no">
@@ -21352,7 +21352,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
           <param name="def" type="wxDragResult" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeave" type="void" overloaded="no">
+      <method name="base_OnLeave" type="" overloaded="no">
         <autodoc>base_OnLeave()</autodoc>
       </method>
       <method name="base_OnDrop" type="bool" overloaded="no">
@@ -21372,15 +21372,15 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="FileDropTarget" oldname="wxPyFileDropTarget" module="misc">
-      <baseclass name="wxPyDropTarget"/>
+      <baseclass name="DropTarget"/>
       <constructor name="wxPyFileDropTarget" overloaded="no">
         <autodoc>__init__() -&gt; FileDropTarget</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="base_OnEnter" type="wxDragResult" overloaded="no">
@@ -21399,7 +21399,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
           <param name="def" type="wxDragResult" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeave" type="void" overloaded="no">
+      <method name="base_OnLeave" type="" overloaded="no">
         <autodoc>base_OnLeave()</autodoc>
       </method>
       <method name="base_OnDrop" type="bool" overloaded="no">
@@ -21422,7 +21422,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Clipboard" oldname="wxClipboard" module="misc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Clipboard" overloaded="no">
         <autodoc>__init__() -&gt; Clipboard</autodoc>
       </constructor>
@@ -21432,7 +21432,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="Open" type="bool" overloaded="no">
         <autodoc>Open() -&gt; bool</autodoc>
       </method>
-      <method name="Close" type="void" overloaded="no">
+      <method name="Close" type="" overloaded="no">
         <autodoc>Close()</autodoc>
       </method>
       <method name="IsOpened" type="bool" overloaded="no">
@@ -21441,34 +21441,34 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="AddData" type="bool" overloaded="no">
         <autodoc>AddData(DataObject data) -&gt; bool</autodoc>
         <paramlist>
-          <param name="data" type="p.wxDataObject" default=""/>
+          <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="SetData" type="bool" overloaded="no">
         <autodoc>SetData(DataObject data) -&gt; bool</autodoc>
         <paramlist>
-          <param name="data" type="p.wxDataObject" default=""/>
+          <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
       <method name="IsSupported" type="bool" overloaded="no">
         <autodoc>IsSupported(DataFormat format) -&gt; bool</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxDataFormat" default=""/>
+          <param name="format" type="DataFormat" default=""/>
         </paramlist>
       </method>
       <method name="GetData" type="bool" overloaded="no">
         <autodoc>GetData(DataObject data) -&gt; bool</autodoc>
         <paramlist>
-          <param name="data" type="r.wxDataObject" default=""/>
+          <param name="data" type="DataObject" default=""/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="Flush" type="bool" overloaded="no">
         <autodoc>Flush() -&gt; bool</autodoc>
       </method>
-      <method name="UsePrimarySelection" type="void" overloaded="no">
+      <method name="UsePrimarySelection" type="" overloaded="no">
         <autodoc>UsePrimarySelection(bool primary=False)</autodoc>
         <paramlist>
           <param name="primary" type="bool" default="False"/>
@@ -21479,7 +21479,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <constructor name="ClipboardLocker" overloaded="no">
         <autodoc>__init__(Clipboard clipboard=None) -&gt; ClipboardLocker</autodoc>
         <paramlist>
-          <param name="clipboard" type="p.wxClipboard" default="NULL"/>
+          <param name="clipboard" type="Clipboard" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxClipboardLocker" overloaded="no">
@@ -21499,10 +21499,10 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     Font font=wxNullFont, 
     int border=CAL_BORDER_NONE) -&gt; CalendarDateAttr</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
-          <param name="colBack" type="r.q(const).wxColour" default="wxNullColour"/>
-          <param name="colBorder" type="r.q(const).wxColour" default="wxNullColour"/>
-          <param name="font" type="r.q(const).wxFont" default="wxNullFont"/>
+          <param name="colText" type="Colour" default=""/>
+          <param name="colBack" type="Colour" default="wxNullColour"/>
+          <param name="colBorder" type="Colour" default="wxNullColour"/>
+          <param name="font" type="Font" default="wxNullFont"/>
           <param name="border" type="wxCalendarDateBorder" default="wxCAL_BORDER_NONE"/>
         </paramlist>
       </constructor>
@@ -21510,40 +21510,40 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
         <autodoc>CalendarDateAttrBorder(int border, Colour colBorder=wxNullColour) -&gt; CalendarDateAttr</autodoc>
         <paramlist>
           <param name="border" type="wxCalendarDateBorder" default=""/>
-          <param name="colBorder" type="r.q(const).wxColour" default="wxNullColour"/>
+          <param name="colBorder" type="Colour" default="wxNullColour"/>
         </paramlist>
       </constructor>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBorderColour" type="void" overloaded="no">
+      <method name="SetBorderColour" type="" overloaded="no">
         <autodoc>SetBorderColour(Colour col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetBorder" type="void" overloaded="no">
+      <method name="SetBorder" type="" overloaded="no">
         <autodoc>SetBorder(int border)</autodoc>
         <paramlist>
           <param name="border" type="wxCalendarDateBorder" default=""/>
         </paramlist>
       </method>
-      <method name="SetHoliday" type="void" overloaded="no">
+      <method name="SetHoliday" type="" overloaded="no">
         <autodoc>SetHoliday(bool holiday)</autodoc>
         <paramlist>
           <param name="holiday" type="bool" default=""/>
@@ -21567,16 +21567,16 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="IsHoliday" type="bool" overloaded="no">
         <autodoc>IsHoliday() -&gt; bool</autodoc>
       </method>
-      <method name="GetTextColour" type="wxColour" overloaded="no">
+      <method name="GetTextColour" type="Colour" overloaded="no">
         <autodoc>GetTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetBorderColour" type="wxColour" overloaded="no">
+      <method name="GetBorderColour" type="Colour" overloaded="no">
         <autodoc>GetBorderColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
       <method name="GetBorder" type="wxCalendarDateBorder" overloaded="no">
@@ -21584,27 +21584,27 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="CalendarEvent" oldname="wxCalendarEvent" module="calendar">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="CalendarEvent" overloaded="no">
         <autodoc>__init__(CalendarCtrl cal, wxEventType type) -&gt; CalendarEvent</autodoc>
         <paramlist>
-          <param name="cal" type="p.wxCalendarCtrl" default=""/>
+          <param name="cal" type="wxCalendarCtrl" default=""/>
           <param name="type" type="wxEventType" default=""/>
         </paramlist>
       </constructor>
-      <method name="GetDate" type="q(const).wxDateTime" overloaded="no">
+      <method name="GetDate" type="DateTime" overloaded="no">
         <autodoc>GetDate() -&gt; DateTime</autodoc>
       </method>
-      <method name="SetDate" type="void" overloaded="no">
+      <method name="SetDate" type="" overloaded="no">
         <autodoc>SetDate(DateTime date)</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxDateTime" default=""/>
+          <param name="date" type="DateTime" default=""/>
         </paramlist>
       </method>
-      <method name="SetWeekDay" type="void" overloaded="no">
+      <method name="SetWeekDay" type="" overloaded="no">
         <autodoc>SetWeekDay(int wd)</autodoc>
         <paramlist>
-          <param name="wd" type="q(const).wxDateTime::WeekDay" default=""/>
+          <param name="wd" type="wxDateTime::WeekDay" default=""/>
         </paramlist>
       </method>
       <method name="GetWeekDay" type="wxDateTime::WeekDay" overloaded="no">
@@ -21620,20 +21620,20 @@ EVT_CALENDAR_YEAR =            wx.PyEventBinder( wxEVT_CALENDAR_YEAR_CHANGED, 1)
 EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
 </pythoncode>
     <class name="CalendarCtrl" oldname="wxCalendarCtrl" module="calendar">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="CalendarCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id, DateTime date=wxDefaultDateTime, 
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; CalendarCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="date" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="date" type="DateTime" default="wxDefaultDateTime"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyCalendarNameStr"/>
+          <param name="name" type="String" default="wxPyCalendarNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreCalendarCtrl" overloaded="no">
@@ -21645,126 +21645,126 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="date" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="date" type="DateTime" default="wxDefaultDateTime"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyCalendarNameStr"/>
+          <param name="name" type="String" default="wxPyCalendarNameStr"/>
         </paramlist>
       </method>
-      <method name="SetDate" type="void" overloaded="no">
+      <method name="SetDate" type="" overloaded="no">
         <autodoc>SetDate(DateTime date)</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxDateTime" default=""/>
+          <param name="date" type="DateTime" default=""/>
         </paramlist>
       </method>
-      <method name="GetDate" type="q(const).wxDateTime" overloaded="no">
+      <method name="GetDate" type="DateTime" overloaded="no">
         <autodoc>GetDate() -&gt; DateTime</autodoc>
       </method>
       <method name="SetLowerDateLimit" type="bool" overloaded="no">
         <autodoc>SetLowerDateLimit(DateTime date=wxDefaultDateTime) -&gt; bool</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
+          <param name="date" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>
-      <method name="GetLowerDateLimit" type="q(const).wxDateTime" overloaded="no">
+      <method name="GetLowerDateLimit" type="DateTime" overloaded="no">
         <autodoc>GetLowerDateLimit() -&gt; DateTime</autodoc>
       </method>
       <method name="SetUpperDateLimit" type="bool" overloaded="no">
         <autodoc>SetUpperDateLimit(DateTime date=wxDefaultDateTime) -&gt; bool</autodoc>
         <paramlist>
-          <param name="date" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
+          <param name="date" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>
-      <method name="GetUpperDateLimit" type="q(const).wxDateTime" overloaded="no">
+      <method name="GetUpperDateLimit" type="DateTime" overloaded="no">
         <autodoc>GetUpperDateLimit() -&gt; DateTime</autodoc>
       </method>
       <method name="SetDateRange" type="bool" overloaded="no">
         <autodoc>SetDateRange(DateTime lowerdate=wxDefaultDateTime, DateTime upperdate=wxDefaultDateTime) -&gt; bool</autodoc>
         <paramlist>
-          <param name="lowerdate" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
-          <param name="upperdate" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
+          <param name="lowerdate" type="DateTime" default="wxDefaultDateTime"/>
+          <param name="upperdate" type="DateTime" default="wxDefaultDateTime"/>
         </paramlist>
       </method>
-      <method name="EnableYearChange" type="void" overloaded="no">
+      <method name="EnableYearChange" type="" overloaded="no">
         <autodoc>EnableYearChange(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="EnableMonthChange" type="void" overloaded="no">
+      <method name="EnableMonthChange" type="" overloaded="no">
         <autodoc>EnableMonthChange(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="EnableHolidayDisplay" type="void" overloaded="no">
+      <method name="EnableHolidayDisplay" type="" overloaded="no">
         <autodoc>EnableHolidayDisplay(bool display=True)</autodoc>
         <paramlist>
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetHeaderColours" type="void" overloaded="no">
+      <method name="SetHeaderColours" type="" overloaded="no">
         <autodoc>SetHeaderColours(Colour colFg, Colour colBg)</autodoc>
         <paramlist>
-          <param name="colFg" type="r.q(const).wxColour" default=""/>
-          <param name="colBg" type="r.q(const).wxColour" default=""/>
+          <param name="colFg" type="Colour" default=""/>
+          <param name="colBg" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetHeaderColourFg" type="wxColour" overloaded="no">
+      <method name="GetHeaderColourFg" type="Colour" overloaded="no">
         <autodoc>GetHeaderColourFg() -&gt; Colour</autodoc>
       </method>
-      <method name="GetHeaderColourBg" type="wxColour" overloaded="no">
+      <method name="GetHeaderColourBg" type="Colour" overloaded="no">
         <autodoc>GetHeaderColourBg() -&gt; Colour</autodoc>
       </method>
-      <method name="SetHighlightColours" type="void" overloaded="no">
+      <method name="SetHighlightColours" type="" overloaded="no">
         <autodoc>SetHighlightColours(Colour colFg, Colour colBg)</autodoc>
         <paramlist>
-          <param name="colFg" type="r.q(const).wxColour" default=""/>
-          <param name="colBg" type="r.q(const).wxColour" default=""/>
+          <param name="colFg" type="Colour" default=""/>
+          <param name="colBg" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetHighlightColourFg" type="wxColour" overloaded="no">
+      <method name="GetHighlightColourFg" type="Colour" overloaded="no">
         <autodoc>GetHighlightColourFg() -&gt; Colour</autodoc>
       </method>
-      <method name="GetHighlightColourBg" type="wxColour" overloaded="no">
+      <method name="GetHighlightColourBg" type="Colour" overloaded="no">
         <autodoc>GetHighlightColourBg() -&gt; Colour</autodoc>
       </method>
-      <method name="SetHolidayColours" type="void" overloaded="no">
+      <method name="SetHolidayColours" type="" overloaded="no">
         <autodoc>SetHolidayColours(Colour colFg, Colour colBg)</autodoc>
         <paramlist>
-          <param name="colFg" type="r.q(const).wxColour" default=""/>
-          <param name="colBg" type="r.q(const).wxColour" default=""/>
+          <param name="colFg" type="Colour" default=""/>
+          <param name="colBg" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetHolidayColourFg" type="wxColour" overloaded="no">
+      <method name="GetHolidayColourFg" type="Colour" overloaded="no">
         <autodoc>GetHolidayColourFg() -&gt; Colour</autodoc>
       </method>
-      <method name="GetHolidayColourBg" type="wxColour" overloaded="no">
+      <method name="GetHolidayColourBg" type="Colour" overloaded="no">
         <autodoc>GetHolidayColourBg() -&gt; Colour</autodoc>
       </method>
-      <method name="GetAttr" type="wxCalendarDateAttr" overloaded="no">
+      <method name="GetAttr" type="CalendarDateAttr" overloaded="no">
         <autodoc>GetAttr(size_t day) -&gt; CalendarDateAttr</autodoc>
         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetAttr" type="void" overloaded="no">
+      <method name="SetAttr" type="" overloaded="no">
         <autodoc>SetAttr(size_t day, CalendarDateAttr attr)</autodoc>
         <paramlist>
           <param name="day" type="size_t" default=""/>
-          <param name="attr" type="p.wxCalendarDateAttr" default=""/>
+          <param name="attr" type="CalendarDateAttr" default=""/>
         </paramlist>
       </method>
-      <method name="SetHoliday" type="void" overloaded="no">
+      <method name="SetHoliday" type="" overloaded="no">
         <autodoc>SetHoliday(size_t day)</autodoc>
         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="ResetAttr" type="void" overloaded="no">
+      <method name="ResetAttr" type="" overloaded="no">
         <autodoc>ResetAttr(size_t day)</autodoc>
         <paramlist>
           <param name="day" type="size_t" default=""/>
@@ -21773,9 +21773,9 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="HitTest" type="wxCalendarHitTestResult" overloaded="no">
         <autodoc>HitTest(Point pos, DateTime date=None, int wd=None) -&gt; int</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
-          <param name="date" type="p.wxDateTime" default="NULL"/>
-          <param name="wd" type="p.wxDateTime::WeekDay" default="NULL"/>
+          <param name="pos" type="Point" default=""/>
+          <param name="date" type="DateTime" default="NULL"/>
+          <param name="wd" type="wxDateTime::WeekDay" default="NULL"/>
         </paramlist>
       </method>
       <method name="Enable" type="bool" overloaded="no">
@@ -21790,10 +21790,10 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="show" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="GetMonthControl" type="wxControl" overloaded="no">
+      <method name="GetMonthControl" type="Control" overloaded="no">
         <autodoc>GetMonthControl() -&gt; Control</autodoc>
       </method>
-      <method name="GetYearControl" type="wxControl" overloaded="no">
+      <method name="GetYearControl" type="Control" overloaded="no">
         <autodoc>GetYearControl() -&gt; Control</autodoc>
       </method>
     </class>
@@ -21802,84 +21802,84 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
     <import name="windows"/>
     <pythoncode> wx = core </pythoncode>
     <class name="GridCellRenderer" oldname="wxGridCellRenderer" module="grid">
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetParameters" type="void" overloaded="no">
+      <method name="SetParameters" type="" overloaded="no">
         <autodoc>SetParameters(String params)</autodoc>
         <paramlist>
-          <param name="params" type="r.q(const).wxString" default=""/>
+          <param name="params" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="IncRef" type="void" overloaded="no">
+      <method name="IncRef" type="" overloaded="no">
         <autodoc>IncRef()</autodoc>
       </method>
-      <method name="DecRef" type="void" overloaded="no">
+      <method name="DecRef" type="" overloaded="no">
         <autodoc>DecRef()</autodoc>
       </method>
-      <method name="Draw" type="void" overloaded="no">
+      <method name="Draw" type="" overloaded="no">
         <autodoc>Draw(Grid grid, GridCellAttr attr, DC dc, Rect rect, int row, 
     int col, bool isSelected)</autodoc>
         <paramlist>
-          <param name="grid" type="r.wxGrid" default=""/>
-          <param name="attr" type="r.wxGridCellAttr" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
+          <param name="attr" type="wxGridCellAttr" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
           <param name="isSelected" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="GetBestSize" type="wxSize" overloaded="no">
+      <method name="GetBestSize" type="Size" overloaded="no">
         <autodoc>GetBestSize(Grid grid, GridCellAttr attr, DC dc, int row, int col) -&gt; Size</autodoc>
         <paramlist>
-          <param name="grid" type="r.wxGrid" default=""/>
-          <param name="attr" type="r.wxGridCellAttr" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
+          <param name="attr" type="wxGridCellAttr" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Clone" type="wxGridCellRenderer" overloaded="no">
+      <method name="Clone" type="GridCellRenderer" overloaded="no">
         <autodoc>Clone() -&gt; GridCellRenderer</autodoc>
       </method>
     </class>
     <class name="PyGridCellRenderer" oldname="wxPyGridCellRenderer" module="grid">
-      <baseclass name="wxGridCellRenderer"/>
+      <baseclass name="GridCellRenderer"/>
       <constructor name="PyGridCellRenderer" overloaded="no">
         <autodoc>__init__() -&gt; PyGridCellRenderer</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetParameters" type="void" overloaded="no">
+      <method name="base_SetParameters" type="" overloaded="no">
         <autodoc>base_SetParameters(String params)</autodoc>
         <paramlist>
-          <param name="params" type="r.q(const).wxString" default=""/>
+          <param name="params" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="GridCellStringRenderer" oldname="wxGridCellStringRenderer" module="grid">
-      <baseclass name="wxGridCellRenderer"/>
+      <baseclass name="GridCellRenderer"/>
       <constructor name="GridCellStringRenderer" overloaded="no">
         <autodoc>__init__() -&gt; GridCellStringRenderer</autodoc>
       </constructor>
     </class>
     <class name="GridCellNumberRenderer" oldname="wxGridCellNumberRenderer" module="grid">
-      <baseclass name="wxGridCellStringRenderer"/>
+      <baseclass name="GridCellStringRenderer"/>
       <constructor name="GridCellNumberRenderer" overloaded="no">
         <autodoc>__init__() -&gt; GridCellNumberRenderer</autodoc>
       </constructor>
     </class>
     <class name="GridCellFloatRenderer" oldname="wxGridCellFloatRenderer" module="grid">
-      <baseclass name="wxGridCellStringRenderer"/>
+      <baseclass name="GridCellStringRenderer"/>
       <constructor name="GridCellFloatRenderer" overloaded="no">
         <autodoc>__init__(int width=-1, int precision=-1) -&gt; GridCellFloatRenderer</autodoc>
         <paramlist>
@@ -21890,7 +21890,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetWidth" type="int" overloaded="no">
         <autodoc>GetWidth() -&gt; int</autodoc>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
@@ -21899,7 +21899,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetPrecision" type="int" overloaded="no">
         <autodoc>GetPrecision() -&gt; int</autodoc>
       </method>
-      <method name="SetPrecision" type="void" overloaded="no">
+      <method name="SetPrecision" type="" overloaded="no">
         <autodoc>SetPrecision(int precision)</autodoc>
         <paramlist>
           <param name="precision" type="int" default=""/>
@@ -21907,90 +21907,90 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridCellBoolRenderer" oldname="wxGridCellBoolRenderer" module="grid">
-      <baseclass name="wxGridCellRenderer"/>
+      <baseclass name="GridCellRenderer"/>
       <constructor name="GridCellBoolRenderer" overloaded="no">
         <autodoc>__init__() -&gt; GridCellBoolRenderer</autodoc>
       </constructor>
     </class>
     <class name="GridCellDateTimeRenderer" oldname="wxGridCellDateTimeRenderer" module="grid">
-      <baseclass name="wxGridCellStringRenderer"/>
+      <baseclass name="GridCellStringRenderer"/>
       <constructor name="GridCellDateTimeRenderer" overloaded="no">
         <autodoc>__init__(String outformat=DateTimeFormatStr, String informat=DateTimeFormatStr) -&gt; GridCellDateTimeRenderer</autodoc>
         <paramlist>
-          <param name="outformat" type="wxString" default="wxPyDateTimeFormatStr"/>
-          <param name="informat" type="wxString" default="wxPyDateTimeFormatStr"/>
+          <param name="outformat" type="String" default="wxPyDateTimeFormatStr"/>
+          <param name="informat" type="String" default="wxPyDateTimeFormatStr"/>
         </paramlist>
       </constructor>
     </class>
     <class name="GridCellEnumRenderer" oldname="wxGridCellEnumRenderer" module="grid">
-      <baseclass name="wxGridCellStringRenderer"/>
+      <baseclass name="GridCellStringRenderer"/>
       <constructor name="GridCellEnumRenderer" overloaded="no">
         <autodoc>__init__(String choices=EmptyString) -&gt; GridCellEnumRenderer</autodoc>
         <paramlist>
-          <param name="choices" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="choices" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
     </class>
     <class name="GridCellAutoWrapStringRenderer" oldname="wxGridCellAutoWrapStringRenderer" module="grid">
-      <baseclass name="wxGridCellStringRenderer"/>
+      <baseclass name="GridCellStringRenderer"/>
       <constructor name="GridCellAutoWrapStringRenderer" overloaded="no">
         <autodoc>__init__() -&gt; GridCellAutoWrapStringRenderer</autodoc>
       </constructor>
     </class>
     <class name="GridCellEditor" oldname="wxGridCellEditor" module="grid">
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="IsCreated" type="bool" overloaded="no">
         <autodoc>IsCreated() -&gt; bool</autodoc>
       </method>
-      <method name="GetControl" type="wxControl" overloaded="no">
+      <method name="GetControl" type="Control" overloaded="no">
         <autodoc>GetControl() -&gt; Control</autodoc>
       </method>
-      <method name="SetControl" type="void" overloaded="no">
+      <method name="SetControl" type="" overloaded="no">
         <autodoc>SetControl(Control control)</autodoc>
         <paramlist>
-          <param name="control" type="p.wxControl" default=""/>
+          <param name="control" type="Control" default=""/>
         </paramlist>
       </method>
       <method name="GetCellAttr" type="wxGridCellAttr" overloaded="no">
         <autodoc>GetCellAttr() -&gt; GridCellAttr</autodoc>
       </method>
-      <method name="SetCellAttr" type="void" overloaded="no">
+      <method name="SetCellAttr" type="" overloaded="no">
         <autodoc>SetCellAttr(GridCellAttr attr)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="wxGridCellAttr" default=""/>
         </paramlist>
       </method>
-      <method name="SetParameters" type="void" overloaded="no">
+      <method name="SetParameters" type="" overloaded="no">
         <autodoc>SetParameters(String params)</autodoc>
         <paramlist>
-          <param name="params" type="r.q(const).wxString" default=""/>
+          <param name="params" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="IncRef" type="void" overloaded="no">
+      <method name="IncRef" type="" overloaded="no">
         <autodoc>IncRef()</autodoc>
       </method>
-      <method name="DecRef" type="void" overloaded="no">
+      <method name="DecRef" type="" overloaded="no">
         <autodoc>DecRef()</autodoc>
       </method>
-      <method name="Create" type="void" overloaded="no">
+      <method name="Create" type="" overloaded="no">
         <autodoc>Create(Window parent, int id, EvtHandler evtHandler)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="evtHandler" type="p.wxEvtHandler" default=""/>
+          <param name="evtHandler" type="EvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="BeginEdit" type="void" overloaded="no">
+      <method name="BeginEdit" type="" overloaded="no">
         <autodoc>BeginEdit(int row, int col, Grid grid)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="grid" type="p.wxGrid" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
         </paramlist>
       </method>
       <method name="EndEdit" type="bool" overloaded="no">
@@ -21998,134 +21998,134 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="grid" type="p.wxGrid" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
         </paramlist>
       </method>
-      <method name="Reset" type="void" overloaded="no">
+      <method name="Reset" type="" overloaded="no">
         <autodoc>Reset()</autodoc>
       </method>
-      <method name="Clone" type="wxGridCellEditor" overloaded="no">
+      <method name="Clone" type="GridCellEditor" overloaded="no">
         <autodoc>Clone() -&gt; GridCellEditor</autodoc>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="Show" type="void" overloaded="no">
+      <method name="Show" type="" overloaded="no">
         <autodoc>Show(bool show, GridCellAttr attr=None)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default="NULL"/>
+          <param name="attr" type="wxGridCellAttr" default="NULL"/>
         </paramlist>
       </method>
-      <method name="PaintBackground" type="void" overloaded="no">
+      <method name="PaintBackground" type="" overloaded="no">
         <autodoc>PaintBackground(Rect rectCell, GridCellAttr attr)</autodoc>
         <paramlist>
-          <param name="rectCell" type="r.q(const).wxRect" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="rectCell" type="Rect" default=""/>
+          <param name="attr" type="wxGridCellAttr" default=""/>
         </paramlist>
       </method>
       <method name="IsAcceptedKey" type="bool" overloaded="no">
         <autodoc>IsAcceptedKey(KeyEvent event) -&gt; bool</autodoc>
         <paramlist>
-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="StartingKey" type="void" overloaded="no">
+      <method name="StartingKey" type="" overloaded="no">
         <autodoc>StartingKey(KeyEvent event)</autodoc>
         <paramlist>
-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="StartingClick" type="void" overloaded="no">
+      <method name="StartingClick" type="" overloaded="no">
         <autodoc>StartingClick()</autodoc>
       </method>
-      <method name="HandleReturn" type="void" overloaded="no">
+      <method name="HandleReturn" type="" overloaded="no">
         <autodoc>HandleReturn(KeyEvent event)</autodoc>
         <paramlist>
-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
     <class name="PyGridCellEditor" oldname="wxPyGridCellEditor" module="grid">
-      <baseclass name="wxGridCellEditor"/>
+      <baseclass name="GridCellEditor"/>
       <constructor name="PyGridCellEditor" overloaded="no">
         <autodoc>__init__() -&gt; PyGridCellEditor</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetSize" type="void" overloaded="no">
+      <method name="base_SetSize" type="" overloaded="no">
         <autodoc>base_SetSize(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="base_Show" type="void" overloaded="no">
+      <method name="base_Show" type="" overloaded="no">
         <autodoc>base_Show(bool show, GridCellAttr attr=None)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default="NULL"/>
+          <param name="attr" type="wxGridCellAttr" default="NULL"/>
         </paramlist>
       </method>
-      <method name="base_PaintBackground" type="void" overloaded="no">
+      <method name="base_PaintBackground" type="" overloaded="no">
         <autodoc>base_PaintBackground(Rect rectCell, GridCellAttr attr)</autodoc>
         <paramlist>
-          <param name="rectCell" type="r.q(const).wxRect" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="rectCell" type="Rect" default=""/>
+          <param name="attr" type="wxGridCellAttr" default=""/>
         </paramlist>
       </method>
       <method name="base_IsAcceptedKey" type="bool" overloaded="no">
         <autodoc>base_IsAcceptedKey(KeyEvent event) -&gt; bool</autodoc>
         <paramlist>
-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="base_StartingKey" type="void" overloaded="no">
+      <method name="base_StartingKey" type="" overloaded="no">
         <autodoc>base_StartingKey(KeyEvent event)</autodoc>
         <paramlist>
-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="base_StartingClick" type="void" overloaded="no">
+      <method name="base_StartingClick" type="" overloaded="no">
         <autodoc>base_StartingClick()</autodoc>
       </method>
-      <method name="base_HandleReturn" type="void" overloaded="no">
+      <method name="base_HandleReturn" type="" overloaded="no">
         <autodoc>base_HandleReturn(KeyEvent event)</autodoc>
         <paramlist>
-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>
         </paramlist>
       </method>
-      <method name="base_Destroy" type="void" overloaded="no">
+      <method name="base_Destroy" type="" overloaded="no">
         <autodoc>base_Destroy()</autodoc>
       </method>
-      <method name="base_SetParameters" type="void" overloaded="no">
+      <method name="base_SetParameters" type="" overloaded="no">
         <autodoc>base_SetParameters(String params)</autodoc>
         <paramlist>
-          <param name="params" type="r.q(const).wxString" default=""/>
+          <param name="params" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="GridCellTextEditor" oldname="wxGridCellTextEditor" module="grid">
-      <baseclass name="wxGridCellEditor"/>
+      <baseclass name="GridCellEditor"/>
       <constructor name="GridCellTextEditor" overloaded="no">
         <autodoc>__init__() -&gt; GridCellTextEditor</autodoc>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
     <class name="GridCellNumberEditor" oldname="wxGridCellNumberEditor" module="grid">
-      <baseclass name="wxGridCellTextEditor"/>
+      <baseclass name="GridCellTextEditor"/>
       <constructor name="GridCellNumberEditor" overloaded="no">
         <autodoc>__init__(int min=-1, int max=-1) -&gt; GridCellNumberEditor</autodoc>
         <paramlist>
@@ -22133,60 +22133,60 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="max" type="int" default="-1"/>
         </paramlist>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
     <class name="GridCellFloatEditor" oldname="wxGridCellFloatEditor" module="grid">
-      <baseclass name="wxGridCellTextEditor"/>
+      <baseclass name="GridCellTextEditor"/>
       <constructor name="GridCellFloatEditor" overloaded="no">
         <autodoc>__init__() -&gt; GridCellFloatEditor</autodoc>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
     <class name="GridCellBoolEditor" oldname="wxGridCellBoolEditor" module="grid">
-      <baseclass name="wxGridCellEditor"/>
+      <baseclass name="GridCellEditor"/>
       <constructor name="GridCellBoolEditor" overloaded="no">
         <autodoc>__init__() -&gt; GridCellBoolEditor</autodoc>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
     <class name="GridCellChoiceEditor" oldname="wxGridCellChoiceEditor" module="grid">
-      <baseclass name="wxGridCellEditor"/>
+      <baseclass name="GridCellEditor"/>
       <constructor name="GridCellChoiceEditor" overloaded="no">
         <autodoc>__init__(int choices=0, String choices_array=None, bool allowOthers=False) -&gt; GridCellChoiceEditor</autodoc>
         <paramlist>
           <param name="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.q(const).wxString" default="NULL"/>
+          <param name="choices_array" type="String" default="NULL"/>
           <param name="allowOthers" type="bool" default="False"/>
         </paramlist>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
     <class name="GridCellEnumEditor" oldname="wxGridCellEnumEditor" module="grid">
-      <baseclass name="wxGridCellChoiceEditor"/>
+      <baseclass name="GridCellChoiceEditor"/>
       <constructor name="GridCellEnumEditor" overloaded="no">
         <autodoc>__init__(String choices=EmptyString) -&gt; GridCellEnumEditor</autodoc>
         <paramlist>
-          <param name="choices" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="choices" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
     <class name="GridCellAutoWrapStringEditor" oldname="wxGridCellAutoWrapStringEditor" module="grid">
-      <baseclass name="wxGridCellTextEditor"/>
+      <baseclass name="GridCellTextEditor"/>
       <constructor name="GridCellAutoWrapStringEditor" overloaded="no">
         <autodoc>__init__() -&gt; GridCellAutoWrapStringEditor</autodoc>
       </constructor>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>
@@ -22194,87 +22194,87 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <constructor name="GridCellAttr" overloaded="no">
         <autodoc>__init__(GridCellAttr attrDefault=None) -&gt; GridCellAttr</autodoc>
         <paramlist>
-          <param name="attrDefault" type="p.wxGridCellAttr" default="NULL"/>
+          <param name="attrDefault" type="GridCellAttr" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="Clone" type="wxGridCellAttr" overloaded="no">
+      <method name="Clone" type="GridCellAttr" overloaded="no">
         <autodoc>Clone() -&gt; GridCellAttr</autodoc>
       </method>
-      <method name="MergeWith" type="void" overloaded="no">
+      <method name="MergeWith" type="" overloaded="no">
         <autodoc>MergeWith(GridCellAttr mergefrom)</autodoc>
         <paramlist>
-          <param name="mergefrom" type="p.wxGridCellAttr" default=""/>
+          <param name="mergefrom" type="GridCellAttr" default=""/>
         </paramlist>
       </method>
-      <method name="IncRef" type="void" overloaded="no">
+      <method name="IncRef" type="" overloaded="no">
         <autodoc>IncRef()</autodoc>
       </method>
-      <method name="DecRef" type="void" overloaded="no">
+      <method name="DecRef" type="" overloaded="no">
         <autodoc>DecRef()</autodoc>
       </method>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetAlignment" type="void" overloaded="no">
+      <method name="SetAlignment" type="" overloaded="no">
         <autodoc>SetAlignment(int hAlign, int vAlign)</autodoc>
         <paramlist>
           <param name="hAlign" type="int" default=""/>
           <param name="vAlign" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(int num_rows, int num_cols)</autodoc>
         <paramlist>
           <param name="num_rows" type="int" default=""/>
           <param name="num_cols" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetOverflow" type="void" overloaded="no">
+      <method name="SetOverflow" type="" overloaded="no">
         <autodoc>SetOverflow(bool allow=True)</autodoc>
         <paramlist>
           <param name="allow" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetReadOnly" type="void" overloaded="no">
+      <method name="SetReadOnly" type="" overloaded="no">
         <autodoc>SetReadOnly(bool isReadOnly=True)</autodoc>
         <paramlist>
           <param name="isReadOnly" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetRenderer" type="void" overloaded="no">
+      <method name="SetRenderer" type="" overloaded="no">
         <autodoc>SetRenderer(GridCellRenderer renderer)</autodoc>
         <paramlist>
-          <param name="renderer" type="p.wxGridCellRenderer" default=""/>
+          <param name="renderer" type="GridCellRenderer" default=""/>
         </paramlist>
       </method>
-      <method name="SetEditor" type="void" overloaded="no">
+      <method name="SetEditor" type="" overloaded="no">
         <autodoc>SetEditor(GridCellEditor editor)</autodoc>
         <paramlist>
-          <param name="editor" type="p.wxGridCellEditor" default=""/>
+          <param name="editor" type="GridCellEditor" default=""/>
         </paramlist>
       </method>
-      <method name="SetKind" type="void" overloaded="no">
+      <method name="SetKind" type="" overloaded="no">
         <autodoc>SetKind(int kind)</autodoc>
         <paramlist>
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
@@ -22304,44 +22304,44 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="HasOverflowMode" type="bool" overloaded="no">
         <autodoc>HasOverflowMode() -&gt; bool</autodoc>
       </method>
-      <method name="GetTextColour" type="wxColour" overloaded="no">
+      <method name="GetTextColour" type="Colour" overloaded="no">
         <autodoc>GetTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
-      <method name="GetAlignment" type="void" overloaded="no">
+      <method name="GetAlignment" type="" overloaded="no">
         <autodoc>GetAlignment() -&gt; (hAlign, vAlign)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="void" overloaded="no">
+      <method name="GetSize" type="" overloaded="no">
         <autodoc>GetSize() -&gt; (num_rows, num_cols)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetOverflow" type="bool" overloaded="no">
         <autodoc>GetOverflow() -&gt; bool</autodoc>
       </method>
-      <method name="GetRenderer" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetRenderer" type="GridCellRenderer" overloaded="no">
         <autodoc>GetRenderer(Grid grid, int row, int col) -&gt; GridCellRenderer</autodoc>
         <paramlist>
-          <param name="grid" type="p.wxGrid" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetEditor" type="wxGridCellEditor" overloaded="no">
+      <method name="GetEditor" type="GridCellEditor" overloaded="no">
         <autodoc>GetEditor(Grid grid, int row, int col) -&gt; GridCellEditor</autodoc>
         <paramlist>
-          <param name="grid" type="p.wxGrid" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
@@ -22349,10 +22349,10 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="IsReadOnly" type="bool" overloaded="no">
         <autodoc>IsReadOnly() -&gt; bool</autodoc>
       </method>
-      <method name="SetDefAttr" type="void" overloaded="no">
+      <method name="SetDefAttr" type="" overloaded="no">
         <autodoc>SetDefAttr(GridCellAttr defAttr)</autodoc>
         <paramlist>
-          <param name="defAttr" type="p.wxGridCellAttr" default=""/>
+          <param name="defAttr" type="GridCellAttr" default=""/>
         </paramlist>
       </method>
     </class>
@@ -22360,13 +22360,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <constructor name="GridCellAttrProvider" overloaded="no">
         <autodoc>__init__() -&gt; GridCellAttrProvider</autodoc>
       </constructor>
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetAttr" type="wxGridCellAttr" overloaded="no">
+      <method name="GetAttr" type="GridCellAttr" overloaded="no">
         <autodoc>GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22374,36 +22374,36 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
-      <method name="SetAttr" type="void" overloaded="no">
+      <method name="SetAttr" type="" overloaded="no">
         <autodoc>SetAttr(GridCellAttr attr, int row, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowAttr" type="void" overloaded="no">
+      <method name="SetRowAttr" type="" overloaded="no">
         <autodoc>SetRowAttr(GridCellAttr attr, int row)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColAttr" type="void" overloaded="no">
+      <method name="SetColAttr" type="" overloaded="no">
         <autodoc>SetColAttr(GridCellAttr attr, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="UpdateAttrRows" type="void" overloaded="no">
+      <method name="UpdateAttrRows" type="" overloaded="no">
         <autodoc>UpdateAttrRows(size_t pos, int numRows)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="numRows" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="UpdateAttrCols" type="void" overloaded="no">
+      <method name="UpdateAttrCols" type="" overloaded="no">
         <autodoc>UpdateAttrCols(size_t pos, int numCols)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
@@ -22412,18 +22412,18 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="PyGridCellAttrProvider" oldname="wxPyGridCellAttrProvider" module="grid">
-      <baseclass name="wxGridCellAttrProvider"/>
+      <baseclass name="GridCellAttrProvider"/>
       <constructor name="PyGridCellAttrProvider" overloaded="no">
         <autodoc>__init__() -&gt; PyGridCellAttrProvider</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_GetAttr" type="wxGridCellAttr" overloaded="no">
+      <method name="base_GetAttr" type="GridCellAttr" overloaded="no">
         <autodoc>base_GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22431,50 +22431,50 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetAttr" type="void" overloaded="no">
+      <method name="base_SetAttr" type="" overloaded="no">
         <autodoc>base_SetAttr(GridCellAttr attr, int row, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetRowAttr" type="void" overloaded="no">
+      <method name="base_SetRowAttr" type="" overloaded="no">
         <autodoc>base_SetRowAttr(GridCellAttr attr, int row)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetColAttr" type="void" overloaded="no">
+      <method name="base_SetColAttr" type="" overloaded="no">
         <autodoc>base_SetColAttr(GridCellAttr attr, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="GridTableBase" oldname="wxGridTableBase" module="grid">
-      <baseclass name="wxObject"/>
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetAttrProvider" type="void" overloaded="no">
+      <method name="SetAttrProvider" type="" overloaded="no">
         <autodoc>SetAttrProvider(GridCellAttrProvider attrProvider)</autodoc>
         <paramlist>
-          <param name="attrProvider" type="p.wxGridCellAttrProvider" default=""/>
+          <param name="attrProvider" type="GridCellAttrProvider" default=""/>
         </paramlist>
       </method>
-      <method name="GetAttrProvider" type="wxGridCellAttrProvider" overloaded="no">
+      <method name="GetAttrProvider" type="GridCellAttrProvider" overloaded="no">
         <autodoc>GetAttrProvider() -&gt; GridCellAttrProvider</autodoc>
       </method>
-      <method name="SetView" type="void" overloaded="no">
+      <method name="SetView" type="" overloaded="no">
         <autodoc>SetView(Grid grid)</autodoc>
         <paramlist>
-          <param name="grid" type="p.wxGrid" default=""/>
+          <param name="grid" type="wxGrid" default=""/>
         </paramlist>
       </method>
       <method name="GetView" type="wxGrid" overloaded="no">
@@ -22493,22 +22493,22 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue(int row, int col) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(int row, int col, String value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetTypeName" type="wxString" overloaded="no">
+      <method name="GetTypeName" type="String" overloaded="no">
         <autodoc>GetTypeName(int row, int col) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22520,7 +22520,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="CanSetValueAs" type="bool" overloaded="no">
@@ -22528,7 +22528,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetValueAsLong" type="long" overloaded="no">
@@ -22552,7 +22552,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetValueAsLong" type="void" overloaded="no">
+      <method name="SetValueAsLong" type="" overloaded="no">
         <autodoc>SetValueAsLong(int row, int col, long value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22560,7 +22560,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="value" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="SetValueAsDouble" type="void" overloaded="no">
+      <method name="SetValueAsDouble" type="" overloaded="no">
         <autodoc>SetValueAsDouble(int row, int col, double value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22568,7 +22568,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="value" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetValueAsBool" type="void" overloaded="no">
+      <method name="SetValueAsBool" type="" overloaded="no">
         <autodoc>SetValueAsBool(int row, int col, bool value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22576,7 +22576,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="InsertRows" type="bool" overloaded="no">
@@ -22619,36 +22619,36 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="numCols" type="size_t" default="1"/>
         </paramlist>
       </method>
-      <method name="GetRowLabelValue" type="wxString" overloaded="no">
+      <method name="GetRowLabelValue" type="String" overloaded="no">
         <autodoc>GetRowLabelValue(int row) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetColLabelValue" type="wxString" overloaded="no">
+      <method name="GetColLabelValue" type="String" overloaded="no">
         <autodoc>GetColLabelValue(int col) -&gt; String</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowLabelValue" type="void" overloaded="no">
+      <method name="SetRowLabelValue" type="" overloaded="no">
         <autodoc>SetRowLabelValue(int row, String value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetColLabelValue" type="void" overloaded="no">
+      <method name="SetColLabelValue" type="" overloaded="no">
         <autodoc>SetColLabelValue(int col, String value)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
       <method name="CanHaveAttributes" type="bool" overloaded="no">
         <autodoc>CanHaveAttributes() -&gt; bool</autodoc>
       </method>
-      <method name="GetAttr" type="wxGridCellAttr" overloaded="no">
+      <method name="GetAttr" type="GridCellAttr" overloaded="no">
         <autodoc>GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22656,46 +22656,46 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
-      <method name="SetAttr" type="void" overloaded="no">
+      <method name="SetAttr" type="" overloaded="no">
         <autodoc>SetAttr(GridCellAttr attr, int row, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowAttr" type="void" overloaded="no">
+      <method name="SetRowAttr" type="" overloaded="no">
         <autodoc>SetRowAttr(GridCellAttr attr, int row)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColAttr" type="void" overloaded="no">
+      <method name="SetColAttr" type="" overloaded="no">
         <autodoc>SetColAttr(GridCellAttr attr, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyGridTableBase" oldname="wxPyGridTableBase" module="grid">
-      <baseclass name="wxGridTableBase"/>
+      <baseclass name="GridTableBase"/>
       <constructor name="PyGridTableBase" overloaded="no">
         <autodoc>__init__() -&gt; PyGridTableBase</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">
         <autodoc>Destroy()</autodoc>
         <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
       </method>
-      <method name="base_GetTypeName" type="wxString" overloaded="no">
+      <method name="base_GetTypeName" type="String" overloaded="no">
         <autodoc>base_GetTypeName(int row, int col) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22707,7 +22707,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
       <method name="base_CanSetValueAs" type="bool" overloaded="no">
@@ -22715,10 +22715,10 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="base_Clear" type="void" overloaded="no">
+      <method name="base_Clear" type="" overloaded="no">
         <autodoc>base_Clear()</autodoc>
       </method>
       <method name="base_InsertRows" type="bool" overloaded="no">
@@ -22761,36 +22761,36 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="numCols" type="size_t" default="1"/>
         </paramlist>
       </method>
-      <method name="base_GetRowLabelValue" type="wxString" overloaded="no">
+      <method name="base_GetRowLabelValue" type="String" overloaded="no">
         <autodoc>base_GetRowLabelValue(int row) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_GetColLabelValue" type="wxString" overloaded="no">
+      <method name="base_GetColLabelValue" type="String" overloaded="no">
         <autodoc>base_GetColLabelValue(int col) -&gt; String</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetRowLabelValue" type="void" overloaded="no">
+      <method name="base_SetRowLabelValue" type="" overloaded="no">
         <autodoc>base_SetRowLabelValue(int row, String value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetColLabelValue" type="void" overloaded="no">
+      <method name="base_SetColLabelValue" type="" overloaded="no">
         <autodoc>base_SetColLabelValue(int col, String value)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
       <method name="base_CanHaveAttributes" type="bool" overloaded="no">
         <autodoc>base_CanHaveAttributes() -&gt; bool</autodoc>
       </method>
-      <method name="base_GetAttr" type="wxGridCellAttr" overloaded="no">
+      <method name="base_GetAttr" type="GridCellAttr" overloaded="no">
         <autodoc>base_GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22798,31 +22798,31 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetAttr" type="void" overloaded="no">
+      <method name="base_SetAttr" type="" overloaded="no">
         <autodoc>base_SetAttr(GridCellAttr attr, int row, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetRowAttr" type="void" overloaded="no">
+      <method name="base_SetRowAttr" type="" overloaded="no">
         <autodoc>base_SetRowAttr(GridCellAttr attr, int row)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_SetColAttr" type="void" overloaded="no">
+      <method name="base_SetColAttr" type="" overloaded="no">
         <autodoc>base_SetColAttr(GridCellAttr attr, int col)</autodoc>
         <paramlist>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="GridStringTable" oldname="wxGridStringTable" module="grid">
-      <baseclass name="wxGridTableBase"/>
+      <baseclass name="GridTableBase"/>
       <constructor name="GridStringTable" overloaded="no">
         <autodoc>__init__(int numRows=0, int numCols=0) -&gt; GridStringTable</autodoc>
         <paramlist>
@@ -22835,7 +22835,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <constructor name="GridTableMessage" overloaded="no">
         <autodoc>__init__(GridTableBase table, int id, int comInt1=-1, int comInt2=-1) -&gt; GridTableMessage</autodoc>
         <paramlist>
-          <param name="table" type="p.wxGridTableBase" default=""/>
+          <param name="table" type="GridTableBase" default=""/>
           <param name="id" type="int" default=""/>
           <param name="comInt1" type="int" default="-1"/>
           <param name="comInt2" type="int" default="-1"/>
@@ -22844,16 +22844,16 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <destructor name="~wxGridTableMessage" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetTableObject" type="void" overloaded="no">
+      <method name="SetTableObject" type="" overloaded="no">
         <autodoc>SetTableObject(GridTableBase table)</autodoc>
         <paramlist>
-          <param name="table" type="p.wxGridTableBase" default=""/>
+          <param name="table" type="GridTableBase" default=""/>
         </paramlist>
       </method>
-      <method name="GetTableObject" type="wxGridTableBase" overloaded="no">
+      <method name="GetTableObject" type="GridTableBase" overloaded="no">
         <autodoc>GetTableObject() -&gt; GridTableBase</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(int id)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
@@ -22862,7 +22862,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
-      <method name="SetCommandInt" type="void" overloaded="no">
+      <method name="SetCommandInt" type="" overloaded="no">
         <autodoc>SetCommandInt(int comInt1)</autodoc>
         <paramlist>
           <param name="comInt1" type="int" default=""/>
@@ -22871,7 +22871,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetCommandInt" type="int" overloaded="no">
         <autodoc>GetCommandInt() -&gt; int</autodoc>
       </method>
-      <method name="SetCommandInt2" type="void" overloaded="no">
+      <method name="SetCommandInt2" type="" overloaded="no">
         <autodoc>SetCommandInt2(int comInt2)</autodoc>
         <paramlist>
           <param name="comInt2" type="int" default=""/>
@@ -22895,7 +22895,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetRow" type="int" overloaded="no">
         <autodoc>GetRow() -&gt; int</autodoc>
       </method>
-      <method name="SetRow" type="void" overloaded="no">
+      <method name="SetRow" type="" overloaded="no">
         <autodoc>SetRow(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -22904,13 +22904,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetCol" type="int" overloaded="no">
         <autodoc>GetCol() -&gt; int</autodoc>
       </method>
-      <method name="SetCol" type="void" overloaded="no">
+      <method name="SetCol" type="" overloaded="no">
         <autodoc>SetCol(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(int row, int col)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -22920,13 +22920,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(GridCellCoords other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxGridCellCoords" default=""/>
+          <param name="other" type="GridCellCoords" default=""/>
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(GridCellCoords other) -&gt; bool</autodoc>
         <paramlist>
-          <param name="other" type="r.q(const).wxGridCellCoords" default=""/>
+          <param name="other" type="GridCellCoords" default=""/>
         </paramlist>
       </method>
       <method name="asTuple" type="PyObject" overloaded="no">
@@ -22934,18 +22934,18 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="Grid" oldname="wxGrid" module="grid">
-      <baseclass name="wxScrolledWindow"/>
+      <baseclass name="ScrolledWindow"/>
       <constructor name="Grid" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=WANTS_CHARS, 
     String name=PanelNameStr) -&gt; Grid</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxWANTS_CHARS"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>
         </paramlist>
       </constructor>
       <method name="CreateGrid" type="bool" overloaded="no">
@@ -22956,7 +22956,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="selmode" type="WXGRIDSELECTIONMODES" default="wxGrid::wxGridSelectCells"/>
         </paramlist>
       </method>
-      <method name="SetSelectionMode" type="void" overloaded="no">
+      <method name="SetSelectionMode" type="" overloaded="no">
         <autodoc>SetSelectionMode(WXGRIDSELECTIONMODES selmode)</autodoc>
         <paramlist>
           <param name="selmode" type="WXGRIDSELECTIONMODES" default=""/>
@@ -22974,21 +22974,21 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="ProcessTableMessage" type="bool" overloaded="no">
         <autodoc>ProcessTableMessage(GridTableMessage ??) -&gt; bool</autodoc>
         <paramlist>
-          <param name="" type="r.wxGridTableMessage" default=""/>
+          <param name="" type="GridTableMessage" default=""/>
         </paramlist>
       </method>
-      <method name="GetTable" type="wxGridTableBase" overloaded="no">
+      <method name="GetTable" type="GridTableBase" overloaded="no">
         <autodoc>GetTable() -&gt; GridTableBase</autodoc>
       </method>
       <method name="SetTable" type="bool" overloaded="no">
         <autodoc>SetTable(GridTableBase table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -&gt; bool</autodoc>
         <paramlist>
-          <param name="table" type="p.wxGridTableBase" default=""/>
+          <param name="table" type="GridTableBase" default=""/>
           <param name="takeOwnership" type="bool" default="False"/>
           <param name="selmode" type="WXGRIDSELECTIONMODES" default="wxGrid::wxGridSelectCells"/>
         </paramlist>
       </method>
-      <method name="ClearGrid" type="void" overloaded="no">
+      <method name="ClearGrid" type="" overloaded="no">
         <autodoc>ClearGrid()</autodoc>
       </method>
       <method name="InsertRows" type="bool" overloaded="no">
@@ -23037,69 +23037,69 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="updateLabels" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="DrawCellHighlight" type="void" overloaded="no">
+      <method name="DrawCellHighlight" type="" overloaded="no">
         <autodoc>DrawCellHighlight(DC dc, GridCellAttr attr)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="attr" type="p.q(const).wxGridCellAttr" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
         </paramlist>
       </method>
-      <method name="DrawTextRectangle" type="void" overloaded="no">
+      <method name="DrawTextRectangle" type="" overloaded="no">
         <autodoc>DrawTextRectangle(DC dc, String ??, Rect ??, int horizontalAlignment=LEFT, 
     int verticalAlignment=TOP, int textOrientation=HORIZONTAL)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="" type="r.q(const).wxString" default=""/>
-          <param name="" type="r.q(const).wxRect" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="" type="String" default=""/>
+          <param name="" type="Rect" default=""/>
           <param name="horizontalAlignment" type="int" default="wxLEFT"/>
           <param name="verticalAlignment" type="int" default="wxTOP"/>
           <param name="textOrientation" type="int" default="wxHORIZONTAL"/>
         </paramlist>
       </method>
-      <method name="GetTextBoxSize" type="void" overloaded="no">
+      <method name="GetTextBoxSize" type="" overloaded="no">
         <autodoc>GetTextBoxSize(DC dc, list lines) -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="lines" type="r.wxArrayString" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
-          <param name="OUTPUT" type="p.long" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="lines" type="wxArrayString" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="BeginBatch" type="void" overloaded="no">
+      <method name="BeginBatch" type="" overloaded="no">
         <autodoc>BeginBatch()</autodoc>
       </method>
-      <method name="EndBatch" type="void" overloaded="no">
+      <method name="EndBatch" type="" overloaded="no">
         <autodoc>EndBatch()</autodoc>
       </method>
       <method name="GetBatchCount" type="int" overloaded="no">
         <autodoc>GetBatchCount() -&gt; int</autodoc>
       </method>
-      <method name="ForceRefresh" type="void" overloaded="no">
+      <method name="ForceRefresh" type="" overloaded="no">
         <autodoc>ForceRefresh()</autodoc>
       </method>
-      <method name="Refresh" type="void" overloaded="no">
+      <method name="Refresh" type="" overloaded="no">
         <autodoc>Refresh(bool eraseb=True, Rect rect=None)</autodoc>
         <paramlist>
           <param name="eraseb" type="bool" default="True"/>
-          <param name="rect" type="p.q(const).wxRect" default="NULL"/>
+          <param name="rect" type="Rect" default="NULL"/>
         </paramlist>
       </method>
       <method name="IsEditable" type="bool" overloaded="no">
         <autodoc>IsEditable() -&gt; bool</autodoc>
       </method>
-      <method name="EnableEditing" type="void" overloaded="no">
+      <method name="EnableEditing" type="" overloaded="no">
         <autodoc>EnableEditing(bool edit)</autodoc>
         <paramlist>
           <param name="edit" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="EnableCellEditControl" type="void" overloaded="no">
+      <method name="EnableCellEditControl" type="" overloaded="no">
         <autodoc>EnableCellEditControl(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="DisableCellEditControl" type="void" overloaded="no">
+      <method name="DisableCellEditControl" type="" overloaded="no">
         <autodoc>DisableCellEditControl()</autodoc>
       </method>
       <method name="CanEnableCellControl" type="bool" overloaded="no">
@@ -23114,16 +23114,16 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="IsCurrentCellReadOnly" type="bool" overloaded="no">
         <autodoc>IsCurrentCellReadOnly() -&gt; bool</autodoc>
       </method>
-      <method name="ShowCellEditControl" type="void" overloaded="no">
+      <method name="ShowCellEditControl" type="" overloaded="no">
         <autodoc>ShowCellEditControl()</autodoc>
       </method>
-      <method name="HideCellEditControl" type="void" overloaded="no">
+      <method name="HideCellEditControl" type="" overloaded="no">
         <autodoc>HideCellEditControl()</autodoc>
       </method>
-      <method name="SaveEditControlValue" type="void" overloaded="no">
+      <method name="SaveEditControlValue" type="" overloaded="no">
         <autodoc>SaveEditControlValue()</autodoc>
       </method>
-      <method name="XYToCell" type="wxGridCellCoords" overloaded="no">
+      <method name="XYToCell" type="GridCellCoords" overloaded="no">
         <autodoc>XYToCell(int x, int y) -&gt; GridCellCoords</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -23154,7 +23154,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="x" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CellToRect" type="wxRect" overloaded="no">
+      <method name="CellToRect" type="Rect" overloaded="no">
         <autodoc>CellToRect(int row, int col) -&gt; Rect</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -23175,14 +23175,14 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="wholeCellVisible" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="MakeCellVisible" type="void" overloaded="no">
+      <method name="MakeCellVisible" type="" overloaded="no">
         <autodoc>MakeCellVisible(int row, int col)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetGridCursor" type="void" overloaded="no">
+      <method name="SetGridCursor" type="" overloaded="no">
         <autodoc>SetGridCursor(int row, int col)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -23255,48 +23255,48 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetColLabelSize" type="int" overloaded="no">
         <autodoc>GetColLabelSize() -&gt; int</autodoc>
       </method>
-      <method name="GetLabelBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetLabelBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetLabelBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetLabelTextColour" type="wxColour" overloaded="no">
+      <method name="GetLabelTextColour" type="Colour" overloaded="no">
         <autodoc>GetLabelTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetLabelFont" type="wxFont" overloaded="no">
+      <method name="GetLabelFont" type="Font" overloaded="no">
         <autodoc>GetLabelFont() -&gt; Font</autodoc>
       </method>
-      <method name="GetRowLabelAlignment" type="void" overloaded="no">
+      <method name="GetRowLabelAlignment" type="" overloaded="no">
         <autodoc>GetRowLabelAlignment() -&gt; (horiz, vert)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetColLabelAlignment" type="void" overloaded="no">
+      <method name="GetColLabelAlignment" type="" overloaded="no">
         <autodoc>GetColLabelAlignment() -&gt; (horiz, vert)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetColLabelTextOrientation" type="int" overloaded="no">
         <autodoc>GetColLabelTextOrientation() -&gt; int</autodoc>
       </method>
-      <method name="GetRowLabelValue" type="wxString" overloaded="no">
+      <method name="GetRowLabelValue" type="String" overloaded="no">
         <autodoc>GetRowLabelValue(int row) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetColLabelValue" type="wxString" overloaded="no">
+      <method name="GetColLabelValue" type="String" overloaded="no">
         <autodoc>GetColLabelValue(int col) -&gt; String</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetGridLineColour" type="wxColour" overloaded="no">
+      <method name="GetGridLineColour" type="Colour" overloaded="no">
         <autodoc>GetGridLineColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetCellHighlightColour" type="wxColour" overloaded="no">
+      <method name="GetCellHighlightColour" type="Colour" overloaded="no">
         <autodoc>GetCellHighlightColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetCellHighlightPenWidth" type="int" overloaded="no">
@@ -23305,165 +23305,165 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetCellHighlightROPenWidth" type="int" overloaded="no">
         <autodoc>GetCellHighlightROPenWidth() -&gt; int</autodoc>
       </method>
-      <method name="SetRowLabelSize" type="void" overloaded="no">
+      <method name="SetRowLabelSize" type="" overloaded="no">
         <autodoc>SetRowLabelSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColLabelSize" type="void" overloaded="no">
+      <method name="SetColLabelSize" type="" overloaded="no">
         <autodoc>SetColLabelSize(int height)</autodoc>
         <paramlist>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabelBackgroundColour" type="void" overloaded="no">
+      <method name="SetLabelBackgroundColour" type="" overloaded="no">
         <autodoc>SetLabelBackgroundColour(Colour ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabelTextColour" type="void" overloaded="no">
+      <method name="SetLabelTextColour" type="" overloaded="no">
         <autodoc>SetLabelTextColour(Colour ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetLabelFont" type="void" overloaded="no">
+      <method name="SetLabelFont" type="" overloaded="no">
         <autodoc>SetLabelFont(Font ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxFont" default=""/>
+          <param name="" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowLabelAlignment" type="void" overloaded="no">
+      <method name="SetRowLabelAlignment" type="" overloaded="no">
         <autodoc>SetRowLabelAlignment(int horiz, int vert)</autodoc>
         <paramlist>
           <param name="horiz" type="int" default=""/>
           <param name="vert" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColLabelAlignment" type="void" overloaded="no">
+      <method name="SetColLabelAlignment" type="" overloaded="no">
         <autodoc>SetColLabelAlignment(int horiz, int vert)</autodoc>
         <paramlist>
           <param name="horiz" type="int" default=""/>
           <param name="vert" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColLabelTextOrientation" type="void" overloaded="no">
+      <method name="SetColLabelTextOrientation" type="" overloaded="no">
         <autodoc>SetColLabelTextOrientation(int textOrientation)</autodoc>
         <paramlist>
           <param name="textOrientation" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowLabelValue" type="void" overloaded="no">
+      <method name="SetRowLabelValue" type="" overloaded="no">
         <autodoc>SetRowLabelValue(int row, String ??)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
-          <param name="" type="r.q(const).wxString" default=""/>
+          <param name="" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetColLabelValue" type="void" overloaded="no">
+      <method name="SetColLabelValue" type="" overloaded="no">
         <autodoc>SetColLabelValue(int col, String ??)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
-          <param name="" type="r.q(const).wxString" default=""/>
+          <param name="" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetGridLineColour" type="void" overloaded="no">
+      <method name="SetGridLineColour" type="" overloaded="no">
         <autodoc>SetGridLineColour(Colour ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellHighlightColour" type="void" overloaded="no">
+      <method name="SetCellHighlightColour" type="" overloaded="no">
         <autodoc>SetCellHighlightColour(Colour ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellHighlightPenWidth" type="void" overloaded="no">
+      <method name="SetCellHighlightPenWidth" type="" overloaded="no">
         <autodoc>SetCellHighlightPenWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellHighlightROPenWidth" type="void" overloaded="no">
+      <method name="SetCellHighlightROPenWidth" type="" overloaded="no">
         <autodoc>SetCellHighlightROPenWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="EnableDragRowSize" type="void" overloaded="no">
+      <method name="EnableDragRowSize" type="" overloaded="no">
         <autodoc>EnableDragRowSize(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="DisableDragRowSize" type="void" overloaded="no">
+      <method name="DisableDragRowSize" type="" overloaded="no">
         <autodoc>DisableDragRowSize()</autodoc>
       </method>
       <method name="CanDragRowSize" type="bool" overloaded="no">
         <autodoc>CanDragRowSize() -&gt; bool</autodoc>
       </method>
-      <method name="EnableDragColSize" type="void" overloaded="no">
+      <method name="EnableDragColSize" type="" overloaded="no">
         <autodoc>EnableDragColSize(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="DisableDragColSize" type="void" overloaded="no">
+      <method name="DisableDragColSize" type="" overloaded="no">
         <autodoc>DisableDragColSize()</autodoc>
       </method>
       <method name="CanDragColSize" type="bool" overloaded="no">
         <autodoc>CanDragColSize() -&gt; bool</autodoc>
       </method>
-      <method name="EnableDragGridSize" type="void" overloaded="no">
+      <method name="EnableDragGridSize" type="" overloaded="no">
         <autodoc>EnableDragGridSize(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="DisableDragGridSize" type="void" overloaded="no">
+      <method name="DisableDragGridSize" type="" overloaded="no">
         <autodoc>DisableDragGridSize()</autodoc>
       </method>
       <method name="CanDragGridSize" type="bool" overloaded="no">
         <autodoc>CanDragGridSize() -&gt; bool</autodoc>
       </method>
-      <method name="SetAttr" type="void" overloaded="no">
+      <method name="SetAttr" type="" overloaded="no">
         <autodoc>SetAttr(int row, int col, GridCellAttr attr)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowAttr" type="void" overloaded="no">
+      <method name="SetRowAttr" type="" overloaded="no">
         <autodoc>SetRowAttr(int row, GridCellAttr attr)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
         </paramlist>
       </method>
-      <method name="SetColAttr" type="void" overloaded="no">
+      <method name="SetColAttr" type="" overloaded="no">
         <autodoc>SetColAttr(int col, GridCellAttr attr)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="GridCellAttr" default=""/>
         </paramlist>
       </method>
-      <method name="SetColFormatBool" type="void" overloaded="no">
+      <method name="SetColFormatBool" type="" overloaded="no">
         <autodoc>SetColFormatBool(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColFormatNumber" type="void" overloaded="no">
+      <method name="SetColFormatNumber" type="" overloaded="no">
         <autodoc>SetColFormatNumber(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColFormatFloat" type="void" overloaded="no">
+      <method name="SetColFormatFloat" type="" overloaded="no">
         <autodoc>SetColFormatFloat(int col, int width=-1, int precision=-1)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
@@ -23471,14 +23471,14 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="precision" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="SetColFormatCustom" type="void" overloaded="no">
+      <method name="SetColFormatCustom" type="" overloaded="no">
         <autodoc>SetColFormatCustom(int col, String typeName)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="EnableGridLines" type="void" overloaded="no">
+      <method name="EnableGridLines" type="" overloaded="no">
         <autodoc>EnableGridLines(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
@@ -23505,50 +23505,50 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultCellBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetDefaultCellBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetDefaultCellBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetCellBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetCellBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetCellBackgroundColour(int row, int col) -&gt; Colour</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultCellTextColour" type="wxColour" overloaded="no">
+      <method name="GetDefaultCellTextColour" type="Colour" overloaded="no">
         <autodoc>GetDefaultCellTextColour() -&gt; Colour</autodoc>
       </method>
-      <method name="GetCellTextColour" type="wxColour" overloaded="no">
+      <method name="GetCellTextColour" type="Colour" overloaded="no">
         <autodoc>GetCellTextColour(int row, int col) -&gt; Colour</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultCellFont" type="wxFont" overloaded="no">
+      <method name="GetDefaultCellFont" type="Font" overloaded="no">
         <autodoc>GetDefaultCellFont() -&gt; Font</autodoc>
       </method>
-      <method name="GetCellFont" type="wxFont" overloaded="no">
+      <method name="GetCellFont" type="Font" overloaded="no">
         <autodoc>GetCellFont(int row, int col) -&gt; Font</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultCellAlignment" type="void" overloaded="no">
+      <method name="GetDefaultCellAlignment" type="" overloaded="no">
         <autodoc>GetDefaultCellAlignment() -&gt; (horiz, vert)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetCellAlignment" type="void" overloaded="no">
+      <method name="GetCellAlignment" type="" overloaded="no">
         <autodoc>GetCellAlignment() -&gt; (horiz, vert)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetDefaultCellOverflow" type="bool" overloaded="no">
@@ -23561,105 +23561,105 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetCellSize" type="void" overloaded="no">
+      <method name="GetCellSize" type="" overloaded="no">
         <autodoc>GetCellSize(int row, int col) -&gt; (num_rows, num_cols)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultRowSize" type="void" overloaded="no">
+      <method name="SetDefaultRowSize" type="" overloaded="no">
         <autodoc>SetDefaultRowSize(int height, bool resizeExistingRows=False)</autodoc>
         <paramlist>
           <param name="height" type="int" default=""/>
           <param name="resizeExistingRows" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="SetRowSize" type="void" overloaded="no">
+      <method name="SetRowSize" type="" overloaded="no">
         <autodoc>SetRowSize(int row, int height)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultColSize" type="void" overloaded="no">
+      <method name="SetDefaultColSize" type="" overloaded="no">
         <autodoc>SetDefaultColSize(int width, bool resizeExistingCols=False)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="resizeExistingCols" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="SetColSize" type="void" overloaded="no">
+      <method name="SetColSize" type="" overloaded="no">
         <autodoc>SetColSize(int col, int width)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AutoSizeColumn" type="void" overloaded="no">
+      <method name="AutoSizeColumn" type="" overloaded="no">
         <autodoc>AutoSizeColumn(int col, bool setAsMin=True)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
           <param name="setAsMin" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="AutoSizeRow" type="void" overloaded="no">
+      <method name="AutoSizeRow" type="" overloaded="no">
         <autodoc>AutoSizeRow(int row, bool setAsMin=True)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="setAsMin" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="AutoSizeColumns" type="void" overloaded="no">
+      <method name="AutoSizeColumns" type="" overloaded="no">
         <autodoc>AutoSizeColumns(bool setAsMin=True)</autodoc>
         <paramlist>
           <param name="setAsMin" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="AutoSizeRows" type="void" overloaded="no">
+      <method name="AutoSizeRows" type="" overloaded="no">
         <autodoc>AutoSizeRows(bool setAsMin=True)</autodoc>
         <paramlist>
           <param name="setAsMin" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="AutoSize" type="void" overloaded="no">
+      <method name="AutoSize" type="" overloaded="no">
         <autodoc>AutoSize()</autodoc>
       </method>
-      <method name="AutoSizeRowLabelSize" type="void" overloaded="no">
+      <method name="AutoSizeRowLabelSize" type="" overloaded="no">
         <autodoc>AutoSizeRowLabelSize(int row)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AutoSizeColLabelSize" type="void" overloaded="no">
+      <method name="AutoSizeColLabelSize" type="" overloaded="no">
         <autodoc>AutoSizeColLabelSize(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColMinimalWidth" type="void" overloaded="no">
+      <method name="SetColMinimalWidth" type="" overloaded="no">
         <autodoc>SetColMinimalWidth(int col, int width)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowMinimalHeight" type="void" overloaded="no">
+      <method name="SetRowMinimalHeight" type="" overloaded="no">
         <autodoc>SetRowMinimalHeight(int row, int width)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetColMinimalAcceptableWidth" type="void" overloaded="no">
+      <method name="SetColMinimalAcceptableWidth" type="" overloaded="no">
         <autodoc>SetColMinimalAcceptableWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetRowMinimalAcceptableHeight" type="void" overloaded="no">
+      <method name="SetRowMinimalAcceptableHeight" type="" overloaded="no">
         <autodoc>SetRowMinimalAcceptableHeight(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
@@ -23671,56 +23671,56 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetRowMinimalAcceptableHeight" type="int" overloaded="no">
         <autodoc>GetRowMinimalAcceptableHeight() -&gt; int</autodoc>
       </method>
-      <method name="SetDefaultCellBackgroundColour" type="void" overloaded="no">
+      <method name="SetDefaultCellBackgroundColour" type="" overloaded="no">
         <autodoc>SetDefaultCellBackgroundColour(Colour ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellBackgroundColour" type="void" overloaded="no">
+      <method name="SetCellBackgroundColour" type="" overloaded="no">
         <autodoc>SetCellBackgroundColour(int row, int col, Colour ??)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultCellTextColour" type="void" overloaded="no">
+      <method name="SetDefaultCellTextColour" type="" overloaded="no">
         <autodoc>SetDefaultCellTextColour(Colour ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellTextColour" type="void" overloaded="no">
+      <method name="SetCellTextColour" type="" overloaded="no">
         <autodoc>SetCellTextColour(int row, int col, Colour ??)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultCellFont" type="void" overloaded="no">
+      <method name="SetDefaultCellFont" type="" overloaded="no">
         <autodoc>SetDefaultCellFont(Font ??)</autodoc>
         <paramlist>
-          <param name="" type="r.q(const).wxFont" default=""/>
+          <param name="" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellFont" type="void" overloaded="no">
+      <method name="SetCellFont" type="" overloaded="no">
         <autodoc>SetCellFont(int row, int col, Font ??)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="" type="r.q(const).wxFont" default=""/>
+          <param name="" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultCellAlignment" type="void" overloaded="no">
+      <method name="SetDefaultCellAlignment" type="" overloaded="no">
         <autodoc>SetDefaultCellAlignment(int horiz, int vert)</autodoc>
         <paramlist>
           <param name="horiz" type="int" default=""/>
           <param name="vert" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellAlignment" type="void" overloaded="no">
+      <method name="SetCellAlignment" type="" overloaded="no">
         <autodoc>SetCellAlignment(int row, int col, int horiz, int vert)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -23729,13 +23729,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="vert" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultCellOverflow" type="void" overloaded="no">
+      <method name="SetDefaultCellOverflow" type="" overloaded="no">
         <autodoc>SetDefaultCellOverflow(bool allow)</autodoc>
         <paramlist>
           <param name="allow" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellOverflow" type="void" overloaded="no">
+      <method name="SetCellOverflow" type="" overloaded="no">
         <autodoc>SetCellOverflow(int row, int col, bool allow)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -23743,7 +23743,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="allow" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellSize" type="void" overloaded="no">
+      <method name="SetCellSize" type="" overloaded="no">
         <autodoc>SetCellSize(int row, int col, int num_rows, int num_cols)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -23752,67 +23752,67 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="num_cols" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultRenderer" type="void" overloaded="no">
+      <method name="SetDefaultRenderer" type="" overloaded="no">
         <autodoc>SetDefaultRenderer(GridCellRenderer renderer)</autodoc>
         <paramlist>
-          <param name="renderer" type="p.wxGridCellRenderer" default=""/>
+          <param name="renderer" type="GridCellRenderer" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellRenderer" type="void" overloaded="no">
+      <method name="SetCellRenderer" type="" overloaded="no">
         <autodoc>SetCellRenderer(int row, int col, GridCellRenderer renderer)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="renderer" type="p.wxGridCellRenderer" default=""/>
+          <param name="renderer" type="GridCellRenderer" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultRenderer" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetDefaultRenderer" type="GridCellRenderer" overloaded="no">
         <autodoc>GetDefaultRenderer() -&gt; GridCellRenderer</autodoc>
       </method>
-      <method name="GetCellRenderer" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetCellRenderer" type="GridCellRenderer" overloaded="no">
         <autodoc>GetCellRenderer(int row, int col) -&gt; GridCellRenderer</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDefaultEditor" type="void" overloaded="no">
+      <method name="SetDefaultEditor" type="" overloaded="no">
         <autodoc>SetDefaultEditor(GridCellEditor editor)</autodoc>
         <paramlist>
-          <param name="editor" type="p.wxGridCellEditor" default=""/>
+          <param name="editor" type="GridCellEditor" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellEditor" type="void" overloaded="no">
+      <method name="SetCellEditor" type="" overloaded="no">
         <autodoc>SetCellEditor(int row, int col, GridCellEditor editor)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="editor" type="p.wxGridCellEditor" default=""/>
+          <param name="editor" type="GridCellEditor" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultEditor" type="wxGridCellEditor" overloaded="no">
+      <method name="GetDefaultEditor" type="GridCellEditor" overloaded="no">
         <autodoc>GetDefaultEditor() -&gt; GridCellEditor</autodoc>
       </method>
-      <method name="GetCellEditor" type="wxGridCellEditor" overloaded="no">
+      <method name="GetCellEditor" type="GridCellEditor" overloaded="no">
         <autodoc>GetCellEditor(int row, int col) -&gt; GridCellEditor</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetCellValue" type="wxString" overloaded="no">
+      <method name="GetCellValue" type="String" overloaded="no">
         <autodoc>GetCellValue(int row, int col) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCellValue" type="void" overloaded="no">
+      <method name="SetCellValue" type="" overloaded="no">
         <autodoc>SetCellValue(int row, int col, String s)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
       <method name="IsReadOnly" type="bool" overloaded="no">
@@ -23822,7 +23822,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetReadOnly" type="void" overloaded="no">
+      <method name="SetReadOnly" type="" overloaded="no">
         <autodoc>SetReadOnly(int row, int col, bool isReadOnly=True)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
@@ -23830,21 +23830,21 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="isReadOnly" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SelectRow" type="void" overloaded="no">
+      <method name="SelectRow" type="" overloaded="no">
         <autodoc>SelectRow(int row, bool addToSelected=False)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="addToSelected" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="SelectCol" type="void" overloaded="no">
+      <method name="SelectCol" type="" overloaded="no">
         <autodoc>SelectCol(int col, bool addToSelected=False)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
           <param name="addToSelected" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="SelectBlock" type="void" overloaded="no">
+      <method name="SelectBlock" type="" overloaded="no">
         <autodoc>SelectBlock(int topRow, int leftCol, int bottomRow, int rightCol, 
     bool addToSelected=False)</autodoc>
         <paramlist>
@@ -23855,13 +23855,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="addToSelected" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="SelectAll" type="void" overloaded="no">
+      <method name="SelectAll" type="" overloaded="no">
         <autodoc>SelectAll()</autodoc>
       </method>
       <method name="IsSelection" type="bool" overloaded="no">
         <autodoc>IsSelection() -&gt; bool</autodoc>
       </method>
-      <method name="ClearSelection" type="void" overloaded="no">
+      <method name="ClearSelection" type="" overloaded="no">
         <autodoc>ClearSelection()</autodoc>
       </method>
       <method name="IsInSelection" type="bool" overloaded="no">
@@ -23871,121 +23871,121 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelectedCells" type="q(const).wxGridCellCoordsArray" overloaded="no">
+      <method name="GetSelectedCells" type="wxGridCellCoordsArray" overloaded="no">
         <autodoc>GetSelectedCells() -&gt; wxGridCellCoordsArray</autodoc>
       </method>
-      <method name="GetSelectionBlockTopLeft" type="q(const).wxGridCellCoordsArray" overloaded="no">
+      <method name="GetSelectionBlockTopLeft" type="wxGridCellCoordsArray" overloaded="no">
         <autodoc>GetSelectionBlockTopLeft() -&gt; wxGridCellCoordsArray</autodoc>
       </method>
-      <method name="GetSelectionBlockBottomRight" type="q(const).wxGridCellCoordsArray" overloaded="no">
+      <method name="GetSelectionBlockBottomRight" type="wxGridCellCoordsArray" overloaded="no">
         <autodoc>GetSelectionBlockBottomRight() -&gt; wxGridCellCoordsArray</autodoc>
       </method>
-      <method name="GetSelectedRows" type="q(const).wxArrayInt" overloaded="no">
+      <method name="GetSelectedRows" type="wxArrayInt" overloaded="no">
         <autodoc>GetSelectedRows() -&gt; wxArrayInt</autodoc>
       </method>
-      <method name="GetSelectedCols" type="q(const).wxArrayInt" overloaded="no">
+      <method name="GetSelectedCols" type="wxArrayInt" overloaded="no">
         <autodoc>GetSelectedCols() -&gt; wxArrayInt</autodoc>
       </method>
-      <method name="DeselectRow" type="void" overloaded="no">
+      <method name="DeselectRow" type="" overloaded="no">
         <autodoc>DeselectRow(int row)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DeselectCol" type="void" overloaded="no">
+      <method name="DeselectCol" type="" overloaded="no">
         <autodoc>DeselectCol(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DeselectCell" type="void" overloaded="no">
+      <method name="DeselectCell" type="" overloaded="no">
         <autodoc>DeselectCell(int row, int col)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="BlockToDeviceRect" type="wxRect" overloaded="no">
+      <method name="BlockToDeviceRect" type="Rect" overloaded="no">
         <autodoc>BlockToDeviceRect(GridCellCoords topLeft, GridCellCoords bottomRight) -&gt; Rect</autodoc>
         <paramlist>
-          <param name="topLeft" type="r.q(const).wxGridCellCoords" default=""/>
-          <param name="bottomRight" type="r.q(const).wxGridCellCoords" default=""/>
+          <param name="topLeft" type="GridCellCoords" default=""/>
+          <param name="bottomRight" type="GridCellCoords" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelectionBackground" type="wxColour" overloaded="no">
+      <method name="GetSelectionBackground" type="Colour" overloaded="no">
         <autodoc>GetSelectionBackground() -&gt; Colour</autodoc>
       </method>
-      <method name="GetSelectionForeground" type="wxColour" overloaded="no">
+      <method name="GetSelectionForeground" type="Colour" overloaded="no">
         <autodoc>GetSelectionForeground() -&gt; Colour</autodoc>
       </method>
-      <method name="SetSelectionBackground" type="void" overloaded="no">
+      <method name="SetSelectionBackground" type="" overloaded="no">
         <autodoc>SetSelectionBackground(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelectionForeground" type="void" overloaded="no">
+      <method name="SetSelectionForeground" type="" overloaded="no">
         <autodoc>SetSelectionForeground(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="RegisterDataType" type="void" overloaded="no">
+      <method name="RegisterDataType" type="" overloaded="no">
         <autodoc>RegisterDataType(String typeName, GridCellRenderer renderer, GridCellEditor editor)</autodoc>
         <paramlist>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
-          <param name="renderer" type="p.wxGridCellRenderer" default=""/>
-          <param name="editor" type="p.wxGridCellEditor" default=""/>
+          <param name="typeName" type="String" default=""/>
+          <param name="renderer" type="GridCellRenderer" default=""/>
+          <param name="editor" type="GridCellEditor" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultEditorForCell" type="wxGridCellEditor" overloaded="no">
+      <method name="GetDefaultEditorForCell" type="GridCellEditor" overloaded="no">
         <autodoc>GetDefaultEditorForCell(int row, int col) -&gt; GridCellEditor</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultRendererForCell" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetDefaultRendererForCell" type="GridCellRenderer" overloaded="no">
         <autodoc>GetDefaultRendererForCell(int row, int col) -&gt; GridCellRenderer</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultEditorForType" type="wxGridCellEditor" overloaded="no">
+      <method name="GetDefaultEditorForType" type="GridCellEditor" overloaded="no">
         <autodoc>GetDefaultEditorForType(String typeName) -&gt; GridCellEditor</autodoc>
         <paramlist>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetDefaultRendererForType" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetDefaultRendererForType" type="GridCellRenderer" overloaded="no">
         <autodoc>GetDefaultRendererForType(String typeName) -&gt; GridCellRenderer</autodoc>
         <paramlist>
-          <param name="typeName" type="r.q(const).wxString" default=""/>
+          <param name="typeName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetMargins" type="void" overloaded="no">
+      <method name="SetMargins" type="" overloaded="no">
         <autodoc>SetMargins(int extraWidth, int extraHeight)</autodoc>
         <paramlist>
           <param name="extraWidth" type="int" default=""/>
           <param name="extraHeight" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetGridWindow" type="wxWindow" overloaded="no">
+      <method name="GetGridWindow" type="Window" overloaded="no">
         <autodoc>GetGridWindow() -&gt; Window</autodoc>
       </method>
-      <method name="GetGridRowLabelWindow" type="wxWindow" overloaded="no">
+      <method name="GetGridRowLabelWindow" type="Window" overloaded="no">
         <autodoc>GetGridRowLabelWindow() -&gt; Window</autodoc>
       </method>
-      <method name="GetGridColLabelWindow" type="wxWindow" overloaded="no">
+      <method name="GetGridColLabelWindow" type="Window" overloaded="no">
         <autodoc>GetGridColLabelWindow() -&gt; Window</autodoc>
       </method>
-      <method name="GetGridCornerLabelWindow" type="wxWindow" overloaded="no">
+      <method name="GetGridCornerLabelWindow" type="Window" overloaded="no">
         <autodoc>GetGridCornerLabelWindow() -&gt; Window</autodoc>
       </method>
     </class>
     <class name="GridEvent" oldname="wxGridEvent" module="grid">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="GridEvent" overloaded="no">
         <autodoc>__init__(int id, wxEventType type, Grid obj, int row=-1, int col=-1, 
     int x=-1, int y=-1, bool sel=True, bool control=False, 
@@ -23994,7 +23994,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
-          <param name="obj" type="p.wxGrid" default=""/>
+          <param name="obj" type="Grid" default=""/>
           <param name="row" type="int" default="-1"/>
           <param name="col" type="int" default="-1"/>
           <param name="x" type="int" default="-1"/>
@@ -24012,7 +24012,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetCol" type="int" overloaded="no">
         <autodoc>GetCol() -&gt; int</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="Selecting" type="bool" overloaded="no">
@@ -24032,7 +24032,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridSizeEvent" oldname="wxGridSizeEvent" module="grid">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="GridSizeEvent" overloaded="no">
         <autodoc>__init__(int id, wxEventType type, Grid obj, int rowOrCol=-1, 
     int x=-1, int y=-1, bool control=False, bool shift=False, 
@@ -24040,7 +24040,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
-          <param name="obj" type="p.wxGrid" default=""/>
+          <param name="obj" type="Grid" default=""/>
           <param name="rowOrCol" type="int" default="-1"/>
           <param name="x" type="int" default="-1"/>
           <param name="y" type="int" default="-1"/>
@@ -24053,7 +24053,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetRowOrCol" type="int" overloaded="no">
         <autodoc>GetRowOrCol() -&gt; int</autodoc>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="ControlDown" type="bool" overloaded="no">
@@ -24070,7 +24070,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridRangeSelectEvent" oldname="wxGridRangeSelectEvent" module="grid">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="GridRangeSelectEvent" overloaded="no">
         <autodoc>__init__(int id, wxEventType type, Grid obj, GridCellCoords topLeft, 
     GridCellCoords bottomRight, bool sel=True, 
@@ -24079,9 +24079,9 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
-          <param name="obj" type="p.wxGrid" default=""/>
-          <param name="topLeft" type="r.q(const).wxGridCellCoords" default=""/>
-          <param name="bottomRight" type="r.q(const).wxGridCellCoords" default=""/>
+          <param name="obj" type="Grid" default=""/>
+          <param name="topLeft" type="GridCellCoords" default=""/>
+          <param name="bottomRight" type="GridCellCoords" default=""/>
           <param name="sel" type="bool" default="True"/>
           <param name="control" type="bool" default="False"/>
           <param name="shift" type="bool" default="False"/>
@@ -24089,10 +24089,10 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="meta" type="bool" default="False"/>
         </paramlist>
       </constructor>
-      <method name="GetTopLeftCoords" type="wxGridCellCoords" overloaded="no">
+      <method name="GetTopLeftCoords" type="GridCellCoords" overloaded="no">
         <autodoc>GetTopLeftCoords() -&gt; GridCellCoords</autodoc>
       </method>
-      <method name="GetBottomRightCoords" type="wxGridCellCoords" overloaded="no">
+      <method name="GetBottomRightCoords" type="GridCellCoords" overloaded="no">
         <autodoc>GetBottomRightCoords() -&gt; GridCellCoords</autodoc>
       </method>
       <method name="GetTopRow" type="int" overloaded="no">
@@ -24124,17 +24124,17 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridEditorCreatedEvent" oldname="wxGridEditorCreatedEvent" module="grid">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="GridEditorCreatedEvent" overloaded="no">
         <autodoc>__init__(int id, wxEventType type, Object obj, int row, int col, 
     Control ctrl) -&gt; GridEditorCreatedEvent</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
-          <param name="obj" type="p.wxObject" default=""/>
+          <param name="obj" type="Object" default=""/>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
-          <param name="ctrl" type="p.wxControl" default=""/>
+          <param name="ctrl" type="Control" default=""/>
         </paramlist>
       </constructor>
       <method name="GetRow" type="int" overloaded="no">
@@ -24143,25 +24143,25 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <method name="GetCol" type="int" overloaded="no">
         <autodoc>GetCol() -&gt; int</autodoc>
       </method>
-      <method name="GetControl" type="wxControl" overloaded="no">
+      <method name="GetControl" type="Control" overloaded="no">
         <autodoc>GetControl() -&gt; Control</autodoc>
       </method>
-      <method name="SetRow" type="void" overloaded="no">
+      <method name="SetRow" type="" overloaded="no">
         <autodoc>SetRow(int row)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCol" type="void" overloaded="no">
+      <method name="SetCol" type="" overloaded="no">
         <autodoc>SetCol(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetControl" type="void" overloaded="no">
+      <method name="SetControl" type="" overloaded="no">
         <autodoc>SetControl(Control ctrl)</autodoc>
         <paramlist>
-          <param name="ctrl" type="p.wxControl" default=""/>
+          <param name="ctrl" type="Control" default=""/>
         </paramlist>
       </method>
     </class>
@@ -24191,58 +24191,58 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlLinkInfo" oldname="wxHtmlLinkInfo" module="html">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="HtmlLinkInfo" overloaded="no">
         <autodoc>__init__(String href, String target=EmptyString) -&gt; HtmlLinkInfo</autodoc>
         <paramlist>
-          <param name="href" type="r.q(const).wxString" default=""/>
-          <param name="target" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="href" type="String" default=""/>
+          <param name="target" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
-      <method name="GetHref" type="wxString" overloaded="no">
+      <method name="GetHref" type="String" overloaded="no">
         <autodoc>GetHref() -&gt; String</autodoc>
       </method>
-      <method name="GetTarget" type="wxString" overloaded="no">
+      <method name="GetTarget" type="String" overloaded="no">
         <autodoc>GetTarget() -&gt; String</autodoc>
       </method>
-      <method name="GetEvent" type="wxMouseEvent" overloaded="no">
+      <method name="GetEvent" type="MouseEvent" overloaded="no">
         <autodoc>GetEvent() -&gt; MouseEvent</autodoc>
       </method>
       <method name="GetHtmlCell" type="wxHtmlCell" overloaded="no">
         <autodoc>GetHtmlCell() -&gt; HtmlCell</autodoc>
       </method>
-      <method name="SetEvent" type="void" overloaded="no">
+      <method name="SetEvent" type="" overloaded="no">
         <autodoc>SetEvent(MouseEvent e)</autodoc>
         <paramlist>
-          <param name="e" type="p.q(const).wxMouseEvent" default=""/>
+          <param name="e" type="MouseEvent" default=""/>
         </paramlist>
       </method>
-      <method name="SetHtmlCell" type="void" overloaded="no">
+      <method name="SetHtmlCell" type="" overloaded="no">
         <autodoc>SetHtmlCell(HtmlCell e)</autodoc>
         <paramlist>
-          <param name="e" type="p.q(const).wxHtmlCell" default=""/>
+          <param name="e" type="wxHtmlCell" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="HtmlTag" oldname="wxHtmlTag" module="html">
-      <baseclass name="wxObject"/>
-      <method name="GetName" type="wxString" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
       <method name="HasParam" type="bool" overloaded="no">
         <autodoc>HasParam(String par) -&gt; bool</autodoc>
         <paramlist>
-          <param name="par" type="r.q(const).wxString" default=""/>
+          <param name="par" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetParam" type="wxString" overloaded="no">
+      <method name="GetParam" type="String" overloaded="no">
         <autodoc>GetParam(String par, int with_commas=False) -&gt; String</autodoc>
         <paramlist>
-          <param name="par" type="r.q(const).wxString" default=""/>
+          <param name="par" type="String" default=""/>
           <param name="with_commas" type="int" default="False"/>
         </paramlist>
       </method>
-      <method name="GetAllParams" type="wxString" overloaded="no">
+      <method name="GetAllParams" type="String" overloaded="no">
         <autodoc>GetAllParams() -&gt; String</autodoc>
       </method>
       <method name="HasEnding" type="bool" overloaded="no">
@@ -24259,76 +24259,76 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       </method>
     </class>
     <class name="HtmlParser" oldname="wxHtmlParser" module="html">
-      <baseclass name="wxObject"/>
-      <method name="SetFS" type="void" overloaded="no">
+      <baseclass name="Object"/>
+      <method name="SetFS" type="" overloaded="no">
         <autodoc>SetFS(FileSystem fs)</autodoc>
         <paramlist>
-          <param name="fs" type="p.wxFileSystem" default=""/>
+          <param name="fs" type="FileSystem" default=""/>
         </paramlist>
       </method>
-      <method name="GetFS" type="wxFileSystem" overloaded="no">
+      <method name="GetFS" type="FileSystem" overloaded="no">
         <autodoc>GetFS() -&gt; FileSystem</autodoc>
       </method>
-      <method name="Parse" type="wxObject" overloaded="no">
+      <method name="Parse" type="Object" overloaded="no">
         <autodoc>Parse(String source) -&gt; Object</autodoc>
         <paramlist>
-          <param name="source" type="r.q(const).wxString" default=""/>
+          <param name="source" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="InitParser" type="void" overloaded="no">
+      <method name="InitParser" type="" overloaded="no">
         <autodoc>InitParser(String source)</autodoc>
         <paramlist>
-          <param name="source" type="r.q(const).wxString" default=""/>
+          <param name="source" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="DoneParser" type="void" overloaded="no">
+      <method name="DoneParser" type="" overloaded="no">
         <autodoc>DoneParser()</autodoc>
       </method>
-      <method name="DoParsing" type="void" overloaded="no">
+      <method name="DoParsing" type="" overloaded="no">
         <autodoc>DoParsing(int begin_pos, int end_pos)</autodoc>
         <paramlist>
           <param name="begin_pos" type="int" default=""/>
           <param name="end_pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="StopParsing" type="void" overloaded="no">
+      <method name="StopParsing" type="" overloaded="no">
         <autodoc>StopParsing()</autodoc>
       </method>
-      <method name="AddTagHandler" type="void" overloaded="no">
+      <method name="AddTagHandler" type="" overloaded="no">
         <autodoc>AddTagHandler(HtmlTagHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxHtmlTagHandler" default=""/>
+          <param name="handler" type="wxHtmlTagHandler" default=""/>
         </paramlist>
       </method>
-      <method name="GetSource" type="wxString" overloaded="no">
+      <method name="GetSource" type="String" overloaded="no">
         <autodoc>GetSource() -&gt; String</autodoc>
       </method>
-      <method name="PushTagHandler" type="void" overloaded="no">
+      <method name="PushTagHandler" type="" overloaded="no">
         <autodoc>PushTagHandler(HtmlTagHandler handler, String tags)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxHtmlTagHandler" default=""/>
-          <param name="tags" type="wxString" default=""/>
+          <param name="handler" type="wxHtmlTagHandler" default=""/>
+          <param name="tags" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="PopTagHandler" type="void" overloaded="no">
+      <method name="PopTagHandler" type="" overloaded="no">
         <autodoc>PopTagHandler()</autodoc>
       </method>
     </class>
     <class name="HtmlWinParser" oldname="wxHtmlWinParser" module="html">
-      <baseclass name="wxHtmlParser"/>
+      <baseclass name="HtmlParser"/>
       <constructor name="HtmlWinParser" overloaded="no">
         <autodoc>__init__(HtmlWindow wnd=None) -&gt; HtmlWinParser</autodoc>
         <paramlist>
-          <param name="wnd" type="p.wxPyHtmlWindow" default="NULL"/>
+          <param name="wnd" type="wxPyHtmlWindow" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="SetDC" type="void" overloaded="no">
+      <method name="SetDC" type="" overloaded="no">
         <autodoc>SetDC(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="GetDC" type="wxDC" overloaded="no">
+      <method name="GetDC" type="DC" overloaded="no">
         <autodoc>GetDC() -&gt; DC</autodoc>
       </method>
       <method name="GetCharHeight" type="int" overloaded="no">
@@ -24340,12 +24340,12 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetWindow" type="wxPyHtmlWindow" overloaded="no">
         <autodoc>GetWindow() -&gt; HtmlWindow</autodoc>
       </method>
-      <method name="SetFonts" type="void" overloaded="no">
+      <method name="SetFonts" type="" overloaded="no">
         <autodoc>SetFonts(String normal_face, String fixed_face, PyObject sizes=None)</autodoc>
         <paramlist>
-          <param name="normal_face" type="wxString" default=""/>
-          <param name="fixed_face" type="wxString" default=""/>
-          <param name="sizes" type="p.PyObject" default="NULL"/>
+          <param name="normal_face" type="String" default=""/>
+          <param name="fixed_face" type="String" default=""/>
+          <param name="sizes" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
       <method name="GetContainer" type="wxHtmlContainerCell" overloaded="no">
@@ -24357,7 +24357,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="SetContainer" type="wxHtmlContainerCell" overloaded="no">
         <autodoc>SetContainer(HtmlContainerCell c) -&gt; HtmlContainerCell</autodoc>
         <paramlist>
-          <param name="c" type="p.wxHtmlContainerCell" default=""/>
+          <param name="c" type="wxHtmlContainerCell" default=""/>
         </paramlist>
       </method>
       <method name="CloseContainer" type="wxHtmlContainerCell" overloaded="no">
@@ -24366,7 +24366,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetFontSize" type="int" overloaded="no">
         <autodoc>GetFontSize() -&gt; int</autodoc>
       </method>
-      <method name="SetFontSize" type="void" overloaded="no">
+      <method name="SetFontSize" type="" overloaded="no">
         <autodoc>SetFontSize(int s)</autodoc>
         <paramlist>
           <param name="s" type="int" default=""/>
@@ -24375,7 +24375,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetFontBold" type="int" overloaded="no">
         <autodoc>GetFontBold() -&gt; int</autodoc>
       </method>
-      <method name="SetFontBold" type="void" overloaded="no">
+      <method name="SetFontBold" type="" overloaded="no">
         <autodoc>SetFontBold(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -24384,7 +24384,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetFontItalic" type="int" overloaded="no">
         <autodoc>GetFontItalic() -&gt; int</autodoc>
       </method>
-      <method name="SetFontItalic" type="void" overloaded="no">
+      <method name="SetFontItalic" type="" overloaded="no">
         <autodoc>SetFontItalic(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -24393,7 +24393,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetFontUnderlined" type="int" overloaded="no">
         <autodoc>GetFontUnderlined() -&gt; int</autodoc>
       </method>
-      <method name="SetFontUnderlined" type="void" overloaded="no">
+      <method name="SetFontUnderlined" type="" overloaded="no">
         <autodoc>SetFontUnderlined(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -24402,7 +24402,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetFontFixed" type="int" overloaded="no">
         <autodoc>GetFontFixed() -&gt; int</autodoc>
       </method>
-      <method name="SetFontFixed" type="void" overloaded="no">
+      <method name="SetFontFixed" type="" overloaded="no">
         <autodoc>SetFontFixed(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -24411,103 +24411,103 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetAlign" type="int" overloaded="no">
         <autodoc>GetAlign() -&gt; int</autodoc>
       </method>
-      <method name="SetAlign" type="void" overloaded="no">
+      <method name="SetAlign" type="" overloaded="no">
         <autodoc>SetAlign(int a)</autodoc>
         <paramlist>
           <param name="a" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetLinkColor" type="wxColour" overloaded="no">
+      <method name="GetLinkColor" type="Colour" overloaded="no">
         <autodoc>GetLinkColor() -&gt; Colour</autodoc>
       </method>
-      <method name="SetLinkColor" type="void" overloaded="no">
+      <method name="SetLinkColor" type="" overloaded="no">
         <autodoc>SetLinkColor(Colour clr)</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetActualColor" type="wxColour" overloaded="no">
+      <method name="GetActualColor" type="Colour" overloaded="no">
         <autodoc>GetActualColor() -&gt; Colour</autodoc>
       </method>
-      <method name="SetActualColor" type="void" overloaded="no">
+      <method name="SetActualColor" type="" overloaded="no">
         <autodoc>SetActualColor(Colour clr)</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetLink" type="void" overloaded="no">
+      <method name="SetLink" type="" overloaded="no">
         <autodoc>SetLink(String link)</autodoc>
         <paramlist>
-          <param name="link" type="r.q(const).wxString" default=""/>
+          <param name="link" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="CreateCurrentFont" type="wxFont" overloaded="no">
+      <method name="CreateCurrentFont" type="Font" overloaded="no">
         <autodoc>CreateCurrentFont() -&gt; Font</autodoc>
       </method>
-      <method name="GetLink" type="wxHtmlLinkInfo" overloaded="no">
+      <method name="GetLink" type="HtmlLinkInfo" overloaded="no">
         <autodoc>GetLink() -&gt; HtmlLinkInfo</autodoc>
       </method>
     </class>
     <class name="HtmlTagHandler" oldname="wxPyHtmlTagHandler" module="html">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="wxPyHtmlTagHandler" overloaded="no">
         <autodoc>__init__() -&gt; HtmlTagHandler</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetParser" type="void" overloaded="no">
+      <method name="SetParser" type="" overloaded="no">
         <autodoc>SetParser(HtmlParser parser)</autodoc>
         <paramlist>
-          <param name="parser" type="p.wxHtmlParser" default=""/>
+          <param name="parser" type="HtmlParser" default=""/>
         </paramlist>
       </method>
-      <method name="GetParser" type="wxHtmlParser" overloaded="no">
+      <method name="GetParser" type="HtmlParser" overloaded="no">
         <autodoc>GetParser() -&gt; HtmlParser</autodoc>
       </method>
-      <method name="ParseInner" type="void" overloaded="no">
+      <method name="ParseInner" type="" overloaded="no">
         <autodoc>ParseInner(HtmlTag tag)</autodoc>
         <paramlist>
-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="HtmlWinTagHandler" oldname="wxPyHtmlWinTagHandler" module="html">
-      <baseclass name="wxPyHtmlTagHandler"/>
+      <baseclass name="HtmlTagHandler"/>
       <constructor name="wxPyHtmlWinTagHandler" overloaded="no">
         <autodoc>__init__() -&gt; HtmlWinTagHandler</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetParser" type="void" overloaded="no">
+      <method name="SetParser" type="" overloaded="no">
         <autodoc>SetParser(HtmlParser parser)</autodoc>
         <paramlist>
-          <param name="parser" type="p.wxHtmlParser" default=""/>
+          <param name="parser" type="HtmlParser" default=""/>
         </paramlist>
       </method>
-      <method name="GetParser" type="wxHtmlWinParser" overloaded="no">
+      <method name="GetParser" type="HtmlWinParser" overloaded="no">
         <autodoc>GetParser() -&gt; HtmlWinParser</autodoc>
       </method>
-      <method name="ParseInner" type="void" overloaded="no">
+      <method name="ParseInner" type="" overloaded="no">
         <autodoc>ParseInner(HtmlTag tag)</autodoc>
         <paramlist>
-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>
         </paramlist>
       </method>
     </class>
-    <method name="HtmlWinParser_AddTagHandler" oldname="wxHtmlWinParser_AddTagHandler" type="void" overloaded="no">
+    <method name="HtmlWinParser_AddTagHandler" oldname="wxHtmlWinParser_AddTagHandler" type="" overloaded="no">
       <autodoc>HtmlWinParser_AddTagHandler(PyObject tagHandlerClass)</autodoc>
       <paramlist>
-        <param name="tagHandlerClass" type="p.PyObject" default=""/>
+        <param name="tagHandlerClass" type="PyObject" default=""/>
       </paramlist>
     </method>
     <pythoncode>
@@ -24520,56 +24520,56 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlSelection" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Set" type="void" overloaded="no">
+      <method name="Set" type="" overloaded="no">
         <autodoc>Set(Point fromPos, HtmlCell fromCell, Point toPos, HtmlCell toCell)</autodoc>
         <paramlist>
-          <param name="fromPos" type="r.q(const).wxPoint" default=""/>
-          <param name="fromCell" type="p.q(const).wxHtmlCell" default=""/>
-          <param name="toPos" type="r.q(const).wxPoint" default=""/>
-          <param name="toCell" type="p.q(const).wxHtmlCell" default=""/>
+          <param name="fromPos" type="Point" default=""/>
+          <param name="fromCell" type="wxHtmlCell" default=""/>
+          <param name="toPos" type="Point" default=""/>
+          <param name="toCell" type="wxHtmlCell" default=""/>
         </paramlist>
       </method>
-      <method name="SetCells" type="void" overloaded="no">
+      <method name="SetCells" type="" overloaded="no">
         <autodoc>SetCells(HtmlCell fromCell, HtmlCell toCell)</autodoc>
         <paramlist>
-          <param name="fromCell" type="p.q(const).wxHtmlCell" default=""/>
-          <param name="toCell" type="p.q(const).wxHtmlCell" default=""/>
+          <param name="fromCell" type="wxHtmlCell" default=""/>
+          <param name="toCell" type="wxHtmlCell" default=""/>
         </paramlist>
       </method>
-      <method name="GetFromCell" type="q(const).wxHtmlCell" overloaded="no">
+      <method name="GetFromCell" type="wxHtmlCell" overloaded="no">
         <autodoc>GetFromCell() -&gt; HtmlCell</autodoc>
       </method>
-      <method name="GetToCell" type="q(const).wxHtmlCell" overloaded="no">
+      <method name="GetToCell" type="wxHtmlCell" overloaded="no">
         <autodoc>GetToCell() -&gt; HtmlCell</autodoc>
       </method>
-      <method name="GetFromPos" type="q(const).wxPoint" overloaded="no">
+      <method name="GetFromPos" type="Point" overloaded="no">
         <autodoc>GetFromPos() -&gt; Point</autodoc>
       </method>
-      <method name="GetToPos" type="q(const).wxPoint" overloaded="no">
+      <method name="GetToPos" type="Point" overloaded="no">
         <autodoc>GetToPos() -&gt; Point</autodoc>
       </method>
-      <method name="GetFromPrivPos" type="q(const).wxPoint" overloaded="no">
+      <method name="GetFromPrivPos" type="Point" overloaded="no">
         <autodoc>GetFromPrivPos() -&gt; Point</autodoc>
       </method>
-      <method name="GetToPrivPos" type="q(const).wxPoint" overloaded="no">
+      <method name="GetToPrivPos" type="Point" overloaded="no">
         <autodoc>GetToPrivPos() -&gt; Point</autodoc>
       </method>
-      <method name="SetFromPrivPos" type="void" overloaded="no">
+      <method name="SetFromPrivPos" type="" overloaded="no">
         <autodoc>SetFromPrivPos(Point pos)</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetToPrivPos" type="void" overloaded="no">
+      <method name="SetToPrivPos" type="" overloaded="no">
         <autodoc>SetToPrivPos(Point pos)</autodoc>
         <paramlist>
-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="ClearPrivPos" type="void" overloaded="no">
+      <method name="ClearPrivPos" type="" overloaded="no">
         <autodoc>ClearPrivPos()</autodoc>
       </method>
-      <method name="IsEmpty" type="q(const).bool" overloaded="no">
+      <method name="IsEmpty" type="bool" overloaded="no">
         <autodoc>IsEmpty() -&gt; bool</autodoc>
       </method>
     </class>
@@ -24580,7 +24580,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlRenderingState" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetSelectionState" type="void" overloaded="no">
+      <method name="SetSelectionState" type="" overloaded="no">
         <autodoc>SetSelectionState(int s)</autodoc>
         <paramlist>
           <param name="s" type="wxHtmlSelectionState" default=""/>
@@ -24589,51 +24589,51 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetSelectionState" type="wxHtmlSelectionState" overloaded="no">
         <autodoc>GetSelectionState() -&gt; int</autodoc>
       </method>
-      <method name="SetFgColour" type="void" overloaded="no">
+      <method name="SetFgColour" type="" overloaded="no">
         <autodoc>SetFgColour(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetFgColour" type="q(const).wxColour" overloaded="no">
+      <method name="GetFgColour" type="Colour" overloaded="no">
         <autodoc>GetFgColour() -&gt; Colour</autodoc>
       </method>
-      <method name="SetBgColour" type="void" overloaded="no">
+      <method name="SetBgColour" type="" overloaded="no">
         <autodoc>SetBgColour(Colour c)</autodoc>
         <paramlist>
-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetBgColour" type="q(const).wxColour" overloaded="no">
+      <method name="GetBgColour" type="Colour" overloaded="no">
         <autodoc>GetBgColour() -&gt; Colour</autodoc>
       </method>
     </class>
     <class name="HtmlRenderingStyle" oldname="wxHtmlRenderingStyle" module="html">
-      <method name="GetSelectedTextColour" type="wxColour" overloaded="no">
+      <method name="GetSelectedTextColour" type="Colour" overloaded="no">
         <autodoc>GetSelectedTextColour(Colour clr) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelectedTextBgColour" type="wxColour" overloaded="no">
+      <method name="GetSelectedTextBgColour" type="Colour" overloaded="no">
         <autodoc>GetSelectedTextBgColour(Colour clr) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="DefaultHtmlRenderingStyle" oldname="wxDefaultHtmlRenderingStyle" module="html">
-      <baseclass name="wxHtmlRenderingStyle"/>
-      <method name="GetSelectedTextColour" type="wxColour" overloaded="no">
+      <baseclass name="HtmlRenderingStyle"/>
+      <method name="GetSelectedTextColour" type="Colour" overloaded="no">
         <autodoc>GetSelectedTextColour(Colour clr) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelectedTextBgColour" type="wxColour" overloaded="no">
+      <method name="GetSelectedTextBgColour" type="Colour" overloaded="no">
         <autodoc>GetSelectedTextBgColour(Colour clr) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
     </class>
@@ -24644,25 +24644,25 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlRenderingInfo" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(HtmlSelection s)</autodoc>
         <paramlist>
-          <param name="s" type="p.wxHtmlSelection" default=""/>
+          <param name="s" type="HtmlSelection" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelection" type="wxHtmlSelection" overloaded="no">
+      <method name="GetSelection" type="HtmlSelection" overloaded="no">
         <autodoc>GetSelection() -&gt; HtmlSelection</autodoc>
       </method>
-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">
         <autodoc>SetStyle(HtmlRenderingStyle style)</autodoc>
         <paramlist>
-          <param name="style" type="p.wxHtmlRenderingStyle" default=""/>
+          <param name="style" type="HtmlRenderingStyle" default=""/>
         </paramlist>
       </method>
-      <method name="GetStyle" type="wxHtmlRenderingStyle" overloaded="no">
+      <method name="GetStyle" type="HtmlRenderingStyle" overloaded="no">
         <autodoc>GetStyle() -&gt; HtmlRenderingStyle</autodoc>
       </method>
-      <method name="GetState" type="wxHtmlRenderingState" overloaded="no">
+      <method name="GetState" type="HtmlRenderingState" overloaded="no">
         <autodoc>GetState() -&gt; HtmlRenderingState</autodoc>
       </method>
     </class>
@@ -24670,7 +24670,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlCell" oldname="wxHtmlCell" module="html">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="HtmlCell" overloaded="no">
         <autodoc>__init__() -&gt; HtmlCell</autodoc>
       </constructor>
@@ -24689,102 +24689,102 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetDescent" type="int" overloaded="no">
         <autodoc>GetDescent() -&gt; int</autodoc>
       </method>
-      <method name="GetId" type="q(const).wxString" overloaded="no">
+      <method name="GetId" type="String" overloaded="no">
         <autodoc>GetId() -&gt; String</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(String id)</autodoc>
         <paramlist>
-          <param name="id" type="r.q(const).wxString" default=""/>
+          <param name="id" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetLink" type="wxHtmlLinkInfo" overloaded="no">
+      <method name="GetLink" type="HtmlLinkInfo" overloaded="no">
         <autodoc>GetLink(int x=0, int y=0) -&gt; HtmlLinkInfo</autodoc>
         <paramlist>
           <param name="x" type="int" default="0"/>
           <param name="y" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetNext" type="wxHtmlCell" overloaded="no">
+      <method name="GetNext" type="HtmlCell" overloaded="no">
         <autodoc>GetNext() -&gt; HtmlCell</autodoc>
       </method>
       <method name="GetParent" type="wxHtmlContainerCell" overloaded="no">
         <autodoc>GetParent() -&gt; HtmlContainerCell</autodoc>
       </method>
-      <method name="GetFirstChild" type="wxHtmlCell" overloaded="no">
+      <method name="GetFirstChild" type="HtmlCell" overloaded="no">
         <autodoc>GetFirstChild() -&gt; HtmlCell</autodoc>
       </method>
-      <method name="GetCursor" type="wxCursor" overloaded="no">
+      <method name="GetCursor" type="Cursor" overloaded="no">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>
       </method>
       <method name="IsFormattingCell" type="bool" overloaded="no">
         <autodoc>IsFormattingCell() -&gt; bool</autodoc>
       </method>
-      <method name="SetLink" type="void" overloaded="no">
+      <method name="SetLink" type="" overloaded="no">
         <autodoc>SetLink(HtmlLinkInfo link)</autodoc>
         <paramlist>
-          <param name="link" type="r.q(const).wxHtmlLinkInfo" default=""/>
+          <param name="link" type="HtmlLinkInfo" default=""/>
         </paramlist>
       </method>
-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">
         <autodoc>SetNext(HtmlCell cell)</autodoc>
         <paramlist>
-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>
         </paramlist>
       </method>
-      <method name="SetParent" type="void" overloaded="no">
+      <method name="SetParent" type="" overloaded="no">
         <autodoc>SetParent(HtmlContainerCell p)</autodoc>
         <paramlist>
-          <param name="p" type="p.wxHtmlContainerCell" default=""/>
+          <param name="p" type="wxHtmlContainerCell" default=""/>
         </paramlist>
       </method>
-      <method name="SetPos" type="void" overloaded="no">
+      <method name="SetPos" type="" overloaded="no">
         <autodoc>SetPos(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Layout" type="void" overloaded="no">
+      <method name="Layout" type="" overloaded="no">
         <autodoc>Layout(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Draw" type="void" overloaded="no">
+      <method name="Draw" type="" overloaded="no">
         <autodoc>Draw(DC dc, int x, int y, int view_y1, int view_y2, HtmlRenderingInfo info)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
           <param name="view_y1" type="int" default=""/>
           <param name="view_y2" type="int" default=""/>
-          <param name="info" type="r.wxHtmlRenderingInfo" default=""/>
+          <param name="info" type="HtmlRenderingInfo" default=""/>
         </paramlist>
       </method>
-      <method name="DrawInvisible" type="void" overloaded="no">
+      <method name="DrawInvisible" type="" overloaded="no">
         <autodoc>DrawInvisible(DC dc, int x, int y, HtmlRenderingInfo info)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
-          <param name="info" type="r.wxHtmlRenderingInfo" default=""/>
+          <param name="info" type="HtmlRenderingInfo" default=""/>
         </paramlist>
       </method>
-      <method name="Find" type="q(const).wxHtmlCell" overloaded="no">
+      <method name="Find" type="HtmlCell" overloaded="no">
         <autodoc>Find(int condition, void param) -&gt; HtmlCell</autodoc>
         <paramlist>
           <param name="condition" type="int" default=""/>
-          <param name="param" type="p.q(const).void" default=""/>
+          <param name="param" type="" default=""/>
         </paramlist>
       </method>
       <method name="AdjustPagebreak" type="bool" overloaded="no">
         <autodoc>AdjustPagebreak(int INOUT) -&gt; bool</autodoc>
         <paramlist>
-          <param name="INOUT" type="p.int" default=""/>
+          <param name="INOUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCanLiveOnPagebreak" type="void" overloaded="no">
+      <method name="SetCanLiveOnPagebreak" type="" overloaded="no">
         <autodoc>SetCanLiveOnPagebreak(bool can)</autodoc>
         <paramlist>
           <param name="can" type="bool" default=""/>
@@ -24796,7 +24796,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="IsTerminalCell" type="bool" overloaded="no">
         <autodoc>IsTerminalCell() -&gt; bool</autodoc>
       </method>
-      <method name="FindCellByPos" type="wxHtmlCell" overloaded="no">
+      <method name="FindCellByPos" type="HtmlCell" overloaded="no">
         <autodoc>FindCellByPos(int x, int y, unsigned int flags=HTML_FIND_EXACT) -&gt; HtmlCell</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -24804,13 +24804,13 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="flags" type="unsigned int" default="wxHTML_FIND_EXACT"/>
         </paramlist>
       </method>
-      <method name="GetAbsPos" type="wxPoint" overloaded="no">
+      <method name="GetAbsPos" type="Point" overloaded="no">
         <autodoc>GetAbsPos() -&gt; Point</autodoc>
       </method>
-      <method name="GetFirstTerminal" type="wxHtmlCell" overloaded="no">
+      <method name="GetFirstTerminal" type="HtmlCell" overloaded="no">
         <autodoc>GetFirstTerminal() -&gt; HtmlCell</autodoc>
       </method>
-      <method name="GetLastTerminal" type="wxHtmlCell" overloaded="no">
+      <method name="GetLastTerminal" type="HtmlCell" overloaded="no">
         <autodoc>GetLastTerminal() -&gt; HtmlCell</autodoc>
       </method>
       <method name="GetDepth" type="unsigned int" overloaded="no">
@@ -24819,41 +24819,41 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="IsBefore" type="bool" overloaded="no">
         <autodoc>IsBefore(HtmlCell cell) -&gt; bool</autodoc>
         <paramlist>
-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>
         </paramlist>
       </method>
-      <method name="ConvertToText" type="wxString" overloaded="no">
+      <method name="ConvertToText" type="String" overloaded="no">
         <autodoc>ConvertToText(HtmlSelection sel) -&gt; String</autodoc>
         <paramlist>
-          <param name="sel" type="p.wxHtmlSelection" default=""/>
+          <param name="sel" type="HtmlSelection" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="HtmlWordCell" oldname="wxHtmlWordCell" module="html">
-      <baseclass name="wxHtmlCell"/>
+      <baseclass name="HtmlCell"/>
       <constructor name="HtmlWordCell" overloaded="no">
         <autodoc>__init__(String word, DC dc) -&gt; HtmlWordCell</autodoc>
         <paramlist>
-          <param name="word" type="r.q(const).wxString" default=""/>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="word" type="String" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </constructor>
     </class>
     <class name="HtmlContainerCell" oldname="wxHtmlContainerCell" module="html">
-      <baseclass name="wxHtmlCell"/>
+      <baseclass name="HtmlCell"/>
       <constructor name="HtmlContainerCell" overloaded="no">
         <autodoc>__init__(HtmlContainerCell parent) -&gt; HtmlContainerCell</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxHtmlContainerCell" default=""/>
+          <param name="parent" type="HtmlContainerCell" default=""/>
         </paramlist>
       </constructor>
-      <method name="InsertCell" type="void" overloaded="no">
+      <method name="InsertCell" type="" overloaded="no">
         <autodoc>InsertCell(HtmlCell cell)</autodoc>
         <paramlist>
-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>
         </paramlist>
       </method>
-      <method name="SetAlignHor" type="void" overloaded="no">
+      <method name="SetAlignHor" type="" overloaded="no">
         <autodoc>SetAlignHor(int al)</autodoc>
         <paramlist>
           <param name="al" type="int" default=""/>
@@ -24862,7 +24862,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetAlignHor" type="int" overloaded="no">
         <autodoc>GetAlignHor() -&gt; int</autodoc>
       </method>
-      <method name="SetAlignVer" type="void" overloaded="no">
+      <method name="SetAlignVer" type="" overloaded="no">
         <autodoc>SetAlignVer(int al)</autodoc>
         <paramlist>
           <param name="al" type="int" default=""/>
@@ -24871,7 +24871,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetAlignVer" type="int" overloaded="no">
         <autodoc>GetAlignVer() -&gt; int</autodoc>
       </method>
-      <method name="SetIndent" type="void" overloaded="no">
+      <method name="SetIndent" type="" overloaded="no">
         <autodoc>SetIndent(int i, int what, int units=HTML_UNITS_PIXELS)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>
@@ -24891,77 +24891,77 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="ind" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAlign" type="void" overloaded="no">
+      <method name="SetAlign" type="" overloaded="no">
         <autodoc>SetAlign(HtmlTag tag)</autodoc>
         <paramlist>
-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidthFloat" type="void" overloaded="no">
+      <method name="SetWidthFloat" type="" overloaded="no">
         <autodoc>SetWidthFloat(int w, int units)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>
           <param name="units" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidthFloatFromTag" type="void" overloaded="no">
+      <method name="SetWidthFloatFromTag" type="" overloaded="no">
         <autodoc>SetWidthFloatFromTag(HtmlTag tag)</autodoc>
         <paramlist>
-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinHeight" type="void" overloaded="no">
+      <method name="SetMinHeight" type="" overloaded="no">
         <autodoc>SetMinHeight(int h, int align=HTML_ALIGN_TOP)</autodoc>
         <paramlist>
           <param name="h" type="int" default=""/>
           <param name="align" type="int" default="wxHTML_ALIGN_TOP"/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour clr)</autodoc>
         <paramlist>
-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
-      <method name="SetBorder" type="void" overloaded="no">
+      <method name="SetBorder" type="" overloaded="no">
         <autodoc>SetBorder(Colour clr1, Colour clr2)</autodoc>
         <paramlist>
-          <param name="clr1" type="r.q(const).wxColour" default=""/>
-          <param name="clr2" type="r.q(const).wxColour" default=""/>
+          <param name="clr1" type="Colour" default=""/>
+          <param name="clr2" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="GetFirstChild" type="wxHtmlCell" overloaded="no">
+      <method name="GetFirstChild" type="HtmlCell" overloaded="no">
         <autodoc>GetFirstChild() -&gt; HtmlCell</autodoc>
       </method>
     </class>
     <class name="HtmlColourCell" oldname="wxHtmlColourCell" module="html">
-      <baseclass name="wxHtmlCell"/>
+      <baseclass name="HtmlCell"/>
       <constructor name="HtmlColourCell" overloaded="no">
         <autodoc>__init__(Colour clr, int flags=HTML_CLR_FOREGROUND) -&gt; HtmlColourCell</autodoc>
         <paramlist>
-          <param name="clr" type="wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>
           <param name="flags" type="int" default="wxHTML_CLR_FOREGROUND"/>
         </paramlist>
       </constructor>
     </class>
     <class name="HtmlFontCell" oldname="wxHtmlFontCell" module="html">
-      <baseclass name="wxHtmlCell"/>
+      <baseclass name="HtmlCell"/>
       <constructor name="HtmlFontCell" overloaded="no">
         <autodoc>__init__(Font font) -&gt; HtmlFontCell</autodoc>
         <paramlist>
-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </constructor>
     </class>
     <class name="HtmlWidgetCell" oldname="wxHtmlWidgetCell" module="html">
-      <baseclass name="wxHtmlCell"/>
+      <baseclass name="HtmlCell"/>
       <constructor name="HtmlWidgetCell" overloaded="no">
         <autodoc>__init__(Window wnd, int w=0) -&gt; HtmlWidgetCell</autodoc>
         <paramlist>
-          <param name="wnd" type="p.wxWindow" default=""/>
+          <param name="wnd" type="Window" default=""/>
           <param name="w" type="int" default="0"/>
         </paramlist>
       </constructor>
@@ -24970,15 +24970,15 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlFilter" oldname="wxPyHtmlFilter" module="html">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="wxPyHtmlFilter" overloaded="no">
         <autodoc>__init__() -&gt; HtmlFilter</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -24986,18 +24986,18 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlWindow" oldname="wxPyHtmlWindow" module="html">
-      <baseclass name="wxScrolledWindow"/>
+      <baseclass name="ScrolledWindow"/>
       <constructor name="wxPyHtmlWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 
     String name=HtmlWindowNameStr) -&gt; HtmlWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="int" default="wxHW_DEFAULT_STYLE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyHtmlWindowNameStr"/>
+          <param name="name" type="String" default="wxPyHtmlWindowNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreHtmlWindow" overloaded="no">
@@ -25008,102 +25008,102 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
     Size size=DefaultSize, int style=HW_SCROLLBAR_AUTO, 
     String name=HtmlWindowNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="int" default="wxHW_SCROLLBAR_AUTO"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyHtmlWindowNameStr"/>
+          <param name="name" type="String" default="wxPyHtmlWindowNameStr"/>
         </paramlist>
       </method>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="SetPage" type="bool" overloaded="no">
         <autodoc>SetPage(String source) -&gt; bool</autodoc>
         <paramlist>
-          <param name="source" type="r.q(const).wxString" default=""/>
+          <param name="source" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadPage" type="bool" overloaded="no">
         <autodoc>LoadPage(String location) -&gt; bool</autodoc>
         <paramlist>
-          <param name="location" type="r.q(const).wxString" default=""/>
+          <param name="location" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadFile" type="bool" overloaded="no">
         <autodoc>LoadFile(String filename) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
       <method name="AppendToPage" type="bool" overloaded="no">
         <autodoc>AppendToPage(String source) -&gt; bool</autodoc>
         <paramlist>
-          <param name="source" type="r.q(const).wxString" default=""/>
+          <param name="source" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetOpenedPage" type="wxString" overloaded="no">
+      <method name="GetOpenedPage" type="String" overloaded="no">
         <autodoc>GetOpenedPage() -&gt; String</autodoc>
       </method>
-      <method name="GetOpenedAnchor" type="wxString" overloaded="no">
+      <method name="GetOpenedAnchor" type="String" overloaded="no">
         <autodoc>GetOpenedAnchor() -&gt; String</autodoc>
       </method>
-      <method name="GetOpenedPageTitle" type="wxString" overloaded="no">
+      <method name="GetOpenedPageTitle" type="String" overloaded="no">
         <autodoc>GetOpenedPageTitle() -&gt; String</autodoc>
       </method>
-      <method name="SetRelatedFrame" type="void" overloaded="no">
+      <method name="SetRelatedFrame" type="" overloaded="no">
         <autodoc>SetRelatedFrame(Frame frame, String format)</autodoc>
         <paramlist>
-          <param name="frame" type="p.wxFrame" default=""/>
-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="frame" type="Frame" default=""/>
+          <param name="format" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetRelatedFrame" type="wxFrame" overloaded="no">
+      <method name="GetRelatedFrame" type="Frame" overloaded="no">
         <autodoc>GetRelatedFrame() -&gt; Frame</autodoc>
       </method>
-      <method name="SetRelatedStatusBar" type="void" overloaded="no">
+      <method name="SetRelatedStatusBar" type="" overloaded="no">
         <autodoc>SetRelatedStatusBar(int bar)</autodoc>
         <paramlist>
           <param name="bar" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFonts" type="void" overloaded="no">
+      <method name="SetFonts" type="" overloaded="no">
         <autodoc>SetFonts(String normal_face, String fixed_face, PyObject sizes=None)</autodoc>
         <paramlist>
-          <param name="normal_face" type="wxString" default=""/>
-          <param name="fixed_face" type="wxString" default=""/>
-          <param name="sizes" type="p.PyObject" default="NULL"/>
+          <param name="normal_face" type="String" default=""/>
+          <param name="fixed_face" type="String" default=""/>
+          <param name="sizes" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetBorders" type="void" overloaded="no">
+      <method name="SetBorders" type="" overloaded="no">
         <autodoc>SetBorders(int b)</autodoc>
         <paramlist>
           <param name="b" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ReadCustomization" type="void" overloaded="no">
+      <method name="ReadCustomization" type="" overloaded="no">
         <autodoc>ReadCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
-          <param name="cfg" type="p.wxConfigBase" default=""/>
-          <param name="path" type="wxString" default="wxPyEmptyString"/>
+          <param name="cfg" type="ConfigBase" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="WriteCustomization" type="void" overloaded="no">
+      <method name="WriteCustomization" type="" overloaded="no">
         <autodoc>WriteCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
-          <param name="cfg" type="p.wxConfigBase" default=""/>
-          <param name="path" type="wxString" default="wxPyEmptyString"/>
+          <param name="cfg" type="ConfigBase" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="HistoryBack" type="bool" overloaded="no">
@@ -25118,60 +25118,60 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="HistoryCanForward" type="bool" overloaded="no">
         <autodoc>HistoryCanForward() -&gt; bool</autodoc>
       </method>
-      <method name="HistoryClear" type="void" overloaded="no">
+      <method name="HistoryClear" type="" overloaded="no">
         <autodoc>HistoryClear()</autodoc>
       </method>
-      <method name="GetInternalRepresentation" type="wxHtmlContainerCell" overloaded="no">
+      <method name="GetInternalRepresentation" type="HtmlContainerCell" overloaded="no">
         <autodoc>GetInternalRepresentation() -&gt; HtmlContainerCell</autodoc>
       </method>
-      <method name="GetParser" type="wxHtmlWinParser" overloaded="no">
+      <method name="GetParser" type="HtmlWinParser" overloaded="no">
         <autodoc>GetParser() -&gt; HtmlWinParser</autodoc>
       </method>
       <method name="ScrollToAnchor" type="bool" overloaded="no">
         <autodoc>ScrollToAnchor(String anchor) -&gt; bool</autodoc>
         <paramlist>
-          <param name="anchor" type="r.q(const).wxString" default=""/>
+          <param name="anchor" type="String" default=""/>
         </paramlist>
       </method>
       <method name="HasAnchor" type="bool" overloaded="no">
         <autodoc>HasAnchor(String anchor) -&gt; bool</autodoc>
         <paramlist>
-          <param name="anchor" type="r.q(const).wxString" default=""/>
+          <param name="anchor" type="String" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="AddFilter" type="void" overloaded="no">
+      <staticmethod name="AddFilter" type="" overloaded="no">
         <autodoc>HtmlWindow.AddFilter(HtmlFilter filter)</autodoc>
         <paramlist>
-          <param name="filter" type="p.wxPyHtmlFilter" default=""/>
+          <param name="filter" type="HtmlFilter" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="base_OnLinkClicked" type="void" overloaded="no">
+      <method name="base_OnLinkClicked" type="" overloaded="no">
         <autodoc>base_OnLinkClicked(HtmlLinkInfo link)</autodoc>
         <paramlist>
-          <param name="link" type="r.q(const).wxHtmlLinkInfo" default=""/>
+          <param name="link" type="HtmlLinkInfo" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnSetTitle" type="void" overloaded="no">
+      <method name="base_OnSetTitle" type="" overloaded="no">
         <autodoc>base_OnSetTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnCellMouseHover" type="void" overloaded="no">
+      <method name="base_OnCellMouseHover" type="" overloaded="no">
         <autodoc>base_OnCellMouseHover(HtmlCell cell, int x, int y)</autodoc>
         <paramlist>
-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnCellClicked" type="void" overloaded="no">
+      <method name="base_OnCellClicked" type="" overloaded="no">
         <autodoc>base_OnCellClicked(HtmlCell cell, int x, int y, MouseEvent event)</autodoc>
         <paramlist>
-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
-          <param name="event" type="r.q(const).wxMouseEvent" default=""/>
+          <param name="event" type="MouseEvent" default=""/>
         </paramlist>
       </method>
     </class>
@@ -25179,41 +25179,41 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlDCRenderer" oldname="wxHtmlDCRenderer" module="html">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="HtmlDCRenderer" overloaded="no">
         <autodoc>__init__() -&gt; HtmlDCRenderer</autodoc>
       </constructor>
       <destructor name="~wxHtmlDCRenderer" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetDC" type="void" overloaded="no">
+      <method name="SetDC" type="" overloaded="no">
         <autodoc>SetDC(DC dc, int maxwidth)</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="maxwidth" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetHtmlText" type="void" overloaded="no">
+      <method name="SetHtmlText" type="" overloaded="no">
         <autodoc>SetHtmlText(String html, String basepath=EmptyString, bool isdir=True)</autodoc>
         <paramlist>
-          <param name="html" type="r.q(const).wxString" default=""/>
-          <param name="basepath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="html" type="String" default=""/>
+          <param name="basepath" type="String" default="wxPyEmptyString"/>
           <param name="isdir" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetFonts" type="void" overloaded="no">
+      <method name="SetFonts" type="" overloaded="no">
         <autodoc>SetFonts(String normal_face, String fixed_face, PyObject sizes=None)</autodoc>
         <paramlist>
-          <param name="normal_face" type="wxString" default=""/>
-          <param name="fixed_face" type="wxString" default=""/>
-          <param name="sizes" type="p.PyObject" default="NULL"/>
+          <param name="normal_face" type="String" default=""/>
+          <param name="fixed_face" type="String" default=""/>
+          <param name="sizes" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
       <method name="Render" type="int" overloaded="no">
@@ -25225,7 +25225,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="from" type="int" default="0"/>
           <param name="dont_render" type="int" default="False"/>
           <param name="to" type="int" default="INT_MAX"/>
-          <param name="choices" type="p.int" default="NULL"/>
+          <param name="choices" type="int" default="NULL"/>
           <param name="LCOUNT" type="int" default="0"/>
         </paramlist>
       </method>
@@ -25234,50 +25234,50 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       </method>
     </class>
     <class name="HtmlPrintout" oldname="wxHtmlPrintout" module="html">
-      <baseclass name="wxPyPrintout"/>
+      <baseclass name="Printout"/>
       <constructor name="HtmlPrintout" overloaded="no">
         <autodoc>__init__(String title=HtmlPrintoutTitleStr) -&gt; HtmlPrintout</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default="wxPyHtmlPrintoutTitleStr"/>
+          <param name="title" type="String" default="wxPyHtmlPrintoutTitleStr"/>
         </paramlist>
       </constructor>
-      <method name="SetHtmlText" type="void" overloaded="no">
+      <method name="SetHtmlText" type="" overloaded="no">
         <autodoc>SetHtmlText(String html, String basepath=EmptyString, bool isdir=True)</autodoc>
         <paramlist>
-          <param name="html" type="r.q(const).wxString" default=""/>
-          <param name="basepath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="html" type="String" default=""/>
+          <param name="basepath" type="String" default="wxPyEmptyString"/>
           <param name="isdir" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetHtmlFile" type="void" overloaded="no">
+      <method name="SetHtmlFile" type="" overloaded="no">
         <autodoc>SetHtmlFile(String htmlfile)</autodoc>
         <paramlist>
-          <param name="htmlfile" type="r.q(const).wxString" default=""/>
+          <param name="htmlfile" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetHeader" type="void" overloaded="no">
+      <method name="SetHeader" type="" overloaded="no">
         <autodoc>SetHeader(String header, int pg=PAGE_ALL)</autodoc>
         <paramlist>
-          <param name="header" type="r.q(const).wxString" default=""/>
+          <param name="header" type="String" default=""/>
           <param name="pg" type="int" default="wxPAGE_ALL"/>
         </paramlist>
       </method>
-      <method name="SetFooter" type="void" overloaded="no">
+      <method name="SetFooter" type="" overloaded="no">
         <autodoc>SetFooter(String footer, int pg=PAGE_ALL)</autodoc>
         <paramlist>
-          <param name="footer" type="r.q(const).wxString" default=""/>
+          <param name="footer" type="String" default=""/>
           <param name="pg" type="int" default="wxPAGE_ALL"/>
         </paramlist>
       </method>
-      <method name="SetFonts" type="void" overloaded="no">
+      <method name="SetFonts" type="" overloaded="no">
         <autodoc>SetFonts(String normal_face, String fixed_face, PyObject sizes=None)</autodoc>
         <paramlist>
-          <param name="normal_face" type="wxString" default=""/>
-          <param name="fixed_face" type="wxString" default=""/>
-          <param name="sizes" type="p.PyObject" default="NULL"/>
+          <param name="normal_face" type="String" default=""/>
+          <param name="fixed_face" type="String" default=""/>
+          <param name="sizes" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="SetMargins" type="void" overloaded="no">
+      <method name="SetMargins" type="" overloaded="no">
         <autodoc>SetMargins(float top=25.2, float bottom=25.2, float left=25.2, 
     float right=25.2, float spaces=5)</autodoc>
         <paramlist>
@@ -25288,86 +25288,86 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="spaces" type="float" default="5"/>
         </paramlist>
       </method>
-      <staticmethod name="AddFilter" type="void" overloaded="no">
+      <staticmethod name="AddFilter" type="" overloaded="no">
         <autodoc>HtmlPrintout.AddFilter(wxHtmlFilter filter)</autodoc>
         <paramlist>
-          <param name="filter" type="p.wxHtmlFilter" default=""/>
+          <param name="filter" type="wxHtmlFilter" default=""/>
         </paramlist>
       </staticmethod>
-      <staticmethod name="CleanUpStatics" type="void" overloaded="no">
+      <staticmethod name="CleanUpStatics" type="" overloaded="no">
         <autodoc>HtmlPrintout.CleanUpStatics()</autodoc>
       </staticmethod>
     </class>
     <class name="HtmlEasyPrinting" oldname="wxHtmlEasyPrinting" module="html">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="HtmlEasyPrinting" overloaded="no">
         <autodoc>__init__(String name=HtmlPrintingTitleStr, Window parentWindow=None) -&gt; HtmlEasyPrinting</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default="wxPyHtmlPrintingTitleStr"/>
-          <param name="parentWindow" type="p.wxWindow" default="NULL"/>
+          <param name="name" type="String" default="wxPyHtmlPrintingTitleStr"/>
+          <param name="parentWindow" type="Window" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxHtmlEasyPrinting" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="PreviewFile" type="void" overloaded="no">
+      <method name="PreviewFile" type="" overloaded="no">
         <autodoc>PreviewFile(String htmlfile)</autodoc>
         <paramlist>
-          <param name="htmlfile" type="r.q(const).wxString" default=""/>
+          <param name="htmlfile" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="PreviewText" type="void" overloaded="no">
+      <method name="PreviewText" type="" overloaded="no">
         <autodoc>PreviewText(String htmltext, String basepath=EmptyString)</autodoc>
         <paramlist>
-          <param name="htmltext" type="r.q(const).wxString" default=""/>
-          <param name="basepath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="htmltext" type="String" default=""/>
+          <param name="basepath" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="PrintFile" type="void" overloaded="no">
+      <method name="PrintFile" type="" overloaded="no">
         <autodoc>PrintFile(String htmlfile)</autodoc>
         <paramlist>
-          <param name="htmlfile" type="r.q(const).wxString" default=""/>
+          <param name="htmlfile" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="PrintText" type="void" overloaded="no">
+      <method name="PrintText" type="" overloaded="no">
         <autodoc>PrintText(String htmltext, String basepath=EmptyString)</autodoc>
         <paramlist>
-          <param name="htmltext" type="r.q(const).wxString" default=""/>
-          <param name="basepath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="htmltext" type="String" default=""/>
+          <param name="basepath" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="PrinterSetup" type="void" overloaded="no">
+      <method name="PrinterSetup" type="" overloaded="no">
         <autodoc>PrinterSetup()</autodoc>
       </method>
-      <method name="PageSetup" type="void" overloaded="no">
+      <method name="PageSetup" type="" overloaded="no">
         <autodoc>PageSetup()</autodoc>
       </method>
-      <method name="SetHeader" type="void" overloaded="no">
+      <method name="SetHeader" type="" overloaded="no">
         <autodoc>SetHeader(String header, int pg=PAGE_ALL)</autodoc>
         <paramlist>
-          <param name="header" type="r.q(const).wxString" default=""/>
+          <param name="header" type="String" default=""/>
           <param name="pg" type="int" default="wxPAGE_ALL"/>
         </paramlist>
       </method>
-      <method name="SetFooter" type="void" overloaded="no">
+      <method name="SetFooter" type="" overloaded="no">
         <autodoc>SetFooter(String footer, int pg=PAGE_ALL)</autodoc>
         <paramlist>
-          <param name="footer" type="r.q(const).wxString" default=""/>
+          <param name="footer" type="String" default=""/>
           <param name="pg" type="int" default="wxPAGE_ALL"/>
         </paramlist>
       </method>
-      <method name="SetFonts" type="void" overloaded="no">
+      <method name="SetFonts" type="" overloaded="no">
         <autodoc>SetFonts(String normal_face, String fixed_face, PyObject sizes=None)</autodoc>
         <paramlist>
-          <param name="normal_face" type="wxString" default=""/>
-          <param name="fixed_face" type="wxString" default=""/>
-          <param name="sizes" type="p.PyObject" default="NULL"/>
+          <param name="normal_face" type="String" default=""/>
+          <param name="fixed_face" type="String" default=""/>
+          <param name="sizes" type="PyObject" default="NULL"/>
         </paramlist>
       </method>
-      <method name="GetPrintData" type="wxPrintData" overloaded="no">
+      <method name="GetPrintData" type="PrintData" overloaded="no">
         <autodoc>GetPrintData() -&gt; PrintData</autodoc>
       </method>
-      <method name="GetPageSetupData" type="wxPageSetupDialogData" overloaded="no">
+      <method name="GetPageSetupData" type="PageSetupDialogData" overloaded="no">
         <autodoc>GetPageSetupData() -&gt; PageSetupDialogData</autodoc>
       </method>
     </class>
@@ -25378,25 +25378,25 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <constructor name="HtmlBookRecord" overloaded="no">
         <autodoc>__init__(String bookfile, String basepath, String title, String start) -&gt; HtmlBookRecord</autodoc>
         <paramlist>
-          <param name="bookfile" type="r.q(const).wxString" default=""/>
-          <param name="basepath" type="r.q(const).wxString" default=""/>
-          <param name="title" type="r.q(const).wxString" default=""/>
-          <param name="start" type="r.q(const).wxString" default=""/>
+          <param name="bookfile" type="String" default=""/>
+          <param name="basepath" type="String" default=""/>
+          <param name="title" type="String" default=""/>
+          <param name="start" type="String" default=""/>
         </paramlist>
       </constructor>
-      <method name="GetBookFile" type="wxString" overloaded="no">
+      <method name="GetBookFile" type="String" overloaded="no">
         <autodoc>GetBookFile() -&gt; String</autodoc>
       </method>
-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">
         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
-      <method name="GetStart" type="wxString" overloaded="no">
+      <method name="GetStart" type="String" overloaded="no">
         <autodoc>GetStart() -&gt; String</autodoc>
       </method>
-      <method name="GetBasePath" type="wxString" overloaded="no">
+      <method name="GetBasePath" type="String" overloaded="no">
         <autodoc>GetBasePath() -&gt; String</autodoc>
       </method>
-      <method name="SetContentsRange" type="void" overloaded="no">
+      <method name="SetContentsRange" type="" overloaded="no">
         <autodoc>SetContentsRange(int start, int end)</autodoc>
         <paramlist>
           <param name="start" type="int" default=""/>
@@ -25409,28 +25409,28 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetContentsEnd" type="int" overloaded="no">
         <autodoc>GetContentsEnd() -&gt; int</autodoc>
       </method>
-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>
-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetBasePath" type="void" overloaded="no">
+      <method name="SetBasePath" type="" overloaded="no">
         <autodoc>SetBasePath(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetStart" type="void" overloaded="no">
+      <method name="SetStart" type="" overloaded="no">
         <autodoc>SetStart(String start)</autodoc>
         <paramlist>
-          <param name="start" type="r.q(const).wxString" default=""/>
+          <param name="start" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetFullPath" type="wxString" overloaded="no">
+      <method name="GetFullPath" type="String" overloaded="no">
         <autodoc>GetFullPath(String page) -&gt; String</autodoc>
         <paramlist>
-          <param name="page" type="r.q(const).wxString" default=""/>
+          <param name="page" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -25441,13 +25441,13 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetID" type="int" overloaded="no">
         <autodoc>GetID() -&gt; int</autodoc>
       </method>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="GetPage" type="wxString" overloaded="no">
+      <method name="GetPage" type="String" overloaded="no">
         <autodoc>GetPage() -&gt; String</autodoc>
       </method>
-      <method name="GetBook" type="wxHtmlBookRecord" overloaded="no">
+      <method name="GetBook" type="HtmlBookRecord" overloaded="no">
         <autodoc>GetBook() -&gt; HtmlBookRecord</autodoc>
       </method>
     </class>
@@ -25464,10 +25464,10 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <method name="GetMaxIndex" type="int" overloaded="no">
         <autodoc>GetMaxIndex() -&gt; int</autodoc>
       </method>
-      <method name="GetName" type="q(const).wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="GetContentsItem" type="wxHtmlContentsItem" overloaded="no">
+      <method name="GetContentsItem" type="HtmlContentsItem" overloaded="no">
         <autodoc>GetContentsItem() -&gt; HtmlContentsItem</autodoc>
       </method>
     </class>
@@ -25478,40 +25478,40 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlHelpData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetTempDir" type="void" overloaded="no">
+      <method name="SetTempDir" type="" overloaded="no">
         <autodoc>SetTempDir(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
       <method name="AddBook" type="bool" overloaded="no">
         <autodoc>AddBook(String book) -&gt; bool</autodoc>
         <paramlist>
-          <param name="book" type="r.q(const).wxString" default=""/>
+          <param name="book" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindPageByName" type="wxString" overloaded="no">
+      <method name="FindPageByName" type="String" overloaded="no">
         <autodoc>FindPageByName(String page) -&gt; String</autodoc>
         <paramlist>
-          <param name="page" type="r.q(const).wxString" default=""/>
+          <param name="page" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindPageById" type="wxString" overloaded="no">
+      <method name="FindPageById" type="String" overloaded="no">
         <autodoc>FindPageById(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetBookRecArray" type="q(const).wxHtmlBookRecArray" overloaded="no">
+      <method name="GetBookRecArray" type="wxHtmlBookRecArray" overloaded="no">
         <autodoc>GetBookRecArray() -&gt; wxHtmlBookRecArray</autodoc>
       </method>
-      <method name="GetContents" type="wxHtmlContentsItem" overloaded="no">
+      <method name="GetContents" type="HtmlContentsItem" overloaded="no">
         <autodoc>GetContents() -&gt; HtmlContentsItem</autodoc>
       </method>
       <method name="GetContentsCnt" type="int" overloaded="no">
         <autodoc>GetContentsCnt() -&gt; int</autodoc>
       </method>
-      <method name="GetIndex" type="wxHtmlContentsItem" overloaded="no">
+      <method name="GetIndex" type="HtmlContentsItem" overloaded="no">
         <autodoc>GetIndex() -&gt; HtmlContentsItem</autodoc>
       </method>
       <method name="GetIndexCnt" type="int" overloaded="no">
@@ -25519,75 +25519,75 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       </method>
     </class>
     <class name="HtmlHelpFrame" oldname="wxHtmlHelpFrame" module="html">
-      <baseclass name="wxFrame"/>
+      <baseclass name="Frame"/>
       <constructor name="HtmlHelpFrame" overloaded="no">
         <autodoc>__init__(Window parent, int ??, String title=EmptyString, int style=HF_DEFAULTSTYLE, 
     HtmlHelpData data=None) -&gt; HtmlHelpFrame</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="" type="int" default=""/>
-          <param name="title" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="title" type="String" default="wxPyEmptyString"/>
           <param name="style" type="int" default="wxHF_DEFAULTSTYLE"/>
-          <param name="data" type="p.wxHtmlHelpData" default="NULL"/>
+          <param name="data" type="HtmlHelpData" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="GetData" type="wxHtmlHelpData" overloaded="no">
+      <method name="GetData" type="HtmlHelpData" overloaded="no">
         <autodoc>GetData() -&gt; HtmlHelpData</autodoc>
       </method>
-      <method name="SetTitleFormat" type="void" overloaded="no">
+      <method name="SetTitleFormat" type="" overloaded="no">
         <autodoc>SetTitleFormat(String format)</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Display" type="void" overloaded="no">
+      <method name="Display" type="" overloaded="no">
         <autodoc>Display(String x)</autodoc>
         <paramlist>
-          <param name="x" type="r.q(const).wxString" default=""/>
+          <param name="x" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="DisplayID" type="void" overloaded="no">
+      <method name="DisplayID" type="" overloaded="no">
         <autodoc>DisplayID(int id)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DisplayContents" type="void" overloaded="no">
+      <method name="DisplayContents" type="" overloaded="no">
         <autodoc>DisplayContents()</autodoc>
       </method>
-      <method name="DisplayIndex" type="void" overloaded="no">
+      <method name="DisplayIndex" type="" overloaded="no">
         <autodoc>DisplayIndex()</autodoc>
       </method>
       <method name="KeywordSearch" type="bool" overloaded="no">
         <autodoc>KeywordSearch(String keyword) -&gt; bool</autodoc>
         <paramlist>
-          <param name="keyword" type="r.q(const).wxString" default=""/>
+          <param name="keyword" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="UseConfig" type="void" overloaded="no">
+      <method name="UseConfig" type="" overloaded="no">
         <autodoc>UseConfig(ConfigBase config, String rootpath=EmptyString)</autodoc>
         <paramlist>
-          <param name="config" type="p.wxConfigBase" default=""/>
-          <param name="rootpath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="config" type="ConfigBase" default=""/>
+          <param name="rootpath" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="ReadCustomization" type="void" overloaded="no">
+      <method name="ReadCustomization" type="" overloaded="no">
         <autodoc>ReadCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
-          <param name="cfg" type="p.wxConfigBase" default=""/>
-          <param name="path" type="wxString" default="wxPyEmptyString"/>
+          <param name="cfg" type="ConfigBase" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="WriteCustomization" type="void" overloaded="no">
+      <method name="WriteCustomization" type="" overloaded="no">
         <autodoc>WriteCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
-          <param name="cfg" type="p.wxConfigBase" default=""/>
-          <param name="path" type="wxString" default="wxPyEmptyString"/>
+          <param name="cfg" type="ConfigBase" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
     </class>
     <class name="HtmlHelpController" oldname="wxHtmlHelpController" module="html">
-      <baseclass name="wxEvtHandler"/>
+      <baseclass name="EvtHandler"/>
       <constructor name="HtmlHelpController" overloaded="no">
         <autodoc>__init__(int style=HF_DEFAULTSTYLE) -&gt; HtmlHelpController</autodoc>
         <paramlist>
@@ -25597,71 +25597,71 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlHelpController" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetTitleFormat" type="void" overloaded="no">
+      <method name="SetTitleFormat" type="" overloaded="no">
         <autodoc>SetTitleFormat(String format)</autodoc>
         <paramlist>
-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetTempDir" type="void" overloaded="no">
+      <method name="SetTempDir" type="" overloaded="no">
         <autodoc>SetTempDir(String path)</autodoc>
         <paramlist>
-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>
         </paramlist>
       </method>
       <method name="AddBook" type="bool" overloaded="no">
         <autodoc>AddBook(String book, int show_wait_msg=False) -&gt; bool</autodoc>
         <paramlist>
-          <param name="book" type="r.q(const).wxString" default=""/>
+          <param name="book" type="String" default=""/>
           <param name="show_wait_msg" type="int" default="False"/>
         </paramlist>
       </method>
-      <method name="Display" type="void" overloaded="no">
+      <method name="Display" type="" overloaded="no">
         <autodoc>Display(String x)</autodoc>
         <paramlist>
-          <param name="x" type="r.q(const).wxString" default=""/>
+          <param name="x" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="DisplayID" type="void" overloaded="no">
+      <method name="DisplayID" type="" overloaded="no">
         <autodoc>DisplayID(int id)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DisplayContents" type="void" overloaded="no">
+      <method name="DisplayContents" type="" overloaded="no">
         <autodoc>DisplayContents()</autodoc>
       </method>
-      <method name="DisplayIndex" type="void" overloaded="no">
+      <method name="DisplayIndex" type="" overloaded="no">
         <autodoc>DisplayIndex()</autodoc>
       </method>
       <method name="KeywordSearch" type="bool" overloaded="no">
         <autodoc>KeywordSearch(String keyword) -&gt; bool</autodoc>
         <paramlist>
-          <param name="keyword" type="r.q(const).wxString" default=""/>
+          <param name="keyword" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="UseConfig" type="void" overloaded="no">
+      <method name="UseConfig" type="" overloaded="no">
         <autodoc>UseConfig(ConfigBase config, String rootpath=EmptyString)</autodoc>
         <paramlist>
-          <param name="config" type="p.wxConfigBase" default=""/>
-          <param name="rootpath" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="config" type="ConfigBase" default=""/>
+          <param name="rootpath" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="ReadCustomization" type="void" overloaded="no">
+      <method name="ReadCustomization" type="" overloaded="no">
         <autodoc>ReadCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
-          <param name="cfg" type="p.wxConfigBase" default=""/>
-          <param name="path" type="wxString" default="wxPyEmptyString"/>
+          <param name="cfg" type="ConfigBase" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="WriteCustomization" type="void" overloaded="no">
+      <method name="WriteCustomization" type="" overloaded="no">
         <autodoc>WriteCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
-          <param name="cfg" type="p.wxConfigBase" default=""/>
-          <param name="path" type="wxString" default="wxPyEmptyString"/>
+          <param name="cfg" type="ConfigBase" default=""/>
+          <param name="path" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="GetFrame" type="wxHtmlHelpFrame" overloaded="no">
+      <method name="GetFrame" type="HtmlHelpFrame" overloaded="no">
         <autodoc>GetFrame() -&gt; HtmlHelpFrame</autodoc>
       </method>
     </class>
@@ -25677,7 +25677,7 @@ EVT_WIZARD_HELP          = wx.PyEventBinder( wxEVT_WIZARD_HELP, 1)
 EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
 </pythoncode>
     <class name="WizardEvent" oldname="wxWizardEvent" module="wizard">
-      <baseclass name="wxNotifyEvent"/>
+      <baseclass name="NotifyEvent"/>
       <constructor name="WizardEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int id=-1, bool direction=True, 
     WizardPage page=None) -&gt; WizardEvent</autodoc>
@@ -25685,7 +25685,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="type" type="wxEventType" default="wxEVT_NULL"/>
           <param name="id" type="int" default="-1"/>
           <param name="direction" type="bool" default="True"/>
-          <param name="page" type="p.wxWizardPage" default="NULL"/>
+          <param name="page" type="wxWizardPage" default="NULL"/>
         </paramlist>
       </constructor>
       <method name="GetDirection" type="bool" overloaded="no">
@@ -25696,33 +25696,33 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="WizardPage" oldname="wxWizardPage" module="wizard">
-      <baseclass name="wxPanel"/>
+      <baseclass name="Panel"/>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWizard" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
-          <param name="resource" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="parent" type="wxWizard" default=""/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
+          <param name="resource" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="GetPrev" type="wxWizardPage" overloaded="no">
+      <method name="GetPrev" type="WizardPage" overloaded="no">
         <autodoc>GetPrev() -&gt; WizardPage</autodoc>
       </method>
-      <method name="GetNext" type="wxWizardPage" overloaded="no">
+      <method name="GetNext" type="WizardPage" overloaded="no">
         <autodoc>GetNext() -&gt; WizardPage</autodoc>
       </method>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
     </class>
     <class name="PyWizardPage" oldname="wxPyWizardPage" module="wizard">
-      <baseclass name="wxWizardPage"/>
+      <baseclass name="WizardPage"/>
       <constructor name="PyWizardPage" overloaded="no">
         <autodoc>__init__(Wizard parent, Bitmap bitmap=&amp;wxNullBitmap, String resource=&amp;wxPyEmptyString) -&gt; PyWizardPage</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWizard" default=""/>
-          <param name="bitmap" type="p.q(const).wxBitmap" default="&amp;wxNullBitmap"/>
-          <param name="resource" type="p.q(const).wxString" default="&amp;wxPyEmptyString"/>
+          <param name="parent" type="wxWizard" default=""/>
+          <param name="bitmap" type="Bitmap" default="&amp;wxNullBitmap"/>
+          <param name="resource" type="String" default="&amp;wxPyEmptyString"/>
         </paramlist>
       </constructor>
       <constructor name="PrePyWizardPage" overloaded="no">
@@ -25731,19 +25731,19 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWizard" default=""/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
-          <param name="resource" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="parent" type="wxWizard" default=""/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
+          <param name="resource" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoMoveWindow" type="void" overloaded="no">
+      <method name="base_DoMoveWindow" type="" overloaded="no">
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -25752,7 +25752,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetSize" type="void" overloaded="no">
+      <method name="base_DoSetSize" type="" overloaded="no">
         <autodoc>base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
@@ -25762,48 +25762,48 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
-      <method name="base_DoSetClientSize" type="void" overloaded="no">
+      <method name="base_DoSetClientSize" type="" overloaded="no">
         <autodoc>base_DoSetClientSize(int width, int height)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoSetVirtualSize" type="void" overloaded="no">
+      <method name="base_DoSetVirtualSize" type="" overloaded="no">
         <autodoc>base_DoSetVirtualSize(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetSize" type="void" overloaded="no">
+      <method name="base_DoGetSize" type="" overloaded="no">
         <autodoc>base_DoGetSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetClientSize" type="void" overloaded="no">
+      <method name="base_DoGetClientSize" type="" overloaded="no">
         <autodoc>base_DoGetClientSize() -&gt; (width, height)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetPosition" type="void" overloaded="no">
+      <method name="base_DoGetPosition" type="" overloaded="no">
         <autodoc>base_DoGetPosition() -&gt; (x,y)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="base_DoGetVirtualSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetVirtualSize" type="Size" overloaded="no">
         <autodoc>base_DoGetVirtualSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_DoGetBestSize" type="wxSize" overloaded="no">
+      <method name="base_DoGetBestSize" type="Size" overloaded="no">
         <autodoc>base_DoGetBestSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_InitDialog" type="void" overloaded="no">
+      <method name="base_InitDialog" type="" overloaded="no">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">
@@ -25821,33 +25821,33 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="base_AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>base_AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
-      <method name="base_GetMaxSize" type="wxSize" overloaded="no">
+      <method name="base_GetMaxSize" type="Size" overloaded="no">
         <autodoc>base_GetMaxSize() -&gt; Size</autodoc>
       </method>
-      <method name="base_AddChild" type="void" overloaded="no">
+      <method name="base_AddChild" type="" overloaded="no">
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">
         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="WizardPageSimple" oldname="wxWizardPageSimple" module="wizard">
-      <baseclass name="wxWizardPage"/>
+      <baseclass name="WizardPage"/>
       <constructor name="WizardPageSimple" overloaded="no">
         <autodoc>__init__(Wizard parent, WizardPage prev=None, WizardPage next=None, 
     Bitmap bitmap=wxNullBitmap, wxChar resource=None) -&gt; WizardPageSimple</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWizard" default=""/>
-          <param name="prev" type="p.wxWizardPage" default="NULL"/>
-          <param name="next" type="p.wxWizardPage" default="NULL"/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
-          <param name="resource" type="p.q(const).wxChar" default="NULL"/>
+          <param name="parent" type="wxWizard" default=""/>
+          <param name="prev" type="WizardPage" default="NULL"/>
+          <param name="next" type="WizardPage" default="NULL"/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
+          <param name="resource" type="wxChar" default="NULL"/>
         </paramlist>
       </constructor>
       <constructor name="PreWizardPageSimple" overloaded="no">
@@ -25857,45 +25857,45 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>Create(Wizard parent=None, WizardPage prev=None, WizardPage next=None, 
     Bitmap bitmap=wxNullBitmap, wxChar resource=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWizard" default="NULL"/>
-          <param name="prev" type="p.wxWizardPage" default="NULL"/>
-          <param name="next" type="p.wxWizardPage" default="NULL"/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
-          <param name="resource" type="p.q(const).wxChar" default="NULL"/>
+          <param name="parent" type="wxWizard" default="NULL"/>
+          <param name="prev" type="WizardPage" default="NULL"/>
+          <param name="next" type="WizardPage" default="NULL"/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
+          <param name="resource" type="wxChar" default="NULL"/>
         </paramlist>
       </method>
-      <method name="SetPrev" type="void" overloaded="no">
+      <method name="SetPrev" type="" overloaded="no">
         <autodoc>SetPrev(WizardPage prev)</autodoc>
         <paramlist>
-          <param name="prev" type="p.wxWizardPage" default=""/>
+          <param name="prev" type="WizardPage" default=""/>
         </paramlist>
       </method>
-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">
         <autodoc>SetNext(WizardPage next)</autodoc>
         <paramlist>
-          <param name="next" type="p.wxWizardPage" default=""/>
+          <param name="next" type="WizardPage" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="Chain" type="void" overloaded="no">
+      <staticmethod name="Chain" type="" overloaded="no">
         <autodoc>WizardPageSimple.Chain(WizardPageSimple first, WizardPageSimple second)</autodoc>
         <paramlist>
-          <param name="first" type="p.wxWizardPageSimple" default=""/>
-          <param name="second" type="p.wxWizardPageSimple" default=""/>
+          <param name="first" type="WizardPageSimple" default=""/>
+          <param name="second" type="WizardPageSimple" default=""/>
         </paramlist>
       </staticmethod>
     </class>
     <class name="Wizard" oldname="wxWizard" module="wizard">
-      <baseclass name="wxDialog"/>
+      <baseclass name="Dialog"/>
       <constructor name="Wizard" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, String title=EmptyString, 
     Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition, 
     long style=DEFAULT_DIALOG_STYLE) -&gt; Wizard</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="title" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="title" type="String" default="wxPyEmptyString"/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
           <param name="style" type="long" default="wxDEFAULT_DIALOG_STYLE"/>
         </paramlist>
       </constructor>
@@ -25906,44 +25906,44 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>Create(Window parent, int id=-1, String title=EmptyString, 
     Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="title" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="bitmap" type="r.q(const).wxBitmap" default="wxNullBitmap"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="title" type="String" default="wxPyEmptyString"/>
+          <param name="bitmap" type="Bitmap" default="wxNullBitmap"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
         </paramlist>
       </method>
-      <method name="Init" type="void" overloaded="no">
+      <method name="Init" type="" overloaded="no">
         <autodoc>Init()</autodoc>
       </method>
       <method name="RunWizard" type="bool" overloaded="no">
         <autodoc>RunWizard(WizardPage firstPage) -&gt; bool</autodoc>
         <paramlist>
-          <param name="firstPage" type="p.wxWizardPage" default=""/>
+          <param name="firstPage" type="WizardPage" default=""/>
         </paramlist>
       </method>
-      <method name="GetCurrentPage" type="wxWizardPage" overloaded="no">
+      <method name="GetCurrentPage" type="WizardPage" overloaded="no">
         <autodoc>GetCurrentPage() -&gt; WizardPage</autodoc>
       </method>
-      <method name="SetPageSize" type="void" overloaded="no">
+      <method name="SetPageSize" type="" overloaded="no">
         <autodoc>SetPageSize(Size size)</autodoc>
         <paramlist>
-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>
         </paramlist>
       </method>
-      <method name="GetPageSize" type="wxSize" overloaded="no">
+      <method name="GetPageSize" type="Size" overloaded="no">
         <autodoc>GetPageSize() -&gt; Size</autodoc>
       </method>
-      <method name="FitToPage" type="void" overloaded="no">
+      <method name="FitToPage" type="" overloaded="no">
         <autodoc>FitToPage(WizardPage firstPage)</autodoc>
         <paramlist>
-          <param name="firstPage" type="p.q(const).wxWizardPage" default=""/>
+          <param name="firstPage" type="WizardPage" default=""/>
         </paramlist>
       </method>
-      <method name="GetPageAreaSizer" type="wxSizer" overloaded="no">
+      <method name="GetPageAreaSizer" type="Sizer" overloaded="no">
         <autodoc>GetPageAreaSizer() -&gt; Sizer</autodoc>
       </method>
-      <method name="SetBorder" type="void" overloaded="no">
+      <method name="SetBorder" type="" overloaded="no">
         <autodoc>SetBorder(int border)</autodoc>
         <paramlist>
           <param name="border" type="int" default=""/>
@@ -25955,20 +25955,20 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="ShowPage" type="bool" overloaded="no">
         <autodoc>ShowPage(WizardPage page, bool goingForward=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="page" type="p.wxWizardPage" default=""/>
+          <param name="page" type="WizardPage" default=""/>
           <param name="goingForward" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="HasNextPage" type="bool" overloaded="no">
         <autodoc>HasNextPage(WizardPage page) -&gt; bool</autodoc>
         <paramlist>
-          <param name="page" type="p.wxWizardPage" default=""/>
+          <param name="page" type="WizardPage" default=""/>
         </paramlist>
       </method>
       <method name="HasPrevPage" type="bool" overloaded="no">
         <autodoc>HasPrevPage(WizardPage page) -&gt; bool</autodoc>
         <paramlist>
-          <param name="page" type="p.wxWizardPage" default=""/>
+          <param name="page" type="WizardPage" default=""/>
         </paramlist>
       </method>
     </class>
@@ -25977,66 +25977,66 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     <import name="core"/>
     <pythoncode> wx = core </pythoncode>
     <class name="GLContext" oldname="wxGLContext" module="glcanvas">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="GLContext" overloaded="no">
         <autodoc>__init__(bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette, 
     GLContext other=None) -&gt; GLContext</autodoc>
         <paramlist>
           <param name="isRGB" type="bool" default=""/>
-          <param name="win" type="p.wxGLCanvas" default=""/>
-          <param name="palette" type="r.q(const).wxPalette" default="wxNullPalette"/>
-          <param name="other" type="p.q(const).wxGLContext" default="NULL"/>
+          <param name="win" type="wxGLCanvas" default=""/>
+          <param name="palette" type="Palette" default="wxNullPalette"/>
+          <param name="other" type="GLContext" default="NULL"/>
         </paramlist>
       </constructor>
       <destructor name="~wxGLContext" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetCurrent" type="void" overloaded="no">
+      <method name="SetCurrent" type="" overloaded="no">
         <autodoc>SetCurrent()</autodoc>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(String colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SwapBuffers" type="void" overloaded="no">
+      <method name="SwapBuffers" type="" overloaded="no">
         <autodoc>SwapBuffers()</autodoc>
       </method>
-      <method name="SetupPixelFormat" type="void" overloaded="no">
+      <method name="SetupPixelFormat" type="" overloaded="no">
         <autodoc>SetupPixelFormat()</autodoc>
       </method>
-      <method name="SetupPalette" type="void" overloaded="no">
+      <method name="SetupPalette" type="" overloaded="no">
         <autodoc>SetupPalette(wxPalette palette)</autodoc>
         <paramlist>
-          <param name="palette" type="r.q(const).wxPalette" default=""/>
+          <param name="palette" type="Palette" default=""/>
         </paramlist>
       </method>
-      <method name="CreateDefaultPalette" type="wxPalette" overloaded="no">
+      <method name="CreateDefaultPalette" type="Palette" overloaded="no">
         <autodoc>CreateDefaultPalette() -&gt; wxPalette</autodoc>
       </method>
-      <method name="GetPalette" type="wxPalette" overloaded="no">
+      <method name="GetPalette" type="Palette" overloaded="no">
         <autodoc>GetPalette() -&gt; wxPalette</autodoc>
       </method>
-      <method name="GetWindow" type="wxWindow" overloaded="no">
+      <method name="GetWindow" type="Window" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
     </class>
     <class name="GLCanvas" oldname="wxGLCanvas" module="glcanvas">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="GLCanvas" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
     int attribList=None, wxPalette palette=wxNullPalette) -&gt; GLCanvas</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyGLCanvasNameStr"/>
-          <param name="attribList" type="p.int" default="NULL"/>
-          <param name="palette" type="r.q(const).wxPalette" default="wxNullPalette"/>
+          <param name="name" type="String" default="wxPyGLCanvasNameStr"/>
+          <param name="attribList" type="int" default="NULL"/>
+          <param name="palette" type="Palette" default="wxNullPalette"/>
         </paramlist>
       </constructor>
       <constructor name="wxGLCanvasWithContext" overloaded="no">
@@ -26045,30 +26045,30 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     long style=0, String name=GLCanvasNameStr, 
     int attribList=None, wxPalette palette=wxNullPalette) -&gt; GLCanvas</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="shared" type="p.q(const).wxGLContext" default="NULL"/>
+          <param name="parent" type="Window" default=""/>
+          <param name="shared" type="GLContext" default="NULL"/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyGLCanvasNameStr"/>
-          <param name="attribList" type="p.int" default="NULL"/>
-          <param name="palette" type="r.q(const).wxPalette" default="wxNullPalette"/>
+          <param name="name" type="String" default="wxPyGLCanvasNameStr"/>
+          <param name="attribList" type="int" default="NULL"/>
+          <param name="palette" type="Palette" default="wxNullPalette"/>
         </paramlist>
       </constructor>
-      <method name="SetCurrent" type="void" overloaded="no">
+      <method name="SetCurrent" type="" overloaded="no">
         <autodoc>SetCurrent()</autodoc>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(String colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SwapBuffers" type="void" overloaded="no">
+      <method name="SwapBuffers" type="" overloaded="no">
         <autodoc>SwapBuffers()</autodoc>
       </method>
-      <method name="GetContext" type="wxGLContext" overloaded="no">
+      <method name="GetContext" type="GLContext" overloaded="no">
         <autodoc>GetContext() -&gt; GLContext</autodoc>
       </method>
     </class>
@@ -26080,136 +26080,136 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ShapeRegion" oldname="wxShapeRegion" module="ogl">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ShapeRegion" overloaded="no">
         <autodoc>__init__() -&gt; ShapeRegion</autodoc>
       </constructor>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String s)</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font f)</autodoc>
         <paramlist>
-          <param name="f" type="p.wxFont" default=""/>
+          <param name="f" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetMinSize" type="void" overloaded="no">
+      <method name="SetMinSize" type="" overloaded="no">
         <autodoc>SetMinSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetProportions" type="void" overloaded="no">
+      <method name="SetProportions" type="" overloaded="no">
         <autodoc>SetProportions(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetFormatMode" type="void" overloaded="no">
+      <method name="SetFormatMode" type="" overloaded="no">
         <autodoc>SetFormatMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetName" type="void" overloaded="no">
+      <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String s)</autodoc>
         <paramlist>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">
         <autodoc>SetColour(String col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxString" default=""/>
+          <param name="col" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
-      <method name="GetMinSize" type="void" overloaded="no">
+      <method name="GetMinSize" type="" overloaded="no">
         <autodoc>GetMinSize(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetProportion" type="void" overloaded="no">
+      <method name="GetProportion" type="" overloaded="no">
         <autodoc>GetProportion(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="void" overloaded="no">
+      <method name="GetSize" type="" overloaded="no">
         <autodoc>GetSize(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetPosition" type="void" overloaded="no">
+      <method name="GetPosition" type="" overloaded="no">
         <autodoc>GetPosition(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
       <method name="GetFormatMode" type="int" overloaded="no">
         <autodoc>GetFormatMode() -&gt; int</autodoc>
       </method>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="GetColour" type="wxString" overloaded="no">
+      <method name="GetColour" type="String" overloaded="no">
         <autodoc>GetColour() -&gt; String</autodoc>
       </method>
-      <method name="GetActualColourObject" type="wxColour" overloaded="no">
+      <method name="GetActualColourObject" type="Colour" overloaded="no">
         <autodoc>GetActualColourObject() -&gt; Colour</autodoc>
       </method>
       <method name="GetFormattedText" type="wxList" overloaded="no">
         <autodoc>GetFormattedText() -&gt; wxList</autodoc>
       </method>
-      <method name="GetPenColour" type="wxString" overloaded="no">
+      <method name="GetPenColour" type="String" overloaded="no">
         <autodoc>GetPenColour() -&gt; String</autodoc>
       </method>
       <method name="GetPenStyle" type="int" overloaded="no">
         <autodoc>GetPenStyle() -&gt; int</autodoc>
       </method>
-      <method name="SetPenStyle" type="void" overloaded="no">
+      <method name="SetPenStyle" type="" overloaded="no">
         <autodoc>SetPenStyle(int style)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPenColour" type="void" overloaded="no">
+      <method name="SetPenColour" type="" overloaded="no">
         <autodoc>SetPenColour(String col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxString" default=""/>
+          <param name="col" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetActualPen" type="wxPen" overloaded="no">
+      <method name="GetActualPen" type="Pen" overloaded="no">
         <autodoc>GetActualPen() -&gt; wxPen</autodoc>
       </method>
       <method name="GetWidth" type="double" overloaded="no">
@@ -26218,100 +26218,100 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetHeight" type="double" overloaded="no">
         <autodoc>GetHeight() -&gt; double</autodoc>
       </method>
-      <method name="ClearText" type="void" overloaded="no">
+      <method name="ClearText" type="" overloaded="no">
         <autodoc>ClearText()</autodoc>
       </method>
     </class>
     <class name="PyShapeEvtHandler" oldname="wxPyShapeEvtHandler" module="ogl">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="PyShapeEvtHandler" overloaded="no">
         <autodoc>__init__(PyShapeEvtHandler prev=None, PyShape shape=None) -&gt; PyShapeEvtHandler</autodoc>
         <paramlist>
-          <param name="prev" type="p.wxPyShapeEvtHandler" default="NULL"/>
-          <param name="shape" type="p.wxPyShape" default="NULL"/>
+          <param name="prev" type="PyShapeEvtHandler" default="NULL"/>
+          <param name="shape" type="wxPyShape" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetShape" type="void" overloaded="no">
+      <method name="SetShape" type="" overloaded="no">
         <autodoc>SetShape(PyShape sh)</autodoc>
         <paramlist>
-          <param name="sh" type="p.wxPyShape" default=""/>
+          <param name="sh" type="wxPyShape" default=""/>
         </paramlist>
       </method>
       <method name="GetShape" type="wxPyShape" overloaded="no">
         <autodoc>GetShape() -&gt; PyShape</autodoc>
       </method>
-      <method name="SetPreviousHandler" type="void" overloaded="no">
+      <method name="SetPreviousHandler" type="" overloaded="no">
         <autodoc>SetPreviousHandler(PyShapeEvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxPyShapeEvtHandler" default=""/>
+          <param name="handler" type="PyShapeEvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="GetPreviousHandler" type="wxPyShapeEvtHandler" overloaded="no">
+      <method name="GetPreviousHandler" type="PyShapeEvtHandler" overloaded="no">
         <autodoc>GetPreviousHandler() -&gt; PyShapeEvtHandler</autodoc>
       </method>
-      <method name="CreateNewCopy" type="wxPyShapeEvtHandler" overloaded="no">
+      <method name="CreateNewCopy" type="PyShapeEvtHandler" overloaded="no">
         <autodoc>CreateNewCopy() -&gt; PyShapeEvtHandler</autodoc>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=False)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26320,7 +26320,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26329,7 +26329,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26338,7 +26338,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26349,7 +26349,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -26357,11 +26357,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -26369,7 +26369,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -26379,7 +26379,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26388,7 +26388,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26397,7 +26397,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -26407,7 +26407,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26416,7 +26416,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26425,40 +26425,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -26466,36 +26466,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -26504,32 +26504,32 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyShape" oldname="wxPyShape" module="ogl">
-      <baseclass name="wxPyShapeEvtHandler"/>
+      <baseclass name="PyShapeEvtHandler"/>
       <constructor name="PyShape" overloaded="no">
         <autodoc>__init__(PyShapeCanvas can=None) -&gt; PyShape</autodoc>
         <paramlist>
-          <param name="can" type="p.wxPyShapeCanvas" default="NULL"/>
+          <param name="can" type="wxPyShapeCanvas" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetBoundingBoxMax" type="void" overloaded="no">
+      <method name="GetBoundingBoxMax" type="" overloaded="no">
         <autodoc>GetBoundingBoxMax(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetBoundingBoxMin" type="void" overloaded="no">
+      <method name="GetBoundingBoxMin" type="" overloaded="no">
         <autodoc>GetBoundingBoxMin(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
       <method name="GetPerimeterPoint" type="bool" overloaded="no">
@@ -26540,36 +26540,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="y1" type="double" default=""/>
           <param name="x2" type="double" default=""/>
           <param name="y2" type="double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
       <method name="GetCanvas" type="wxPyShapeCanvas" overloaded="no">
         <autodoc>GetCanvas() -&gt; PyShapeCanvas</autodoc>
       </method>
-      <method name="SetCanvas" type="void" overloaded="no">
+      <method name="SetCanvas" type="" overloaded="no">
         <autodoc>SetCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>
-          <param name="the_canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="AddToCanvas" type="void" overloaded="no">
+      <method name="AddToCanvas" type="" overloaded="no">
         <autodoc>AddToCanvas(PyShapeCanvas the_canvas, PyShape addAfter=None)</autodoc>
         <paramlist>
-          <param name="the_canvas" type="p.wxPyShapeCanvas" default=""/>
-          <param name="addAfter" type="p.wxPyShape" default="NULL"/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default=""/>
+          <param name="addAfter" type="PyShape" default="NULL"/>
         </paramlist>
       </method>
-      <method name="InsertInCanvas" type="void" overloaded="no">
+      <method name="InsertInCanvas" type="" overloaded="no">
         <autodoc>InsertInCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>
-          <param name="the_canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveFromCanvas" type="void" overloaded="no">
+      <method name="RemoveFromCanvas" type="" overloaded="no">
         <autodoc>RemoveFromCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>
-          <param name="the_canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default=""/>
         </paramlist>
       </method>
       <method name="GetX" type="double" overloaded="no">
@@ -26578,37 +26578,37 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetY" type="double" overloaded="no">
         <autodoc>GetY() -&gt; double</autodoc>
       </method>
-      <method name="SetX" type="void" overloaded="no">
+      <method name="SetX" type="" overloaded="no">
         <autodoc>SetX(double x)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetY" type="void" overloaded="no">
+      <method name="SetY" type="" overloaded="no">
         <autodoc>SetY(double y)</autodoc>
         <paramlist>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetParent" type="wxPyShape" overloaded="no">
+      <method name="GetParent" type="PyShape" overloaded="no">
         <autodoc>GetParent() -&gt; PyShape</autodoc>
       </method>
-      <method name="SetParent" type="void" overloaded="no">
+      <method name="SetParent" type="" overloaded="no">
         <autodoc>SetParent(PyShape p)</autodoc>
         <paramlist>
-          <param name="p" type="p.wxPyShape" default=""/>
+          <param name="p" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="GetTopAncestor" type="wxPyShape" overloaded="no">
+      <method name="GetTopAncestor" type="PyShape" overloaded="no">
         <autodoc>GetTopAncestor() -&gt; PyShape</autodoc>
       </method>
       <method name="GetChildren" type="PyObject" overloaded="no">
         <autodoc>GetChildren() -&gt; PyObject</autodoc>
       </method>
-      <method name="Unlink" type="void" overloaded="no">
+      <method name="Unlink" type="" overloaded="no">
         <autodoc>Unlink()</autodoc>
       </method>
-      <method name="SetDrawHandles" type="void" overloaded="no">
+      <method name="SetDrawHandles" type="" overloaded="no">
         <autodoc>SetDrawHandles(bool drawH)</autodoc>
         <paramlist>
           <param name="drawH" type="bool" default=""/>
@@ -26617,47 +26617,47 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetDrawHandles" type="bool" overloaded="no">
         <autodoc>GetDrawHandles() -&gt; bool</autodoc>
       </method>
-      <method name="MakeControlPoints" type="void" overloaded="no">
+      <method name="MakeControlPoints" type="" overloaded="no">
         <autodoc>MakeControlPoints()</autodoc>
       </method>
-      <method name="DeleteControlPoints" type="void" overloaded="no">
+      <method name="DeleteControlPoints" type="" overloaded="no">
         <autodoc>DeleteControlPoints(DC dc=None)</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default="NULL"/>
+          <param name="dc" type="DC" default="NULL"/>
         </paramlist>
       </method>
-      <method name="ResetControlPoints" type="void" overloaded="no">
+      <method name="ResetControlPoints" type="" overloaded="no">
         <autodoc>ResetControlPoints()</autodoc>
       </method>
-      <method name="GetEventHandler" type="wxPyShapeEvtHandler" overloaded="no">
+      <method name="GetEventHandler" type="PyShapeEvtHandler" overloaded="no">
         <autodoc>GetEventHandler() -&gt; PyShapeEvtHandler</autodoc>
       </method>
-      <method name="SetEventHandler" type="void" overloaded="no">
+      <method name="SetEventHandler" type="" overloaded="no">
         <autodoc>SetEventHandler(PyShapeEvtHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxPyShapeEvtHandler" default=""/>
+          <param name="handler" type="PyShapeEvtHandler" default=""/>
         </paramlist>
       </method>
-      <method name="MakeMandatoryControlPoints" type="void" overloaded="no">
+      <method name="MakeMandatoryControlPoints" type="" overloaded="no">
         <autodoc>MakeMandatoryControlPoints()</autodoc>
       </method>
-      <method name="ResetMandatoryControlPoints" type="void" overloaded="no">
+      <method name="ResetMandatoryControlPoints" type="" overloaded="no">
         <autodoc>ResetMandatoryControlPoints()</autodoc>
       </method>
       <method name="Recompute" type="bool" overloaded="no">
         <autodoc>Recompute() -&gt; bool</autodoc>
       </method>
-      <method name="CalculateSize" type="void" overloaded="no">
+      <method name="CalculateSize" type="" overloaded="no">
         <autodoc>CalculateSize()</autodoc>
       </method>
-      <method name="Select" type="void" overloaded="no">
+      <method name="Select" type="" overloaded="no">
         <autodoc>Select(bool select=True, DC dc=None)</autodoc>
         <paramlist>
           <param name="select" type="bool" default="True"/>
-          <param name="dc" type="p.wxDC" default="NULL"/>
+          <param name="dc" type="DC" default="NULL"/>
         </paramlist>
       </method>
-      <method name="SetHighlight" type="void" overloaded="no">
+      <method name="SetHighlight" type="" overloaded="no">
         <autodoc>SetHighlight(bool hi=True, bool recurse=False)</autodoc>
         <paramlist>
           <param name="hi" type="bool" default="True"/>
@@ -26673,7 +26673,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="AncestorSelected" type="bool" overloaded="no">
         <autodoc>AncestorSelected() -&gt; bool</autodoc>
       </method>
-      <method name="SetSensitivityFilter" type="void" overloaded="no">
+      <method name="SetSensitivityFilter" type="" overloaded="no">
         <autodoc>SetSensitivityFilter(int sens=OP_ALL, bool recursive=False)</autodoc>
         <paramlist>
           <param name="sens" type="int" default="OP_ALL"/>
@@ -26683,25 +26683,25 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetSensitivityFilter" type="int" overloaded="no">
         <autodoc>GetSensitivityFilter() -&gt; int</autodoc>
       </method>
-      <method name="SetDraggable" type="void" overloaded="no">
+      <method name="SetDraggable" type="" overloaded="no">
         <autodoc>SetDraggable(bool drag, bool recursive=False)</autodoc>
         <paramlist>
           <param name="drag" type="bool" default=""/>
           <param name="recursive" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="SetFixedSize" type="void" overloaded="no">
+      <method name="SetFixedSize" type="" overloaded="no">
         <autodoc>SetFixedSize(bool x, bool y)</autodoc>
         <paramlist>
           <param name="x" type="bool" default=""/>
           <param name="y" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="GetFixedSize" type="void" overloaded="no">
+      <method name="GetFixedSize" type="" overloaded="no">
         <autodoc>GetFixedSize(bool OUTPUT, bool OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.bool" default=""/>
-          <param name="OUTPUT" type="p.bool" default=""/>
+          <param name="OUTPUT" type="bool" default=""/>
+          <param name="OUTPUT" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetFixedWidth" type="bool" overloaded="no">
@@ -26710,7 +26710,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetFixedHeight" type="bool" overloaded="no">
         <autodoc>GetFixedHeight() -&gt; bool</autodoc>
       </method>
-      <method name="SetSpaceAttachments" type="void" overloaded="no">
+      <method name="SetSpaceAttachments" type="" overloaded="no">
         <autodoc>SetSpaceAttachments(bool sp)</autodoc>
         <paramlist>
           <param name="sp" type="bool" default=""/>
@@ -26719,7 +26719,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetSpaceAttachments" type="bool" overloaded="no">
         <autodoc>GetSpaceAttachments() -&gt; bool</autodoc>
       </method>
-      <method name="SetShadowMode" type="void" overloaded="no">
+      <method name="SetShadowMode" type="" overloaded="no">
         <autodoc>SetShadowMode(int mode, bool redraw=False)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -26734,11 +26734,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetCentreResize" type="void" overloaded="no">
+      <method name="SetCentreResize" type="" overloaded="no">
         <autodoc>SetCentreResize(bool cr)</autodoc>
         <paramlist>
           <param name="cr" type="bool" default=""/>
@@ -26747,7 +26747,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetCentreResize" type="bool" overloaded="no">
         <autodoc>GetCentreResize() -&gt; bool</autodoc>
       </method>
-      <method name="SetMaintainAspectRatio" type="void" overloaded="no">
+      <method name="SetMaintainAspectRatio" type="" overloaded="no">
         <autodoc>SetMaintainAspectRatio(bool ar)</autodoc>
         <paramlist>
           <param name="ar" type="bool" default=""/>
@@ -26759,7 +26759,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetLines" type="PyObject" overloaded="no">
         <autodoc>GetLines() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetDisableLabel" type="void" overloaded="no">
+      <method name="SetDisableLabel" type="" overloaded="no">
         <autodoc>SetDisableLabel(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>
@@ -26768,7 +26768,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetDisableLabel" type="bool" overloaded="no">
         <autodoc>GetDisableLabel() -&gt; bool</autodoc>
       </method>
-      <method name="SetAttachmentMode" type="void" overloaded="no">
+      <method name="SetAttachmentMode" type="" overloaded="no">
         <autodoc>SetAttachmentMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -26777,7 +26777,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetAttachmentMode" type="int" overloaded="no">
         <autodoc>GetAttachmentMode() -&gt; int</autodoc>
       </method>
-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">
         <autodoc>SetId(long i)</autodoc>
         <paramlist>
           <param name="i" type="long" default=""/>
@@ -26786,19 +26786,19 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetId" type="long" overloaded="no">
         <autodoc>GetId() -&gt; long</autodoc>
       </method>
-      <method name="SetPen" type="void" overloaded="no">
+      <method name="SetPen" type="" overloaded="no">
         <autodoc>SetPen(wxPen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
-      <method name="SetBrush" type="void" overloaded="no">
+      <method name="SetBrush" type="" overloaded="no">
         <autodoc>SetBrush(wxBrush brush)</autodoc>
         <paramlist>
-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
         </paramlist>
       </method>
-      <method name="Show" type="void" overloaded="no">
+      <method name="Show" type="" overloaded="no">
         <autodoc>Show(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -26807,49 +26807,49 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>
       </method>
-      <method name="Move" type="void" overloaded="no">
+      <method name="Move" type="" overloaded="no">
         <autodoc>Move(DC dc, double x1, double y1, bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x1" type="double" default=""/>
           <param name="y1" type="double" default=""/>
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Erase" type="void" overloaded="no">
+      <method name="Erase" type="" overloaded="no">
         <autodoc>Erase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="EraseContents" type="void" overloaded="no">
+      <method name="EraseContents" type="" overloaded="no">
         <autodoc>EraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="Draw" type="void" overloaded="no">
+      <method name="Draw" type="" overloaded="no">
         <autodoc>Draw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="Flash" type="void" overloaded="no">
+      <method name="Flash" type="" overloaded="no">
         <autodoc>Flash()</autodoc>
       </method>
-      <method name="MoveLinks" type="void" overloaded="no">
+      <method name="MoveLinks" type="" overloaded="no">
         <autodoc>MoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="DrawContents" type="void" overloaded="no">
+      <method name="DrawContents" type="" overloaded="no">
         <autodoc>DrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(double x, double y, bool recursive=True)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -26857,31 +26857,31 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="recursive" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetAttachmentSize" type="void" overloaded="no">
+      <method name="SetAttachmentSize" type="" overloaded="no">
         <autodoc>SetAttachmentSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="Attach" type="void" overloaded="no">
+      <method name="Attach" type="" overloaded="no">
         <autodoc>Attach(PyShapeCanvas can)</autodoc>
         <paramlist>
-          <param name="can" type="p.wxPyShapeCanvas" default=""/>
+          <param name="can" type="wxPyShapeCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">
         <autodoc>Detach()</autodoc>
       </method>
       <method name="Constrain" type="bool" overloaded="no">
         <autodoc>Constrain() -&gt; bool</autodoc>
       </method>
-      <method name="AddLine" type="void" overloaded="no">
+      <method name="AddLine" type="" overloaded="no">
         <autodoc>AddLine(PyLineShape line, PyShape other, int attachFrom=0, 
     int attachTo=0, int positionFrom=-1, int positionTo=-1)</autodoc>
         <paramlist>
-          <param name="line" type="p.wxPyLineShape" default=""/>
-          <param name="other" type="p.wxPyShape" default=""/>
+          <param name="line" type="wxPyLineShape" default=""/>
+          <param name="other" type="PyShape" default=""/>
           <param name="attachFrom" type="int" default="0"/>
           <param name="attachTo" type="int" default="0"/>
           <param name="positionFrom" type="int" default="-1"/>
@@ -26891,33 +26891,33 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetLinePosition" type="int" overloaded="no">
         <autodoc>GetLinePosition(PyLineShape line) -&gt; int</autodoc>
         <paramlist>
-          <param name="line" type="p.wxPyLineShape" default=""/>
+          <param name="line" type="wxPyLineShape" default=""/>
         </paramlist>
       </method>
-      <method name="AddText" type="void" overloaded="no">
+      <method name="AddText" type="" overloaded="no">
         <autodoc>AddText(String string)</autodoc>
         <paramlist>
-          <param name="string" type="r.q(const).wxString" default=""/>
+          <param name="string" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetPen" type="wxPen" overloaded="no">
+      <method name="GetPen" type="Pen" overloaded="no">
         <autodoc>GetPen() -&gt; wxPen</autodoc>
       </method>
-      <method name="GetBrush" type="wxBrush" overloaded="no">
+      <method name="GetBrush" type="Brush" overloaded="no">
         <autodoc>GetBrush() -&gt; wxBrush</autodoc>
       </method>
-      <method name="SetDefaultRegionSize" type="void" overloaded="no">
+      <method name="SetDefaultRegionSize" type="" overloaded="no">
         <autodoc>SetDefaultRegionSize()</autodoc>
       </method>
-      <method name="FormatText" type="void" overloaded="no">
+      <method name="FormatText" type="" overloaded="no">
         <autodoc>FormatText(DC dc, String s, int regionId=0)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="s" type="String" default=""/>
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetFormatMode" type="void" overloaded="no">
+      <method name="SetFormatMode" type="" overloaded="no">
         <autodoc>SetFormatMode(int mode, int regionId=0)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -26930,27 +26930,27 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font, int regionId=0)</autodoc>
         <paramlist>
-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont(int regionId=0) -&gt; Font</autodoc>
         <paramlist>
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(String colour, int regionId=0)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetTextColour" type="wxString" overloaded="no">
+      <method name="GetTextColour" type="String" overloaded="no">
         <autodoc>GetTextColour(int regionId=0) -&gt; String</autodoc>
         <paramlist>
           <param name="regionId" type="int" default="0"/>
@@ -26959,14 +26959,14 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetNumberOfTextRegions" type="int" overloaded="no">
         <autodoc>GetNumberOfTextRegions() -&gt; int</autodoc>
       </method>
-      <method name="SetRegionName" type="void" overloaded="no">
+      <method name="SetRegionName" type="" overloaded="no">
         <autodoc>SetRegionName(String name, int regionId=0)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetRegionName" type="wxString" overloaded="no">
+      <method name="GetRegionName" type="String" overloaded="no">
         <autodoc>GetRegionName(int regionId) -&gt; String</autodoc>
         <paramlist>
           <param name="regionId" type="int" default=""/>
@@ -26975,53 +26975,53 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetRegionId" type="int" overloaded="no">
         <autodoc>GetRegionId(String name) -&gt; int</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="NameRegions" type="void" overloaded="no">
+      <method name="NameRegions" type="" overloaded="no">
         <autodoc>NameRegions(String parentName=EmptyString)</autodoc>
         <paramlist>
-          <param name="parentName" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="parentName" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </method>
       <method name="GetRegions" type="PyObject" overloaded="no">
         <autodoc>GetRegions() -&gt; PyObject</autodoc>
       </method>
-      <method name="AddRegion" type="void" overloaded="no">
+      <method name="AddRegion" type="" overloaded="no">
         <autodoc>AddRegion(ShapeRegion region)</autodoc>
         <paramlist>
-          <param name="region" type="p.wxShapeRegion" default=""/>
+          <param name="region" type="ShapeRegion" default=""/>
         </paramlist>
       </method>
-      <method name="ClearRegions" type="void" overloaded="no">
+      <method name="ClearRegions" type="" overloaded="no">
         <autodoc>ClearRegions()</autodoc>
       </method>
-      <method name="AssignNewIds" type="void" overloaded="no">
+      <method name="AssignNewIds" type="" overloaded="no">
         <autodoc>AssignNewIds()</autodoc>
       </method>
-      <method name="FindRegion" type="wxPyShape" overloaded="no">
+      <method name="FindRegion" type="PyShape" overloaded="no">
         <autodoc>FindRegion(String regionName, int OUTPUT) -&gt; PyShape</autodoc>
         <paramlist>
-          <param name="regionName" type="r.q(const).wxString" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="regionName" type="String" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="FindRegionNames" type="void" overloaded="no">
+      <method name="FindRegionNames" type="" overloaded="no">
         <autodoc>FindRegionNames(wxStringList list)</autodoc>
         <paramlist>
-          <param name="list" type="r.wxStringList" default=""/>
+          <param name="list" type="wxStringList" default=""/>
         </paramlist>
       </method>
-      <method name="ClearText" type="void" overloaded="no">
+      <method name="ClearText" type="" overloaded="no">
         <autodoc>ClearText(int regionId=0)</autodoc>
         <paramlist>
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="RemoveLine" type="void" overloaded="no">
+      <method name="RemoveLine" type="" overloaded="no">
         <autodoc>RemoveLine(PyLineShape line)</autodoc>
         <paramlist>
-          <param name="line" type="p.wxPyLineShape" default=""/>
+          <param name="line" type="wxPyLineShape" default=""/>
         </paramlist>
       </method>
       <method name="GetAttachmentPosition" type="bool" overloaded="no">
@@ -27029,11 +27029,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     int no_arcs=1, PyLineShape line=None) -&gt; bool</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
           <param name="nth" type="int" default="0"/>
           <param name="no_arcs" type="int" default="1"/>
-          <param name="line" type="p.wxPyLineShape" default="NULL"/>
+          <param name="line" type="wxPyLineShape" default="NULL"/>
         </paramlist>
       </method>
       <method name="GetNumberOfAttachments" type="int" overloaded="no">
@@ -27050,44 +27050,44 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     int no_arcs=1, PyLineShape line=None) -&gt; bool</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
           <param name="nth" type="int" default="0"/>
           <param name="no_arcs" type="int" default="1"/>
-          <param name="line" type="p.wxPyLineShape" default="NULL"/>
+          <param name="line" type="wxPyLineShape" default="NULL"/>
         </paramlist>
       </method>
-      <method name="CalcSimpleAttachment" type="wxRealPoint" overloaded="no">
+      <method name="CalcSimpleAttachment" type="RealPoint" overloaded="no">
         <autodoc>CalcSimpleAttachment(RealPoint pt1, RealPoint pt2, int nth, int noArcs, 
     PyLineShape line) -&gt; RealPoint</autodoc>
         <paramlist>
-          <param name="pt1" type="r.q(const).wxRealPoint" default=""/>
-          <param name="pt2" type="r.q(const).wxRealPoint" default=""/>
+          <param name="pt1" type="RealPoint" default=""/>
+          <param name="pt2" type="RealPoint" default=""/>
           <param name="nth" type="int" default=""/>
           <param name="noArcs" type="int" default=""/>
-          <param name="line" type="p.wxPyLineShape" default=""/>
+          <param name="line" type="wxPyLineShape" default=""/>
         </paramlist>
       </method>
       <method name="AttachmentSortTest" type="bool" overloaded="no">
         <autodoc>AttachmentSortTest(int attachmentPoint, RealPoint pt1, RealPoint pt2) -&gt; bool</autodoc>
         <paramlist>
           <param name="attachmentPoint" type="int" default=""/>
-          <param name="pt1" type="r.q(const).wxRealPoint" default=""/>
-          <param name="pt2" type="r.q(const).wxRealPoint" default=""/>
+          <param name="pt1" type="RealPoint" default=""/>
+          <param name="pt2" type="RealPoint" default=""/>
         </paramlist>
       </method>
-      <method name="EraseLinks" type="void" overloaded="no">
+      <method name="EraseLinks" type="" overloaded="no">
         <autodoc>EraseLinks(DC dc, int attachment=-1, bool recurse=False)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="attachment" type="int" default="-1"/>
           <param name="recurse" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="DrawLinks" type="void" overloaded="no">
+      <method name="DrawLinks" type="" overloaded="no">
         <autodoc>DrawLinks(DC dc, int attachment=-1, bool recurse=False)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="attachment" type="int" default="-1"/>
           <param name="recurse" type="bool" default="False"/>
         </paramlist>
@@ -27095,19 +27095,19 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="MoveLineToNewAttachment" type="bool" overloaded="no">
         <autodoc>MoveLineToNewAttachment(DC dc, PyLineShape to_move, double x, double y) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="to_move" type="p.wxPyLineShape" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="to_move" type="wxPyLineShape" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="ApplyAttachmentOrdering" type="void" overloaded="no">
+      <method name="ApplyAttachmentOrdering" type="" overloaded="no">
         <autodoc>ApplyAttachmentOrdering(PyObject linesToSort)</autodoc>
         <paramlist>
-          <param name="linesToSort" type="p.PyObject" default=""/>
+          <param name="linesToSort" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetBranchingAttachmentRoot" type="wxRealPoint" overloaded="no">
+      <method name="GetBranchingAttachmentRoot" type="RealPoint" overloaded="no">
         <autodoc>GetBranchingAttachmentRoot(int attachment) -&gt; RealPoint</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>
@@ -27118,10 +27118,10 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     RealPoint shoulder2) -&gt; bool</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>
-          <param name="root" type="r.wxRealPoint" default=""/>
-          <param name="neck" type="r.wxRealPoint" default=""/>
-          <param name="shoulder1" type="r.wxRealPoint" default=""/>
-          <param name="shoulder2" type="r.wxRealPoint" default=""/>
+          <param name="root" type="RealPoint" default=""/>
+          <param name="neck" type="RealPoint" default=""/>
+          <param name="shoulder1" type="RealPoint" default=""/>
+          <param name="shoulder2" type="RealPoint" default=""/>
         </paramlist>
       </method>
       <method name="GetBranchingAttachmentPoint" type="bool" overloaded="no">
@@ -27129,8 +27129,8 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <paramlist>
           <param name="attachment" type="int" default=""/>
           <param name="n" type="int" default=""/>
-          <param name="attachmentPoint" type="r.wxRealPoint" default=""/>
-          <param name="stemPoint" type="r.wxRealPoint" default=""/>
+          <param name="attachmentPoint" type="RealPoint" default=""/>
+          <param name="stemPoint" type="RealPoint" default=""/>
         </paramlist>
       </method>
       <method name="GetAttachmentLineCount" type="int" overloaded="no">
@@ -27139,7 +27139,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetBranchNeckLength" type="void" overloaded="no">
+      <method name="SetBranchNeckLength" type="" overloaded="no">
         <autodoc>SetBranchNeckLength(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>
@@ -27148,7 +27148,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetBranchNeckLength" type="int" overloaded="no">
         <autodoc>GetBranchNeckLength() -&gt; int</autodoc>
       </method>
-      <method name="SetBranchStemLength" type="void" overloaded="no">
+      <method name="SetBranchStemLength" type="" overloaded="no">
         <autodoc>SetBranchStemLength(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>
@@ -27157,7 +27157,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetBranchStemLength" type="int" overloaded="no">
         <autodoc>GetBranchStemLength() -&gt; int</autodoc>
       </method>
-      <method name="SetBranchSpacing" type="void" overloaded="no">
+      <method name="SetBranchSpacing" type="" overloaded="no">
         <autodoc>SetBranchSpacing(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>
@@ -27166,7 +27166,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetBranchSpacing" type="int" overloaded="no">
         <autodoc>GetBranchSpacing() -&gt; int</autodoc>
       </method>
-      <method name="SetBranchStyle" type="void" overloaded="no">
+      <method name="SetBranchStyle" type="" overloaded="no">
         <autodoc>SetBranchStyle(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
@@ -27193,29 +27193,29 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="HasDescendant" type="bool" overloaded="no">
         <autodoc>HasDescendant(PyShape image) -&gt; bool</autodoc>
         <paramlist>
-          <param name="image" type="p.wxPyShape" default=""/>
+          <param name="image" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="CreateNewCopy" type="wxPyShape" overloaded="no">
+      <method name="CreateNewCopy" type="PyShape" overloaded="no">
         <autodoc>CreateNewCopy(bool resetMapping=True, bool recompute=True) -&gt; PyShape</autodoc>
         <paramlist>
           <param name="resetMapping" type="bool" default="True"/>
           <param name="recompute" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">
         <autodoc>Copy(PyShape copy)</autodoc>
         <paramlist>
-          <param name="copy" type="r.wxPyShape" default=""/>
+          <param name="copy" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="CopyWithHandler" type="void" overloaded="no">
+      <method name="CopyWithHandler" type="" overloaded="no">
         <autodoc>CopyWithHandler(PyShape copy)</autodoc>
         <paramlist>
-          <param name="copy" type="r.wxPyShape" default=""/>
+          <param name="copy" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="Rotate" type="void" overloaded="no">
+      <method name="Rotate" type="" overloaded="no">
         <autodoc>Rotate(double x, double y, double theta)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27226,74 +27226,74 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetRotation" type="double" overloaded="no">
         <autodoc>GetRotation() -&gt; double</autodoc>
       </method>
-      <method name="ClearAttachments" type="void" overloaded="no">
+      <method name="ClearAttachments" type="" overloaded="no">
         <autodoc>ClearAttachments()</autodoc>
       </method>
-      <method name="Recentre" type="void" overloaded="no">
+      <method name="Recentre" type="" overloaded="no">
         <autodoc>Recentre(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="ClearPointList" type="void" overloaded="no">
+      <method name="ClearPointList" type="" overloaded="no">
         <autodoc>ClearPointList(wxList list)</autodoc>
         <paramlist>
-          <param name="list" type="r.wxList" default=""/>
+          <param name="list" type="wxList" default=""/>
         </paramlist>
       </method>
-      <method name="GetBackgroundPen" type="wxPen" overloaded="no">
+      <method name="GetBackgroundPen" type="Pen" overloaded="no">
         <autodoc>GetBackgroundPen() -&gt; wxPen</autodoc>
       </method>
-      <method name="GetBackgroundBrush" type="wxBrush" overloaded="no">
+      <method name="GetBackgroundBrush" type="Brush" overloaded="no">
         <autodoc>GetBackgroundBrush() -&gt; wxBrush</autodoc>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=False)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27302,7 +27302,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27311,7 +27311,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27320,7 +27320,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27331,7 +27331,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -27339,11 +27339,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -27351,7 +27351,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -27361,7 +27361,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27370,7 +27370,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27379,7 +27379,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -27389,7 +27389,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27398,7 +27398,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27407,40 +27407,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -27448,36 +27448,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -27486,52 +27486,52 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PseudoMetaFile" oldname="wxPseudoMetaFile" module="ogl">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="PseudoMetaFile" overloaded="no">
         <autodoc>__init__() -&gt; PseudoMetaFile</autodoc>
       </constructor>
       <destructor name="~wxPseudoMetaFile" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="Draw" type="void" overloaded="no">
+      <method name="Draw" type="" overloaded="no">
         <autodoc>Draw(DC dc, double xoffset, double yoffset)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="xoffset" type="double" default=""/>
           <param name="yoffset" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">
         <autodoc>Copy(PseudoMetaFile copy)</autodoc>
         <paramlist>
-          <param name="copy" type="r.wxPseudoMetaFile" default=""/>
+          <param name="copy" type="PseudoMetaFile" default=""/>
         </paramlist>
       </method>
-      <method name="Scale" type="void" overloaded="no">
+      <method name="Scale" type="" overloaded="no">
         <autodoc>Scale(double sx, double sy)</autodoc>
         <paramlist>
           <param name="sx" type="double" default=""/>
           <param name="sy" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="ScaleTo" type="void" overloaded="no">
+      <method name="ScaleTo" type="" overloaded="no">
         <autodoc>ScaleTo(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="Translate" type="void" overloaded="no">
+      <method name="Translate" type="" overloaded="no">
         <autodoc>Translate(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="Rotate" type="void" overloaded="no">
+      <method name="Rotate" type="" overloaded="no">
         <autodoc>Rotate(double x, double y, double theta)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27542,27 +27542,27 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="LoadFromMetaFile" type="bool" overloaded="no">
         <autodoc>LoadFromMetaFile(String filename, double width, double height) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="width" type="p.double" default=""/>
-          <param name="height" type="p.double" default=""/>
+          <param name="filename" type="String" default=""/>
+          <param name="width" type="double" default=""/>
+          <param name="height" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetBounds" type="void" overloaded="no">
+      <method name="GetBounds" type="" overloaded="no">
         <autodoc>GetBounds(double minX, double minY, double maxX, double maxY)</autodoc>
         <paramlist>
-          <param name="minX" type="p.double" default=""/>
-          <param name="minY" type="p.double" default=""/>
-          <param name="maxX" type="p.double" default=""/>
-          <param name="maxY" type="p.double" default=""/>
+          <param name="minX" type="double" default=""/>
+          <param name="minY" type="double" default=""/>
+          <param name="maxX" type="double" default=""/>
+          <param name="maxY" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="CalculateSize" type="void" overloaded="no">
+      <method name="CalculateSize" type="" overloaded="no">
         <autodoc>CalculateSize(PyDrawnShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyDrawnShape" default=""/>
+          <param name="shape" type="wxPyDrawnShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetRotateable" type="void" overloaded="no">
+      <method name="SetRotateable" type="" overloaded="no">
         <autodoc>SetRotateable(bool rot)</autodoc>
         <paramlist>
           <param name="rot" type="bool" default=""/>
@@ -27571,32 +27571,32 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetRotateable" type="bool" overloaded="no">
         <autodoc>GetRotateable() -&gt; bool</autodoc>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetFillBrush" type="void" overloaded="no">
+      <method name="SetFillBrush" type="" overloaded="no">
         <autodoc>SetFillBrush(wxBrush brush)</autodoc>
         <paramlist>
-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
         </paramlist>
       </method>
-      <method name="GetFillBrush" type="wxBrush" overloaded="no">
+      <method name="GetFillBrush" type="Brush" overloaded="no">
         <autodoc>GetFillBrush() -&gt; wxBrush</autodoc>
       </method>
-      <method name="SetOutlinePen" type="void" overloaded="no">
+      <method name="SetOutlinePen" type="" overloaded="no">
         <autodoc>SetOutlinePen(wxPen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
-      <method name="GetOutlinePen" type="wxPen" overloaded="no">
+      <method name="GetOutlinePen" type="Pen" overloaded="no">
         <autodoc>GetOutlinePen() -&gt; wxPen</autodoc>
       </method>
-      <method name="SetOutlineOp" type="void" overloaded="no">
+      <method name="SetOutlineOp" type="" overloaded="no">
         <autodoc>SetOutlineOp(int op)</autodoc>
         <paramlist>
           <param name="op" type="int" default=""/>
@@ -27608,125 +27608,125 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="IsValid" type="bool" overloaded="no">
         <autodoc>IsValid() -&gt; bool</autodoc>
       </method>
-      <method name="DrawLine" type="void" overloaded="no">
+      <method name="DrawLine" type="" overloaded="no">
         <autodoc>DrawLine(Point pt1, Point pt2)</autodoc>
         <paramlist>
-          <param name="pt1" type="r.q(const).wxPoint" default=""/>
-          <param name="pt2" type="r.q(const).wxPoint" default=""/>
+          <param name="pt1" type="Point" default=""/>
+          <param name="pt2" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRectangle" type="void" overloaded="no">
+      <method name="DrawRectangle" type="" overloaded="no">
         <autodoc>DrawRectangle(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRoundedRectangle" type="void" overloaded="no">
+      <method name="DrawRoundedRectangle" type="" overloaded="no">
         <autodoc>DrawRoundedRectangle(Rect rect, double radius)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawArc" type="void" overloaded="no">
+      <method name="DrawArc" type="" overloaded="no">
         <autodoc>DrawArc(Point centrePt, Point startPt, Point endPt)</autodoc>
         <paramlist>
-          <param name="centrePt" type="r.q(const).wxPoint" default=""/>
-          <param name="startPt" type="r.q(const).wxPoint" default=""/>
-          <param name="endPt" type="r.q(const).wxPoint" default=""/>
+          <param name="centrePt" type="Point" default=""/>
+          <param name="startPt" type="Point" default=""/>
+          <param name="endPt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipticArc" type="void" overloaded="no">
+      <method name="DrawEllipticArc" type="" overloaded="no">
         <autodoc>DrawEllipticArc(Rect rect, double startAngle, double endAngle)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="startAngle" type="double" default=""/>
           <param name="endAngle" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipse" type="void" overloaded="no">
+      <method name="DrawEllipse" type="" overloaded="no">
         <autodoc>DrawEllipse(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DrawPoint" type="void" overloaded="no">
+      <method name="DrawPoint" type="" overloaded="no">
         <autodoc>DrawPoint(Point pt)</autodoc>
         <paramlist>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawText" type="void" overloaded="no">
+      <method name="DrawText" type="" overloaded="no">
         <autodoc>DrawText(String text, Point pt)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="text" type="String" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawLines" type="void" overloaded="no">
+      <method name="DrawLines" type="" overloaded="no">
         <autodoc>DrawLines(int PCOUNT, Point points)</autodoc>
         <paramlist>
           <param name="PCOUNT" type="int" default=""/>
-          <param name="points" type="p.wxPoint" default=""/>
+          <param name="points" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawPolygon" type="void" overloaded="no">
+      <method name="DrawPolygon" type="" overloaded="no">
         <autodoc>DrawPolygon(int PCOUNT, Point points, int flags=0)</autodoc>
         <paramlist>
           <param name="PCOUNT" type="int" default=""/>
-          <param name="points" type="p.wxPoint" default=""/>
+          <param name="points" type="Point" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="DrawSpline" type="void" overloaded="no">
+      <method name="DrawSpline" type="" overloaded="no">
         <autodoc>DrawSpline(int PCOUNT, Point points)</autodoc>
         <paramlist>
           <param name="PCOUNT" type="int" default=""/>
-          <param name="points" type="p.wxPoint" default=""/>
+          <param name="points" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="SetClippingRect" type="void" overloaded="no">
+      <method name="SetClippingRect" type="" overloaded="no">
         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DestroyClippingRect" type="void" overloaded="no">
+      <method name="DestroyClippingRect" type="" overloaded="no">
         <autodoc>DestroyClippingRect()</autodoc>
       </method>
-      <method name="SetPen" type="void" overloaded="no">
+      <method name="SetPen" type="" overloaded="no">
         <autodoc>SetPen(wxPen pen, bool isOutline=FALSE)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
           <param name="isOutline" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="SetBrush" type="void" overloaded="no">
+      <method name="SetBrush" type="" overloaded="no">
         <autodoc>SetBrush(wxBrush brush, bool isFill=FALSE)</autodoc>
         <paramlist>
-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>
           <param name="isFill" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">
         <autodoc>SetTextColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetBackgroundMode" type="void" overloaded="no">
+      <method name="SetBackgroundMode" type="" overloaded="no">
         <autodoc>SetBackgroundMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -27734,7 +27734,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyRectangleShape" oldname="wxPyRectangleShape" module="ogl">
-      <baseclass name="wxPyShape"/>
+      <baseclass name="PyShape"/>
       <constructor name="PyRectangleShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyRectangleShape</autodoc>
         <paramlist>
@@ -27742,66 +27742,66 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetCornerRadius" type="void" overloaded="no">
+      <method name="SetCornerRadius" type="" overloaded="no">
         <autodoc>SetCornerRadius(double radius)</autodoc>
         <paramlist>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27810,7 +27810,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27819,7 +27819,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27828,7 +27828,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27839,7 +27839,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -27847,11 +27847,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -27859,7 +27859,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -27869,7 +27869,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27878,7 +27878,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27887,7 +27887,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -27897,7 +27897,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27906,7 +27906,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -27915,40 +27915,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -27956,36 +27956,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="wxPyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -27994,80 +27994,80 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyControlPoint" oldname="wxPyControlPoint" module="ogl">
-      <baseclass name="wxPyRectangleShape"/>
+      <baseclass name="PyRectangleShape"/>
       <constructor name="PyControlPoint" overloaded="no">
         <autodoc>__init__(PyShapeCanvas the_canvas=None, PyShape object=None, 
     double size=0.0, double the_xoffset=0.0, double the_yoffset=0.0, 
     int the_type=0) -&gt; PyControlPoint</autodoc>
         <paramlist>
-          <param name="the_canvas" type="p.wxPyShapeCanvas" default="NULL"/>
-          <param name="object" type="p.wxPyShape" default="NULL"/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default="NULL"/>
+          <param name="object" type="PyShape" default="NULL"/>
           <param name="size" type="double" default="0.0"/>
           <param name="the_xoffset" type="double" default="0.0"/>
           <param name="the_yoffset" type="double" default="0.0"/>
           <param name="the_type" type="int" default="0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetCornerRadius" type="void" overloaded="no">
+      <method name="SetCornerRadius" type="" overloaded="no">
         <autodoc>SetCornerRadius(double radius)</autodoc>
         <paramlist>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28076,7 +28076,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28085,7 +28085,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28094,7 +28094,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28105,7 +28105,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -28113,11 +28113,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -28125,7 +28125,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -28135,7 +28135,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28144,7 +28144,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28153,7 +28153,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -28163,7 +28163,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28172,7 +28172,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28181,40 +28181,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -28222,36 +28222,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -28260,82 +28260,82 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyBitmapShape" oldname="wxPyBitmapShape" module="ogl">
-      <baseclass name="wxPyRectangleShape"/>
+      <baseclass name="PyRectangleShape"/>
       <constructor name="PyBitmapShape" overloaded="no">
         <autodoc>__init__() -&gt; PyBitmapShape</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
-      <method name="GetFilename" type="wxString" overloaded="no">
+      <method name="GetFilename" type="String" overloaded="no">
         <autodoc>GetFilename() -&gt; String</autodoc>
       </method>
-      <method name="SetBitmap" type="void" overloaded="no">
+      <method name="SetBitmap" type="" overloaded="no">
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetFilename" type="void" overloaded="no">
+      <method name="SetFilename" type="" overloaded="no">
         <autodoc>SetFilename(String filename)</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28344,7 +28344,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28353,7 +28353,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28362,7 +28362,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28373,7 +28373,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -28381,11 +28381,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -28393,7 +28393,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -28403,7 +28403,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28412,7 +28412,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28421,7 +28421,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -28431,7 +28431,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28440,7 +28440,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28449,40 +28449,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -28490,36 +28490,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -28528,104 +28528,104 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyDrawnShape" oldname="wxPyDrawnShape" module="ogl">
-      <baseclass name="wxPyRectangleShape"/>
+      <baseclass name="PyRectangleShape"/>
       <constructor name="PyDrawnShape" overloaded="no">
         <autodoc>__init__() -&gt; PyDrawnShape</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="CalculateSize" type="void" overloaded="no">
+      <method name="CalculateSize" type="" overloaded="no">
         <autodoc>CalculateSize()</autodoc>
       </method>
-      <method name="DestroyClippingRect" type="void" overloaded="no">
+      <method name="DestroyClippingRect" type="" overloaded="no">
         <autodoc>DestroyClippingRect()</autodoc>
       </method>
-      <method name="DrawArc" type="void" overloaded="no">
+      <method name="DrawArc" type="" overloaded="no">
         <autodoc>DrawArc(Point centrePoint, Point startPoint, Point endPoint)</autodoc>
         <paramlist>
-          <param name="centrePoint" type="r.q(const).wxPoint" default=""/>
-          <param name="startPoint" type="r.q(const).wxPoint" default=""/>
-          <param name="endPoint" type="r.q(const).wxPoint" default=""/>
+          <param name="centrePoint" type="Point" default=""/>
+          <param name="startPoint" type="Point" default=""/>
+          <param name="endPoint" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawAtAngle" type="void" overloaded="no">
+      <method name="DrawAtAngle" type="" overloaded="no">
         <autodoc>DrawAtAngle(int angle)</autodoc>
         <paramlist>
           <param name="angle" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DrawEllipticArc" type="void" overloaded="no">
+      <method name="DrawEllipticArc" type="" overloaded="no">
         <autodoc>DrawEllipticArc(Rect rect, double startAngle, double endAngle)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="startAngle" type="double" default=""/>
           <param name="endAngle" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawLine" type="void" overloaded="no">
+      <method name="DrawLine" type="" overloaded="no">
         <autodoc>DrawLine(Point point1, Point point2)</autodoc>
         <paramlist>
-          <param name="point1" type="r.q(const).wxPoint" default=""/>
-          <param name="point2" type="r.q(const).wxPoint" default=""/>
+          <param name="point1" type="Point" default=""/>
+          <param name="point2" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawLines" type="void" overloaded="no">
+      <method name="DrawLines" type="" overloaded="no">
         <autodoc>DrawLines(int PCOUNT, Point points)</autodoc>
         <paramlist>
           <param name="PCOUNT" type="int" default=""/>
-          <param name="points" type="p.wxPoint" default=""/>
+          <param name="points" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawPoint" type="void" overloaded="no">
+      <method name="DrawPoint" type="" overloaded="no">
         <autodoc>DrawPoint(Point point)</autodoc>
         <paramlist>
-          <param name="point" type="r.q(const).wxPoint" default=""/>
+          <param name="point" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawPolygon" type="void" overloaded="no">
+      <method name="DrawPolygon" type="" overloaded="no">
         <autodoc>DrawPolygon(int PCOUNT, Point points, int flags=0)</autodoc>
         <paramlist>
           <param name="PCOUNT" type="int" default=""/>
-          <param name="points" type="p.wxPoint" default=""/>
+          <param name="points" type="Point" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="DrawRectangle" type="void" overloaded="no">
+      <method name="DrawRectangle" type="" overloaded="no">
         <autodoc>DrawRectangle(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRoundedRectangle" type="void" overloaded="no">
+      <method name="DrawRoundedRectangle" type="" overloaded="no">
         <autodoc>DrawRoundedRectangle(Rect rect, double radius)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="DrawSpline" type="void" overloaded="no">
+      <method name="DrawSpline" type="" overloaded="no">
         <autodoc>DrawSpline(int PCOUNT, Point points)</autodoc>
         <paramlist>
           <param name="PCOUNT" type="int" default=""/>
-          <param name="points" type="p.wxPoint" default=""/>
+          <param name="points" type="Point" default=""/>
         </paramlist>
       </method>
-      <method name="DrawText" type="void" overloaded="no">
+      <method name="DrawText" type="" overloaded="no">
         <autodoc>DrawText(String text, Point point)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
-          <param name="point" type="r.q(const).wxPoint" default=""/>
+          <param name="text" type="String" default=""/>
+          <param name="point" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="GetAngle" type="int" overloaded="no">
         <autodoc>GetAngle() -&gt; int</autodoc>
       </method>
-      <method name="GetMetaFile" type="wxPseudoMetaFile" overloaded="no">
+      <method name="GetMetaFile" type="PseudoMetaFile" overloaded="no">
         <autodoc>GetMetaFile() -&gt; PseudoMetaFile</autodoc>
       </method>
       <method name="GetRotation" type="double" overloaded="no">
@@ -28634,10 +28634,10 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="LoadFromMetaFile" type="bool" overloaded="no">
         <autodoc>LoadFromMetaFile(String filename) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="Rotate" type="void" overloaded="no">
+      <method name="Rotate" type="" overloaded="no">
         <autodoc>Rotate(double x, double y, double theta)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28645,117 +28645,117 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="theta" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetClippingRect" type="void" overloaded="no">
+      <method name="SetClippingRect" type="" overloaded="no">
         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>
-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>
         </paramlist>
       </method>
-      <method name="SetDrawnBackgroundColour" type="void" overloaded="no">
+      <method name="SetDrawnBackgroundColour" type="" overloaded="no">
         <autodoc>SetDrawnBackgroundColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetDrawnBackgroundMode" type="void" overloaded="no">
+      <method name="SetDrawnBackgroundMode" type="" overloaded="no">
         <autodoc>SetDrawnBackgroundMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDrawnBrush" type="void" overloaded="no">
+      <method name="SetDrawnBrush" type="" overloaded="no">
         <autodoc>SetDrawnBrush(wxBrush pen, bool isOutline=FALSE)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxBrush" default=""/>
+          <param name="pen" type="Brush" default=""/>
           <param name="isOutline" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="SetDrawnFont" type="void" overloaded="no">
+      <method name="SetDrawnFont" type="" overloaded="no">
         <autodoc>SetDrawnFont(Font font)</autodoc>
         <paramlist>
-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="SetDrawnPen" type="void" overloaded="no">
+      <method name="SetDrawnPen" type="" overloaded="no">
         <autodoc>SetDrawnPen(wxPen pen, bool isOutline=FALSE)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
           <param name="isOutline" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="SetDrawnTextColour" type="void" overloaded="no">
+      <method name="SetDrawnTextColour" type="" overloaded="no">
         <autodoc>SetDrawnTextColour(Colour colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="Scale" type="void" overloaded="no">
+      <method name="Scale" type="" overloaded="no">
         <autodoc>Scale(double sx, double sy)</autodoc>
         <paramlist>
           <param name="sx" type="double" default=""/>
           <param name="sy" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetSaveToFile" type="void" overloaded="no">
+      <method name="SetSaveToFile" type="" overloaded="no">
         <autodoc>SetSaveToFile(bool save)</autodoc>
         <paramlist>
           <param name="save" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Translate" type="void" overloaded="no">
+      <method name="Translate" type="" overloaded="no">
         <autodoc>Translate(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28764,7 +28764,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28773,7 +28773,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28782,7 +28782,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28793,7 +28793,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -28801,11 +28801,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -28813,7 +28813,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -28823,7 +28823,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28832,7 +28832,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28841,7 +28841,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -28851,7 +28851,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28860,7 +28860,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28869,40 +28869,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -28910,36 +28910,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -28948,19 +28948,19 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="OGLConstraint" oldname="wxOGLConstraint" module="ogl">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="OGLConstraint" overloaded="no">
         <autodoc>__init__(int type, PyShape constraining, PyObject constrained) -&gt; OGLConstraint</autodoc>
         <paramlist>
           <param name="type" type="int" default=""/>
-          <param name="constraining" type="p.wxPyShape" default=""/>
-          <param name="constrained" type="p.PyObject" default=""/>
+          <param name="constraining" type="PyShape" default=""/>
+          <param name="constrained" type="PyObject" default=""/>
         </paramlist>
       </constructor>
       <method name="Evaluate" type="bool" overloaded="no">
         <autodoc>Evaluate() -&gt; bool</autodoc>
       </method>
-      <method name="SetSpacing" type="void" overloaded="no">
+      <method name="SetSpacing" type="" overloaded="no">
         <autodoc>SetSpacing(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -28976,68 +28976,68 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyCompositeShape" oldname="wxPyCompositeShape" module="ogl">
-      <baseclass name="wxPyRectangleShape"/>
+      <baseclass name="PyRectangleShape"/>
       <constructor name="PyCompositeShape" overloaded="no">
         <autodoc>__init__() -&gt; PyCompositeShape</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="AddChild" type="void" overloaded="no">
+      <method name="AddChild" type="" overloaded="no">
         <autodoc>AddChild(PyShape child, PyShape addAfter=None)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxPyShape" default=""/>
-          <param name="addAfter" type="p.wxPyShape" default="NULL"/>
+          <param name="child" type="PyShape" default=""/>
+          <param name="addAfter" type="PyShape" default="NULL"/>
         </paramlist>
       </method>
-      <method name="AddConstraint" type="wxOGLConstraint" overloaded="no">
+      <method name="AddConstraint" type="OGLConstraint" overloaded="no">
         <autodoc>AddConstraint(OGLConstraint constraint) -&gt; OGLConstraint</autodoc>
         <paramlist>
-          <param name="constraint" type="p.wxOGLConstraint" default=""/>
+          <param name="constraint" type="OGLConstraint" default=""/>
         </paramlist>
       </method>
-      <method name="AddConstrainedShapes" type="wxOGLConstraint" overloaded="no">
+      <method name="AddConstrainedShapes" type="OGLConstraint" overloaded="no">
         <autodoc>AddConstrainedShapes(int type, PyShape constraining, PyObject constrained) -&gt; OGLConstraint</autodoc>
         <paramlist>
           <param name="type" type="int" default=""/>
-          <param name="constraining" type="p.wxPyShape" default=""/>
-          <param name="constrained" type="p.PyObject" default=""/>
+          <param name="constraining" type="PyShape" default=""/>
+          <param name="constrained" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="AddSimpleConstraint" type="wxOGLConstraint" overloaded="no">
+      <method name="AddSimpleConstraint" type="OGLConstraint" overloaded="no">
         <autodoc>AddSimpleConstraint(int type, PyShape constraining, PyShape constrained) -&gt; OGLConstraint</autodoc>
         <paramlist>
           <param name="type" type="int" default=""/>
-          <param name="constraining" type="p.wxPyShape" default=""/>
-          <param name="constrained" type="p.wxPyShape" default=""/>
+          <param name="constraining" type="PyShape" default=""/>
+          <param name="constrained" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="CalculateSize" type="void" overloaded="no">
+      <method name="CalculateSize" type="" overloaded="no">
         <autodoc>CalculateSize()</autodoc>
       </method>
       <method name="ContainsDivision" type="bool" overloaded="no">
         <autodoc>ContainsDivision(PyDivisionShape division) -&gt; bool</autodoc>
         <paramlist>
-          <param name="division" type="p.wxPyDivisionShape" default=""/>
+          <param name="division" type="wxPyDivisionShape" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteConstraint" type="void" overloaded="no">
+      <method name="DeleteConstraint" type="" overloaded="no">
         <autodoc>DeleteConstraint(OGLConstraint constraint)</autodoc>
         <paramlist>
-          <param name="constraint" type="p.wxOGLConstraint" default=""/>
+          <param name="constraint" type="OGLConstraint" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteConstraintsInvolvingChild" type="void" overloaded="no">
+      <method name="DeleteConstraintsInvolvingChild" type="" overloaded="no">
         <autodoc>DeleteConstraintsInvolvingChild(PyShape child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxPyShape" default=""/>
+          <param name="child" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="FindContainerImage" type="wxPyShape" overloaded="no">
+      <method name="FindContainerImage" type="PyShape" overloaded="no">
         <autodoc>FindContainerImage() -&gt; PyShape</autodoc>
       </method>
       <method name="GetConstraints" type="PyObject" overloaded="no">
@@ -29046,65 +29046,65 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetDivisions" type="PyObject" overloaded="no">
         <autodoc>GetDivisions() -&gt; PyObject</autodoc>
       </method>
-      <method name="MakeContainer" type="void" overloaded="no">
+      <method name="MakeContainer" type="" overloaded="no">
         <autodoc>MakeContainer()</autodoc>
       </method>
       <method name="Recompute" type="bool" overloaded="no">
         <autodoc>Recompute() -&gt; bool</autodoc>
       </method>
-      <method name="RemoveChild" type="void" overloaded="no">
+      <method name="RemoveChild" type="" overloaded="no">
         <autodoc>RemoveChild(PyShape child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxPyShape" default=""/>
+          <param name="child" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29113,7 +29113,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29122,7 +29122,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29131,7 +29131,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29142,7 +29142,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -29150,11 +29150,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -29162,7 +29162,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -29172,7 +29172,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29181,7 +29181,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29190,7 +29190,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -29200,7 +29200,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29209,7 +29209,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29218,40 +29218,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -29259,36 +29259,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -29297,7 +29297,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyDividedShape" oldname="wxPyDividedShape" module="ogl">
-      <baseclass name="wxPyRectangleShape"/>
+      <baseclass name="PyRectangleShape"/>
       <constructor name="PyDividedShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyDividedShape</autodoc>
         <paramlist>
@@ -29305,66 +29305,66 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="EditRegions" type="void" overloaded="no">
+      <method name="EditRegions" type="" overloaded="no">
         <autodoc>EditRegions()</autodoc>
       </method>
-      <method name="SetRegionSizes" type="void" overloaded="no">
+      <method name="SetRegionSizes" type="" overloaded="no">
         <autodoc>SetRegionSizes()</autodoc>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29373,7 +29373,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29382,7 +29382,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29391,7 +29391,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29402,7 +29402,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -29410,11 +29410,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -29422,7 +29422,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -29432,7 +29432,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29441,7 +29441,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29450,7 +29450,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -29460,7 +29460,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29469,7 +29469,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29478,40 +29478,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -29519,36 +29519,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -29557,82 +29557,82 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyDivisionShape" oldname="wxPyDivisionShape" module="ogl">
-      <baseclass name="wxPyCompositeShape"/>
+      <baseclass name="PyCompositeShape"/>
       <constructor name="PyDivisionShape" overloaded="no">
         <autodoc>__init__() -&gt; PyDivisionShape</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="AdjustBottom" type="void" overloaded="no">
+      <method name="AdjustBottom" type="" overloaded="no">
         <autodoc>AdjustBottom(double bottom, bool test)</autodoc>
         <paramlist>
           <param name="bottom" type="double" default=""/>
           <param name="test" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="AdjustLeft" type="void" overloaded="no">
+      <method name="AdjustLeft" type="" overloaded="no">
         <autodoc>AdjustLeft(double left, bool test)</autodoc>
         <paramlist>
           <param name="left" type="double" default=""/>
           <param name="test" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="AdjustRight" type="void" overloaded="no">
+      <method name="AdjustRight" type="" overloaded="no">
         <autodoc>AdjustRight(double right, bool test)</autodoc>
         <paramlist>
           <param name="right" type="double" default=""/>
           <param name="test" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="AdjustTop" type="void" overloaded="no">
+      <method name="AdjustTop" type="" overloaded="no">
         <autodoc>AdjustTop(double top, bool test)</autodoc>
         <paramlist>
           <param name="top" type="double" default=""/>
           <param name="test" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Divide" type="void" overloaded="no">
+      <method name="Divide" type="" overloaded="no">
         <autodoc>Divide(int direction)</autodoc>
         <paramlist>
           <param name="direction" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="EditEdge" type="void" overloaded="no">
+      <method name="EditEdge" type="" overloaded="no">
         <autodoc>EditEdge(int side)</autodoc>
         <paramlist>
           <param name="side" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetBottomSide" type="wxPyDivisionShape" overloaded="no">
+      <method name="GetBottomSide" type="PyDivisionShape" overloaded="no">
         <autodoc>GetBottomSide() -&gt; PyDivisionShape</autodoc>
       </method>
       <method name="GetHandleSide" type="int" overloaded="no">
         <autodoc>GetHandleSide() -&gt; int</autodoc>
       </method>
-      <method name="GetLeftSide" type="wxPyDivisionShape" overloaded="no">
+      <method name="GetLeftSide" type="PyDivisionShape" overloaded="no">
         <autodoc>GetLeftSide() -&gt; PyDivisionShape</autodoc>
       </method>
-      <method name="GetLeftSideColour" type="wxString" overloaded="no">
+      <method name="GetLeftSideColour" type="String" overloaded="no">
         <autodoc>GetLeftSideColour() -&gt; String</autodoc>
       </method>
-      <method name="GetLeftSidePen" type="wxPen" overloaded="no">
+      <method name="GetLeftSidePen" type="Pen" overloaded="no">
         <autodoc>GetLeftSidePen() -&gt; wxPen</autodoc>
       </method>
-      <method name="GetRightSide" type="wxPyDivisionShape" overloaded="no">
+      <method name="GetRightSide" type="PyDivisionShape" overloaded="no">
         <autodoc>GetRightSide() -&gt; PyDivisionShape</autodoc>
       </method>
-      <method name="GetTopSide" type="wxPyDivisionShape" overloaded="no">
+      <method name="GetTopSide" type="PyDivisionShape" overloaded="no">
         <autodoc>GetTopSide() -&gt; PyDivisionShape</autodoc>
       </method>
-      <method name="GetTopSidePen" type="wxPen" overloaded="no">
+      <method name="GetTopSidePen" type="Pen" overloaded="no">
         <autodoc>GetTopSidePen() -&gt; wxPen</autodoc>
       </method>
-      <method name="ResizeAdjoining" type="void" overloaded="no">
+      <method name="ResizeAdjoining" type="" overloaded="no">
         <autodoc>ResizeAdjoining(int side, double newPos, bool test)</autodoc>
         <paramlist>
           <param name="side" type="int" default=""/>
@@ -29640,114 +29640,114 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="test" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="PopupMenu" type="void" overloaded="no">
+      <method name="PopupMenu" type="" overloaded="no">
         <autodoc>PopupMenu(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetBottomSide" type="void" overloaded="no">
+      <method name="SetBottomSide" type="" overloaded="no">
         <autodoc>SetBottomSide(PyDivisionShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetHandleSide" type="void" overloaded="no">
+      <method name="SetHandleSide" type="" overloaded="no">
         <autodoc>SetHandleSide(int side)</autodoc>
         <paramlist>
           <param name="side" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLeftSide" type="void" overloaded="no">
+      <method name="SetLeftSide" type="" overloaded="no">
         <autodoc>SetLeftSide(PyDivisionShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetLeftSideColour" type="void" overloaded="no">
+      <method name="SetLeftSideColour" type="" overloaded="no">
         <autodoc>SetLeftSideColour(String colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetLeftSidePen" type="void" overloaded="no">
+      <method name="SetLeftSidePen" type="" overloaded="no">
         <autodoc>SetLeftSidePen(wxPen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
-      <method name="SetRightSide" type="void" overloaded="no">
+      <method name="SetRightSide" type="" overloaded="no">
         <autodoc>SetRightSide(PyDivisionShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetTopSide" type="void" overloaded="no">
+      <method name="SetTopSide" type="" overloaded="no">
         <autodoc>SetTopSide(PyDivisionShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetTopSideColour" type="void" overloaded="no">
+      <method name="SetTopSideColour" type="" overloaded="no">
         <autodoc>SetTopSideColour(String colour)</autodoc>
         <paramlist>
-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetTopSidePen" type="void" overloaded="no">
+      <method name="SetTopSidePen" type="" overloaded="no">
         <autodoc>SetTopSidePen(wxPen pen)</autodoc>
         <paramlist>
-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29756,7 +29756,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29765,7 +29765,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29774,7 +29774,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29785,7 +29785,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -29793,11 +29793,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -29805,7 +29805,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -29815,7 +29815,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29824,7 +29824,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29833,7 +29833,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -29843,7 +29843,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29852,7 +29852,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -29861,40 +29861,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -29902,36 +29902,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -29940,7 +29940,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyEllipseShape" oldname="wxPyEllipseShape" module="ogl">
-      <baseclass name="wxPyShape"/>
+      <baseclass name="PyShape"/>
       <constructor name="PyEllipseShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyEllipseShape</autodoc>
         <paramlist>
@@ -29948,57 +29948,57 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30007,7 +30007,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30016,7 +30016,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30025,7 +30025,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30036,7 +30036,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -30044,11 +30044,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -30056,7 +30056,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -30066,7 +30066,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30075,7 +30075,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30084,7 +30084,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -30094,7 +30094,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30103,7 +30103,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30112,40 +30112,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -30153,36 +30153,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -30191,64 +30191,64 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyCircleShape" oldname="wxPyCircleShape" module="ogl">
-      <baseclass name="wxPyEllipseShape"/>
+      <baseclass name="PyEllipseShape"/>
       <constructor name="PyCircleShape" overloaded="no">
         <autodoc>__init__(double width=0.0) -&gt; PyCircleShape</autodoc>
         <paramlist>
           <param name="width" type="double" default="0.0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30257,7 +30257,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30266,7 +30266,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30275,7 +30275,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30286,7 +30286,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -30294,11 +30294,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -30306,7 +30306,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -30316,7 +30316,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30325,7 +30325,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30334,7 +30334,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -30344,7 +30344,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30353,7 +30353,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30362,40 +30362,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -30403,36 +30403,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -30441,7 +30441,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="ArrowHead" oldname="wxArrowHead" module="ogl">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="ArrowHead" overloaded="no">
         <autodoc>__init__(int type=0, int end=0, double size=0.0, double dist=0.0, 
     String name=EmptyString, PseudoMetaFile mf=None, 
@@ -30451,8 +30451,8 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="end" type="int" default="0"/>
           <param name="size" type="double" default="0.0"/>
           <param name="dist" type="double" default="0.0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="mf" type="p.wxPseudoMetaFile" default="NULL"/>
+          <param name="name" type="String" default="wxPyEmptyString"/>
+          <param name="mf" type="PseudoMetaFile" default="NULL"/>
           <param name="arrowId" type="long" default="-1"/>
         </paramlist>
       </constructor>
@@ -30465,7 +30465,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetPosition" type="int" overloaded="no">
         <autodoc>GetPosition() -&gt; int</autodoc>
       </method>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -30483,22 +30483,22 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetSize" type="double" overloaded="no">
         <autodoc>GetSize() -&gt; double</autodoc>
       </method>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="SetXOffset" type="void" overloaded="no">
+      <method name="SetXOffset" type="" overloaded="no">
         <autodoc>SetXOffset(double x)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetYOffset" type="void" overloaded="no">
+      <method name="SetYOffset" type="" overloaded="no">
         <autodoc>SetYOffset(double y)</autodoc>
         <paramlist>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetMetaFile" type="wxPseudoMetaFile" overloaded="no">
+      <method name="GetMetaFile" type="PseudoMetaFile" overloaded="no">
         <autodoc>GetMetaFile() -&gt; PseudoMetaFile</autodoc>
       </method>
       <method name="GetId" type="long" overloaded="no">
@@ -30510,13 +30510,13 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetArrowSize" type="double" overloaded="no">
         <autodoc>GetArrowSize() -&gt; double</autodoc>
       </method>
-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">
         <autodoc>SetSize(double size)</autodoc>
         <paramlist>
           <param name="size" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetSpacing" type="void" overloaded="no">
+      <method name="SetSpacing" type="" overloaded="no">
         <autodoc>SetSpacing(double sp)</autodoc>
         <paramlist>
           <param name="sp" type="double" default=""/>
@@ -30524,18 +30524,18 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyLineShape" oldname="wxPyLineShape" module="ogl">
-      <baseclass name="wxPyShape"/>
+      <baseclass name="PyShape"/>
       <constructor name="PyLineShape" overloaded="no">
         <autodoc>__init__() -&gt; PyLineShape</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="AddArrow" type="void" overloaded="no">
+      <method name="AddArrow" type="" overloaded="no">
         <autodoc>AddArrow(int type, int end=ARROW_POSITION_END, double arrowSize=10.0, 
     double xOffset=0.0, String name=EmptyString, 
     PseudoMetaFile mf=None, long arrowId=-1)</autodoc>
@@ -30544,36 +30544,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="end" type="int" default="ARROW_POSITION_END"/>
           <param name="arrowSize" type="double" default="10.0"/>
           <param name="xOffset" type="double" default="0.0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="mf" type="p.wxPseudoMetaFile" default="NULL"/>
+          <param name="name" type="String" default="wxPyEmptyString"/>
+          <param name="mf" type="PseudoMetaFile" default="NULL"/>
           <param name="arrowId" type="long" default="-1"/>
         </paramlist>
       </method>
-      <method name="AddArrowOrdered" type="void" overloaded="no">
+      <method name="AddArrowOrdered" type="" overloaded="no">
         <autodoc>AddArrowOrdered(ArrowHead arrow, PyObject referenceList, int end)</autodoc>
         <paramlist>
-          <param name="arrow" type="p.wxArrowHead" default=""/>
-          <param name="referenceList" type="p.PyObject" default=""/>
+          <param name="arrow" type="ArrowHead" default=""/>
+          <param name="referenceList" type="PyObject" default=""/>
           <param name="end" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ClearArrow" type="bool" overloaded="no">
         <autodoc>ClearArrow(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="ClearArrowsAtPosition" type="void" overloaded="no">
+      <method name="ClearArrowsAtPosition" type="" overloaded="no">
         <autodoc>ClearArrowsAtPosition(int position=-1)</autodoc>
         <paramlist>
           <param name="position" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="DrawArrow" type="void" overloaded="no">
+      <method name="DrawArrow" type="" overloaded="no">
         <autodoc>DrawArrow(DC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="arrow" type="p.wxArrowHead" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="arrow" type="ArrowHead" default=""/>
           <param name="xOffset" type="double" default=""/>
           <param name="proportionalOffset" type="bool" default=""/>
         </paramlist>
@@ -30588,56 +30588,56 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>DeleteArrowHead(int position, String name) -&gt; bool</autodoc>
         <paramlist>
           <param name="position" type="int" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteLineControlPoint" type="bool" overloaded="no">
         <autodoc>DeleteLineControlPoint() -&gt; bool</autodoc>
       </method>
-      <method name="DrawArrows" type="void" overloaded="no">
+      <method name="DrawArrows" type="" overloaded="no">
         <autodoc>DrawArrows(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="DrawRegion" type="void" overloaded="no">
+      <method name="DrawRegion" type="" overloaded="no">
         <autodoc>DrawRegion(DC dc, ShapeRegion region, double x, double y)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="region" type="p.wxShapeRegion" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="region" type="ShapeRegion" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="EraseRegion" type="void" overloaded="no">
+      <method name="EraseRegion" type="" overloaded="no">
         <autodoc>EraseRegion(DC dc, ShapeRegion region, double x, double y)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
-          <param name="region" type="p.wxShapeRegion" default=""/>
+          <param name="dc" type="DC" default=""/>
+          <param name="region" type="ShapeRegion" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="FindArrowHeadId" type="wxArrowHead" overloaded="no">
+      <method name="FindArrowHeadId" type="ArrowHead" overloaded="no">
         <autodoc>FindArrowHeadId(long arrowId) -&gt; ArrowHead</autodoc>
         <paramlist>
           <param name="arrowId" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="FindArrowHead" type="wxArrowHead" overloaded="no">
+      <method name="FindArrowHead" type="ArrowHead" overloaded="no">
         <autodoc>FindArrowHead(int position, String name) -&gt; ArrowHead</autodoc>
         <paramlist>
           <param name="position" type="int" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="FindLineEndPoints" type="void" overloaded="no">
+      <method name="FindLineEndPoints" type="" overloaded="no">
         <autodoc>FindLineEndPoints(double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
       <method name="FindLinePosition" type="int" overloaded="no">
@@ -30650,12 +30650,12 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="FindMinimumWidth" type="double" overloaded="no">
         <autodoc>FindMinimumWidth() -&gt; double</autodoc>
       </method>
-      <method name="FindNth" type="void" overloaded="no">
+      <method name="FindNth" type="" overloaded="no">
         <autodoc>FindNth(PyShape image, int OUTPUT, int OUTPUT, bool incoming)</autodoc>
         <paramlist>
-          <param name="image" type="p.wxPyShape" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="image" type="PyShape" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
           <param name="incoming" type="bool" default=""/>
         </paramlist>
       </method>
@@ -30665,54 +30665,54 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetAttachmentTo" type="int" overloaded="no">
         <autodoc>GetAttachmentTo() -&gt; int</autodoc>
       </method>
-      <method name="GetEnds" type="void" overloaded="no">
+      <method name="GetEnds" type="" overloaded="no">
         <autodoc>GetEnds(double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetFrom" type="wxPyShape" overloaded="no">
+      <method name="GetFrom" type="PyShape" overloaded="no">
         <autodoc>GetFrom() -&gt; PyShape</autodoc>
       </method>
-      <method name="GetLabelPosition" type="void" overloaded="no">
+      <method name="GetLabelPosition" type="" overloaded="no">
         <autodoc>GetLabelPosition(int position, double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
           <param name="position" type="int" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
-          <param name="OUTPUT" type="p.double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
+          <param name="OUTPUT" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="GetNextControlPoint" type="wxRealPoint" overloaded="no">
+      <method name="GetNextControlPoint" type="RealPoint" overloaded="no">
         <autodoc>GetNextControlPoint(PyShape shape) -&gt; RealPoint</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="GetTo" type="wxPyShape" overloaded="no">
+      <method name="GetTo" type="PyShape" overloaded="no">
         <autodoc>GetTo() -&gt; PyShape</autodoc>
       </method>
-      <method name="Initialise" type="void" overloaded="no">
+      <method name="Initialise" type="" overloaded="no">
         <autodoc>Initialise()</autodoc>
       </method>
-      <method name="InsertLineControlPoint" type="void" overloaded="no">
+      <method name="InsertLineControlPoint" type="" overloaded="no">
         <autodoc>InsertLineControlPoint(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
       <method name="IsEnd" type="bool" overloaded="no">
         <autodoc>IsEnd(PyShape shape) -&gt; bool</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>
         </paramlist>
       </method>
       <method name="IsSpline" type="bool" overloaded="no">
         <autodoc>IsSpline() -&gt; bool</autodoc>
       </method>
-      <method name="MakeLineControlPoints" type="void" overloaded="no">
+      <method name="MakeLineControlPoints" type="" overloaded="no">
         <autodoc>MakeLineControlPoints(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
@@ -30721,26 +30721,26 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetLineControlPoints" type="PyObject" overloaded="no">
         <autodoc>GetLineControlPoints() -&gt; PyObject</autodoc>
       </method>
-      <method name="SetAttachmentFrom" type="void" overloaded="no">
+      <method name="SetAttachmentFrom" type="" overloaded="no">
         <autodoc>SetAttachmentFrom(int fromAttach)</autodoc>
         <paramlist>
           <param name="fromAttach" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAttachments" type="void" overloaded="no">
+      <method name="SetAttachments" type="" overloaded="no">
         <autodoc>SetAttachments(int fromAttach, int toAttach)</autodoc>
         <paramlist>
           <param name="fromAttach" type="int" default=""/>
           <param name="toAttach" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAttachmentTo" type="void" overloaded="no">
+      <method name="SetAttachmentTo" type="" overloaded="no">
         <autodoc>SetAttachmentTo(int toAttach)</autodoc>
         <paramlist>
           <param name="toAttach" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetEnds" type="void" overloaded="no">
+      <method name="SetEnds" type="" overloaded="no">
         <autodoc>SetEnds(double x1, double y1, double x2, double y2)</autodoc>
         <paramlist>
           <param name="x1" type="double" default=""/>
@@ -30749,83 +30749,83 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="y2" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetFrom" type="void" overloaded="no">
+      <method name="SetFrom" type="" overloaded="no">
         <autodoc>SetFrom(PyShape object)</autodoc>
         <paramlist>
-          <param name="object" type="p.wxPyShape" default=""/>
+          <param name="object" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetIgnoreOffsets" type="void" overloaded="no">
+      <method name="SetIgnoreOffsets" type="" overloaded="no">
         <autodoc>SetIgnoreOffsets(bool ignore)</autodoc>
         <paramlist>
           <param name="ignore" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetSpline" type="void" overloaded="no">
+      <method name="SetSpline" type="" overloaded="no">
         <autodoc>SetSpline(bool spline)</autodoc>
         <paramlist>
           <param name="spline" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetTo" type="void" overloaded="no">
+      <method name="SetTo" type="" overloaded="no">
         <autodoc>SetTo(PyShape object)</autodoc>
         <paramlist>
-          <param name="object" type="p.wxPyShape" default=""/>
+          <param name="object" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="Straighten" type="void" overloaded="no">
+      <method name="Straighten" type="" overloaded="no">
         <autodoc>Straighten(DC dc=None)</autodoc>
         <paramlist>
-          <param name="dc" type="p.wxDC" default="NULL"/>
+          <param name="dc" type="DC" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Unlink" type="void" overloaded="no">
+      <method name="Unlink" type="" overloaded="no">
         <autodoc>Unlink()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30834,7 +30834,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30843,7 +30843,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30852,7 +30852,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30863,7 +30863,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -30871,11 +30871,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -30883,7 +30883,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -30893,7 +30893,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30902,7 +30902,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30911,7 +30911,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -30921,7 +30921,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30930,7 +30930,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -30939,40 +30939,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -30980,36 +30980,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -31018,33 +31018,33 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyPolygonShape" oldname="wxPyPolygonShape" module="ogl">
-      <baseclass name="wxPyShape"/>
+      <baseclass name="PyShape"/>
       <constructor name="PyPolygonShape" overloaded="no">
         <autodoc>__init__() -&gt; PyPolygonShape</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="Create" type="PyObject" overloaded="no">
         <autodoc>Create(PyObject points) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="points" type="p.PyObject" default=""/>
+          <param name="points" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="AddPolygonPoint" type="void" overloaded="no">
+      <method name="AddPolygonPoint" type="" overloaded="no">
         <autodoc>AddPolygonPoint(int pos=0)</autodoc>
         <paramlist>
           <param name="pos" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="CalculatePolygonCentre" type="void" overloaded="no">
+      <method name="CalculatePolygonCentre" type="" overloaded="no">
         <autodoc>CalculatePolygonCentre()</autodoc>
       </method>
-      <method name="DeletePolygonPoint" type="void" overloaded="no">
+      <method name="DeletePolygonPoint" type="" overloaded="no">
         <autodoc>DeletePolygonPoint(int pos=0)</autodoc>
         <paramlist>
           <param name="pos" type="int" default="0"/>
@@ -31053,53 +31053,53 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetPoints" type="PyObject" overloaded="no">
         <autodoc>GetPoints() -&gt; PyObject</autodoc>
       </method>
-      <method name="UpdateOriginalPoints" type="void" overloaded="no">
+      <method name="UpdateOriginalPoints" type="" overloaded="no">
         <autodoc>UpdateOriginalPoints()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31108,7 +31108,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31117,7 +31117,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31126,7 +31126,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31137,7 +31137,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -31145,11 +31145,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -31157,7 +31157,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -31167,7 +31167,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31176,7 +31176,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31185,7 +31185,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -31195,7 +31195,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31204,7 +31204,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31213,40 +31213,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -31254,36 +31254,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -31292,7 +31292,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyTextShape" oldname="wxPyTextShape" module="ogl">
-      <baseclass name="wxPyRectangleShape"/>
+      <baseclass name="PyRectangleShape"/>
       <constructor name="PyTextShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyTextShape</autodoc>
         <paramlist>
@@ -31300,60 +31300,60 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">
         <autodoc>base_OnDelete()</autodoc>
       </method>
-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawBranches" type="void" overloaded="no">
+      <method name="base_OnDrawBranches" type="" overloaded="no">
         <autodoc>base_OnDrawBranches(DC dc, bool erase=FALSE)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="erase" type="bool" default="FALSE"/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLinks" type="void" overloaded="no">
+      <method name="base_OnMoveLinks" type="" overloaded="no">
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31362,7 +31362,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftDoubleClick" type="void" overloaded="no">
+      <method name="base_OnLeftDoubleClick" type="" overloaded="no">
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31371,7 +31371,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31380,7 +31380,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSize" type="void" overloaded="no">
+      <method name="base_OnSize" type="" overloaded="no">
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31391,7 +31391,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <autodoc>base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -31399,11 +31399,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnMovePost" type="void" overloaded="no">
+      <method name="base_OnMovePost" type="" overloaded="no">
         <autodoc>base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, 
     bool display=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>
@@ -31411,7 +31411,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -31421,7 +31421,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31430,7 +31430,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31439,7 +31439,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -31449,7 +31449,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31458,7 +31458,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31467,40 +31467,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDrawOutline" type="void" overloaded="no">
+      <method name="base_OnDrawOutline" type="" overloaded="no">
         <autodoc>base_OnDrawOutline(DC dc, double x, double y, double w, double h)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnDrawControlPoints" type="void" overloaded="no">
+      <method name="base_OnDrawControlPoints" type="" overloaded="no">
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnMoveLink" type="void" overloaded="no">
+      <method name="base_OnMoveLink" type="" overloaded="no">
         <autodoc>base_OnMoveLink(DC dc, bool moveControlPoints=True)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="moveControlPoints" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
@@ -31508,36 +31508,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnSizingEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnSizingEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
     int attachment=0)</autodoc>
         <paramlist>
-          <param name="pt" type="p.wxPyControlPoint" default=""/>
+          <param name="pt" type="PyControlPoint" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="keys" type="int" default="0"/>
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginSize" type="void" overloaded="no">
+      <method name="base_OnBeginSize" type="" overloaded="no">
         <autodoc>base_OnBeginSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
           <param name="h" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnEndSize" type="void" overloaded="no">
+      <method name="base_OnEndSize" type="" overloaded="no">
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>
@@ -31546,37 +31546,37 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="Diagram" oldname="wxDiagram" module="ogl">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="Diagram" overloaded="no">
         <autodoc>__init__() -&gt; Diagram</autodoc>
       </constructor>
-      <method name="AddShape" type="void" overloaded="no">
+      <method name="AddShape" type="" overloaded="no">
         <autodoc>AddShape(PyShape shape, PyShape addAfter=None)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
-          <param name="addAfter" type="p.wxPyShape" default="NULL"/>
+          <param name="shape" type="PyShape" default=""/>
+          <param name="addAfter" type="PyShape" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteAllShapes" type="void" overloaded="no">
+      <method name="DeleteAllShapes" type="" overloaded="no">
         <autodoc>DeleteAllShapes()</autodoc>
       </method>
-      <method name="DrawOutline" type="void" overloaded="no">
+      <method name="DrawOutline" type="" overloaded="no">
         <autodoc>DrawOutline(DC dc, double x1, double y1, double x2, double y2)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
           <param name="x1" type="double" default=""/>
           <param name="y1" type="double" default=""/>
           <param name="x2" type="double" default=""/>
           <param name="y2" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="FindShape" type="wxPyShape" overloaded="no">
+      <method name="FindShape" type="PyShape" overloaded="no">
         <autodoc>FindShape(long id) -&gt; PyShape</autodoc>
         <paramlist>
           <param name="id" type="long" default=""/>
@@ -31603,139 +31603,139 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetSnapToGrid" type="bool" overloaded="no">
         <autodoc>GetSnapToGrid() -&gt; bool</autodoc>
       </method>
-      <method name="InsertShape" type="void" overloaded="no">
+      <method name="InsertShape" type="" overloaded="no">
         <autodoc>InsertShape(PyShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="RecentreAll" type="void" overloaded="no">
+      <method name="RecentreAll" type="" overloaded="no">
         <autodoc>RecentreAll(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="Redraw" type="void" overloaded="no">
+      <method name="Redraw" type="" overloaded="no">
         <autodoc>Redraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveAllShapes" type="void" overloaded="no">
+      <method name="RemoveAllShapes" type="" overloaded="no">
         <autodoc>RemoveAllShapes()</autodoc>
       </method>
-      <method name="RemoveShape" type="void" overloaded="no">
+      <method name="RemoveShape" type="" overloaded="no">
         <autodoc>RemoveShape(PyShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetCanvas" type="void" overloaded="no">
+      <method name="SetCanvas" type="" overloaded="no">
         <autodoc>SetCanvas(PyShapeCanvas canvas)</autodoc>
         <paramlist>
-          <param name="canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="canvas" type="wxPyShapeCanvas" default=""/>
         </paramlist>
       </method>
-      <method name="SetGridSpacing" type="void" overloaded="no">
+      <method name="SetGridSpacing" type="" overloaded="no">
         <autodoc>SetGridSpacing(double spacing)</autodoc>
         <paramlist>
           <param name="spacing" type="double" default=""/>
         </paramlist>
       </method>
-      <method name="SetMouseTolerance" type="void" overloaded="no">
+      <method name="SetMouseTolerance" type="" overloaded="no">
         <autodoc>SetMouseTolerance(int tolerance)</autodoc>
         <paramlist>
           <param name="tolerance" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetQuickEditMode" type="void" overloaded="no">
+      <method name="SetQuickEditMode" type="" overloaded="no">
         <autodoc>SetQuickEditMode(bool mode)</autodoc>
         <paramlist>
           <param name="mode" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetSnapToGrid" type="void" overloaded="no">
+      <method name="SetSnapToGrid" type="" overloaded="no">
         <autodoc>SetSnapToGrid(bool snap)</autodoc>
         <paramlist>
           <param name="snap" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="ShowAll" type="void" overloaded="no">
+      <method name="ShowAll" type="" overloaded="no">
         <autodoc>ShowAll(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="Snap" type="void" overloaded="no">
+      <method name="Snap" type="" overloaded="no">
         <autodoc>Snap(double INOUT, double INOUT)</autodoc>
         <paramlist>
-          <param name="INOUT" type="p.double" default=""/>
-          <param name="INOUT" type="p.double" default=""/>
+          <param name="INOUT" type="double" default=""/>
+          <param name="INOUT" type="double" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="PyShapeCanvas" oldname="wxPyShapeCanvas" module="ogl">
-      <baseclass name="wxScrolledWindow"/>
+      <baseclass name="ScrolledWindow"/>
       <constructor name="PyShapeCanvas" overloaded="no">
         <autodoc>__init__(Window parent=None, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BORDER, 
     String name=wxPyShapeCanvasNameStr) -&gt; PyShapeCanvas</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default="NULL"/>
+          <param name="parent" type="Window" default="NULL"/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxBORDER"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyShapeCanvasNameStr"/>
+          <param name="name" type="String" default="wxPyShapeCanvasNameStr"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="AddShape" type="void" overloaded="no">
+      <method name="AddShape" type="" overloaded="no">
         <autodoc>AddShape(PyShape shape, PyShape addAfter=None)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
-          <param name="addAfter" type="p.wxPyShape" default="NULL"/>
+          <param name="shape" type="PyShape" default=""/>
+          <param name="addAfter" type="PyShape" default="NULL"/>
         </paramlist>
       </method>
-      <method name="FindShape" type="wxPyShape" overloaded="no">
+      <method name="FindShape" type="PyShape" overloaded="no">
         <autodoc>FindShape(double x1, double y, int OUTPUT, wxClassInfo info=None, 
     PyShape notImage=None) -&gt; PyShape</autodoc>
         <paramlist>
           <param name="x1" type="double" default=""/>
           <param name="y" type="double" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="info" type="p.wxClassInfo" default="NULL"/>
-          <param name="notImage" type="p.wxPyShape" default="NULL"/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="info" type="wxClassInfo" default="NULL"/>
+          <param name="notImage" type="PyShape" default="NULL"/>
         </paramlist>
       </method>
-      <method name="FindFirstSensitiveShape" type="wxPyShape" overloaded="no">
+      <method name="FindFirstSensitiveShape" type="PyShape" overloaded="no">
         <autodoc>FindFirstSensitiveShape(double x1, double y, int OUTPUT, int op) -&gt; PyShape</autodoc>
         <paramlist>
           <param name="x1" type="double" default=""/>
           <param name="y" type="double" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
           <param name="op" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetDiagram" type="wxDiagram" overloaded="no">
+      <method name="GetDiagram" type="Diagram" overloaded="no">
         <autodoc>GetDiagram() -&gt; Diagram</autodoc>
       </method>
       <method name="GetQuickEditMode" type="bool" overloaded="no">
         <autodoc>GetQuickEditMode() -&gt; bool</autodoc>
       </method>
-      <method name="InsertShape" type="void" overloaded="no">
+      <method name="InsertShape" type="" overloaded="no">
         <autodoc>InsertShape(PyShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragLeft" type="void" overloaded="no">
+      <method name="base_OnBeginDragLeft" type="" overloaded="no">
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31743,7 +31743,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnBeginDragRight" type="void" overloaded="no">
+      <method name="base_OnBeginDragRight" type="" overloaded="no">
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31751,7 +31751,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragLeft" type="void" overloaded="no">
+      <method name="base_OnEndDragLeft" type="" overloaded="no">
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31759,7 +31759,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnEndDragRight" type="void" overloaded="no">
+      <method name="base_OnEndDragRight" type="" overloaded="no">
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31767,7 +31767,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragLeft" type="void" overloaded="no">
+      <method name="base_OnDragLeft" type="" overloaded="no">
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -31776,7 +31776,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnDragRight" type="void" overloaded="no">
+      <method name="base_OnDragRight" type="" overloaded="no">
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>
@@ -31785,7 +31785,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnLeftClick" type="void" overloaded="no">
+      <method name="base_OnLeftClick" type="" overloaded="no">
         <autodoc>base_OnLeftClick(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31793,7 +31793,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="base_OnRightClick" type="void" overloaded="no">
+      <method name="base_OnRightClick" type="" overloaded="no">
         <autodoc>base_OnRightClick(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>
@@ -31801,29 +31801,29 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="Redraw" type="void" overloaded="no">
+      <method name="Redraw" type="" overloaded="no">
         <autodoc>Redraw(DC dc)</autodoc>
         <paramlist>
-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveShape" type="void" overloaded="no">
+      <method name="RemoveShape" type="" overloaded="no">
         <autodoc>RemoveShape(PyShape shape)</autodoc>
         <paramlist>
-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>
         </paramlist>
       </method>
-      <method name="SetDiagram" type="void" overloaded="no">
+      <method name="SetDiagram" type="" overloaded="no">
         <autodoc>SetDiagram(Diagram diagram)</autodoc>
         <paramlist>
-          <param name="diagram" type="p.wxDiagram" default=""/>
+          <param name="diagram" type="Diagram" default=""/>
         </paramlist>
       </method>
-      <method name="Snap" type="void" overloaded="no">
+      <method name="Snap" type="" overloaded="no">
         <autodoc>Snap(double INOUT, double INOUT)</autodoc>
         <paramlist>
-          <param name="INOUT" type="p.double" default=""/>
-          <param name="INOUT" type="p.double" default=""/>
+          <param name="INOUT" type="double" default=""/>
+          <param name="INOUT" type="double" default=""/>
         </paramlist>
       </method>
     </class>
@@ -31845,10 +31845,10 @@ PolygonShape =      PyPolygonShape
 TextShape =         PyTextShape
 ControlPoint =      PyControlPoint
 </pythoncode>
-    <method name="OGLInitialize" oldname="wxOGLInitialize" type="void" overloaded="no">
+    <method name="OGLInitialize" oldname="wxOGLInitialize" type="" overloaded="no">
       <autodoc>OGLInitialize()</autodoc>
     </method>
-    <method name="OGLCleanUp" oldname="wxOGLCleanUp" type="void" overloaded="no">
+    <method name="OGLCleanUp" oldname="wxOGLCleanUp" type="" overloaded="no">
       <autodoc>OGLCleanUp()</autodoc>
     </method>
   </module>
@@ -31856,57 +31856,57 @@ ControlPoint =      PyControlPoint
     <import name="core"/>
     <pythoncode> wx = core </pythoncode>
     <class name="StyledTextCtrl" oldname="wxStyledTextCtrl" module="stc">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="StyledTextCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=STCNameStr) -&gt; StyledTextCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPySTCNameStr"/>
+          <param name="name" type="String" default="wxPySTCNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreStyledTextCtrl" overloaded="no">
         <autodoc>PreStyledTextCtrl() -&gt; StyledTextCtrl</autodoc>
       </constructor>
-      <method name="Create" type="void" overloaded="no">
+      <method name="Create" type="" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=wxSTCNameStr)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxSTCNameStr"/>
+          <param name="name" type="String" default="wxSTCNameStr"/>
         </paramlist>
       </method>
-      <method name="AddText" type="void" overloaded="no">
+      <method name="AddText" type="" overloaded="no">
         <autodoc>AddText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AddStyledText" type="void" overloaded="no">
+      <method name="AddStyledText" type="" overloaded="no">
         <autodoc>AddStyledText(wxMemoryBuffer data)</autodoc>
         <paramlist>
-          <param name="data" type="r.q(const).wxMemoryBuffer" default=""/>
+          <param name="data" type="wxMemoryBuffer" default=""/>
         </paramlist>
       </method>
-      <method name="InsertText" type="void" overloaded="no">
+      <method name="InsertText" type="" overloaded="no">
         <autodoc>InsertText(int pos, String text)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="ClearAll" type="void" overloaded="no">
+      <method name="ClearAll" type="" overloaded="no">
         <autodoc>ClearAll()</autodoc>
       </method>
-      <method name="ClearDocumentStyle" type="void" overloaded="no">
+      <method name="ClearDocumentStyle" type="" overloaded="no">
         <autodoc>ClearDocumentStyle()</autodoc>
       </method>
       <method name="GetLength" type="int" overloaded="no">
@@ -31930,19 +31930,19 @@ ControlPoint =      PyControlPoint
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="Redo" type="void" overloaded="no">
+      <method name="Redo" type="" overloaded="no">
         <autodoc>Redo()</autodoc>
       </method>
-      <method name="SetUndoCollection" type="void" overloaded="no">
+      <method name="SetUndoCollection" type="" overloaded="no">
         <autodoc>SetUndoCollection(bool collectUndo)</autodoc>
         <paramlist>
           <param name="collectUndo" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SelectAll" type="void" overloaded="no">
+      <method name="SelectAll" type="" overloaded="no">
         <autodoc>SelectAll()</autodoc>
       </method>
-      <method name="SetSavePoint" type="void" overloaded="no">
+      <method name="SetSavePoint" type="" overloaded="no">
         <autodoc>SetSavePoint()</autodoc>
       </method>
       <method name="GetStyledText" type="wxMemoryBuffer" overloaded="no">
@@ -31961,7 +31961,7 @@ ControlPoint =      PyControlPoint
           <param name="handle" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="MarkerDeleteHandle" type="void" overloaded="no">
+      <method name="MarkerDeleteHandle" type="" overloaded="no">
         <autodoc>MarkerDeleteHandle(int handle)</autodoc>
         <paramlist>
           <param name="handle" type="int" default=""/>
@@ -31973,7 +31973,7 @@ ControlPoint =      PyControlPoint
       <method name="GetViewWhiteSpace" type="int" overloaded="no">
         <autodoc>GetViewWhiteSpace() -&gt; int</autodoc>
       </method>
-      <method name="SetViewWhiteSpace" type="void" overloaded="no">
+      <method name="SetViewWhiteSpace" type="" overloaded="no">
         <autodoc>SetViewWhiteSpace(int viewWS)</autodoc>
         <paramlist>
           <param name="viewWS" type="int" default=""/>
@@ -31982,7 +31982,7 @@ ControlPoint =      PyControlPoint
       <method name="PositionFromPoint" type="int" overloaded="no">
         <autodoc>PositionFromPoint(Point pt) -&gt; int</autodoc>
         <paramlist>
-          <param name="pt" type="wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>
         </paramlist>
       </method>
       <method name="PositionFromPointClose" type="int" overloaded="no">
@@ -31992,34 +31992,34 @@ ControlPoint =      PyControlPoint
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GotoLine" type="void" overloaded="no">
+      <method name="GotoLine" type="" overloaded="no">
         <autodoc>GotoLine(int line)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GotoPos" type="void" overloaded="no">
+      <method name="GotoPos" type="" overloaded="no">
         <autodoc>GotoPos(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetAnchor" type="void" overloaded="no">
+      <method name="SetAnchor" type="" overloaded="no">
         <autodoc>SetAnchor(int posAnchor)</autodoc>
         <paramlist>
           <param name="posAnchor" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetCurLine" type="wxString" overloaded="no">
+      <method name="GetCurLine" type="String" overloaded="no">
         <autodoc>GetCurLine(int OUTPUT) -&gt; String</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetEndStyled" type="int" overloaded="no">
         <autodoc>GetEndStyled() -&gt; int</autodoc>
       </method>
-      <method name="ConvertEOLs" type="void" overloaded="no">
+      <method name="ConvertEOLs" type="" overloaded="no">
         <autodoc>ConvertEOLs(int eolMode)</autodoc>
         <paramlist>
           <param name="eolMode" type="int" default=""/>
@@ -32028,20 +32028,20 @@ ControlPoint =      PyControlPoint
       <method name="GetEOLMode" type="int" overloaded="no">
         <autodoc>GetEOLMode() -&gt; int</autodoc>
       </method>
-      <method name="SetEOLMode" type="void" overloaded="no">
+      <method name="SetEOLMode" type="" overloaded="no">
         <autodoc>SetEOLMode(int eolMode)</autodoc>
         <paramlist>
           <param name="eolMode" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="StartStyling" type="void" overloaded="no">
+      <method name="StartStyling" type="" overloaded="no">
         <autodoc>StartStyling(int pos, int mask)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
           <param name="mask" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyling" type="void" overloaded="no">
+      <method name="SetStyling" type="" overloaded="no">
         <autodoc>SetStyling(int length, int style)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>
@@ -32051,13 +32051,13 @@ ControlPoint =      PyControlPoint
       <method name="GetBufferedDraw" type="bool" overloaded="no">
         <autodoc>GetBufferedDraw() -&gt; bool</autodoc>
       </method>
-      <method name="SetBufferedDraw" type="void" overloaded="no">
+      <method name="SetBufferedDraw" type="" overloaded="no">
         <autodoc>SetBufferedDraw(bool buffered)</autodoc>
         <paramlist>
           <param name="buffered" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetTabWidth" type="void" overloaded="no">
+      <method name="SetTabWidth" type="" overloaded="no">
         <autodoc>SetTabWidth(int tabWidth)</autodoc>
         <paramlist>
           <param name="tabWidth" type="int" default=""/>
@@ -32066,34 +32066,34 @@ ControlPoint =      PyControlPoint
       <method name="GetTabWidth" type="int" overloaded="no">
         <autodoc>GetTabWidth() -&gt; int</autodoc>
       </method>
-      <method name="SetCodePage" type="void" overloaded="no">
+      <method name="SetCodePage" type="" overloaded="no">
         <autodoc>SetCodePage(int codePage)</autodoc>
         <paramlist>
           <param name="codePage" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="MarkerDefine" type="void" overloaded="no">
+      <method name="MarkerDefine" type="" overloaded="no">
         <autodoc>MarkerDefine(int markerNumber, int markerSymbol, Colour foreground=wxNullColour, 
     Colour background=wxNullColour)</autodoc>
         <paramlist>
           <param name="markerNumber" type="int" default=""/>
           <param name="markerSymbol" type="int" default=""/>
-          <param name="foreground" type="r.q(const).wxColour" default="wxNullColour"/>
-          <param name="background" type="r.q(const).wxColour" default="wxNullColour"/>
+          <param name="foreground" type="Colour" default="wxNullColour"/>
+          <param name="background" type="Colour" default="wxNullColour"/>
         </paramlist>
       </method>
-      <method name="MarkerSetForeground" type="void" overloaded="no">
+      <method name="MarkerSetForeground" type="" overloaded="no">
         <autodoc>MarkerSetForeground(int markerNumber, Colour fore)</autodoc>
         <paramlist>
           <param name="markerNumber" type="int" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="MarkerSetBackground" type="void" overloaded="no">
+      <method name="MarkerSetBackground" type="" overloaded="no">
         <autodoc>MarkerSetBackground(int markerNumber, Colour back)</autodoc>
         <paramlist>
           <param name="markerNumber" type="int" default=""/>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="MarkerAdd" type="int" overloaded="no">
@@ -32103,14 +32103,14 @@ ControlPoint =      PyControlPoint
           <param name="markerNumber" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="MarkerDelete" type="void" overloaded="no">
+      <method name="MarkerDelete" type="" overloaded="no">
         <autodoc>MarkerDelete(int line, int markerNumber)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
           <param name="markerNumber" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="MarkerDeleteAll" type="void" overloaded="no">
+      <method name="MarkerDeleteAll" type="" overloaded="no">
         <autodoc>MarkerDeleteAll(int markerNumber)</autodoc>
         <paramlist>
           <param name="markerNumber" type="int" default=""/>
@@ -32136,14 +32136,14 @@ ControlPoint =      PyControlPoint
           <param name="markerMask" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="MarkerDefineBitmap" type="void" overloaded="no">
+      <method name="MarkerDefineBitmap" type="" overloaded="no">
         <autodoc>MarkerDefineBitmap(int markerNumber, Bitmap bmp)</autodoc>
         <paramlist>
           <param name="markerNumber" type="int" default=""/>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginType" type="void" overloaded="no">
+      <method name="SetMarginType" type="" overloaded="no">
         <autodoc>SetMarginType(int margin, int marginType)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>
@@ -32156,7 +32156,7 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginWidth" type="void" overloaded="no">
+      <method name="SetMarginWidth" type="" overloaded="no">
         <autodoc>SetMarginWidth(int margin, int pixelWidth)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>
@@ -32169,7 +32169,7 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginMask" type="void" overloaded="no">
+      <method name="SetMarginMask" type="" overloaded="no">
         <autodoc>SetMarginMask(int margin, int mask)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>
@@ -32182,7 +32182,7 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMarginSensitive" type="void" overloaded="no">
+      <method name="SetMarginSensitive" type="" overloaded="no">
         <autodoc>SetMarginSensitive(int margin, bool sensitive)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>
@@ -32195,110 +32195,110 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="StyleClearAll" type="void" overloaded="no">
+      <method name="StyleClearAll" type="" overloaded="no">
         <autodoc>StyleClearAll()</autodoc>
       </method>
-      <method name="StyleSetForeground" type="void" overloaded="no">
+      <method name="StyleSetForeground" type="" overloaded="no">
         <autodoc>StyleSetForeground(int style, Colour fore)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetBackground" type="void" overloaded="no">
+      <method name="StyleSetBackground" type="" overloaded="no">
         <autodoc>StyleSetBackground(int style, Colour back)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetBold" type="void" overloaded="no">
+      <method name="StyleSetBold" type="" overloaded="no">
         <autodoc>StyleSetBold(int style, bool bold)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="bold" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetItalic" type="void" overloaded="no">
+      <method name="StyleSetItalic" type="" overloaded="no">
         <autodoc>StyleSetItalic(int style, bool italic)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="italic" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetSize" type="void" overloaded="no">
+      <method name="StyleSetSize" type="" overloaded="no">
         <autodoc>StyleSetSize(int style, int sizePoints)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="sizePoints" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetFaceName" type="void" overloaded="no">
+      <method name="StyleSetFaceName" type="" overloaded="no">
         <autodoc>StyleSetFaceName(int style, String fontName)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
-          <param name="fontName" type="r.q(const).wxString" default=""/>
+          <param name="fontName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetEOLFilled" type="void" overloaded="no">
+      <method name="StyleSetEOLFilled" type="" overloaded="no">
         <autodoc>StyleSetEOLFilled(int style, bool filled)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="filled" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="StyleResetDefault" type="void" overloaded="no">
+      <method name="StyleResetDefault" type="" overloaded="no">
         <autodoc>StyleResetDefault()</autodoc>
       </method>
-      <method name="StyleSetUnderline" type="void" overloaded="no">
+      <method name="StyleSetUnderline" type="" overloaded="no">
         <autodoc>StyleSetUnderline(int style, bool underline)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="underline" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetCase" type="void" overloaded="no">
+      <method name="StyleSetCase" type="" overloaded="no">
         <autodoc>StyleSetCase(int style, int caseForce)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="caseForce" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetCharacterSet" type="void" overloaded="no">
+      <method name="StyleSetCharacterSet" type="" overloaded="no">
         <autodoc>StyleSetCharacterSet(int style, int characterSet)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="characterSet" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetHotSpot" type="void" overloaded="no">
+      <method name="StyleSetHotSpot" type="" overloaded="no">
         <autodoc>StyleSetHotSpot(int style, bool hotspot)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="hotspot" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelForeground" type="void" overloaded="no">
+      <method name="SetSelForeground" type="" overloaded="no">
         <autodoc>SetSelForeground(bool useSetting, Colour fore)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelBackground" type="void" overloaded="no">
+      <method name="SetSelBackground" type="" overloaded="no">
         <autodoc>SetSelBackground(bool useSetting, Colour back)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetCaretForeground" type="void" overloaded="no">
+      <method name="SetCaretForeground" type="" overloaded="no">
         <autodoc>SetCaretForeground(Colour fore)</autodoc>
         <paramlist>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="CmdKeyAssign" type="void" overloaded="no">
+      <method name="CmdKeyAssign" type="" overloaded="no">
         <autodoc>CmdKeyAssign(int key, int modifiers, int cmd)</autodoc>
         <paramlist>
           <param name="key" type="int" default=""/>
@@ -32306,24 +32306,24 @@ ControlPoint =      PyControlPoint
           <param name="cmd" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CmdKeyClear" type="void" overloaded="no">
+      <method name="CmdKeyClear" type="" overloaded="no">
         <autodoc>CmdKeyClear(int key, int modifiers)</autodoc>
         <paramlist>
           <param name="key" type="int" default=""/>
           <param name="modifiers" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CmdKeyClearAll" type="void" overloaded="no">
+      <method name="CmdKeyClearAll" type="" overloaded="no">
         <autodoc>CmdKeyClearAll()</autodoc>
       </method>
-      <method name="SetStyleBytes" type="void" overloaded="no">
+      <method name="SetStyleBytes" type="" overloaded="no">
         <autodoc>SetStyleBytes(int length, char styleBytes)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>
-          <param name="styleBytes" type="p.char" default=""/>
+          <param name="styleBytes" type="char" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetVisible" type="void" overloaded="no">
+      <method name="StyleSetVisible" type="" overloaded="no">
         <autodoc>StyleSetVisible(int style, bool visible)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
@@ -32333,25 +32333,25 @@ ControlPoint =      PyControlPoint
       <method name="GetCaretPeriod" type="int" overloaded="no">
         <autodoc>GetCaretPeriod() -&gt; int</autodoc>
       </method>
-      <method name="SetCaretPeriod" type="void" overloaded="no">
+      <method name="SetCaretPeriod" type="" overloaded="no">
         <autodoc>SetCaretPeriod(int periodMilliseconds)</autodoc>
         <paramlist>
           <param name="periodMilliseconds" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWordChars" type="void" overloaded="no">
+      <method name="SetWordChars" type="" overloaded="no">
         <autodoc>SetWordChars(String characters)</autodoc>
         <paramlist>
-          <param name="characters" type="r.q(const).wxString" default=""/>
+          <param name="characters" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="BeginUndoAction" type="void" overloaded="no">
+      <method name="BeginUndoAction" type="" overloaded="no">
         <autodoc>BeginUndoAction()</autodoc>
       </method>
-      <method name="EndUndoAction" type="void" overloaded="no">
+      <method name="EndUndoAction" type="" overloaded="no">
         <autodoc>EndUndoAction()</autodoc>
       </method>
-      <method name="IndicatorSetStyle" type="void" overloaded="no">
+      <method name="IndicatorSetStyle" type="" overloaded="no">
         <autodoc>IndicatorSetStyle(int indic, int style)</autodoc>
         <paramlist>
           <param name="indic" type="int" default=""/>
@@ -32364,34 +32364,34 @@ ControlPoint =      PyControlPoint
           <param name="indic" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="IndicatorSetForeground" type="void" overloaded="no">
+      <method name="IndicatorSetForeground" type="" overloaded="no">
         <autodoc>IndicatorSetForeground(int indic, Colour fore)</autodoc>
         <paramlist>
           <param name="indic" type="int" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="IndicatorGetForeground" type="wxColour" overloaded="no">
+      <method name="IndicatorGetForeground" type="Colour" overloaded="no">
         <autodoc>IndicatorGetForeground(int indic) -&gt; Colour</autodoc>
         <paramlist>
           <param name="indic" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWhitespaceForeground" type="void" overloaded="no">
+      <method name="SetWhitespaceForeground" type="" overloaded="no">
         <autodoc>SetWhitespaceForeground(bool useSetting, Colour fore)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetWhitespaceBackground" type="void" overloaded="no">
+      <method name="SetWhitespaceBackground" type="" overloaded="no">
         <autodoc>SetWhitespaceBackground(bool useSetting, Colour back)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetStyleBits" type="void" overloaded="no">
+      <method name="SetStyleBits" type="" overloaded="no">
         <autodoc>SetStyleBits(int bits)</autodoc>
         <paramlist>
           <param name="bits" type="int" default=""/>
@@ -32400,7 +32400,7 @@ ControlPoint =      PyControlPoint
       <method name="GetStyleBits" type="int" overloaded="no">
         <autodoc>GetStyleBits() -&gt; int</autodoc>
       </method>
-      <method name="SetLineState" type="void" overloaded="no">
+      <method name="SetLineState" type="" overloaded="no">
         <autodoc>SetLineState(int line, int state)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
@@ -32419,36 +32419,36 @@ ControlPoint =      PyControlPoint
       <method name="GetCaretLineVisible" type="bool" overloaded="no">
         <autodoc>GetCaretLineVisible() -&gt; bool</autodoc>
       </method>
-      <method name="SetCaretLineVisible" type="void" overloaded="no">
+      <method name="SetCaretLineVisible" type="" overloaded="no">
         <autodoc>SetCaretLineVisible(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="GetCaretLineBack" type="wxColour" overloaded="no">
+      <method name="GetCaretLineBack" type="Colour" overloaded="no">
         <autodoc>GetCaretLineBack() -&gt; Colour</autodoc>
       </method>
-      <method name="SetCaretLineBack" type="void" overloaded="no">
+      <method name="SetCaretLineBack" type="" overloaded="no">
         <autodoc>SetCaretLineBack(Colour back)</autodoc>
         <paramlist>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetChangeable" type="void" overloaded="no">
+      <method name="StyleSetChangeable" type="" overloaded="no">
         <autodoc>StyleSetChangeable(int style, bool changeable)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
           <param name="changeable" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="AutoCompShow" type="void" overloaded="no">
+      <method name="AutoCompShow" type="" overloaded="no">
         <autodoc>AutoCompShow(int lenEntered, String itemList)</autodoc>
         <paramlist>
           <param name="lenEntered" type="int" default=""/>
-          <param name="itemList" type="r.q(const).wxString" default=""/>
+          <param name="itemList" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AutoCompCancel" type="void" overloaded="no">
+      <method name="AutoCompCancel" type="" overloaded="no">
         <autodoc>AutoCompCancel()</autodoc>
       </method>
       <method name="AutoCompActive" type="bool" overloaded="no">
@@ -32457,16 +32457,16 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompPosStart" type="int" overloaded="no">
         <autodoc>AutoCompPosStart() -&gt; int</autodoc>
       </method>
-      <method name="AutoCompComplete" type="void" overloaded="no">
+      <method name="AutoCompComplete" type="" overloaded="no">
         <autodoc>AutoCompComplete()</autodoc>
       </method>
-      <method name="AutoCompStops" type="void" overloaded="no">
+      <method name="AutoCompStops" type="" overloaded="no">
         <autodoc>AutoCompStops(String characterSet)</autodoc>
         <paramlist>
-          <param name="characterSet" type="r.q(const).wxString" default=""/>
+          <param name="characterSet" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AutoCompSetSeparator" type="void" overloaded="no">
+      <method name="AutoCompSetSeparator" type="" overloaded="no">
         <autodoc>AutoCompSetSeparator(int separatorCharacter)</autodoc>
         <paramlist>
           <param name="separatorCharacter" type="int" default=""/>
@@ -32475,13 +32475,13 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetSeparator" type="int" overloaded="no">
         <autodoc>AutoCompGetSeparator() -&gt; int</autodoc>
       </method>
-      <method name="AutoCompSelect" type="void" overloaded="no">
+      <method name="AutoCompSelect" type="" overloaded="no">
         <autodoc>AutoCompSelect(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AutoCompSetCancelAtStart" type="void" overloaded="no">
+      <method name="AutoCompSetCancelAtStart" type="" overloaded="no">
         <autodoc>AutoCompSetCancelAtStart(bool cancel)</autodoc>
         <paramlist>
           <param name="cancel" type="bool" default=""/>
@@ -32490,13 +32490,13 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetCancelAtStart" type="bool" overloaded="no">
         <autodoc>AutoCompGetCancelAtStart() -&gt; bool</autodoc>
       </method>
-      <method name="AutoCompSetFillUps" type="void" overloaded="no">
+      <method name="AutoCompSetFillUps" type="" overloaded="no">
         <autodoc>AutoCompSetFillUps(String characterSet)</autodoc>
         <paramlist>
-          <param name="characterSet" type="r.q(const).wxString" default=""/>
+          <param name="characterSet" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AutoCompSetChooseSingle" type="void" overloaded="no">
+      <method name="AutoCompSetChooseSingle" type="" overloaded="no">
         <autodoc>AutoCompSetChooseSingle(bool chooseSingle)</autodoc>
         <paramlist>
           <param name="chooseSingle" type="bool" default=""/>
@@ -32505,7 +32505,7 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetChooseSingle" type="bool" overloaded="no">
         <autodoc>AutoCompGetChooseSingle() -&gt; bool</autodoc>
       </method>
-      <method name="AutoCompSetIgnoreCase" type="void" overloaded="no">
+      <method name="AutoCompSetIgnoreCase" type="" overloaded="no">
         <autodoc>AutoCompSetIgnoreCase(bool ignoreCase)</autodoc>
         <paramlist>
           <param name="ignoreCase" type="bool" default=""/>
@@ -32514,14 +32514,14 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetIgnoreCase" type="bool" overloaded="no">
         <autodoc>AutoCompGetIgnoreCase() -&gt; bool</autodoc>
       </method>
-      <method name="UserListShow" type="void" overloaded="no">
+      <method name="UserListShow" type="" overloaded="no">
         <autodoc>UserListShow(int listType, String itemList)</autodoc>
         <paramlist>
           <param name="listType" type="int" default=""/>
-          <param name="itemList" type="r.q(const).wxString" default=""/>
+          <param name="itemList" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AutoCompSetAutoHide" type="void" overloaded="no">
+      <method name="AutoCompSetAutoHide" type="" overloaded="no">
         <autodoc>AutoCompSetAutoHide(bool autoHide)</autodoc>
         <paramlist>
           <param name="autoHide" type="bool" default=""/>
@@ -32530,7 +32530,7 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetAutoHide" type="bool" overloaded="no">
         <autodoc>AutoCompGetAutoHide() -&gt; bool</autodoc>
       </method>
-      <method name="AutoCompSetDropRestOfWord" type="void" overloaded="no">
+      <method name="AutoCompSetDropRestOfWord" type="" overloaded="no">
         <autodoc>AutoCompSetDropRestOfWord(bool dropRestOfWord)</autodoc>
         <paramlist>
           <param name="dropRestOfWord" type="bool" default=""/>
@@ -32539,26 +32539,26 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetDropRestOfWord" type="bool" overloaded="no">
         <autodoc>AutoCompGetDropRestOfWord() -&gt; bool</autodoc>
       </method>
-      <method name="RegisterImage" type="void" overloaded="no">
+      <method name="RegisterImage" type="" overloaded="no">
         <autodoc>RegisterImage(int type, Bitmap bmp)</autodoc>
         <paramlist>
           <param name="type" type="int" default=""/>
-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>
         </paramlist>
       </method>
-      <method name="ClearRegisteredImages" type="void" overloaded="no">
+      <method name="ClearRegisteredImages" type="" overloaded="no">
         <autodoc>ClearRegisteredImages()</autodoc>
       </method>
       <method name="AutoCompGetTypeSeparator" type="int" overloaded="no">
         <autodoc>AutoCompGetTypeSeparator() -&gt; int</autodoc>
       </method>
-      <method name="AutoCompSetTypeSeparator" type="void" overloaded="no">
+      <method name="AutoCompSetTypeSeparator" type="" overloaded="no">
         <autodoc>AutoCompSetTypeSeparator(int separatorCharacter)</autodoc>
         <paramlist>
           <param name="separatorCharacter" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetIndent" type="void" overloaded="no">
+      <method name="SetIndent" type="" overloaded="no">
         <autodoc>SetIndent(int indentSize)</autodoc>
         <paramlist>
           <param name="indentSize" type="int" default=""/>
@@ -32567,7 +32567,7 @@ ControlPoint =      PyControlPoint
       <method name="GetIndent" type="int" overloaded="no">
         <autodoc>GetIndent() -&gt; int</autodoc>
       </method>
-      <method name="SetUseTabs" type="void" overloaded="no">
+      <method name="SetUseTabs" type="" overloaded="no">
         <autodoc>SetUseTabs(bool useTabs)</autodoc>
         <paramlist>
           <param name="useTabs" type="bool" default=""/>
@@ -32576,7 +32576,7 @@ ControlPoint =      PyControlPoint
       <method name="GetUseTabs" type="bool" overloaded="no">
         <autodoc>GetUseTabs() -&gt; bool</autodoc>
       </method>
-      <method name="SetLineIndentation" type="void" overloaded="no">
+      <method name="SetLineIndentation" type="" overloaded="no">
         <autodoc>SetLineIndentation(int line, int indentSize)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
@@ -32601,7 +32601,7 @@ ControlPoint =      PyControlPoint
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetUseHorizontalScrollBar" type="void" overloaded="no">
+      <method name="SetUseHorizontalScrollBar" type="" overloaded="no">
         <autodoc>SetUseHorizontalScrollBar(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -32610,7 +32610,7 @@ ControlPoint =      PyControlPoint
       <method name="GetUseHorizontalScrollBar" type="bool" overloaded="no">
         <autodoc>GetUseHorizontalScrollBar() -&gt; bool</autodoc>
       </method>
-      <method name="SetIndentationGuides" type="void" overloaded="no">
+      <method name="SetIndentationGuides" type="" overloaded="no">
         <autodoc>SetIndentationGuides(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -32619,7 +32619,7 @@ ControlPoint =      PyControlPoint
       <method name="GetIndentationGuides" type="bool" overloaded="no">
         <autodoc>GetIndentationGuides() -&gt; bool</autodoc>
       </method>
-      <method name="SetHighlightGuide" type="void" overloaded="no">
+      <method name="SetHighlightGuide" type="" overloaded="no">
         <autodoc>SetHighlightGuide(int column)</autodoc>
         <paramlist>
           <param name="column" type="int" default=""/>
@@ -32637,19 +32637,19 @@ ControlPoint =      PyControlPoint
       <method name="GetCodePage" type="int" overloaded="no">
         <autodoc>GetCodePage() -&gt; int</autodoc>
       </method>
-      <method name="GetCaretForeground" type="wxColour" overloaded="no">
+      <method name="GetCaretForeground" type="Colour" overloaded="no">
         <autodoc>GetCaretForeground() -&gt; Colour</autodoc>
       </method>
       <method name="GetReadOnly" type="bool" overloaded="no">
         <autodoc>GetReadOnly() -&gt; bool</autodoc>
       </method>
-      <method name="SetCurrentPos" type="void" overloaded="no">
+      <method name="SetCurrentPos" type="" overloaded="no">
         <autodoc>SetCurrentPos(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelectionStart" type="void" overloaded="no">
+      <method name="SetSelectionStart" type="" overloaded="no">
         <autodoc>SetSelectionStart(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -32658,7 +32658,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSelectionStart" type="int" overloaded="no">
         <autodoc>GetSelectionStart() -&gt; int</autodoc>
       </method>
-      <method name="SetSelectionEnd" type="void" overloaded="no">
+      <method name="SetSelectionEnd" type="" overloaded="no">
         <autodoc>SetSelectionEnd(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -32667,7 +32667,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSelectionEnd" type="int" overloaded="no">
         <autodoc>GetSelectionEnd() -&gt; int</autodoc>
       </method>
-      <method name="SetPrintMagnification" type="void" overloaded="no">
+      <method name="SetPrintMagnification" type="" overloaded="no">
         <autodoc>SetPrintMagnification(int magnification)</autodoc>
         <paramlist>
           <param name="magnification" type="int" default=""/>
@@ -32676,7 +32676,7 @@ ControlPoint =      PyControlPoint
       <method name="GetPrintMagnification" type="int" overloaded="no">
         <autodoc>GetPrintMagnification() -&gt; int</autodoc>
       </method>
-      <method name="SetPrintColourMode" type="void" overloaded="no">
+      <method name="SetPrintColourMode" type="" overloaded="no">
         <autodoc>SetPrintColourMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -32690,7 +32690,7 @@ ControlPoint =      PyControlPoint
         <paramlist>
           <param name="minPos" type="int" default=""/>
           <param name="maxPos" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>
@@ -32701,16 +32701,16 @@ ControlPoint =      PyControlPoint
           <param name="doDraw" type="bool" default=""/>
           <param name="startPos" type="int" default=""/>
           <param name="endPos" type="int" default=""/>
-          <param name="draw" type="p.wxDC" default=""/>
-          <param name="target" type="p.wxDC" default=""/>
-          <param name="renderRect" type="wxRect" default=""/>
-          <param name="pageRect" type="wxRect" default=""/>
+          <param name="draw" type="DC" default=""/>
+          <param name="target" type="DC" default=""/>
+          <param name="renderRect" type="Rect" default=""/>
+          <param name="pageRect" type="Rect" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstVisibleLine" type="int" overloaded="no">
         <autodoc>GetFirstVisibleLine() -&gt; int</autodoc>
       </method>
-      <method name="GetLine" type="wxString" overloaded="no">
+      <method name="GetLine" type="String" overloaded="no">
         <autodoc>GetLine(int line) -&gt; String</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
@@ -32719,7 +32719,7 @@ ControlPoint =      PyControlPoint
       <method name="GetLineCount" type="int" overloaded="no">
         <autodoc>GetLineCount() -&gt; int</autodoc>
       </method>
-      <method name="SetMarginLeft" type="void" overloaded="no">
+      <method name="SetMarginLeft" type="" overloaded="no">
         <autodoc>SetMarginLeft(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>
@@ -32728,7 +32728,7 @@ ControlPoint =      PyControlPoint
       <method name="GetMarginLeft" type="int" overloaded="no">
         <autodoc>GetMarginLeft() -&gt; int</autodoc>
       </method>
-      <method name="SetMarginRight" type="void" overloaded="no">
+      <method name="SetMarginRight" type="" overloaded="no">
         <autodoc>SetMarginRight(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>
@@ -32740,24 +32740,24 @@ ControlPoint =      PyControlPoint
       <method name="GetModify" type="bool" overloaded="no">
         <autodoc>GetModify() -&gt; bool</autodoc>
       </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">
         <autodoc>SetSelection(int start, int end)</autodoc>
         <paramlist>
           <param name="start" type="int" default=""/>
           <param name="end" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelectedText" type="wxString" overloaded="no">
+      <method name="GetSelectedText" type="String" overloaded="no">
         <autodoc>GetSelectedText() -&gt; String</autodoc>
       </method>
-      <method name="GetTextRange" type="wxString" overloaded="no">
+      <method name="GetTextRange" type="String" overloaded="no">
         <autodoc>GetTextRange(int startPos, int endPos) -&gt; String</autodoc>
         <paramlist>
           <param name="startPos" type="int" default=""/>
           <param name="endPos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="HideSelection" type="void" overloaded="no">
+      <method name="HideSelection" type="" overloaded="no">
         <autodoc>HideSelection(bool normal)</autodoc>
         <paramlist>
           <param name="normal" type="bool" default=""/>
@@ -32775,23 +32775,23 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="LineScroll" type="void" overloaded="no">
+      <method name="LineScroll" type="" overloaded="no">
         <autodoc>LineScroll(int columns, int lines)</autodoc>
         <paramlist>
           <param name="columns" type="int" default=""/>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="EnsureCaretVisible" type="void" overloaded="no">
+      <method name="EnsureCaretVisible" type="" overloaded="no">
         <autodoc>EnsureCaretVisible()</autodoc>
       </method>
-      <method name="ReplaceSelection" type="void" overloaded="no">
+      <method name="ReplaceSelection" type="" overloaded="no">
         <autodoc>ReplaceSelection(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetReadOnly" type="void" overloaded="no">
+      <method name="SetReadOnly" type="" overloaded="no">
         <autodoc>SetReadOnly(bool readOnly)</autodoc>
         <paramlist>
           <param name="readOnly" type="bool" default=""/>
@@ -32803,37 +32803,37 @@ ControlPoint =      PyControlPoint
       <method name="CanUndo" type="bool" overloaded="no">
         <autodoc>CanUndo() -&gt; bool</autodoc>
       </method>
-      <method name="EmptyUndoBuffer" type="void" overloaded="no">
+      <method name="EmptyUndoBuffer" type="" overloaded="no">
         <autodoc>EmptyUndoBuffer()</autodoc>
       </method>
-      <method name="Undo" type="void" overloaded="no">
+      <method name="Undo" type="" overloaded="no">
         <autodoc>Undo()</autodoc>
       </method>
-      <method name="Cut" type="void" overloaded="no">
+      <method name="Cut" type="" overloaded="no">
         <autodoc>Cut()</autodoc>
       </method>
-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">
         <autodoc>Copy()</autodoc>
       </method>
-      <method name="Paste" type="void" overloaded="no">
+      <method name="Paste" type="" overloaded="no">
         <autodoc>Paste()</autodoc>
       </method>
-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">
         <autodoc>Clear()</autodoc>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetTextLength" type="int" overloaded="no">
         <autodoc>GetTextLength() -&gt; int</autodoc>
       </method>
-      <method name="SetOvertype" type="void" overloaded="no">
+      <method name="SetOvertype" type="" overloaded="no">
         <autodoc>SetOvertype(bool overtype)</autodoc>
         <paramlist>
           <param name="overtype" type="bool" default=""/>
@@ -32842,7 +32842,7 @@ ControlPoint =      PyControlPoint
       <method name="GetOvertype" type="bool" overloaded="no">
         <autodoc>GetOvertype() -&gt; bool</autodoc>
       </method>
-      <method name="SetCaretWidth" type="void" overloaded="no">
+      <method name="SetCaretWidth" type="" overloaded="no">
         <autodoc>SetCaretWidth(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>
@@ -32851,7 +32851,7 @@ ControlPoint =      PyControlPoint
       <method name="GetCaretWidth" type="int" overloaded="no">
         <autodoc>GetCaretWidth() -&gt; int</autodoc>
       </method>
-      <method name="SetTargetStart" type="void" overloaded="no">
+      <method name="SetTargetStart" type="" overloaded="no">
         <autodoc>SetTargetStart(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -32860,7 +32860,7 @@ ControlPoint =      PyControlPoint
       <method name="GetTargetStart" type="int" overloaded="no">
         <autodoc>GetTargetStart() -&gt; int</autodoc>
       </method>
-      <method name="SetTargetEnd" type="void" overloaded="no">
+      <method name="SetTargetEnd" type="" overloaded="no">
         <autodoc>SetTargetEnd(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -32872,22 +32872,22 @@ ControlPoint =      PyControlPoint
       <method name="ReplaceTarget" type="int" overloaded="no">
         <autodoc>ReplaceTarget(String text) -&gt; int</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="ReplaceTargetRE" type="int" overloaded="no">
         <autodoc>ReplaceTargetRE(String text) -&gt; int</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SearchInTarget" type="int" overloaded="no">
         <autodoc>SearchInTarget(String text) -&gt; int</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetSearchFlags" type="void" overloaded="no">
+      <method name="SetSearchFlags" type="" overloaded="no">
         <autodoc>SetSearchFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
@@ -32896,14 +32896,14 @@ ControlPoint =      PyControlPoint
       <method name="GetSearchFlags" type="int" overloaded="no">
         <autodoc>GetSearchFlags() -&gt; int</autodoc>
       </method>
-      <method name="CallTipShow" type="void" overloaded="no">
+      <method name="CallTipShow" type="" overloaded="no">
         <autodoc>CallTipShow(int pos, String definition)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
-          <param name="definition" type="r.q(const).wxString" default=""/>
+          <param name="definition" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="CallTipCancel" type="void" overloaded="no">
+      <method name="CallTipCancel" type="" overloaded="no">
         <autodoc>CallTipCancel()</autodoc>
       </method>
       <method name="CallTipActive" type="bool" overloaded="no">
@@ -32912,29 +32912,29 @@ ControlPoint =      PyControlPoint
       <method name="CallTipPosAtStart" type="int" overloaded="no">
         <autodoc>CallTipPosAtStart() -&gt; int</autodoc>
       </method>
-      <method name="CallTipSetHighlight" type="void" overloaded="no">
+      <method name="CallTipSetHighlight" type="" overloaded="no">
         <autodoc>CallTipSetHighlight(int start, int end)</autodoc>
         <paramlist>
           <param name="start" type="int" default=""/>
           <param name="end" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CallTipSetBackground" type="void" overloaded="no">
+      <method name="CallTipSetBackground" type="" overloaded="no">
         <autodoc>CallTipSetBackground(Colour back)</autodoc>
         <paramlist>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="CallTipSetForeground" type="void" overloaded="no">
+      <method name="CallTipSetForeground" type="" overloaded="no">
         <autodoc>CallTipSetForeground(Colour fore)</autodoc>
         <paramlist>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="CallTipSetForegroundHighlight" type="void" overloaded="no">
+      <method name="CallTipSetForegroundHighlight" type="" overloaded="no">
         <autodoc>CallTipSetForegroundHighlight(Colour fore)</autodoc>
         <paramlist>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
       <method name="VisibleFromDocLine" type="int" overloaded="no">
@@ -32949,7 +32949,7 @@ ControlPoint =      PyControlPoint
           <param name="lineDisplay" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldLevel" type="void" overloaded="no">
+      <method name="SetFoldLevel" type="" overloaded="no">
         <autodoc>SetFoldLevel(int line, int level)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
@@ -32975,14 +32975,14 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ShowLines" type="void" overloaded="no">
+      <method name="ShowLines" type="" overloaded="no">
         <autodoc>ShowLines(int lineStart, int lineEnd)</autodoc>
         <paramlist>
           <param name="lineStart" type="int" default=""/>
           <param name="lineEnd" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="HideLines" type="void" overloaded="no">
+      <method name="HideLines" type="" overloaded="no">
         <autodoc>HideLines(int lineStart, int lineEnd)</autodoc>
         <paramlist>
           <param name="lineStart" type="int" default=""/>
@@ -32995,7 +32995,7 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldExpanded" type="void" overloaded="no">
+      <method name="SetFoldExpanded" type="" overloaded="no">
         <autodoc>SetFoldExpanded(int line, bool expanded)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
@@ -33008,31 +33008,31 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ToggleFold" type="void" overloaded="no">
+      <method name="ToggleFold" type="" overloaded="no">
         <autodoc>ToggleFold(int line)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="EnsureVisible" type="void" overloaded="no">
+      <method name="EnsureVisible" type="" overloaded="no">
         <autodoc>EnsureVisible(int line)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldFlags" type="void" overloaded="no">
+      <method name="SetFoldFlags" type="" overloaded="no">
         <autodoc>SetFoldFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="EnsureVisibleEnforcePolicy" type="void" overloaded="no">
+      <method name="EnsureVisibleEnforcePolicy" type="" overloaded="no">
         <autodoc>EnsureVisibleEnforcePolicy(int line)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetTabIndents" type="void" overloaded="no">
+      <method name="SetTabIndents" type="" overloaded="no">
         <autodoc>SetTabIndents(bool tabIndents)</autodoc>
         <paramlist>
           <param name="tabIndents" type="bool" default=""/>
@@ -33041,7 +33041,7 @@ ControlPoint =      PyControlPoint
       <method name="GetTabIndents" type="bool" overloaded="no">
         <autodoc>GetTabIndents() -&gt; bool</autodoc>
       </method>
-      <method name="SetBackSpaceUnIndents" type="void" overloaded="no">
+      <method name="SetBackSpaceUnIndents" type="" overloaded="no">
         <autodoc>SetBackSpaceUnIndents(bool bsUnIndents)</autodoc>
         <paramlist>
           <param name="bsUnIndents" type="bool" default=""/>
@@ -33050,7 +33050,7 @@ ControlPoint =      PyControlPoint
       <method name="GetBackSpaceUnIndents" type="bool" overloaded="no">
         <autodoc>GetBackSpaceUnIndents() -&gt; bool</autodoc>
       </method>
-      <method name="SetMouseDwellTime" type="void" overloaded="no">
+      <method name="SetMouseDwellTime" type="" overloaded="no">
         <autodoc>SetMouseDwellTime(int periodMilliseconds)</autodoc>
         <paramlist>
           <param name="periodMilliseconds" type="int" default=""/>
@@ -33073,7 +33073,7 @@ ControlPoint =      PyControlPoint
           <param name="onlyWordCharacters" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetWrapMode" type="void" overloaded="no">
+      <method name="SetWrapMode" type="" overloaded="no">
         <autodoc>SetWrapMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -33082,7 +33082,7 @@ ControlPoint =      PyControlPoint
       <method name="GetWrapMode" type="int" overloaded="no">
         <autodoc>GetWrapMode() -&gt; int</autodoc>
       </method>
-      <method name="SetLayoutCache" type="void" overloaded="no">
+      <method name="SetLayoutCache" type="" overloaded="no">
         <autodoc>SetLayoutCache(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -33091,7 +33091,7 @@ ControlPoint =      PyControlPoint
       <method name="GetLayoutCache" type="int" overloaded="no">
         <autodoc>GetLayoutCache() -&gt; int</autodoc>
       </method>
-      <method name="SetScrollWidth" type="void" overloaded="no">
+      <method name="SetScrollWidth" type="" overloaded="no">
         <autodoc>SetScrollWidth(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>
@@ -33104,10 +33104,10 @@ ControlPoint =      PyControlPoint
         <autodoc>TextWidth(int style, String text) -&gt; int</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetEndAtLastLine" type="void" overloaded="no">
+      <method name="SetEndAtLastLine" type="" overloaded="no">
         <autodoc>SetEndAtLastLine(bool endAtLastLine)</autodoc>
         <paramlist>
           <param name="endAtLastLine" type="bool" default=""/>
@@ -33122,7 +33122,7 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetUseVerticalScrollBar" type="void" overloaded="no">
+      <method name="SetUseVerticalScrollBar" type="" overloaded="no">
         <autodoc>SetUseVerticalScrollBar(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>
@@ -33131,67 +33131,67 @@ ControlPoint =      PyControlPoint
       <method name="GetUseVerticalScrollBar" type="bool" overloaded="no">
         <autodoc>GetUseVerticalScrollBar() -&gt; bool</autodoc>
       </method>
-      <method name="AppendText" type="void" overloaded="no">
+      <method name="AppendText" type="" overloaded="no">
         <autodoc>AppendText(int length, String text)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetTwoPhaseDraw" type="bool" overloaded="no">
         <autodoc>GetTwoPhaseDraw() -&gt; bool</autodoc>
       </method>
-      <method name="SetTwoPhaseDraw" type="void" overloaded="no">
+      <method name="SetTwoPhaseDraw" type="" overloaded="no">
         <autodoc>SetTwoPhaseDraw(bool twoPhase)</autodoc>
         <paramlist>
           <param name="twoPhase" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="TargetFromSelection" type="void" overloaded="no">
+      <method name="TargetFromSelection" type="" overloaded="no">
         <autodoc>TargetFromSelection()</autodoc>
       </method>
-      <method name="LinesJoin" type="void" overloaded="no">
+      <method name="LinesJoin" type="" overloaded="no">
         <autodoc>LinesJoin()</autodoc>
       </method>
-      <method name="LinesSplit" type="void" overloaded="no">
+      <method name="LinesSplit" type="" overloaded="no">
         <autodoc>LinesSplit(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldMarginColour" type="void" overloaded="no">
+      <method name="SetFoldMarginColour" type="" overloaded="no">
         <autodoc>SetFoldMarginColour(bool useSetting, Colour back)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldMarginHiColour" type="void" overloaded="no">
+      <method name="SetFoldMarginHiColour" type="" overloaded="no">
         <autodoc>SetFoldMarginHiColour(bool useSetting, Colour fore)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="LineDuplicate" type="void" overloaded="no">
+      <method name="LineDuplicate" type="" overloaded="no">
         <autodoc>LineDuplicate()</autodoc>
       </method>
-      <method name="HomeDisplay" type="void" overloaded="no">
+      <method name="HomeDisplay" type="" overloaded="no">
         <autodoc>HomeDisplay()</autodoc>
       </method>
-      <method name="HomeDisplayExtend" type="void" overloaded="no">
+      <method name="HomeDisplayExtend" type="" overloaded="no">
         <autodoc>HomeDisplayExtend()</autodoc>
       </method>
-      <method name="LineEndDisplay" type="void" overloaded="no">
+      <method name="LineEndDisplay" type="" overloaded="no">
         <autodoc>LineEndDisplay()</autodoc>
       </method>
-      <method name="LineEndDisplayExtend" type="void" overloaded="no">
+      <method name="LineEndDisplayExtend" type="" overloaded="no">
         <autodoc>LineEndDisplayExtend()</autodoc>
       </method>
-      <method name="LineCopy" type="void" overloaded="no">
+      <method name="LineCopy" type="" overloaded="no">
         <autodoc>LineCopy()</autodoc>
       </method>
-      <method name="MoveCaretInsideView" type="void" overloaded="no">
+      <method name="MoveCaretInsideView" type="" overloaded="no">
         <autodoc>MoveCaretInsideView()</autodoc>
       </method>
       <method name="LineLength" type="int" overloaded="no">
@@ -33200,14 +33200,14 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="BraceHighlight" type="void" overloaded="no">
+      <method name="BraceHighlight" type="" overloaded="no">
         <autodoc>BraceHighlight(int pos1, int pos2)</autodoc>
         <paramlist>
           <param name="pos1" type="int" default=""/>
           <param name="pos2" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="BraceBadLight" type="void" overloaded="no">
+      <method name="BraceBadLight" type="" overloaded="no">
         <autodoc>BraceBadLight(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
@@ -33222,22 +33222,22 @@ ControlPoint =      PyControlPoint
       <method name="GetViewEOL" type="bool" overloaded="no">
         <autodoc>GetViewEOL() -&gt; bool</autodoc>
       </method>
-      <method name="SetViewEOL" type="void" overloaded="no">
+      <method name="SetViewEOL" type="" overloaded="no">
         <autodoc>SetViewEOL(bool visible)</autodoc>
         <paramlist>
           <param name="visible" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="GetDocPointer" type="void" overloaded="no">
+      <method name="GetDocPointer" type="" overloaded="no">
         <autodoc>GetDocPointer() -&gt; void</autodoc>
       </method>
-      <method name="SetDocPointer" type="void" overloaded="no">
+      <method name="SetDocPointer" type="" overloaded="no">
         <autodoc>SetDocPointer(void docPointer)</autodoc>
         <paramlist>
-          <param name="docPointer" type="p.void" default=""/>
+          <param name="docPointer" type="" default=""/>
         </paramlist>
       </method>
-      <method name="SetModEventMask" type="void" overloaded="no">
+      <method name="SetModEventMask" type="" overloaded="no">
         <autodoc>SetModEventMask(int mask)</autodoc>
         <paramlist>
           <param name="mask" type="int" default=""/>
@@ -33246,7 +33246,7 @@ ControlPoint =      PyControlPoint
       <method name="GetEdgeColumn" type="int" overloaded="no">
         <autodoc>GetEdgeColumn() -&gt; int</autodoc>
       </method>
-      <method name="SetEdgeColumn" type="void" overloaded="no">
+      <method name="SetEdgeColumn" type="" overloaded="no">
         <autodoc>SetEdgeColumn(int column)</autodoc>
         <paramlist>
           <param name="column" type="int" default=""/>
@@ -33255,42 +33255,42 @@ ControlPoint =      PyControlPoint
       <method name="GetEdgeMode" type="int" overloaded="no">
         <autodoc>GetEdgeMode() -&gt; int</autodoc>
       </method>
-      <method name="SetEdgeMode" type="void" overloaded="no">
+      <method name="SetEdgeMode" type="" overloaded="no">
         <autodoc>SetEdgeMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetEdgeColour" type="wxColour" overloaded="no">
+      <method name="GetEdgeColour" type="Colour" overloaded="no">
         <autodoc>GetEdgeColour() -&gt; Colour</autodoc>
       </method>
-      <method name="SetEdgeColour" type="void" overloaded="no">
+      <method name="SetEdgeColour" type="" overloaded="no">
         <autodoc>SetEdgeColour(Colour edgeColour)</autodoc>
         <paramlist>
-          <param name="edgeColour" type="r.q(const).wxColour" default=""/>
+          <param name="edgeColour" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SearchAnchor" type="void" overloaded="no">
+      <method name="SearchAnchor" type="" overloaded="no">
         <autodoc>SearchAnchor()</autodoc>
       </method>
       <method name="SearchNext" type="int" overloaded="no">
         <autodoc>SearchNext(int flags, String text) -&gt; int</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SearchPrev" type="int" overloaded="no">
         <autodoc>SearchPrev(int flags, String text) -&gt; int</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LinesOnScreen" type="int" overloaded="no">
         <autodoc>LinesOnScreen() -&gt; int</autodoc>
       </method>
-      <method name="UsePopUp" type="void" overloaded="no">
+      <method name="UsePopUp" type="" overloaded="no">
         <autodoc>UsePopUp(bool allowPopUp)</autodoc>
         <paramlist>
           <param name="allowPopUp" type="bool" default=""/>
@@ -33299,7 +33299,7 @@ ControlPoint =      PyControlPoint
       <method name="SelectionIsRectangle" type="bool" overloaded="no">
         <autodoc>SelectionIsRectangle() -&gt; bool</autodoc>
       </method>
-      <method name="SetZoom" type="void" overloaded="no">
+      <method name="SetZoom" type="" overloaded="no">
         <autodoc>SetZoom(int zoom)</autodoc>
         <paramlist>
           <param name="zoom" type="int" default=""/>
@@ -33308,25 +33308,25 @@ ControlPoint =      PyControlPoint
       <method name="GetZoom" type="int" overloaded="no">
         <autodoc>GetZoom() -&gt; int</autodoc>
       </method>
-      <method name="CreateDocument" type="void" overloaded="no">
+      <method name="CreateDocument" type="" overloaded="no">
         <autodoc>CreateDocument() -&gt; void</autodoc>
       </method>
-      <method name="AddRefDocument" type="void" overloaded="no">
+      <method name="AddRefDocument" type="" overloaded="no">
         <autodoc>AddRefDocument(void docPointer)</autodoc>
         <paramlist>
-          <param name="docPointer" type="p.void" default=""/>
+          <param name="docPointer" type="" default=""/>
         </paramlist>
       </method>
-      <method name="ReleaseDocument" type="void" overloaded="no">
+      <method name="ReleaseDocument" type="" overloaded="no">
         <autodoc>ReleaseDocument(void docPointer)</autodoc>
         <paramlist>
-          <param name="docPointer" type="p.void" default=""/>
+          <param name="docPointer" type="" default=""/>
         </paramlist>
       </method>
       <method name="GetModEventMask" type="int" overloaded="no">
         <autodoc>GetModEventMask() -&gt; int</autodoc>
       </method>
-      <method name="SetSTCFocus" type="void" overloaded="no">
+      <method name="SetSTCFocus" type="" overloaded="no">
         <autodoc>SetSTCFocus(bool focus)</autodoc>
         <paramlist>
           <param name="focus" type="bool" default=""/>
@@ -33335,7 +33335,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSTCFocus" type="bool" overloaded="no">
         <autodoc>GetSTCFocus() -&gt; bool</autodoc>
       </method>
-      <method name="SetStatus" type="void" overloaded="no">
+      <method name="SetStatus" type="" overloaded="no">
         <autodoc>SetStatus(int statusCode)</autodoc>
         <paramlist>
           <param name="statusCode" type="int" default=""/>
@@ -33344,7 +33344,7 @@ ControlPoint =      PyControlPoint
       <method name="GetStatus" type="int" overloaded="no">
         <autodoc>GetStatus() -&gt; int</autodoc>
       </method>
-      <method name="SetMouseDownCaptures" type="void" overloaded="no">
+      <method name="SetMouseDownCaptures" type="" overloaded="no">
         <autodoc>SetMouseDownCaptures(bool captures)</autodoc>
         <paramlist>
           <param name="captures" type="bool" default=""/>
@@ -33353,7 +33353,7 @@ ControlPoint =      PyControlPoint
       <method name="GetMouseDownCaptures" type="bool" overloaded="no">
         <autodoc>GetMouseDownCaptures() -&gt; bool</autodoc>
       </method>
-      <method name="SetSTCCursor" type="void" overloaded="no">
+      <method name="SetSTCCursor" type="" overloaded="no">
         <autodoc>SetSTCCursor(int cursorType)</autodoc>
         <paramlist>
           <param name="cursorType" type="int" default=""/>
@@ -33362,7 +33362,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSTCCursor" type="int" overloaded="no">
         <autodoc>GetSTCCursor() -&gt; int</autodoc>
       </method>
-      <method name="SetControlCharSymbol" type="void" overloaded="no">
+      <method name="SetControlCharSymbol" type="" overloaded="no">
         <autodoc>SetControlCharSymbol(int symbol)</autodoc>
         <paramlist>
           <param name="symbol" type="int" default=""/>
@@ -33371,32 +33371,32 @@ ControlPoint =      PyControlPoint
       <method name="GetControlCharSymbol" type="int" overloaded="no">
         <autodoc>GetControlCharSymbol() -&gt; int</autodoc>
       </method>
-      <method name="WordPartLeft" type="void" overloaded="no">
+      <method name="WordPartLeft" type="" overloaded="no">
         <autodoc>WordPartLeft()</autodoc>
       </method>
-      <method name="WordPartLeftExtend" type="void" overloaded="no">
+      <method name="WordPartLeftExtend" type="" overloaded="no">
         <autodoc>WordPartLeftExtend()</autodoc>
       </method>
-      <method name="WordPartRight" type="void" overloaded="no">
+      <method name="WordPartRight" type="" overloaded="no">
         <autodoc>WordPartRight()</autodoc>
       </method>
-      <method name="WordPartRightExtend" type="void" overloaded="no">
+      <method name="WordPartRightExtend" type="" overloaded="no">
         <autodoc>WordPartRightExtend()</autodoc>
       </method>
-      <method name="SetVisiblePolicy" type="void" overloaded="no">
+      <method name="SetVisiblePolicy" type="" overloaded="no">
         <autodoc>SetVisiblePolicy(int visiblePolicy, int visibleSlop)</autodoc>
         <paramlist>
           <param name="visiblePolicy" type="int" default=""/>
           <param name="visibleSlop" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="DelLineLeft" type="void" overloaded="no">
+      <method name="DelLineLeft" type="" overloaded="no">
         <autodoc>DelLineLeft()</autodoc>
       </method>
-      <method name="DelLineRight" type="void" overloaded="no">
+      <method name="DelLineRight" type="" overloaded="no">
         <autodoc>DelLineRight()</autodoc>
       </method>
-      <method name="SetXOffset" type="void" overloaded="no">
+      <method name="SetXOffset" type="" overloaded="no">
         <autodoc>SetXOffset(int newOffset)</autodoc>
         <paramlist>
           <param name="newOffset" type="int" default=""/>
@@ -33405,24 +33405,24 @@ ControlPoint =      PyControlPoint
       <method name="GetXOffset" type="int" overloaded="no">
         <autodoc>GetXOffset() -&gt; int</autodoc>
       </method>
-      <method name="ChooseCaretX" type="void" overloaded="no">
+      <method name="ChooseCaretX" type="" overloaded="no">
         <autodoc>ChooseCaretX()</autodoc>
       </method>
-      <method name="SetXCaretPolicy" type="void" overloaded="no">
+      <method name="SetXCaretPolicy" type="" overloaded="no">
         <autodoc>SetXCaretPolicy(int caretPolicy, int caretSlop)</autodoc>
         <paramlist>
           <param name="caretPolicy" type="int" default=""/>
           <param name="caretSlop" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetYCaretPolicy" type="void" overloaded="no">
+      <method name="SetYCaretPolicy" type="" overloaded="no">
         <autodoc>SetYCaretPolicy(int caretPolicy, int caretSlop)</autodoc>
         <paramlist>
           <param name="caretPolicy" type="int" default=""/>
           <param name="caretSlop" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetPrintWrapMode" type="void" overloaded="no">
+      <method name="SetPrintWrapMode" type="" overloaded="no">
         <autodoc>SetPrintWrapMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>
@@ -33431,21 +33431,21 @@ ControlPoint =      PyControlPoint
       <method name="GetPrintWrapMode" type="int" overloaded="no">
         <autodoc>GetPrintWrapMode() -&gt; int</autodoc>
       </method>
-      <method name="SetHotspotActiveForeground" type="void" overloaded="no">
+      <method name="SetHotspotActiveForeground" type="" overloaded="no">
         <autodoc>SetHotspotActiveForeground(bool useSetting, Colour fore)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetHotspotActiveBackground" type="void" overloaded="no">
+      <method name="SetHotspotActiveBackground" type="" overloaded="no">
         <autodoc>SetHotspotActiveBackground(bool useSetting, Colour back)</autodoc>
         <paramlist>
           <param name="useSetting" type="bool" default=""/>
-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetHotspotActiveUnderline" type="void" overloaded="no">
+      <method name="SetHotspotActiveUnderline" type="" overloaded="no">
         <autodoc>SetHotspotActiveUnderline(bool underline)</autodoc>
         <paramlist>
           <param name="underline" type="bool" default=""/>
@@ -33463,27 +33463,27 @@ ControlPoint =      PyControlPoint
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CopyRange" type="void" overloaded="no">
+      <method name="CopyRange" type="" overloaded="no">
         <autodoc>CopyRange(int start, int end)</autodoc>
         <paramlist>
           <param name="start" type="int" default=""/>
           <param name="end" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="CopyText" type="void" overloaded="no">
+      <method name="CopyText" type="" overloaded="no">
         <autodoc>CopyText(int length, String text)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="StartRecord" type="void" overloaded="no">
+      <method name="StartRecord" type="" overloaded="no">
         <autodoc>StartRecord()</autodoc>
       </method>
-      <method name="StopRecord" type="void" overloaded="no">
+      <method name="StopRecord" type="" overloaded="no">
         <autodoc>StopRecord()</autodoc>
       </method>
-      <method name="SetLexer" type="void" overloaded="no">
+      <method name="SetLexer" type="" overloaded="no">
         <autodoc>SetLexer(int lexer)</autodoc>
         <paramlist>
           <param name="lexer" type="int" default=""/>
@@ -33492,95 +33492,95 @@ ControlPoint =      PyControlPoint
       <method name="GetLexer" type="int" overloaded="no">
         <autodoc>GetLexer() -&gt; int</autodoc>
       </method>
-      <method name="Colourise" type="void" overloaded="no">
+      <method name="Colourise" type="" overloaded="no">
         <autodoc>Colourise(int start, int end)</autodoc>
         <paramlist>
           <param name="start" type="int" default=""/>
           <param name="end" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetProperty" type="void" overloaded="no">
+      <method name="SetProperty" type="" overloaded="no">
         <autodoc>SetProperty(String key, String value)</autodoc>
         <paramlist>
-          <param name="key" type="r.q(const).wxString" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetKeyWords" type="void" overloaded="no">
+      <method name="SetKeyWords" type="" overloaded="no">
         <autodoc>SetKeyWords(int keywordSet, String keyWords)</autodoc>
         <paramlist>
           <param name="keywordSet" type="int" default=""/>
-          <param name="keyWords" type="r.q(const).wxString" default=""/>
+          <param name="keyWords" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetLexerLanguage" type="void" overloaded="no">
+      <method name="SetLexerLanguage" type="" overloaded="no">
         <autodoc>SetLexerLanguage(String language)</autodoc>
         <paramlist>
-          <param name="language" type="r.q(const).wxString" default=""/>
+          <param name="language" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetCurrentLine" type="int" overloaded="no">
         <autodoc>GetCurrentLine() -&gt; int</autodoc>
       </method>
-      <method name="StyleSetSpec" type="void" overloaded="no">
+      <method name="StyleSetSpec" type="" overloaded="no">
         <autodoc>StyleSetSpec(int styleNum, String spec)</autodoc>
         <paramlist>
           <param name="styleNum" type="int" default=""/>
-          <param name="spec" type="r.q(const).wxString" default=""/>
+          <param name="spec" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetFont" type="void" overloaded="no">
+      <method name="StyleSetFont" type="" overloaded="no">
         <autodoc>StyleSetFont(int styleNum, Font font)</autodoc>
         <paramlist>
           <param name="styleNum" type="int" default=""/>
-          <param name="font" type="r.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
-      <method name="StyleSetFontAttr" type="void" overloaded="no">
+      <method name="StyleSetFontAttr" type="" overloaded="no">
         <autodoc>StyleSetFontAttr(int styleNum, int size, String faceName, bool bold, 
     bool italic, bool underline)</autodoc>
         <paramlist>
           <param name="styleNum" type="int" default=""/>
           <param name="size" type="int" default=""/>
-          <param name="faceName" type="r.q(const).wxString" default=""/>
+          <param name="faceName" type="String" default=""/>
           <param name="bold" type="bool" default=""/>
           <param name="italic" type="bool" default=""/>
           <param name="underline" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="CmdKeyExecute" type="void" overloaded="no">
+      <method name="CmdKeyExecute" type="" overloaded="no">
         <autodoc>CmdKeyExecute(int cmd)</autodoc>
         <paramlist>
           <param name="cmd" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMargins" type="void" overloaded="no">
+      <method name="SetMargins" type="" overloaded="no">
         <autodoc>SetMargins(int left, int right)</autodoc>
         <paramlist>
           <param name="left" type="int" default=""/>
           <param name="right" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetSelection" type="void" overloaded="no">
+      <method name="GetSelection" type="" overloaded="no">
         <autodoc>GetSelection(int OUTPUT, int OUTPUT)</autodoc>
         <paramlist>
-          <param name="OUTPUT" type="p.int" default=""/>
-          <param name="OUTPUT" type="p.int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="PointFromPosition" type="wxPoint" overloaded="no">
+      <method name="PointFromPosition" type="Point" overloaded="no">
         <autodoc>PointFromPosition(int pos) -&gt; Point</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ScrollToLine" type="void" overloaded="no">
+      <method name="ScrollToLine" type="" overloaded="no">
         <autodoc>ScrollToLine(int line)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="ScrollToColumn" type="void" overloaded="no">
+      <method name="ScrollToColumn" type="" overloaded="no">
         <autodoc>ScrollToColumn(int column)</autodoc>
         <paramlist>
           <param name="column" type="int" default=""/>
@@ -33594,22 +33594,22 @@ ControlPoint =      PyControlPoint
           <param name="lp" type="long" default="0"/>
         </paramlist>
       </method>
-      <method name="SetVScrollBar" type="void" overloaded="no">
+      <method name="SetVScrollBar" type="" overloaded="no">
         <autodoc>SetVScrollBar(wxScrollBar bar)</autodoc>
         <paramlist>
-          <param name="bar" type="p.wxScrollBar" default=""/>
+          <param name="bar" type="ScrollBar" default=""/>
         </paramlist>
       </method>
-      <method name="SetHScrollBar" type="void" overloaded="no">
+      <method name="SetHScrollBar" type="" overloaded="no">
         <autodoc>SetHScrollBar(wxScrollBar bar)</autodoc>
         <paramlist>
-          <param name="bar" type="p.wxScrollBar" default=""/>
+          <param name="bar" type="ScrollBar" default=""/>
         </paramlist>
       </method>
       <method name="GetLastKeydownProcessed" type="bool" overloaded="no">
         <autodoc>GetLastKeydownProcessed() -&gt; bool</autodoc>
       </method>
-      <method name="SetLastKeydownProcessed" type="void" overloaded="no">
+      <method name="SetLastKeydownProcessed" type="" overloaded="no">
         <autodoc>SetLastKeydownProcessed(bool val)</autodoc>
         <paramlist>
           <param name="val" type="bool" default=""/>
@@ -33618,13 +33618,13 @@ ControlPoint =      PyControlPoint
       <method name="SaveFile" type="bool" overloaded="no">
         <autodoc>SaveFile(String filename) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadFile" type="bool" overloaded="no">
         <autodoc>LoadFile(String filename) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DoDragOver" type="wxDragResult" overloaded="no">
@@ -33640,12 +33640,12 @@ ControlPoint =      PyControlPoint
         <paramlist>
           <param name="x" type="long" default=""/>
           <param name="y" type="long" default=""/>
-          <param name="data" type="r.q(const).wxString" default=""/>
+          <param name="data" type="String" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="StyledTextEvent" oldname="wxStyledTextEvent" module="stc">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="StyledTextEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=0, int id=0) -&gt; StyledTextEvent</autodoc>
         <paramlist>
@@ -33656,121 +33656,121 @@ ControlPoint =      PyControlPoint
       <destructor name="~wxStyledTextEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetKey" type="void" overloaded="no">
+      <method name="SetKey" type="" overloaded="no">
         <autodoc>SetKey(int k)</autodoc>
         <paramlist>
           <param name="k" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetModifiers" type="void" overloaded="no">
+      <method name="SetModifiers" type="" overloaded="no">
         <autodoc>SetModifiers(int m)</autodoc>
         <paramlist>
           <param name="m" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetModificationType" type="void" overloaded="no">
+      <method name="SetModificationType" type="" overloaded="no">
         <autodoc>SetModificationType(int t)</autodoc>
         <paramlist>
           <param name="t" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String t)</autodoc>
         <paramlist>
-          <param name="t" type="r.q(const).wxString" default=""/>
+          <param name="t" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetLength" type="void" overloaded="no">
+      <method name="SetLength" type="" overloaded="no">
         <autodoc>SetLength(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLinesAdded" type="void" overloaded="no">
+      <method name="SetLinesAdded" type="" overloaded="no">
         <autodoc>SetLinesAdded(int num)</autodoc>
         <paramlist>
           <param name="num" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLine" type="void" overloaded="no">
+      <method name="SetLine" type="" overloaded="no">
         <autodoc>SetLine(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldLevelNow" type="void" overloaded="no">
+      <method name="SetFoldLevelNow" type="" overloaded="no">
         <autodoc>SetFoldLevelNow(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetFoldLevelPrev" type="void" overloaded="no">
+      <method name="SetFoldLevelPrev" type="" overloaded="no">
         <autodoc>SetFoldLevelPrev(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMargin" type="void" overloaded="no">
+      <method name="SetMargin" type="" overloaded="no">
         <autodoc>SetMargin(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetMessage" type="void" overloaded="no">
+      <method name="SetMessage" type="" overloaded="no">
         <autodoc>SetMessage(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWParam" type="void" overloaded="no">
+      <method name="SetWParam" type="" overloaded="no">
         <autodoc>SetWParam(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetLParam" type="void" overloaded="no">
+      <method name="SetLParam" type="" overloaded="no">
         <autodoc>SetLParam(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetListType" type="void" overloaded="no">
+      <method name="SetListType" type="" overloaded="no">
         <autodoc>SetListType(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetX" type="void" overloaded="no">
+      <method name="SetX" type="" overloaded="no">
         <autodoc>SetX(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetY" type="void" overloaded="no">
+      <method name="SetY" type="" overloaded="no">
         <autodoc>SetY(int val)</autodoc>
         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetDragText" type="void" overloaded="no">
+      <method name="SetDragText" type="" overloaded="no">
         <autodoc>SetDragText(String val)</autodoc>
         <paramlist>
-          <param name="val" type="r.q(const).wxString" default=""/>
+          <param name="val" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetDragAllowMove" type="void" overloaded="no">
+      <method name="SetDragAllowMove" type="" overloaded="no">
         <autodoc>SetDragAllowMove(bool val)</autodoc>
         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </method>
-      <method name="SetDragResult" type="void" overloaded="no">
+      <method name="SetDragResult" type="" overloaded="no">
         <autodoc>SetDragResult(wxDragResult val)</autodoc>
         <paramlist>
           <param name="val" type="wxDragResult" default=""/>
@@ -33788,7 +33788,7 @@ ControlPoint =      PyControlPoint
       <method name="GetModificationType" type="int" overloaded="no">
         <autodoc>GetModificationType() -&gt; int</autodoc>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetLength" type="int" overloaded="no">
@@ -33827,7 +33827,7 @@ ControlPoint =      PyControlPoint
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>
       </method>
-      <method name="GetDragText" type="wxString" overloaded="no">
+      <method name="GetDragText" type="String" overloaded="no">
         <autodoc>GetDragText() -&gt; String</autodoc>
       </method>
       <method name="GetDragAllowMove" type="bool" overloaded="no">
@@ -33845,7 +33845,7 @@ ControlPoint =      PyControlPoint
       <method name="GetAlt" type="bool" overloaded="no">
         <autodoc>GetAlt() -&gt; bool</autodoc>
       </method>
-      <method name="Clone" type="wxEvent" overloaded="no">
+      <method name="Clone" type="Event" overloaded="no">
         <autodoc>Clone() -&gt; Event</autodoc>
       </method>
     </class>
@@ -33885,11 +33885,11 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="XmlResource" oldname="wxXmlResource" module="xrc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="XmlResource" overloaded="no">
         <autodoc>__init__(String filemask, int flags=XRC_USE_LOCALE) -&gt; XmlResource</autodoc>
         <paramlist>
-          <param name="filemask" type="r.q(const).wxString" default=""/>
+          <param name="filemask" type="String" default=""/>
           <param name="flags" type="int" default="wxXRC_USE_LOCALE"/>
         </paramlist>
       </constructor>
@@ -33905,151 +33905,151 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
       <method name="Load" type="bool" overloaded="no">
         <autodoc>Load(String filemask) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filemask" type="r.q(const).wxString" default=""/>
+          <param name="filemask" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadFromString" type="bool" overloaded="no">
         <autodoc>LoadFromString(String data) -&gt; bool</autodoc>
         <paramlist>
-          <param name="data" type="r.q(const).wxString" default=""/>
+          <param name="data" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="InitAllHandlers" type="void" overloaded="no">
+      <method name="InitAllHandlers" type="" overloaded="no">
         <autodoc>InitAllHandlers()</autodoc>
       </method>
-      <method name="AddHandler" type="void" overloaded="no">
+      <method name="AddHandler" type="" overloaded="no">
         <autodoc>AddHandler(XmlResourceHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxPyXmlResourceHandler" default=""/>
+          <param name="handler" type="wxPyXmlResourceHandler" default=""/>
         </paramlist>
       </method>
-      <method name="InsertHandler" type="void" overloaded="no">
+      <method name="InsertHandler" type="" overloaded="no">
         <autodoc>InsertHandler(XmlResourceHandler handler)</autodoc>
         <paramlist>
-          <param name="handler" type="p.wxPyXmlResourceHandler" default=""/>
+          <param name="handler" type="wxPyXmlResourceHandler" default=""/>
         </paramlist>
       </method>
-      <method name="ClearHandlers" type="void" overloaded="no">
+      <method name="ClearHandlers" type="" overloaded="no">
         <autodoc>ClearHandlers()</autodoc>
       </method>
-      <staticmethod name="AddSubclassFactory" type="void" overloaded="no">
+      <staticmethod name="AddSubclassFactory" type="" overloaded="no">
         <autodoc>XmlResource.AddSubclassFactory(XmlSubclassFactory factory)</autodoc>
         <paramlist>
-          <param name="factory" type="p.wxPyXmlSubclassFactory" default=""/>
+          <param name="factory" type="wxPyXmlSubclassFactory" default=""/>
         </paramlist>
       </staticmethod>
-      <method name="LoadMenu" type="wxMenu" overloaded="no">
+      <method name="LoadMenu" type="Menu" overloaded="no">
         <autodoc>LoadMenu(String name) -&gt; Menu</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadMenuBar" type="wxMenuBar" overloaded="no">
+      <method name="LoadMenuBar" type="MenuBar" overloaded="no">
         <autodoc>LoadMenuBar(String name) -&gt; MenuBar</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadMenuBarOnFrame" type="wxMenuBar" overloaded="no">
+      <method name="LoadMenuBarOnFrame" type="MenuBar" overloaded="no">
         <autodoc>LoadMenuBarOnFrame(Window parent, String name) -&gt; MenuBar</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadToolBar" type="wxToolBar" overloaded="no">
+      <method name="LoadToolBar" type="ToolBar" overloaded="no">
         <autodoc>LoadToolBar(Window parent, String name) -&gt; wxToolBar</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadDialog" type="wxDialog" overloaded="no">
+      <method name="LoadDialog" type="Dialog" overloaded="no">
         <autodoc>LoadDialog(Window parent, String name) -&gt; wxDialog</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadOnDialog" type="bool" overloaded="no">
         <autodoc>LoadOnDialog(wxDialog dlg, Window parent, String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="dlg" type="p.wxDialog" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="dlg" type="Dialog" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadPanel" type="wxPanel" overloaded="no">
+      <method name="LoadPanel" type="Panel" overloaded="no">
         <autodoc>LoadPanel(Window parent, String name) -&gt; wxPanel</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadOnPanel" type="bool" overloaded="no">
         <autodoc>LoadOnPanel(wxPanel panel, Window parent, String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="panel" type="p.wxPanel" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="panel" type="Panel" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadFrame" type="wxFrame" overloaded="no">
+      <method name="LoadFrame" type="Frame" overloaded="no">
         <autodoc>LoadFrame(Window parent, String name) -&gt; wxFrame</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadOnFrame" type="bool" overloaded="no">
         <autodoc>LoadOnFrame(wxFrame frame, Window parent, String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="frame" type="p.wxFrame" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="frame" type="Frame" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadObject" type="wxObject" overloaded="no">
+      <method name="LoadObject" type="Object" overloaded="no">
         <autodoc>LoadObject(Window parent, String name, String classname) -&gt; Object</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="classname" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="classname" type="String" default=""/>
         </paramlist>
       </method>
       <method name="LoadOnObject" type="bool" overloaded="no">
         <autodoc>LoadOnObject(Object instance, Window parent, String name, String classname) -&gt; bool</autodoc>
         <paramlist>
-          <param name="instance" type="p.wxObject" default=""/>
-          <param name="parent" type="p.wxWindow" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="classname" type="r.q(const).wxString" default=""/>
+          <param name="instance" type="Object" default=""/>
+          <param name="parent" type="Window" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="classname" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadBitmap" type="wxBitmap" overloaded="no">
+      <method name="LoadBitmap" type="Bitmap" overloaded="no">
         <autodoc>LoadBitmap(String name) -&gt; Bitmap</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="LoadIcon" type="wxIcon" overloaded="no">
+      <method name="LoadIcon" type="Icon" overloaded="no">
         <autodoc>LoadIcon(String name) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="AttachUnknownControl" type="bool" overloaded="no">
         <autodoc>AttachUnknownControl(String name, Window control, Window parent=None) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="control" type="p.wxWindow" default=""/>
-          <param name="parent" type="p.wxWindow" default="NULL"/>
+          <param name="name" type="String" default=""/>
+          <param name="control" type="Window" default=""/>
+          <param name="parent" type="Window" default="NULL"/>
         </paramlist>
       </method>
       <staticmethod name="GetXRCID" type="int" overloaded="no">
         <autodoc>XmlResource.GetXRCID(String str_id) -&gt; int</autodoc>
         <paramlist>
-          <param name="str_id" type="r.q(const).wxString" default=""/>
+          <param name="str_id" type="String" default=""/>
         </paramlist>
       </staticmethod>
       <method name="GetVersion" type="long" overloaded="no">
@@ -34064,19 +34064,19 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
           <param name="revision" type="int" default=""/>
         </paramlist>
       </method>
-      <staticmethod name="Get" type="wxXmlResource" overloaded="no">
+      <staticmethod name="Get" type="XmlResource" overloaded="no">
         <autodoc>XmlResource.Get() -&gt; XmlResource</autodoc>
       </staticmethod>
-      <staticmethod name="Set" type="wxXmlResource" overloaded="no">
+      <staticmethod name="Set" type="XmlResource" overloaded="no">
         <autodoc>XmlResource.Set(XmlResource res) -&gt; XmlResource</autodoc>
         <paramlist>
-          <param name="res" type="p.wxXmlResource" default=""/>
+          <param name="res" type="XmlResource" default=""/>
         </paramlist>
       </staticmethod>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>
@@ -34097,11 +34097,11 @@ def XRCCTRL(window, str_id, *ignoreargs):
       <constructor name="wxPyXmlSubclassFactory" overloaded="no">
         <autodoc>__init__() -&gt; XmlSubclassFactory</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
     </class>
@@ -34113,36 +34113,36 @@ def XRCCTRL(window, str_id, *ignoreargs):
         <autodoc>__init__(String name=EmptyString, String value=EmptyString, 
     XmlProperty next=None) -&gt; XmlProperty</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="value" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="next" type="p.wxXmlProperty" default="NULL"/>
+          <param name="name" type="String" default="wxPyEmptyString"/>
+          <param name="value" type="String" default="wxPyEmptyString"/>
+          <param name="next" type="XmlProperty" default="NULL"/>
         </paramlist>
       </constructor>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
-      <method name="GetNext" type="wxXmlProperty" overloaded="no">
+      <method name="GetNext" type="XmlProperty" overloaded="no">
         <autodoc>GetNext() -&gt; XmlProperty</autodoc>
       </method>
-      <method name="SetName" type="void" overloaded="no">
+      <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String name)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">
         <autodoc>SetNext(XmlProperty next)</autodoc>
         <paramlist>
-          <param name="next" type="p.wxXmlProperty" default=""/>
+          <param name="next" type="XmlProperty" default=""/>
         </paramlist>
       </method>
     </class>
@@ -34152,154 +34152,154 @@ def XRCCTRL(window, str_id, *ignoreargs):
     String content=EmptyString, XmlProperty props=None, 
     XmlNode next=None) -&gt; XmlNode</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxXmlNode" default="NULL"/>
+          <param name="parent" type="XmlNode" default="NULL"/>
           <param name="type" type="wxXmlNodeType" default="0"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="content" type="r.q(const).wxString" default="wxPyEmptyString"/>
-          <param name="props" type="p.wxXmlProperty" default="NULL"/>
-          <param name="next" type="p.wxXmlNode" default="NULL"/>
+          <param name="name" type="String" default="wxPyEmptyString"/>
+          <param name="content" type="String" default="wxPyEmptyString"/>
+          <param name="props" type="XmlProperty" default="NULL"/>
+          <param name="next" type="XmlNode" default="NULL"/>
         </paramlist>
       </constructor>
       <constructor name="XmlNodeEasy" overloaded="no">
         <autodoc>XmlNodeEasy(int type, String name, String content=EmptyString) -&gt; XmlNode</autodoc>
         <paramlist>
           <param name="type" type="wxXmlNodeType" default=""/>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="content" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="name" type="String" default=""/>
+          <param name="content" type="String" default="wxPyEmptyString"/>
         </paramlist>
       </constructor>
       <destructor name="~wxXmlNode" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
-      <method name="AddChild" type="void" overloaded="no">
+      <method name="AddChild" type="" overloaded="no">
         <autodoc>AddChild(XmlNode child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxXmlNode" default=""/>
+          <param name="child" type="XmlNode" default=""/>
         </paramlist>
       </method>
-      <method name="InsertChild" type="void" overloaded="no">
+      <method name="InsertChild" type="" overloaded="no">
         <autodoc>InsertChild(XmlNode child, XmlNode before_node)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxXmlNode" default=""/>
-          <param name="before_node" type="p.wxXmlNode" default=""/>
+          <param name="child" type="XmlNode" default=""/>
+          <param name="before_node" type="XmlNode" default=""/>
         </paramlist>
       </method>
       <method name="RemoveChild" type="bool" overloaded="no">
         <autodoc>RemoveChild(XmlNode child) -&gt; bool</autodoc>
         <paramlist>
-          <param name="child" type="p.wxXmlNode" default=""/>
+          <param name="child" type="XmlNode" default=""/>
         </paramlist>
       </method>
-      <method name="AddProperty" type="void" overloaded="no">
+      <method name="AddProperty" type="" overloaded="no">
         <autodoc>AddProperty(XmlProperty prop)</autodoc>
         <paramlist>
-          <param name="prop" type="p.wxXmlProperty" default=""/>
+          <param name="prop" type="XmlProperty" default=""/>
         </paramlist>
       </method>
-      <method name="AddPropertyName" type="void" overloaded="no">
+      <method name="AddPropertyName" type="" overloaded="no">
         <autodoc>AddPropertyName(String name, String value)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="value" type="String" default=""/>
         </paramlist>
       </method>
       <method name="DeleteProperty" type="bool" overloaded="no">
         <autodoc>DeleteProperty(String name) -&gt; bool</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
       <method name="GetType" type="wxXmlNodeType" overloaded="no">
         <autodoc>GetType() -&gt; int</autodoc>
       </method>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
-      <method name="GetContent" type="wxString" overloaded="no">
+      <method name="GetContent" type="String" overloaded="no">
         <autodoc>GetContent() -&gt; String</autodoc>
       </method>
-      <method name="GetParent" type="wxXmlNode" overloaded="no">
+      <method name="GetParent" type="XmlNode" overloaded="no">
         <autodoc>GetParent() -&gt; XmlNode</autodoc>
       </method>
-      <method name="GetNext" type="wxXmlNode" overloaded="no">
+      <method name="GetNext" type="XmlNode" overloaded="no">
         <autodoc>GetNext() -&gt; XmlNode</autodoc>
       </method>
-      <method name="GetChildren" type="wxXmlNode" overloaded="no">
+      <method name="GetChildren" type="XmlNode" overloaded="no">
         <autodoc>GetChildren() -&gt; XmlNode</autodoc>
       </method>
-      <method name="GetProperties" type="wxXmlProperty" overloaded="no">
+      <method name="GetProperties" type="XmlProperty" overloaded="no">
         <autodoc>GetProperties() -&gt; XmlProperty</autodoc>
       </method>
-      <method name="GetPropVal" type="wxString" overloaded="no">
+      <method name="GetPropVal" type="String" overloaded="no">
         <autodoc>GetPropVal(String propName, String defaultVal) -&gt; String</autodoc>
         <paramlist>
-          <param name="propName" type="r.q(const).wxString" default=""/>
-          <param name="defaultVal" type="r.q(const).wxString" default=""/>
+          <param name="propName" type="String" default=""/>
+          <param name="defaultVal" type="String" default=""/>
         </paramlist>
       </method>
       <method name="HasProp" type="bool" overloaded="no">
         <autodoc>HasProp(String propName) -&gt; bool</autodoc>
         <paramlist>
-          <param name="propName" type="r.q(const).wxString" default=""/>
+          <param name="propName" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetType" type="void" overloaded="no">
+      <method name="SetType" type="" overloaded="no">
         <autodoc>SetType(int type)</autodoc>
         <paramlist>
           <param name="type" type="wxXmlNodeType" default=""/>
         </paramlist>
       </method>
-      <method name="SetName" type="void" overloaded="no">
+      <method name="SetName" type="" overloaded="no">
         <autodoc>SetName(String name)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetContent" type="void" overloaded="no">
+      <method name="SetContent" type="" overloaded="no">
         <autodoc>SetContent(String con)</autodoc>
         <paramlist>
-          <param name="con" type="r.q(const).wxString" default=""/>
+          <param name="con" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetParent" type="void" overloaded="no">
+      <method name="SetParent" type="" overloaded="no">
         <autodoc>SetParent(XmlNode parent)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxXmlNode" default=""/>
+          <param name="parent" type="XmlNode" default=""/>
         </paramlist>
       </method>
-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">
         <autodoc>SetNext(XmlNode next)</autodoc>
         <paramlist>
-          <param name="next" type="p.wxXmlNode" default=""/>
+          <param name="next" type="XmlNode" default=""/>
         </paramlist>
       </method>
-      <method name="SetChildren" type="void" overloaded="no">
+      <method name="SetChildren" type="" overloaded="no">
         <autodoc>SetChildren(XmlNode child)</autodoc>
         <paramlist>
-          <param name="child" type="p.wxXmlNode" default=""/>
+          <param name="child" type="XmlNode" default=""/>
         </paramlist>
       </method>
-      <method name="SetProperties" type="void" overloaded="no">
+      <method name="SetProperties" type="" overloaded="no">
         <autodoc>SetProperties(XmlProperty prop)</autodoc>
         <paramlist>
-          <param name="prop" type="p.wxXmlProperty" default=""/>
+          <param name="prop" type="XmlProperty" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="XmlDocument" oldname="wxXmlDocument" module="xrc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="XmlDocument" overloaded="no">
         <autodoc>__init__(String filename, String encoding=UTF8String) -&gt; XmlDocument</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="encoding" type="r.q(const).wxString" default="wxPyUTF8String"/>
+          <param name="filename" type="String" default=""/>
+          <param name="encoding" type="String" default="wxPyUTF8String"/>
         </paramlist>
       </constructor>
       <constructor name="XmlDocumentFromStream" overloaded="no">
         <autodoc>XmlDocumentFromStream(InputStream stream, String encoding=UTF8String) -&gt; XmlDocument</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
-          <param name="encoding" type="r.q(const).wxString" default="wxPyUTF8String"/>
+          <param name="stream" type="wxInputStream" default=""/>
+          <param name="encoding" type="String" default="wxPyUTF8String"/>
         </paramlist>
       </constructor>
       <constructor name="EmptyXmlDocument" overloaded="no">
@@ -34311,57 +34311,57 @@ def XRCCTRL(window, str_id, *ignoreargs):
       <method name="Load" type="bool" overloaded="no">
         <autodoc>Load(String filename, String encoding=UTF8String) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
-          <param name="encoding" type="r.q(const).wxString" default="wxPyUTF8String"/>
+          <param name="filename" type="String" default=""/>
+          <param name="encoding" type="String" default="wxPyUTF8String"/>
         </paramlist>
       </method>
       <method name="LoadFromStream" type="bool" overloaded="no">
         <autodoc>LoadFromStream(InputStream stream, String encoding=UTF8String) -&gt; bool</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxInputStream" default=""/>
-          <param name="encoding" type="r.q(const).wxString" default="wxPyUTF8String"/>
+          <param name="stream" type="wxInputStream" default=""/>
+          <param name="encoding" type="String" default="wxPyUTF8String"/>
         </paramlist>
       </method>
       <method name="Save" type="bool" overloaded="no">
         <autodoc>Save(String filename) -&gt; bool</autodoc>
         <paramlist>
-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>
         </paramlist>
       </method>
       <method name="SaveToStream" type="bool" overloaded="no">
         <autodoc>SaveToStream(OutputStream stream) -&gt; bool</autodoc>
         <paramlist>
-          <param name="stream" type="r.wxOutputStream" default=""/>
+          <param name="stream" type="OutputStream" default=""/>
         </paramlist>
       </method>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
-      <method name="GetRoot" type="wxXmlNode" overloaded="no">
+      <method name="GetRoot" type="XmlNode" overloaded="no">
         <autodoc>GetRoot() -&gt; XmlNode</autodoc>
       </method>
-      <method name="GetVersion" type="wxString" overloaded="no">
+      <method name="GetVersion" type="String" overloaded="no">
         <autodoc>GetVersion() -&gt; String</autodoc>
       </method>
-      <method name="GetFileEncoding" type="wxString" overloaded="no">
+      <method name="GetFileEncoding" type="String" overloaded="no">
         <autodoc>GetFileEncoding() -&gt; String</autodoc>
       </method>
-      <method name="SetRoot" type="void" overloaded="no">
+      <method name="SetRoot" type="" overloaded="no">
         <autodoc>SetRoot(XmlNode node)</autodoc>
         <paramlist>
-          <param name="node" type="p.wxXmlNode" default=""/>
+          <param name="node" type="XmlNode" default=""/>
         </paramlist>
       </method>
-      <method name="SetVersion" type="void" overloaded="no">
+      <method name="SetVersion" type="" overloaded="no">
         <autodoc>SetVersion(String version)</autodoc>
         <paramlist>
-          <param name="version" type="r.q(const).wxString" default=""/>
+          <param name="version" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetFileEncoding" type="void" overloaded="no">
+      <method name="SetFileEncoding" type="" overloaded="no">
         <autodoc>SetFileEncoding(String encoding)</autodoc>
         <paramlist>
-          <param name="encoding" type="r.q(const).wxString" default=""/>
+          <param name="encoding" type="String" default=""/>
         </paramlist>
       </method>
     </class>
@@ -34369,205 +34369,205 @@ def XRCCTRL(window, str_id, *ignoreargs):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="XmlResourceHandler" oldname="wxPyXmlResourceHandler" module="xrc">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="wxPyXmlResourceHandler" overloaded="no">
         <autodoc>__init__() -&gt; XmlResourceHandler</autodoc>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="CreateResource" type="wxObject" overloaded="no">
+      <method name="CreateResource" type="Object" overloaded="no">
         <autodoc>CreateResource(XmlNode node, Object parent, Object instance) -&gt; Object</autodoc>
         <paramlist>
-          <param name="node" type="p.wxXmlNode" default=""/>
-          <param name="parent" type="p.wxObject" default=""/>
-          <param name="instance" type="p.wxObject" default=""/>
+          <param name="node" type="XmlNode" default=""/>
+          <param name="parent" type="Object" default=""/>
+          <param name="instance" type="Object" default=""/>
         </paramlist>
       </method>
-      <method name="SetParentResource" type="void" overloaded="no">
+      <method name="SetParentResource" type="" overloaded="no">
         <autodoc>SetParentResource(XmlResource res)</autodoc>
         <paramlist>
-          <param name="res" type="p.wxXmlResource" default=""/>
+          <param name="res" type="XmlResource" default=""/>
         </paramlist>
       </method>
-      <method name="GetResource" type="wxXmlResource" overloaded="no">
+      <method name="GetResource" type="XmlResource" overloaded="no">
         <autodoc>GetResource() -&gt; XmlResource</autodoc>
       </method>
-      <method name="GetNode" type="wxXmlNode" overloaded="no">
+      <method name="GetNode" type="XmlNode" overloaded="no">
         <autodoc>GetNode() -&gt; XmlNode</autodoc>
       </method>
-      <method name="GetClass" type="wxString" overloaded="no">
+      <method name="GetClass" type="String" overloaded="no">
         <autodoc>GetClass() -&gt; String</autodoc>
       </method>
-      <method name="GetParent" type="wxObject" overloaded="no">
+      <method name="GetParent" type="Object" overloaded="no">
         <autodoc>GetParent() -&gt; Object</autodoc>
       </method>
-      <method name="GetInstance" type="wxObject" overloaded="no">
+      <method name="GetInstance" type="Object" overloaded="no">
         <autodoc>GetInstance() -&gt; Object</autodoc>
       </method>
-      <method name="GetParentAsWindow" type="wxWindow" overloaded="no">
+      <method name="GetParentAsWindow" type="Window" overloaded="no">
         <autodoc>GetParentAsWindow() -&gt; Window</autodoc>
       </method>
-      <method name="GetInstanceAsWindow" type="wxWindow" overloaded="no">
+      <method name="GetInstanceAsWindow" type="Window" overloaded="no">
         <autodoc>GetInstanceAsWindow() -&gt; Window</autodoc>
       </method>
       <method name="IsOfClass" type="bool" overloaded="no">
         <autodoc>IsOfClass(XmlNode node, String classname) -&gt; bool</autodoc>
         <paramlist>
-          <param name="node" type="p.wxXmlNode" default=""/>
-          <param name="classname" type="r.q(const).wxString" default=""/>
+          <param name="node" type="XmlNode" default=""/>
+          <param name="classname" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetNodeContent" type="wxString" overloaded="no">
+      <method name="GetNodeContent" type="String" overloaded="no">
         <autodoc>GetNodeContent(XmlNode node) -&gt; String</autodoc>
         <paramlist>
-          <param name="node" type="p.wxXmlNode" default=""/>
+          <param name="node" type="XmlNode" default=""/>
         </paramlist>
       </method>
       <method name="HasParam" type="bool" overloaded="no">
         <autodoc>HasParam(String param) -&gt; bool</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetParamNode" type="wxXmlNode" overloaded="no">
+      <method name="GetParamNode" type="XmlNode" overloaded="no">
         <autodoc>GetParamNode(String param) -&gt; XmlNode</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetParamValue" type="wxString" overloaded="no">
+      <method name="GetParamValue" type="String" overloaded="no">
         <autodoc>GetParamValue(String param) -&gt; String</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AddStyle" type="void" overloaded="no">
+      <method name="AddStyle" type="" overloaded="no">
         <autodoc>AddStyle(String name, int value)</autodoc>
         <paramlist>
-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>
           <param name="value" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="AddWindowStyles" type="void" overloaded="no">
+      <method name="AddWindowStyles" type="" overloaded="no">
         <autodoc>AddWindowStyles()</autodoc>
       </method>
       <method name="GetStyle" type="int" overloaded="no">
         <autodoc>GetStyle(String param=StyleString, int defaults=0) -&gt; int</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default="wxPyStyleString"/>
+          <param name="param" type="String" default="wxPyStyleString"/>
           <param name="defaults" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText(String param, bool translate=True) -&gt; String</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
           <param name="translate" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetID" type="int" overloaded="no">
         <autodoc>GetID() -&gt; int</autodoc>
       </method>
-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">
         <autodoc>GetName() -&gt; String</autodoc>
       </method>
       <method name="GetBool" type="bool" overloaded="no">
         <autodoc>GetBool(String param, bool defaultv=False) -&gt; bool</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
           <param name="defaultv" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="GetLong" type="long" overloaded="no">
         <autodoc>GetLong(String param, long defaultv=0) -&gt; long</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
           <param name="defaultv" type="long" default="0"/>
         </paramlist>
       </method>
-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">
         <autodoc>GetColour(String param) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">
         <autodoc>GetSize(String param=SizeString) -&gt; Size</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default="wxPySizeString"/>
+          <param name="param" type="String" default="wxPySizeString"/>
         </paramlist>
       </method>
-      <method name="GetPosition" type="wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">
         <autodoc>GetPosition(String param=PosString) -&gt; Point</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default="wxPyPosString"/>
+          <param name="param" type="String" default="wxPyPosString"/>
         </paramlist>
       </method>
       <method name="GetDimension" type="int" overloaded="no">
         <autodoc>GetDimension(String param, int defaultv=0) -&gt; int</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default=""/>
+          <param name="param" type="String" default=""/>
           <param name="defaultv" type="int" default="0"/>
         </paramlist>
       </method>
-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">
         <autodoc>GetBitmap(String param=BitmapString, wxArtClient defaultArtClient=wxART_OTHER, 
     Size size=DefaultSize) -&gt; Bitmap</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default="wxPyBitmapString"/>
-          <param name="defaultArtClient" type="r.q(const).wxArtClient" default="wxART_OTHER"/>
-          <param name="size" type="wxSize" default="wxDefaultSize"/>
+          <param name="param" type="String" default="wxPyBitmapString"/>
+          <param name="defaultArtClient" type="wxArtClient" default="wxART_OTHER"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
         </paramlist>
       </method>
-      <method name="GetIcon" type="wxIcon" overloaded="no">
+      <method name="GetIcon" type="Icon" overloaded="no">
         <autodoc>GetIcon(String param=IconString, wxArtClient defaultArtClient=wxART_OTHER, 
     Size size=DefaultSize) -&gt; Icon</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default="wxPyIconString"/>
-          <param name="defaultArtClient" type="r.q(const).wxArtClient" default="wxART_OTHER"/>
-          <param name="size" type="wxSize" default="wxDefaultSize"/>
+          <param name="param" type="String" default="wxPyIconString"/>
+          <param name="defaultArtClient" type="wxArtClient" default="wxART_OTHER"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
         </paramlist>
       </method>
-      <method name="GetFont" type="wxFont" overloaded="no">
+      <method name="GetFont" type="Font" overloaded="no">
         <autodoc>GetFont(String param=FontString) -&gt; Font</autodoc>
         <paramlist>
-          <param name="param" type="r.q(const).wxString" default="wxPyFontString"/>
+          <param name="param" type="String" default="wxPyFontString"/>
         </paramlist>
       </method>
-      <method name="SetupWindow" type="void" overloaded="no">
+      <method name="SetupWindow" type="" overloaded="no">
         <autodoc>SetupWindow(Window wnd)</autodoc>
         <paramlist>
-          <param name="wnd" type="p.wxWindow" default=""/>
+          <param name="wnd" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="CreateChildren" type="void" overloaded="no">
+      <method name="CreateChildren" type="" overloaded="no">
         <autodoc>CreateChildren(Object parent, bool this_hnd_only=False)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxObject" default=""/>
+          <param name="parent" type="Object" default=""/>
           <param name="this_hnd_only" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="CreateChildrenPrivately" type="void" overloaded="no">
+      <method name="CreateChildrenPrivately" type="" overloaded="no">
         <autodoc>CreateChildrenPrivately(Object parent, XmlNode rootnode=None)</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxObject" default=""/>
-          <param name="rootnode" type="p.wxXmlNode" default="NULL"/>
+          <param name="parent" type="Object" default=""/>
+          <param name="rootnode" type="XmlNode" default="NULL"/>
         </paramlist>
       </method>
-      <method name="CreateResFromNode" type="wxObject" overloaded="no">
+      <method name="CreateResFromNode" type="Object" overloaded="no">
         <autodoc>CreateResFromNode(XmlNode node, Object parent, Object instance=None) -&gt; Object</autodoc>
         <paramlist>
-          <param name="node" type="p.wxXmlNode" default=""/>
-          <param name="parent" type="p.wxObject" default=""/>
-          <param name="instance" type="p.wxObject" default="NULL"/>
+          <param name="node" type="XmlNode" default=""/>
+          <param name="parent" type="Object" default=""/>
+          <param name="instance" type="Object" default="NULL"/>
         </paramlist>
       </method>
-      <method name="GetCurFileSystem" type="wxFileSystem" overloaded="no">
+      <method name="GetCurFileSystem" type="FileSystem" overloaded="no">
         <autodoc>GetCurFileSystem() -&gt; FileSystem</autodoc>
       </method>
     </class>
@@ -34614,36 +34614,36 @@ XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
     <import name="controls"/>
     <pythoncode> wx = core </pythoncode>
     <class name="DynamicSashSplitEvent" oldname="wxDynamicSashSplitEvent" module="gizmos">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="DynamicSashSplitEvent" overloaded="no">
         <autodoc>__init__(Object target) -&gt; DynamicSashSplitEvent</autodoc>
         <paramlist>
-          <param name="target" type="p.wxObject" default=""/>
+          <param name="target" type="Object" default=""/>
         </paramlist>
       </constructor>
     </class>
     <class name="DynamicSashUnifyEvent" oldname="wxDynamicSashUnifyEvent" module="gizmos">
-      <baseclass name="wxCommandEvent"/>
+      <baseclass name="CommandEvent"/>
       <constructor name="DynamicSashUnifyEvent" overloaded="no">
         <autodoc>__init__(Object target) -&gt; DynamicSashUnifyEvent</autodoc>
         <paramlist>
-          <param name="target" type="p.wxObject" default=""/>
+          <param name="target" type="Object" default=""/>
         </paramlist>
       </constructor>
     </class>
     <class name="DynamicSashWindow" oldname="wxDynamicSashWindow" module="gizmos">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="DynamicSashWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
     String name=DynamicSashNameStr) -&gt; DynamicSashWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyDynamicSashNameStr"/>
+          <param name="name" type="String" default="wxPyDynamicSashNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreDynamicSashWindow" overloaded="no">
@@ -34654,24 +34654,24 @@ XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
     long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
     String name=DynamicSashNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyDynamicSashNameStr"/>
+          <param name="name" type="String" default="wxPyDynamicSashNameStr"/>
         </paramlist>
       </method>
-      <method name="GetHScrollBar" type="wxScrollBar" overloaded="no">
+      <method name="GetHScrollBar" type="ScrollBar" overloaded="no">
         <autodoc>GetHScrollBar(Window child) -&gt; ScrollBar</autodoc>
         <paramlist>
-          <param name="child" type="p.q(const).wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="GetVScrollBar" type="wxScrollBar" overloaded="no">
+      <method name="GetVScrollBar" type="ScrollBar" overloaded="no">
         <autodoc>GetVScrollBar(Window child) -&gt; ScrollBar</autodoc>
         <paramlist>
-          <param name="child" type="p.q(const).wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>
         </paramlist>
       </method>
     </class>
@@ -34680,25 +34680,25 @@ EVT_DYNAMIC_SASH_SPLIT = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_SPLIT, 1 )
 EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
 </pythoncode>
     <class name="EditableListBox" oldname="wxEditableListBox" module="gizmos">
-      <baseclass name="wxPanel"/>
+      <baseclass name="Panel"/>
       <constructor name="EditableListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxEL_ALLOW_NEW|wxEL_ALLOW_EDIT|wxEL_ALLOW_DELETE, 
     String name=EditableListBoxNameStr) -&gt; EditableListBox</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="label" type="r.q(const).wxString" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxEL_ALLOW_NEW|wxEL_ALLOW_EDIT|wxEL_ALLOW_DELETE"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyEditableListBoxNameStr"/>
+          <param name="name" type="String" default="wxPyEditableListBoxNameStr"/>
         </paramlist>
       </constructor>
-      <method name="SetStrings" type="void" overloaded="no">
+      <method name="SetStrings" type="" overloaded="no">
         <autodoc>SetStrings(wxArrayString strings)</autodoc>
         <paramlist>
-          <param name="strings" type="r.q(const).wxArrayString" default=""/>
+          <param name="strings" type="wxArrayString" default=""/>
         </paramlist>
       </method>
       <method name="GetStrings" type="PyObject" overloaded="no">
@@ -34707,129 +34707,129 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetListCtrl" type="wxListCtrl" overloaded="no">
         <autodoc>GetListCtrl() -&gt; wxListCtrl</autodoc>
       </method>
-      <method name="GetDelButton" type="wxBitmapButton" overloaded="no">
+      <method name="GetDelButton" type="BitmapButton" overloaded="no">
         <autodoc>GetDelButton() -&gt; BitmapButton</autodoc>
       </method>
-      <method name="GetNewButton" type="wxBitmapButton" overloaded="no">
+      <method name="GetNewButton" type="BitmapButton" overloaded="no">
         <autodoc>GetNewButton() -&gt; BitmapButton</autodoc>
       </method>
-      <method name="GetUpButton" type="wxBitmapButton" overloaded="no">
+      <method name="GetUpButton" type="BitmapButton" overloaded="no">
         <autodoc>GetUpButton() -&gt; BitmapButton</autodoc>
       </method>
-      <method name="GetDownButton" type="wxBitmapButton" overloaded="no">
+      <method name="GetDownButton" type="BitmapButton" overloaded="no">
         <autodoc>GetDownButton() -&gt; BitmapButton</autodoc>
       </method>
-      <method name="GetEditButton" type="wxBitmapButton" overloaded="no">
+      <method name="GetEditButton" type="BitmapButton" overloaded="no">
         <autodoc>GetEditButton() -&gt; BitmapButton</autodoc>
       </method>
     </class>
     <class name="RemotelyScrolledTreeCtrl" oldname="wxRemotelyScrolledTreeCtrl" module="gizmos">
-      <baseclass name="wxPyTreeCtrl"/>
+      <baseclass name="TreeCtrl"/>
       <constructor name="RemotelyScrolledTreeCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=TR_HAS_BUTTONS) -&gt; RemotelyScrolledTreeCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default=""/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTR_HAS_BUTTONS"/>
         </paramlist>
       </constructor>
-      <method name="HideVScrollbar" type="void" overloaded="no">
+      <method name="HideVScrollbar" type="" overloaded="no">
         <autodoc>HideVScrollbar()</autodoc>
       </method>
-      <method name="AdjustRemoteScrollbars" type="void" overloaded="no">
+      <method name="AdjustRemoteScrollbars" type="" overloaded="no">
         <autodoc>AdjustRemoteScrollbars()</autodoc>
       </method>
-      <method name="GetScrolledWindow" type="wxScrolledWindow" overloaded="no">
+      <method name="GetScrolledWindow" type="ScrolledWindow" overloaded="no">
         <autodoc>GetScrolledWindow() -&gt; ScrolledWindow</autodoc>
       </method>
-      <method name="ScrollToLine" type="void" overloaded="no">
+      <method name="ScrollToLine" type="" overloaded="no">
         <autodoc>ScrollToLine(int posHoriz, int posVert)</autodoc>
         <paramlist>
           <param name="posHoriz" type="int" default=""/>
           <param name="posVert" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetCompanionWindow" type="void" overloaded="no">
+      <method name="SetCompanionWindow" type="" overloaded="no">
         <autodoc>SetCompanionWindow(Window companion)</autodoc>
         <paramlist>
-          <param name="companion" type="p.wxWindow" default=""/>
+          <param name="companion" type="Window" default=""/>
         </paramlist>
       </method>
-      <method name="GetCompanionWindow" type="wxWindow" overloaded="no">
+      <method name="GetCompanionWindow" type="Window" overloaded="no">
         <autodoc>GetCompanionWindow() -&gt; Window</autodoc>
       </method>
     </class>
     <class name="TreeCompanionWindow" oldname="wxPyTreeCompanionWindow" module="gizmos">
-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>
       <constructor name="wxPyTreeCompanionWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0) -&gt; TreeCompanionWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="GetTreeCtrl" type="wxRemotelyScrolledTreeCtrl" overloaded="no">
+      <method name="GetTreeCtrl" type="RemotelyScrolledTreeCtrl" overloaded="no">
         <autodoc>GetTreeCtrl() -&gt; RemotelyScrolledTreeCtrl</autodoc>
       </method>
-      <method name="SetTreeCtrl" type="void" overloaded="no">
+      <method name="SetTreeCtrl" type="" overloaded="no">
         <autodoc>SetTreeCtrl(RemotelyScrolledTreeCtrl treeCtrl)</autodoc>
         <paramlist>
-          <param name="treeCtrl" type="p.wxRemotelyScrolledTreeCtrl" default=""/>
+          <param name="treeCtrl" type="RemotelyScrolledTreeCtrl" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="ThinSplitterWindow" oldname="wxThinSplitterWindow" module="gizmos">
-      <baseclass name="wxSplitterWindow"/>
+      <baseclass name="SplitterWindow"/>
       <constructor name="ThinSplitterWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxSP_3D|wxCLIP_CHILDREN) -&gt; ThinSplitterWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxSP_3D|wxCLIP_CHILDREN"/>
         </paramlist>
       </constructor>
     </class>
     <class name="SplitterScrolledWindow" oldname="wxSplitterScrolledWindow" module="gizmos">
-      <baseclass name="wxScrolledWindow"/>
+      <baseclass name="ScrolledWindow"/>
       <constructor name="SplitterScrolledWindow" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0) -&gt; SplitterScrolledWindow</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>
     </class>
     <class name="LEDNumberCtrl" oldname="wxLEDNumberCtrl" module="gizmos">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="LEDNumberCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxLED_ALIGN_LEFT|wxLED_DRAW_FADED) -&gt; LEDNumberCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLED_ALIGN_LEFT|wxLED_DRAW_FADED"/>
         </paramlist>
       </constructor>
@@ -34840,10 +34840,10 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxLED_ALIGN_LEFT|wxLED_DRAW_FADED) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxLED_ALIGN_LEFT|wxLED_DRAW_FADED"/>
         </paramlist>
       </method>
@@ -34853,38 +34853,38 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetDrawFaded" type="bool" overloaded="no">
         <autodoc>GetDrawFaded() -&gt; bool</autodoc>
       </method>
-      <method name="GetValue" type="q(const).wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
-      <method name="SetAlignment" type="void" overloaded="no">
+      <method name="SetAlignment" type="" overloaded="no">
         <autodoc>SetAlignment(int Alignment, bool Redraw=true)</autodoc>
         <paramlist>
           <param name="Alignment" type="wxLEDValueAlign" default=""/>
           <param name="Redraw" type="bool" default="true"/>
         </paramlist>
       </method>
-      <method name="SetDrawFaded" type="void" overloaded="no">
+      <method name="SetDrawFaded" type="" overloaded="no">
         <autodoc>SetDrawFaded(bool DrawFaded, bool Redraw=true)</autodoc>
         <paramlist>
           <param name="DrawFaded" type="bool" default=""/>
           <param name="Redraw" type="bool" default="true"/>
         </paramlist>
       </method>
-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">
         <autodoc>SetValue(String Value, bool Redraw=true)</autodoc>
         <paramlist>
-          <param name="Value" type="r.q(const).wxString" default=""/>
+          <param name="Value" type="String" default=""/>
           <param name="Redraw" type="bool" default="true"/>
         </paramlist>
       </method>
     </class>
     <class name="TreeListColumnInfo" oldname="wxTreeListColumnInfo" module="gizmos">
-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>
       <constructor name="TreeListColumnInfo" overloaded="no">
         <autodoc>__init__(String text=EmptyString, int image=-1, size_t width=100, 
     int alignment=TL_ALIGN_LEFT) -&gt; TreeListColumnInfo</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default="wxPyEmptyString"/>
+          <param name="text" type="String" default="wxPyEmptyString"/>
           <param name="image" type="int" default="-1"/>
           <param name="width" type="size_t" default="100"/>
           <param name="alignment" type="wxTreeListColumnAlign" default="wxTL_ALIGN_LEFT"/>
@@ -34893,7 +34893,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetAlignment" type="wxTreeListColumnAlign" overloaded="no">
         <autodoc>GetAlignment() -&gt; int</autodoc>
       </method>
-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetImage" type="int" overloaded="no">
@@ -34905,31 +34905,31 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetWidth" type="size_t" overloaded="no">
         <autodoc>GetWidth() -&gt; size_t</autodoc>
       </method>
-      <method name="SetAlignment" type="void" overloaded="no">
+      <method name="SetAlignment" type="" overloaded="no">
         <autodoc>SetAlignment(int alignment)</autodoc>
         <paramlist>
           <param name="alignment" type="wxTreeListColumnAlign" default=""/>
         </paramlist>
       </method>
-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">
         <autodoc>SetText(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="SetImage" type="void" overloaded="no">
+      <method name="SetImage" type="" overloaded="no">
         <autodoc>SetImage(int image)</autodoc>
         <paramlist>
           <param name="image" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetSelectedImage" type="void" overloaded="no">
+      <method name="SetSelectedImage" type="" overloaded="no">
         <autodoc>SetSelectedImage(int image)</autodoc>
         <paramlist>
           <param name="image" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="SetWidth" type="void" overloaded="no">
+      <method name="SetWidth" type="" overloaded="no">
         <autodoc>SetWidth(size_t with)</autodoc>
         <paramlist>
           <param name="with" type="size_t" default=""/>
@@ -34937,20 +34937,20 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       </method>
     </class>
     <class name="TreeListCtrl" oldname="wxPyTreeListCtrl" module="gizmos">
-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>
       <constructor name="wxPyTreeListCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeListCtrlNameStr) -&gt; TreeListCtrl</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTR_DEFAULT_STYLE"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTreeListCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyTreeListCtrlNameStr"/>
         </paramlist>
       </constructor>
       <constructor name="PreTreeListCtrl" overloaded="no">
@@ -34962,20 +34962,20 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
     Validator validator=DefaultValidator, 
     String name=TreeListCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>
           <param name="id" type="int" default="-1"/>
-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
-          <param name="size" type="r.q(const).wxSize" default="wxDefaultSize"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
           <param name="style" type="long" default="wxTR_DEFAULT_STYLE"/>
-          <param name="validator" type="r.q(const).wxValidator" default="wxDefaultValidator"/>
-          <param name="name" type="r.q(const).wxString" default="wxPyTreeListCtrlNameStr"/>
+          <param name="validator" type="Validator" default="wxDefaultValidator"/>
+          <param name="name" type="String" default="wxPyTreeListCtrlNameStr"/>
         </paramlist>
       </method>
-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">
         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
-          <param name="self" type="p.PyObject" default=""/>
-          <param name="_class" type="p.PyObject" default=""/>
+          <param name="self" type="PyObject" default=""/>
+          <param name="_class" type="PyObject" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="size_t" overloaded="no">
@@ -34984,7 +34984,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetIndent" type="unsigned int" overloaded="no">
         <autodoc>GetIndent() -&gt; unsigned int</autodoc>
       </method>
-      <method name="SetIndent" type="void" overloaded="no">
+      <method name="SetIndent" type="" overloaded="no">
         <autodoc>SetIndent(unsigned int indent)</autodoc>
         <paramlist>
           <param name="indent" type="unsigned int" default=""/>
@@ -34993,7 +34993,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetSpacing" type="unsigned int" overloaded="no">
         <autodoc>GetSpacing() -&gt; unsigned int</autodoc>
       </method>
-      <method name="SetSpacing" type="void" overloaded="no">
+      <method name="SetSpacing" type="" overloaded="no">
         <autodoc>SetSpacing(unsigned int spacing)</autodoc>
         <paramlist>
           <param name="spacing" type="unsigned int" default=""/>
@@ -35002,84 +35002,84 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetLineSpacing" type="unsigned int" overloaded="no">
         <autodoc>GetLineSpacing() -&gt; unsigned int</autodoc>
       </method>
-      <method name="SetLineSpacing" type="void" overloaded="no">
+      <method name="SetLineSpacing" type="" overloaded="no">
         <autodoc>SetLineSpacing(unsigned int spacing)</autodoc>
         <paramlist>
           <param name="spacing" type="unsigned int" default=""/>
         </paramlist>
       </method>
-      <method name="GetImageList" type="wxImageList" overloaded="no">
+      <method name="GetImageList" type="ImageList" overloaded="no">
         <autodoc>GetImageList() -&gt; ImageList</autodoc>
       </method>
-      <method name="GetStateImageList" type="wxImageList" overloaded="no">
+      <method name="GetStateImageList" type="ImageList" overloaded="no">
         <autodoc>GetStateImageList() -&gt; ImageList</autodoc>
       </method>
-      <method name="GetButtonsImageList" type="wxImageList" overloaded="no">
+      <method name="GetButtonsImageList" type="ImageList" overloaded="no">
         <autodoc>GetButtonsImageList() -&gt; ImageList</autodoc>
       </method>
-      <method name="SetImageList" type="void" overloaded="no">
+      <method name="SetImageList" type="" overloaded="no">
         <autodoc>SetImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="SetStateImageList" type="void" overloaded="no">
+      <method name="SetStateImageList" type="" overloaded="no">
         <autodoc>SetStateImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="SetButtonsImageList" type="void" overloaded="no">
+      <method name="SetButtonsImageList" type="" overloaded="no">
         <autodoc>SetButtonsImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">
         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AssignStateImageList" type="void" overloaded="no">
+      <method name="AssignStateImageList" type="" overloaded="no">
         <autodoc>AssignStateImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AssignButtonsImageList" type="void" overloaded="no">
+      <method name="AssignButtonsImageList" type="" overloaded="no">
         <autodoc>AssignButtonsImageList(ImageList imageList)</autodoc>
         <paramlist>
-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>
         </paramlist>
       </method>
-      <method name="AddColumn" type="void" overloaded="no">
+      <method name="AddColumn" type="" overloaded="no">
         <autodoc>AddColumn(String text)</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="AddColumnInfo" type="void" overloaded="no">
+      <method name="AddColumnInfo" type="" overloaded="no">
         <autodoc>AddColumnInfo(TreeListColumnInfo col)</autodoc>
         <paramlist>
-          <param name="col" type="r.q(const).wxTreeListColumnInfo" default=""/>
+          <param name="col" type="TreeListColumnInfo" default=""/>
         </paramlist>
       </method>
-      <method name="InsertColumn" type="void" overloaded="no">
+      <method name="InsertColumn" type="" overloaded="no">
         <autodoc>InsertColumn(size_t before, String text)</autodoc>
         <paramlist>
           <param name="before" type="size_t" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="InsertColumnInfo" type="void" overloaded="no">
+      <method name="InsertColumnInfo" type="" overloaded="no">
         <autodoc>InsertColumnInfo(size_t before, TreeListColumnInfo col)</autodoc>
         <paramlist>
           <param name="before" type="size_t" default=""/>
-          <param name="col" type="r.q(const).wxTreeListColumnInfo" default=""/>
+          <param name="col" type="TreeListColumnInfo" default=""/>
         </paramlist>
       </method>
-      <method name="RemoveColumn" type="void" overloaded="no">
+      <method name="RemoveColumn" type="" overloaded="no">
         <autodoc>RemoveColumn(size_t column)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
@@ -35088,7 +35088,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetColumnCount" type="size_t" overloaded="no">
         <autodoc>GetColumnCount() -&gt; size_t</autodoc>
       </method>
-      <method name="SetColumnWidth" type="void" overloaded="no">
+      <method name="SetColumnWidth" type="" overloaded="no">
         <autodoc>SetColumnWidth(size_t column, size_t width)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
@@ -35101,7 +35101,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetMainColumn" type="void" overloaded="no">
+      <method name="SetMainColumn" type="" overloaded="no">
         <autodoc>SetMainColumn(size_t column)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
@@ -35110,33 +35110,33 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       <method name="GetMainColumn" type="size_t" overloaded="no">
         <autodoc>GetMainColumn() -&gt; size_t</autodoc>
       </method>
-      <method name="SetColumnText" type="void" overloaded="no">
+      <method name="SetColumnText" type="" overloaded="no">
         <autodoc>SetColumnText(size_t column, String text)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
         </paramlist>
       </method>
-      <method name="GetColumnText" type="wxString" overloaded="no">
+      <method name="GetColumnText" type="String" overloaded="no">
         <autodoc>GetColumnText(size_t column) -&gt; String</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetColumn" type="void" overloaded="no">
+      <method name="SetColumn" type="" overloaded="no">
         <autodoc>SetColumn(size_t column, TreeListColumnInfo info)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
-          <param name="info" type="r.q(const).wxTreeListColumnInfo" default=""/>
+          <param name="info" type="TreeListColumnInfo" default=""/>
         </paramlist>
       </method>
-      <method name="GetColumn" type="wxTreeListColumnInfo" overloaded="no">
+      <method name="GetColumn" type="TreeListColumnInfo" overloaded="no">
         <autodoc>GetColumn(size_t column) -&gt; TreeListColumnInfo</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetColumnAlignment" type="void" overloaded="no">
+      <method name="SetColumnAlignment" type="" overloaded="no">
         <autodoc>SetColumnAlignment(size_t column, int align)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
@@ -35149,7 +35149,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="SetColumnImage" type="void" overloaded="no">
+      <method name="SetColumnImage" type="" overloaded="no">
         <autodoc>SetColumnImage(size_t column, int image)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>
@@ -35162,403 +35162,403 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemText" type="wxString" overloaded="no">
+      <method name="GetItemText" type="String" overloaded="no">
         <autodoc>GetItemText(TreeItemId item, int column=-1) -&gt; String</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="column" type="int" default="-1"/>
         </paramlist>
       </method>
       <method name="GetItemImage" type="int" overloaded="no">
         <autodoc>GetItemImage(TreeItemId item, int column=-1, int which=TreeItemIcon_Normal) -&gt; int</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="column" type="int" default="-1"/>
           <param name="which" type="wxTreeItemIcon" default="wxTreeItemIcon_Normal"/>
         </paramlist>
       </method>
-      <method name="SetItemText" type="void" overloaded="no">
+      <method name="SetItemText" type="" overloaded="no">
         <autodoc>SetItemText(TreeItemId item, String text, int column=-1)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="column" type="int" default="-1"/>
         </paramlist>
       </method>
-      <method name="SetItemImage" type="void" overloaded="no">
+      <method name="SetItemImage" type="" overloaded="no">
         <autodoc>SetItemImage(TreeItemId item, int image, int column=-1, int which=TreeItemIcon_Normal)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="image" type="int" default=""/>
           <param name="column" type="int" default="-1"/>
           <param name="which" type="wxTreeItemIcon" default="wxTreeItemIcon_Normal"/>
         </paramlist>
       </method>
-      <method name="GetItemData" type="wxPyTreeItemData" overloaded="no">
+      <method name="GetItemData" type="TreeItemData" overloaded="no">
         <autodoc>GetItemData(TreeItemId item) -&gt; TreeItemData</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemData" type="void" overloaded="no">
+      <method name="SetItemData" type="" overloaded="no">
         <autodoc>SetItemData(TreeItemId item, TreeItemData data)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="data" type="p.wxPyTreeItemData" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="data" type="TreeItemData" default=""/>
         </paramlist>
       </method>
       <method name="GetItemPyData" type="PyObject" overloaded="no">
         <autodoc>GetItemPyData(TreeItemId item) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemPyData" type="void" overloaded="no">
+      <method name="SetItemPyData" type="" overloaded="no">
         <autodoc>SetItemPyData(TreeItemId item, PyObject obj)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="obj" type="p.PyObject" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="obj" type="PyObject" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemHasChildren" type="void" overloaded="no">
+      <method name="SetItemHasChildren" type="" overloaded="no">
         <autodoc>SetItemHasChildren(TreeItemId item, bool has=True)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="has" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetItemBold" type="void" overloaded="no">
+      <method name="SetItemBold" type="" overloaded="no">
         <autodoc>SetItemBold(TreeItemId item, bool bold=True)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="bold" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="SetItemTextColour" type="void" overloaded="no">
+      <method name="SetItemTextColour" type="" overloaded="no">
         <autodoc>SetItemTextColour(TreeItemId item, Colour col)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemBackgroundColour" type="void" overloaded="no">
+      <method name="SetItemBackgroundColour" type="" overloaded="no">
         <autodoc>SetItemBackgroundColour(TreeItemId item, Colour col)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="col" type="Colour" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemFont" type="void" overloaded="no">
+      <method name="SetItemFont" type="" overloaded="no">
         <autodoc>SetItemFont(TreeItemId item, Font font)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="font" type="Font" default=""/>
         </paramlist>
       </method>
       <method name="GetItemBold" type="bool" overloaded="no">
         <autodoc>GetItemBold(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemTextColour" type="wxColour" overloaded="no">
+      <method name="GetItemTextColour" type="Colour" overloaded="no">
         <autodoc>GetItemTextColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetItemBackgroundColour" type="Colour" overloaded="no">
         <autodoc>GetItemBackgroundColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetItemFont" type="wxFont" overloaded="no">
+      <method name="GetItemFont" type="Font" overloaded="no">
         <autodoc>GetItemFont(TreeItemId item) -&gt; Font</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsVisible" type="bool" overloaded="no">
         <autodoc>IsVisible(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="ItemHasChildren" type="bool" overloaded="no">
         <autodoc>ItemHasChildren(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsExpanded" type="bool" overloaded="no">
         <autodoc>IsExpanded(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsSelected" type="bool" overloaded="no">
         <autodoc>IsSelected(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="IsBold" type="bool" overloaded="no">
         <autodoc>IsBold(TreeItemId item) -&gt; bool</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetChildrenCount" type="size_t" overloaded="no">
         <autodoc>GetChildrenCount(TreeItemId item, bool recursively=True) -&gt; size_t</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="recursively" type="bool" default="True"/>
         </paramlist>
       </method>
-      <method name="GetRootItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetRootItem" type="TreeItemId" overloaded="no">
         <autodoc>GetRootItem() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="GetSelection" type="wxTreeItemId" overloaded="no">
+      <method name="GetSelection" type="TreeItemId" overloaded="no">
         <autodoc>GetSelection() -&gt; TreeItemId</autodoc>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">
         <autodoc>GetSelections() -&gt; PyObject</autodoc>
       </method>
-      <method name="GetItemParent" type="wxTreeItemId" overloaded="no">
+      <method name="GetItemParent" type="TreeItemId" overloaded="no">
         <autodoc>GetItemParent(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstChild" type="PyObject" overloaded="no">
         <autodoc>GetFirstChild(TreeItemId item) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetNextChild" type="PyObject" overloaded="no">
         <autodoc>GetNextChild(TreeItemId item, long cookie) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="cookie" type="long" default=""/>
         </paramlist>
       </method>
-      <method name="GetLastChild" type="wxTreeItemId" overloaded="no">
+      <method name="GetLastChild" type="TreeItemId" overloaded="no">
         <autodoc>GetLastChild(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetNextSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetNextSibling" type="TreeItemId" overloaded="no">
         <autodoc>GetNextSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrevSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevSibling" type="TreeItemId" overloaded="no">
         <autodoc>GetPrevSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetFirstVisibleItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetFirstVisibleItem" type="TreeItemId" overloaded="no">
         <autodoc>GetFirstVisibleItem() -&gt; TreeItemId</autodoc>
       </method>
-      <method name="GetNextVisible" type="wxTreeItemId" overloaded="no">
+      <method name="GetNextVisible" type="TreeItemId" overloaded="no">
         <autodoc>GetNextVisible(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetPrevVisible" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevVisible" type="TreeItemId" overloaded="no">
         <autodoc>GetPrevVisible(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="GetNext" type="wxTreeItemId" overloaded="no">
+      <method name="GetNext" type="TreeItemId" overloaded="no">
         <autodoc>GetNext(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="AddRoot" type="wxTreeItemId" overloaded="no">
+      <method name="AddRoot" type="TreeItemId" overloaded="no">
         <autodoc>AddRoot(String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="PrependItem" type="wxTreeItemId" overloaded="no">
+      <method name="PrependItem" type="TreeItemId" overloaded="no">
         <autodoc>PrependItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 
     TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="InsertItem" type="wxTreeItemId" overloaded="no">
+      <method name="InsertItem" type="TreeItemId" overloaded="no">
         <autodoc>InsertItem(TreeItemId parent, TreeItemId idPrevious, String text, 
     int image=-1, int selectedImage=-1, TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="idPrevious" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
+          <param name="idPrevious" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="InsertItemBefore" type="wxTreeItemId" overloaded="no">
+      <method name="InsertItemBefore" type="TreeItemId" overloaded="no">
         <autodoc>InsertItemBefore(TreeItemId parent, size_t index, String text, int image=-1, 
     int selectedImage=-1, TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
           <param name="index" type="size_t" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="AppendItem" type="wxTreeItemId" overloaded="no">
+      <method name="AppendItem" type="TreeItemId" overloaded="no">
         <autodoc>AppendItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 
     TreeItemData data=None) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="parent" type="r.q(const).wxTreeItemId" default=""/>
-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="parent" type="TreeItemId" default=""/>
+          <param name="text" type="String" default=""/>
           <param name="image" type="int" default="-1"/>
           <param name="selectedImage" type="int" default="-1"/>
-          <param name="data" type="p.wxPyTreeItemData" default="NULL"/>
+          <param name="data" type="TreeItemData" default="NULL"/>
         </paramlist>
       </method>
-      <method name="Delete" type="void" overloaded="no">
+      <method name="Delete" type="" overloaded="no">
         <autodoc>Delete(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteChildren" type="void" overloaded="no">
+      <method name="DeleteChildren" type="" overloaded="no">
         <autodoc>DeleteChildren(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="DeleteAllItems" type="void" overloaded="no">
+      <method name="DeleteAllItems" type="" overloaded="no">
         <autodoc>DeleteAllItems()</autodoc>
       </method>
-      <method name="Expand" type="void" overloaded="no">
+      <method name="Expand" type="" overloaded="no">
         <autodoc>Expand(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="ExpandAll" type="void" overloaded="no">
+      <method name="ExpandAll" type="" overloaded="no">
         <autodoc>ExpandAll(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Collapse" type="void" overloaded="no">
+      <method name="Collapse" type="" overloaded="no">
         <autodoc>Collapse(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="CollapseAndReset" type="void" overloaded="no">
+      <method name="CollapseAndReset" type="" overloaded="no">
         <autodoc>CollapseAndReset(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">
         <autodoc>Toggle(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Unselect" type="void" overloaded="no">
+      <method name="Unselect" type="" overloaded="no">
         <autodoc>Unselect()</autodoc>
       </method>
-      <method name="UnselectAll" type="void" overloaded="no">
+      <method name="UnselectAll" type="" overloaded="no">
         <autodoc>UnselectAll()</autodoc>
       </method>
-      <method name="SelectItem" type="void" overloaded="no">
+      <method name="SelectItem" type="" overloaded="no">
         <autodoc>SelectItem(TreeItemId item, bool unselect_others=True, bool extended_select=False)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="unselect_others" type="bool" default="True"/>
           <param name="extended_select" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="EnsureVisible" type="void" overloaded="no">
+      <method name="EnsureVisible" type="" overloaded="no">
         <autodoc>EnsureVisible(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="ScrollTo" type="void" overloaded="no">
+      <method name="ScrollTo" type="" overloaded="no">
         <autodoc>ScrollTo(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="HitTest" type="wxTreeItemId" overloaded="no">
+      <method name="HitTest" type="TreeItemId" overloaded="no">
         <autodoc>HitTest(Point point, int OUTPUT, int OUTPUT) -&gt; TreeItemId</autodoc>
         <paramlist>
-          <param name="point" type="r.q(const).wxPoint" default=""/>
-          <param name="OUTPUT" type="r.int" default=""/>
-          <param name="OUTPUT" type="r.int" default=""/>
+          <param name="point" type="Point" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
+          <param name="OUTPUT" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetBoundingRect" type="PyObject" overloaded="no">
         <autodoc>GetBoundingRect(TreeItemId item, bool textOnly=False) -&gt; PyObject</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="textOnly" type="bool" default="False"/>
         </paramlist>
       </method>
-      <method name="EditLabel" type="void" overloaded="no">
+      <method name="EditLabel" type="" overloaded="no">
         <autodoc>EditLabel(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="Edit" type="void" overloaded="no">
+      <method name="Edit" type="" overloaded="no">
         <autodoc>Edit(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="SortChildren" type="void" overloaded="no">
+      <method name="SortChildren" type="" overloaded="no">
         <autodoc>SortChildren(TreeItemId item)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
       <method name="GetItemSelectedImage" type="int" overloaded="no">
         <autodoc>GetItemSelectedImage(TreeItemId item) -&gt; int</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
         </paramlist>
       </method>
-      <method name="SetItemSelectedImage" type="void" overloaded="no">
+      <method name="SetItemSelectedImage" type="" overloaded="no">
         <autodoc>SetItemSelectedImage(TreeItemId item, int image)</autodoc>
         <paramlist>
-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>
           <param name="image" type="int" default=""/>
         </paramlist>
       </method>
-      <method name="GetHeaderWindow" type="wxWindow" overloaded="no">
+      <method name="GetHeaderWindow" type="Window" overloaded="no">
         <autodoc>GetHeaderWindow() -&gt; Window</autodoc>
       </method>
-      <method name="GetMainWindow" type="wxWindow" overloaded="no">
+      <method name="GetMainWindow" type="Window" overloaded="no">
         <autodoc>GetMainWindow() -&gt; Window</autodoc>
       </method>
     </class>