Remove #!

[wxWidgets.git] / wxPython / docs / xml / wxPython-metadata.xml

diff --git a/wxPython/docs/xml/wxPython-metadata.xml b/wxPython/docs/xml/wxPython-metadata.xml
index 6e45e88ab9ff9d4dfd294221973b99108c415f10..8c0171e6e49eb67e3571c5db2f9f0067abcd766f 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>
     <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>
         <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>
         <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>
         <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>
         </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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
           <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>
         <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=""/>
         <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>
         <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>
         </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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         <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>
         </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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         <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>
         </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">
         </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="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=""/>
         <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="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=""/>
         <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="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=""/>
         <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="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>
         <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>
         <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>
         <autodoc>SetPosition(Point p)</autodoc>
         <paramlist>

-          <param name="p" type="r.q(const).wxPoint" default=""/>
+          <param name="p" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">

         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
         <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>
         <autodoc>SetSize(Size s)</autodoc>
         <paramlist>

-          <param name="s" type="r.q(const).wxSize" default=""/>
+          <param name="s" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTopLeft" type="wxPoint" overloaded="no">
+      <method name="GetTopLeft" type="Point" overloaded="no">

         <autodoc>GetTopLeft() -&gt; Point</autodoc>
       </method>
         <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>
         <autodoc>SetTopLeft(Point p)</autodoc>
         <paramlist>

-          <param name="p" type="r.q(const).wxPoint" default=""/>
+          <param name="p" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetBottomRight" type="wxPoint" overloaded="no">
+      <method name="GetBottomRight" type="Point" overloaded="no">

         <autodoc>GetBottomRight() -&gt; Point</autodoc>
       </method>
         <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>
         <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">
         </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="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>
         <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>
         <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>
         <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>
         <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>
         <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>
           <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
         <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>
           <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
         <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>
           <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         </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">
         </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>
         <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>
         </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"/>
         </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>
         <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>
       <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>
       </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>
         <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>
         </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>
         </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>
         <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>
         </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>
         <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">
         </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="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>
         <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=""/>
         <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>
       <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>
         </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>
         </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>
         </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>
         </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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="__isub__" type="wxPoint2D" overloaded="no">
+      <method name="__isub__" type="Point2D" overloaded="no">

         <autodoc>__isub__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="__imul__" type="wxPoint2D" overloaded="no">
+      <method name="__imul__" type="Point2D" overloaded="no">

         <autodoc>__imul__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="__idiv__" type="wxPoint2D" overloaded="no">
+      <method name="__idiv__" type="Point2D" overloaded="no">

         <autodoc>__idiv__(Point2D pt) -&gt; Point2D</autodoc>
         <paramlist>
         <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>
         </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>
         </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"/>
         </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"/>
         <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>
       <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>
         </paramlist>
       </constructor>

-      <method name="close" type="void" overloaded="no">
+      <method name="close" type="" overloaded="no">

         <autodoc>close()</autodoc>
       </method>
         <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">
         <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>
           <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=""/>
         <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>
     </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>
         <autodoc>write(PyObject obj)</autodoc>
         <paramlist>

-          <param name="obj" type="p.PyObject" default=""/>
+          <param name="obj" type="PyObject" default=""/>

         </paramlist>
       </method>
     </class>
         </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">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <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="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>
         <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>
         <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">
         <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">
     </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>
       <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>
         <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>
         </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>
         </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>
         <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>
         </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>
         <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>
           <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetLeftLocation" type="wxString" overloaded="no">
+      <method name="GetLeftLocation" type="String" overloaded="no">

         <autodoc>GetLeftLocation(String location) -&gt; String</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetAnchor" type="wxString" overloaded="no">
+      <method name="GetAnchor" type="String" overloaded="no">

         <autodoc>GetAnchor(String location) -&gt; String</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetRightLocation" type="wxString" overloaded="no">
+      <method name="GetRightLocation" type="String" overloaded="no">

         <autodoc>GetRightLocation(String location) -&gt; String</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetMimeTypeFromExt" type="wxString" overloaded="no">
+      <method name="GetMimeTypeFromExt" type="String" overloaded="no">

         <autodoc>GetMimeTypeFromExt(String location) -&gt; String</autodoc>
         <paramlist>
         <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">
         </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>
       <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>
         <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>
           <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>
         <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>
         <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>
         </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>
         <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>
           <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>
         <autodoc>FindNext() -&gt; String</autodoc>
       </method>

-      <staticmethod name="AddHandler" type="void" overloaded="no">
-        <autodoc>FileSystem.AddHandler(CPPFileSystemHandler handler)</autodoc>
+      <staticmethod name="AddHandler" type="" overloaded="no">
+        <autodoc>AddHandler(CPPFileSystemHandler handler)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="handler" type="p.wxFileSystemHandler" default=""/>
+          <param name="handler" type="CPPFileSystemHandler" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="CleanUpHandlers" type="void" overloaded="no">
-        <autodoc>FileSystem.CleanUpHandlers()</autodoc>
+      <staticmethod name="CleanUpHandlers" type="" overloaded="no">
+        <autodoc>CleanUpHandlers()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="FileNameToURL" type="wxString" overloaded="no">
-        <autodoc>FileSystem.FileNameToURL(String filename) -&gt; String</autodoc>
+      <staticmethod name="FileNameToURL" type="String" overloaded="no">
+        <autodoc>FileNameToURL(String filename) -&gt; String</autodoc>

         <paramlist>
         <paramlist>

-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>

         </paramlist>
       </staticmethod>
     </class>
         </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>
       <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">
       </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>
       <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>
         </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>
         <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">
         </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>
       <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>
         </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>
         <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>
         </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>
         <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>
           <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>
         <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>
       <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>
         <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>
       <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>
         <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>
       <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>
       </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">
     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>
       <constructor name="MemoryFSHandler" overloaded="no">
         <autodoc>__init__() -&gt; MemoryFSHandler</autodoc>
       </constructor>

-      <staticmethod name="RemoveFile" type="void" overloaded="no">
-        <autodoc>MemoryFSHandler.RemoveFile(String filename)</autodoc>
+      <staticmethod name="RemoveFile" type="" overloaded="no">
+        <autodoc>RemoveFile(String filename)</autodoc>

         <paramlist>
         <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>
         </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>
         </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>
         <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>
         </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>
         <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>
           <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>
         <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">
 #---------------------------------------------------------------------------
 </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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetName" type="void" overloaded="no">
+      <method name="SetName" type="" overloaded="no">

         <autodoc>SetName(String name)</autodoc>
         <paramlist>
         <autodoc>SetName(String name)</autodoc>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetExtension" type="void" overloaded="no">
+      <method name="SetExtension" type="" overloaded="no">

         <autodoc>SetExtension(String extension)</autodoc>
         <paramlist>
         <autodoc>SetExtension(String extension)</autodoc>
         <paramlist>

-          <param name="extension" type="r.q(const).wxString" default=""/>
+          <param name="extension" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetMimeType(String mimetype)</autodoc>
         <paramlist>

-          <param name="mimetype" type="r.q(const).wxString" default=""/>
+          <param name="mimetype" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -1080,7 +1080,7 @@ def MemoryFSHandler_AddFile(filename, a, b=''):
         <autodoc>__init__() -&gt; ImageHistogram</autodoc>
       </constructor>
       <staticmethod name="MakeKey" type="unsigned long" overloaded="no">
         <autodoc>__init__() -&gt; ImageHistogram</autodoc>
       </constructor>
       <staticmethod name="MakeKey" type="unsigned long" overloaded="no">

-        <autodoc>ImageHistogram.MakeKey(unsigned char r, unsigned char g, unsigned char b) -&gt; unsigned long</autodoc>
+        <autodoc>MakeKey(unsigned char r, unsigned char g, unsigned char b) -&gt; unsigned long</autodoc>

         <docstring>Get the key in the histogram for the given RGB values</docstring>
         <paramlist>
           <param name="r" type="unsigned char" default=""/>
         <docstring>Get the key in the histogram for the given RGB values</docstring>
         <paramlist>
           <param name="r" type="unsigned char" default=""/>


@@ -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>
 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"/>
           <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">
       </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>
       <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>
           <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>
       <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="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>
           <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>
       <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>
           <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>
       <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">
         </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=""/>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <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>
           <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=""/>
         <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>
 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"/>
           <param name="startR" type="byte" default="0"/>
           <param name="startG" type="byte" default="0"/>
           <param name="startB" type="byte" default="0"/>


@@ -1260,29 +1260,29 @@ values.</docstring>
       <method name="SetMaskFromImage" type="bool" overloaded="no">
         <autodoc>SetMaskFromImage(Image mask, byte mr, byte mg, byte mb) -&gt; bool</autodoc>
         <paramlist>
       <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=""/>
         </paramlist>
       </method>
       <staticmethod name="CanRead" type="bool" overloaded="no">
           <param name="mr" type="byte" default=""/>
           <param name="mg" type="byte" default=""/>
           <param name="mb" type="byte" default=""/>
         </paramlist>
       </method>
       <staticmethod name="CanRead" type="bool" overloaded="no">

-        <autodoc>Image.CanRead(String name) -&gt; bool</autodoc>
+        <autodoc>CanRead(String name) -&gt; bool</autodoc>

         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetImageCount" type="int" overloaded="no">

-        <autodoc>Image.GetImageCount(String name, long type=BITMAP_TYPE_ANY) -&gt; int</autodoc>
+        <autodoc>GetImageCount(String name, long type=BITMAP_TYPE_ANY) -&gt; int</autodoc>

         <paramlist>
         <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="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>
           <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>
       <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="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="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">
         </paramlist>
       </method>
       <staticmethod name="CanReadStream" type="bool" overloaded="no">

-        <autodoc>Image.CanReadStream(InputStream stream) -&gt; bool</autodoc>
+        <autodoc>CanReadStream(InputStream stream) -&gt; bool</autodoc>

         <paramlist>
         <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>
         </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>
           <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>
       <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>
           <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="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>
         <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>
         </paramlist>
       </method>

-      <method name="Copy" type="wxImage" overloaded="no">
+      <method name="Copy" type="Image" overloaded="no">

         <autodoc>Copy() -&gt; Image</autodoc>
       </method>
         <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>
         <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>
           <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="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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <autodoc>SetAlphaBuffer(PyObject data)</autodoc>
         <paramlist>

-          <param name="data" type="p.PyObject" default=""/>
+          <param name="data" type="PyObject" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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="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"/>
         <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="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=""/>
         <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="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>
         </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>
         <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>
         <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>
         <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>
           <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=""/>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetOptionInt" type="void" overloaded="no">
+      <method name="SetOptionInt" type="" overloaded="no">

         <autodoc>SetOptionInt(String name, int value)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
         </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>
         </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">
         </paramlist>
       </method>
       <method name="CountColours" type="unsigned long" overloaded="no">


@@ -1502,29 +1502,29 @@ values.</docstring>
       <method name="ComputeHistogram" type="unsigned long" overloaded="no">
         <autodoc>ComputeHistogram(ImageHistogram h) -&gt; unsigned long</autodoc>
         <paramlist>
       <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>
         </paramlist>
       </method>

-      <staticmethod name="AddHandler" type="void" overloaded="no">
-        <autodoc>Image.AddHandler(ImageHandler handler)</autodoc>
+      <staticmethod name="AddHandler" type="" overloaded="no">
+        <autodoc>AddHandler(ImageHandler handler)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="handler" type="p.wxImageHandler" default=""/>
+          <param name="handler" type="ImageHandler" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="InsertHandler" type="void" overloaded="no">
-        <autodoc>Image.InsertHandler(ImageHandler handler)</autodoc>
+      <staticmethod name="InsertHandler" type="" overloaded="no">
+        <autodoc>InsertHandler(ImageHandler handler)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="handler" type="p.wxImageHandler" default=""/>
+          <param name="handler" type="ImageHandler" default=""/>

         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveHandler" type="bool" overloaded="no">
         </paramlist>
       </staticmethod>
       <staticmethod name="RemoveHandler" type="bool" overloaded="no">

-        <autodoc>Image.RemoveHandler(String name) -&gt; bool</autodoc>
+        <autodoc>RemoveHandler(String name) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetImageExtWildcard" type="wxString" overloaded="no">
-        <autodoc>Image.GetImageExtWildcard() -&gt; String</autodoc>
+      <staticmethod name="GetImageExtWildcard" type="String" overloaded="no">
+        <autodoc>GetImageExtWildcard() -&gt; String</autodoc>

       </staticmethod>
       <method name="ConvertToBitmap" type="wxBitmap" overloaded="no">
         <autodoc>ConvertToBitmap() -&gt; Bitmap</autodoc>
       </staticmethod>
       <method name="ConvertToBitmap" type="wxBitmap" overloaded="no">
         <autodoc>ConvertToBitmap() -&gt; Bitmap</autodoc>


@@ -1538,71 +1538,71 @@ values.</docstring>
         </paramlist>
       </method>
     </class>
         </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">
       <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">
       <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">
       <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">
       <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">
       <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">
       <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">
       <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">
       <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">
       <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">
       <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">
       <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>
       <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">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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>
         <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>
         <autodoc>SetNextHandler(EvtHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPreviousHandler" type="void" overloaded="no">
+      <method name="SetPreviousHandler" type="" overloaded="no">

         <autodoc>SetPreviousHandler(EvtHandler handler)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <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>
       <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>
         </paramlist>
       </method>

-      <method name="AddPendingEvent" type="void" overloaded="no">
+      <method name="AddPendingEvent" type="" overloaded="no">

         <autodoc>AddPendingEvent(Event event)</autodoc>
         <paramlist>
         <autodoc>AddPendingEvent(Event event)</autodoc>
         <paramlist>

-          <param name="event" type="r.wxEvent" default=""/>
+          <param name="event" type="wxEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ProcessPendingEvents" type="void" overloaded="no">
+      <method name="ProcessPendingEvents" type="" overloaded="no">

         <autodoc>ProcessPendingEvents()</autodoc>
       </method>
         <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=""/>
         <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">
         </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>
           <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>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -1886,10 +1886,6 @@ EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
 EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1)
 EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1)
 
 EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1)
 EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1)
 

-EVT_SPIN_UP   = wx.PyEventBinder( wxEVT_SCROLL_LINEUP, 1)
-EVT_SPIN_DOWN = wx.PyEventBinder( wxEVT_SCROLL_LINEDOWN, 1)
-EVT_SPIN      = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
-

 EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1)
 EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1)
 EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1)
 EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1)
 EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1)
 EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1)


@@ -1933,11 +1929,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Event" oldname="wxEvent" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Event" oldname="wxEvent" module="core">

-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>

       <destructor name="~wxEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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=""/>
         <autodoc>SetEventType(wxEventType typ)</autodoc>
         <paramlist>
           <param name="typ" type="wxEventType" default=""/>


@@ -1946,19 +1942,19 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetEventType" type="wxEventType" overloaded="no">
         <autodoc>GetEventType() -&gt; wxEventType</autodoc>
       </method>
       <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>
         <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>
         <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>
         </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"/>
         <autodoc>SetTimestamp(long ts=0)</autodoc>
         <paramlist>
           <param name="ts" type="long" default="0"/>


@@ -1967,7 +1963,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetId(int Id)</autodoc>
         <paramlist>
           <param name="Id" type="int" default=""/>


@@ -1976,7 +1972,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="IsCommandEvent" type="bool" overloaded="no">
         <autodoc>IsCommandEvent() -&gt; bool</autodoc>
       </method>
       <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"/>
         <autodoc>Skip(bool skip=True)</autodoc>
         <paramlist>
           <param name="skip" type="bool" default="True"/>


@@ -1991,13 +1987,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="StopPropagation" type="int" overloaded="no">
         <autodoc>StopPropagation() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <autodoc>Clone() -&gt; Event</autodoc>
       </method>
     </class>


@@ -2008,7 +2004,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <constructor name="PropagationDisabler" overloaded="no">
         <autodoc>__init__(Event event) -&gt; PropagationDisabler</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxPropagationDisabler" overloaded="no">


@@ -2019,7 +2015,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <constructor name="PropagateOnce" overloaded="no">
         <autodoc>__init__(Event event) -&gt; PropagateOnce</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxPropagateOnce" overloaded="no">


@@ -2030,7 +2026,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CommandEvent" oldname="wxCommandEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="CommandEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -&gt; CommandEvent</autodoc>
         <paramlist>


@@ -2041,13 +2037,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>SetString(String s)</autodoc>
         <paramlist>

-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetString() -&gt; String</autodoc>
       </method>
       <method name="IsChecked" type="bool" overloaded="no">


@@ -2056,7 +2052,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="IsSelection" type="bool" overloaded="no">
         <autodoc>IsSelection() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetExtraLong(long extraLong)</autodoc>
         <paramlist>
           <param name="extraLong" type="long" default=""/>


@@ -2065,7 +2061,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetExtraLong" type="long" overloaded="no">
         <autodoc>GetExtraLong() -&gt; long</autodoc>
       </method>
       <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=""/>
         <autodoc>SetInt(int i)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>


@@ -2074,7 +2070,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetInt" type="long" overloaded="no">
         <autodoc>GetInt() -&gt; long</autodoc>
       </method>
       <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>
         <autodoc>Clone() -&gt; Event</autodoc>
       </method>
     </class>


@@ -2082,7 +2078,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="NotifyEvent" oldname="wxNotifyEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="NotifyEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -&gt; NotifyEvent</autodoc>
         <paramlist>


@@ -2090,10 +2086,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
           <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>
         <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">
         <autodoc>Allow()</autodoc>
       </method>
       <method name="IsAllowed" type="bool" overloaded="no">


@@ -2104,7 +2100,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrollEvent" oldname="wxScrollEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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 +2117,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetPosition" type="int" overloaded="no">
         <autodoc>GetPosition() -&gt; int</autodoc>
       </method>
       <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>
         <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=""/>
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -2138,7 +2134,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrollWinEvent" oldname="wxScrollWinEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="ScrollWinEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int pos=0, int orient=0) -&gt; ScrollWinEvent</autodoc>
         <paramlist>


@@ -2153,13 +2149,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetPosition" type="int" overloaded="no">
         <autodoc>GetPosition() -&gt; int</autodoc>
       </method>
       <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>
         <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=""/>
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -2170,7 +2166,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MouseEvent" oldname="wxMouseEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="MouseEvent" overloaded="no">
         <autodoc>__init__(wxEventType mouseType=wxEVT_NULL) -&gt; MouseEvent</autodoc>
         <paramlist>


@@ -2273,22 +2269,22 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="Leaving" type="bool" overloaded="no">
         <autodoc>Leaving() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetLogicalPosition" type="wxPoint" overloaded="no">
+      <method name="GetLogicalPosition" type="Point" overloaded="no">

         <autodoc>GetLogicalPosition(DC dc) -&gt; Point</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetX" type="int" overloaded="no">


@@ -2326,7 +2322,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SetCursorEvent" oldname="wxSetCursorEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="SetCursorEvent" overloaded="no">
         <autodoc>__init__(int x=0, int y=0) -&gt; SetCursorEvent</autodoc>
         <paramlist>


@@ -2340,13 +2336,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>SetCursor(Cursor cursor)</autodoc>
         <paramlist>

-          <param name="cursor" type="r.q(const).wxCursor" default=""/>
+          <param name="cursor" type="wxCursor" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>
       </method>
       <method name="HasCursor" type="bool" overloaded="no">


@@ -2357,7 +2353,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="KeyEvent" oldname="wxKeyEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="KeyEvent" overloaded="no">
         <autodoc>__init__(wxEventType keyType=wxEVT_NULL) -&gt; KeyEvent</autodoc>
         <paramlist>


@@ -2391,16 +2387,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="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>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="GetX" type="int" overloaded="no">


@@ -2424,73 +2420,73 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SizeEvent" oldname="wxSizeEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <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>
         <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>
         <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>
         <autodoc>SetRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetSize" type="void" overloaded="no">
+      <method name="SetSize" type="" overloaded="no">

         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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">
     </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>
       <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>
           <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>
         <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>
         <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>
         <autodoc>SetRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">

         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>

-          <param name="pos" type="wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
         </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">
     </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>
       <constructor name="PaintEvent" overloaded="no">
         <autodoc>__init__(int Id=0) -&gt; PaintEvent</autodoc>
         <paramlist>


@@ -2499,7 +2495,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       </constructor>
     </class>
     <class name="NcPaintEvent" oldname="wxNcPaintEvent" module="core">
       </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>
       <constructor name="NcPaintEvent" overloaded="no">
         <autodoc>__init__(int winid=0) -&gt; NcPaintEvent</autodoc>
         <paramlist>


@@ -2511,12 +2507,12 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="EraseEvent" oldname="wxEraseEvent" module="core">
 #---------------------------------------------------------------------------
 </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"/>
       <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">
         </paramlist>
       </constructor>
       <method name="GetDC" type="wxDC" overloaded="no">


@@ -2527,7 +2523,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="FocusEvent" oldname="wxFocusEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="FocusEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0) -&gt; FocusEvent</autodoc>
         <paramlist>


@@ -2538,10 +2534,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetWindow" type="wxWindow" overloaded="no">
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
       <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>
         <autodoc>SetWindow(Window win)</autodoc>
         <paramlist>

-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -2549,11 +2545,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ChildFocusEvent" oldname="wxChildFocusEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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">
         </paramlist>
       </constructor>
       <method name="GetWindow" type="wxWindow" overloaded="no">


@@ -2564,7 +2560,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ActivateEvent" oldname="wxActivateEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="ActivateEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, bool active=True, int Id=0) -&gt; ActivateEvent</autodoc>
         <paramlist>


@@ -2581,7 +2577,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="InitDialogEvent" oldname="wxInitDialogEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="InitDialogEvent" overloaded="no">
         <autodoc>__init__(int Id=0) -&gt; InitDialogEvent</autodoc>
         <paramlist>


@@ -2593,13 +2589,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MenuEvent" oldname="wxMenuEvent" module="core">
 #---------------------------------------------------------------------------
 </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"/>
       <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">
         </paramlist>
       </constructor>
       <method name="GetMenuId" type="int" overloaded="no">


@@ -2616,7 +2612,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CloseEvent" oldname="wxCloseEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="CloseEvent" overloaded="no">
         <autodoc>__init__(wxEventType type=wxEVT_NULL, int winid=0) -&gt; CloseEvent</autodoc>
         <paramlist>


@@ -2624,7 +2620,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
           <param name="winid" type="int" default="0"/>
         </paramlist>
       </constructor>
           <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=""/>
         <autodoc>SetLoggingOff(bool logOff)</autodoc>
         <paramlist>
           <param name="logOff" type="bool" default=""/>


@@ -2633,13 +2629,13 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetLoggingOff" type="bool" overloaded="no">
         <autodoc>GetLoggingOff() -&gt; bool</autodoc>
       </method>
       <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>
         <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=""/>
         <autodoc>SetCanVeto(bool canVeto)</autodoc>
         <paramlist>
           <param name="canVeto" type="bool" default=""/>


@@ -2656,7 +2652,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ShowEvent" oldname="wxShowEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="ShowEvent" overloaded="no">
         <autodoc>__init__(int winid=0, bool show=False) -&gt; ShowEvent</autodoc>
         <paramlist>


@@ -2664,7 +2660,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
           <param name="show" type="bool" default="False"/>
         </paramlist>
       </constructor>
           <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=""/>
         <autodoc>SetShow(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -2678,7 +2674,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IconizeEvent" oldname="wxIconizeEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="IconizeEvent" overloaded="no">
         <autodoc>__init__(int id=0, bool iconized=True) -&gt; IconizeEvent</autodoc>
         <paramlist>


@@ -2694,7 +2690,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MaximizeEvent" oldname="wxMaximizeEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="MaximizeEvent" overloaded="no">
         <autodoc>__init__(int id=0) -&gt; MaximizeEvent</autodoc>
         <paramlist>


@@ -2706,8 +2702,8 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DropFilesEvent" oldname="wxDropFilesEvent" module="core">
 #---------------------------------------------------------------------------
 </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">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetNumberOfFiles" type="int" overloaded="no">


@@ -2721,7 +2717,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="UpdateUIEvent" oldname="wxUpdateUIEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="UpdateUIEvent" overloaded="no">
         <autodoc>__init__(int commandId=0) -&gt; UpdateUIEvent</autodoc>
         <paramlist>


@@ -2734,7 +2730,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetEnabled" type="bool" overloaded="no">
         <autodoc>GetEnabled() -&gt; bool</autodoc>
       </method>
       <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">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetSetText" type="bool" overloaded="no">


@@ -2746,57 +2742,57 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetSetEnabled" type="bool" overloaded="no">
         <autodoc>GetSetEnabled() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <autodoc>SetText(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <staticmethod name="SetUpdateInterval" type="void" overloaded="no">
-        <autodoc>UpdateUIEvent.SetUpdateInterval(long updateInterval)</autodoc>
+      <staticmethod name="SetUpdateInterval" type="" overloaded="no">
+        <autodoc>SetUpdateInterval(long updateInterval)</autodoc>

         <paramlist>
           <param name="updateInterval" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetUpdateInterval" type="long" overloaded="no">
         <paramlist>
           <param name="updateInterval" type="long" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetUpdateInterval" type="long" overloaded="no">

-        <autodoc>UpdateUIEvent.GetUpdateInterval() -&gt; long</autodoc>
+        <autodoc>GetUpdateInterval() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="CanUpdate" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="CanUpdate" type="bool" overloaded="no">

-        <autodoc>UpdateUIEvent.CanUpdate(Window win) -&gt; bool</autodoc>
+        <autodoc>CanUpdate(Window win) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="ResetUpdateTime" type="void" overloaded="no">
-        <autodoc>UpdateUIEvent.ResetUpdateTime()</autodoc>
+      <staticmethod name="ResetUpdateTime" type="" overloaded="no">
+        <autodoc>ResetUpdateTime()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetMode" type="void" overloaded="no">
-        <autodoc>UpdateUIEvent.SetMode(int mode)</autodoc>
+      <staticmethod name="SetMode" type="" overloaded="no">
+        <autodoc>SetMode(int mode)</autodoc>

         <paramlist>
           <param name="mode" type="wxUpdateUIMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxUpdateUIMode" overloaded="no">
         <paramlist>
           <param name="mode" type="wxUpdateUIMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxUpdateUIMode" overloaded="no">

-        <autodoc>UpdateUIEvent.GetMode() -&gt; int</autodoc>
+        <autodoc>GetMode() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SysColourChangedEvent" oldname="wxSysColourChangedEvent" module="core">
       </staticmethod>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </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>
       <constructor name="SysColourChangedEvent" overloaded="no">
         <autodoc>__init__() -&gt; SysColourChangedEvent</autodoc>
       </constructor>


@@ -2805,12 +2801,12 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MouseCaptureChangedEvent" oldname="wxMouseCaptureChangedEvent" module="core">
 #---------------------------------------------------------------------------
 </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"/>
       <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">
         </paramlist>
       </constructor>
       <method name="GetCapturedWindow" type="wxWindow" overloaded="no">


@@ -2821,7 +2817,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DisplayChangedEvent" oldname="wxDisplayChangedEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="DisplayChangedEvent" overloaded="no">
         <autodoc>__init__() -&gt; DisplayChangedEvent</autodoc>
       </constructor>


@@ -2830,17 +2826,17 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PaletteChangedEvent" oldname="wxPaletteChangedEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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">
         </paramlist>
       </method>
       <method name="GetChangedWindow" type="wxWindow" overloaded="no">


@@ -2851,14 +2847,14 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="QueryNewPaletteEvent" oldname="wxQueryNewPaletteEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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=""/>
         <autodoc>SetPaletteRealized(bool realized)</autodoc>
         <paramlist>
           <param name="realized" type="bool" default=""/>


@@ -2872,14 +2868,14 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="NavigationKeyEvent" oldname="wxNavigationKeyEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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=""/>
         <autodoc>SetDirection(bool bForward)</autodoc>
         <paramlist>
           <param name="bForward" type="bool" default=""/>


@@ -2888,7 +2884,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="IsWindowChange" type="bool" overloaded="no">
         <autodoc>IsWindowChange() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetWindowChange(bool bIs)</autodoc>
         <paramlist>
           <param name="bIs" type="bool" default=""/>


@@ -2897,10 +2893,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="GetCurrentFocus" type="wxWindow" overloaded="no">
         <autodoc>GetCurrentFocus() -&gt; Window</autodoc>
       </method>
       <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>
         <autodoc>SetCurrentFocus(Window win)</autodoc>
         <paramlist>

-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -2908,11 +2904,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="WindowCreateEvent" oldname="wxWindowCreateEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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">
         </paramlist>
       </constructor>
       <method name="GetWindow" type="wxWindow" overloaded="no">


@@ -2920,11 +2916,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       </method>
     </class>
     <class name="WindowDestroyEvent" oldname="wxWindowDestroyEvent" module="core">
       </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>
       <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">
         </paramlist>
       </constructor>
       <method name="GetWindow" type="wxWindow" overloaded="no">


@@ -2935,22 +2931,22 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ContextMenuEvent" oldname="wxContextMenuEvent" module="core">
 #---------------------------------------------------------------------------
 </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"/>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetPosition" type="q(const).wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">

         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
         <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>
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>

-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -2958,11 +2954,11 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IdleEvent" oldname="wxIdleEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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"/>
         <autodoc>RequestMore(bool needMore=True)</autodoc>
         <paramlist>
           <param name="needMore" type="bool" default="True"/>


@@ -2971,19 +2967,19 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <method name="MoreRequested" type="bool" overloaded="no">
         <autodoc>MoreRequested() -&gt; bool</autodoc>
       </method>
       <method name="MoreRequested" type="bool" overloaded="no">
         <autodoc>MoreRequested() -&gt; bool</autodoc>
       </method>

-      <staticmethod name="SetMode" type="void" overloaded="no">
-        <autodoc>IdleEvent.SetMode(int mode)</autodoc>
+      <staticmethod name="SetMode" type="" overloaded="no">
+        <autodoc>SetMode(int mode)</autodoc>

         <paramlist>
           <param name="mode" type="wxIdleMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxIdleMode" overloaded="no">
         <paramlist>
           <param name="mode" type="wxIdleMode" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMode" type="wxIdleMode" overloaded="no">

-        <autodoc>IdleEvent.GetMode() -&gt; int</autodoc>
+        <autodoc>GetMode() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="CanSend" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="CanSend" type="bool" overloaded="no">

-        <autodoc>IdleEvent.CanSend(Window win) -&gt; bool</autodoc>
+        <autodoc>CanSend(Window win) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="wxWindow" default=""/>

         </paramlist>
       </staticmethod>
     </class>
         </paramlist>
       </staticmethod>
     </class>


@@ -2991,7 +2987,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyEvent" oldname="wxPyEvent" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="PyEvent" overloaded="no">
         <autodoc>__init__(int winid=0, wxEventType commandType=wxEVT_NULL) -&gt; PyEvent</autodoc>
         <paramlist>


@@ -3002,10 +2998,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <destructor name="~wxPyEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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">
         </paramlist>
       </method>
       <method name="GetSelf" type="PyObject" overloaded="no">


@@ -3013,7 +3009,7 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       </method>
     </class>
     <class name="PyCommandEvent" oldname="wxPyCommandEvent" module="core">
       </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>
       <constructor name="PyCommandEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; PyCommandEvent</autodoc>
         <paramlist>


@@ -3024,10 +3020,10 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
       <destructor name="~wxPyCommandEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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">
         </paramlist>
       </method>
       <method name="GetSelf" type="PyObject" overloaded="no">


@@ -3038,54 +3034,55 @@ EVT_CONTEXT_MENU = wx.PyEventBinder( wxEVT_CONTEXT_MENU )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyApp" oldname="wxPyApp" module="core">
 #---------------------------------------------------------------------------
 </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 name="PyApp" overloaded="no">
         <autodoc>__init__() -&gt; PyApp</autodoc>

+        <docstring>Create a new application object, starting the bootstrap process.</docstring>

       </constructor>
       <destructor name="~wxPyApp" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       </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>
         <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>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="GetTraits" type="wxAppTraits" overloaded="no">


@@ -3096,7 +3093,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>
 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
         <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 +3114,7 @@ WARNING: This function is dangerous as it can lead to unexpected
           <param name="onlyIfNeeded" type="bool" default="False"/>
         </paramlist>
       </method>
           <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>
         <autodoc>WakeUpIdle()</autodoc>
         <docstring>Make sure that idle events are sent again</docstring>
       </method>


@@ -3125,11 +3122,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>
         <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>
         <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>
         <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 +3151,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>
         <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>
         </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>
         <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">
         </paramlist>
       </method>
       <method name="GetTopWindow" type="wxWindow" overloaded="no">


@@ -3175,7 +3172,7 @@ is requested.</docstring>
 SetTopWindow(), will return just some top level window and, if there not any,
 will return None)</docstring>
       </method>
 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
         <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 +3188,7 @@ from somewhere.
         <autodoc>GetExitOnFrameDelete() -&gt; bool</autodoc>
         <docstring>Get the current exit behaviour setting.</docstring>
       </method>
         <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>
         <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 +3200,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>
         <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=""/>
         <autodoc>SetPrintMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -3212,7 +3209,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="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:
         <autodoc>SetAssertMode(int mode)</autodoc>
         <docstring>Set the OnAssert behaviour for debug and hybrid builds.  The following flags
 may be or'd together:


@@ -3231,56 +3228,56 @@ may be or'd together:
         <docstring>Get the current OnAssert behaviour setting.</docstring>
       </method>
       <staticmethod name="GetMacSupportPCMenuShortcuts" type="bool" overloaded="no">
         <docstring>Get the current OnAssert behaviour setting.</docstring>
       </method>
       <staticmethod name="GetMacSupportPCMenuShortcuts" type="bool" overloaded="no">

-        <autodoc>PyApp.GetMacSupportPCMenuShortcuts() -&gt; bool</autodoc>
+        <autodoc>GetMacSupportPCMenuShortcuts() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="GetMacAboutMenuItemId" type="long" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacAboutMenuItemId" type="long" overloaded="no">

-        <autodoc>PyApp.GetMacAboutMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacAboutMenuItemId() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="GetMacPreferencesMenuItemId" type="long" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacPreferencesMenuItemId" type="long" overloaded="no">

-        <autodoc>PyApp.GetMacPreferencesMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacPreferencesMenuItemId() -&gt; long</autodoc>

       </staticmethod>
       <staticmethod name="GetMacExitMenuItemId" type="long" overloaded="no">
       </staticmethod>
       <staticmethod name="GetMacExitMenuItemId" type="long" overloaded="no">

-        <autodoc>PyApp.GetMacExitMenuItemId() -&gt; long</autodoc>
+        <autodoc>GetMacExitMenuItemId() -&gt; long</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="GetMacHelpMenuTitleName" type="wxString" overloaded="no">
-        <autodoc>PyApp.GetMacHelpMenuTitleName() -&gt; String</autodoc>
+      <staticmethod name="GetMacHelpMenuTitleName" type="String" overloaded="no">
+        <autodoc>GetMacHelpMenuTitleName() -&gt; String</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetMacSupportPCMenuShortcuts" type="void" overloaded="no">
-        <autodoc>PyApp.SetMacSupportPCMenuShortcuts(bool val)</autodoc>
+      <staticmethod name="SetMacSupportPCMenuShortcuts" type="" overloaded="no">
+        <autodoc>SetMacSupportPCMenuShortcuts(bool val)</autodoc>

         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetMacAboutMenuItemId" type="void" overloaded="no">
-        <autodoc>PyApp.SetMacAboutMenuItemId(long val)</autodoc>
+      <staticmethod name="SetMacAboutMenuItemId" type="" overloaded="no">
+        <autodoc>SetMacAboutMenuItemId(long val)</autodoc>

         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetMacPreferencesMenuItemId" type="void" overloaded="no">
-        <autodoc>PyApp.SetMacPreferencesMenuItemId(long val)</autodoc>
+      <staticmethod name="SetMacPreferencesMenuItemId" type="" overloaded="no">
+        <autodoc>SetMacPreferencesMenuItemId(long val)</autodoc>

         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetMacExitMenuItemId" type="void" overloaded="no">
-        <autodoc>PyApp.SetMacExitMenuItemId(long val)</autodoc>
+      <staticmethod name="SetMacExitMenuItemId" type="" overloaded="no">
+        <autodoc>SetMacExitMenuItemId(long val)</autodoc>

         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="val" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetMacHelpMenuTitleName" type="void" overloaded="no">
-        <autodoc>PyApp.SetMacHelpMenuTitleName(String val)</autodoc>
+      <staticmethod name="SetMacHelpMenuTitleName" type="" overloaded="no">
+        <autodoc>SetMacHelpMenuTitleName(String val)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="val" type="r.q(const).wxString" default=""/>
+          <param name="val" type="String" default=""/>

         </paramlist>
       </staticmethod>
         </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>
       <staticmethod name="GetComCtl32Version" type="int" overloaded="no">
         <autodoc>_BootstrapApp()</autodoc>
         <docstring>For internal use only</docstring>
       </method>
       <staticmethod name="GetComCtl32Version" type="int" overloaded="no">

-        <autodoc>PyApp.GetComCtl32Version() -&gt; int</autodoc>
+        <autodoc>GetComCtl32Version() -&gt; int</autodoc>

         <docstring>Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it
 wasn't found at all.  Raises an exception on non-Windows platforms.</docstring>
       </staticmethod>
         <docstring>Returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it
 wasn't found at all.  Raises an exception on non-Windows platforms.</docstring>
       </staticmethod>


@@ -3288,7 +3285,7 @@ wasn't found at all.  Raises an exception on non-Windows platforms.</docstring>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <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>
       <autodoc>Exit()</autodoc>
       <docstring>Force an exit of the application.  Convenience for wx.GetApp().Exit()</docstring>
     </method>


@@ -3309,27 +3306,27 @@ implementation of some limited user interaction.
 
 Returns the result of the call to wx.Yield.</docstring>
       <paramlist>
 
 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>
         <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>
       <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>
       <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>
       </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>
       <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>
       <autodoc>GetApp() -&gt; PyApp</autodoc>
       <docstring>Return a reference to the current wx.App object.</docstring>
     </method>


@@ -3358,6 +3355,7 @@ class PyOnDemandOutputWindow:
                               style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
         self.text  = wx.TextCtrl(self.frame, -1, "",
                                  style = wx.TE_MULTILINE | wx.TE_READONLY)
                               style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
         self.text  = wx.TextCtrl(self.frame, -1, "",
                                  style = wx.TE_MULTILINE | wx.TE_READONLY)

+        self.text.AppendText(st)

         self.frame.SetSize((450, 300))
         self.frame.Show(True)
         EVT_CLOSE(self.frame, self.OnCloseWindow)
         self.frame.SetSize((450, 300))
         self.frame.Show(True)
         EVT_CLOSE(self.frame, self.OnCloseWindow)


@@ -3557,25 +3555,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="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>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetMenuItem" type="void" overloaded="no">
+      <method name="SetMenuItem" type="" overloaded="no">

         <autodoc>SetMenuItem(MenuItem item)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetMenuItem" type="wxMenuItem" overloaded="no">


@@ -3592,14 +3590,14 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
       </method>
     </class>
     <class name="AcceleratorTable" oldname="wxAcceleratorTable" module="core">
       </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=""/>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxAcceleratorTable" overloaded="no">


@@ -3609,119 +3607,543 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
     </class>
         <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>
       <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">
       </paramlist>
     </method>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Window" oldname="wxWindow" module="core">

-      <baseclass name="wxEvtHandler"/>
+      <docstring>
+wx.Window is the base class for all windows and represents any visible
+object on the screen. All controls, top level windows and so on are
+wx.Windows. Sizers and device contexts are not however, as they don't
+appear on screen themselves.
+</docstring>
+      <refdoc>
+  Styles
+
+    wx.SIMPLE_BORDER:          Displays a thin border around the window.
+
+    wx.DOUBLE_BORDER:          Displays a double border. Windows and Mac only.
+
+    wx.SUNKEN_BORDER:          Displays a sunken border.
+
+    wx.RAISED_BORDER:          Displays a raised border.
+
+    wx.STATIC_BORDER:           Displays a border suitable for a static
+                                control. Windows only.
+
+    wx.NO_BORDER:               Displays no border, overriding the default
+                                border style for the window.
+
+    wx.TRANSPARENT_WINDOW:      The window is transparent, that is, it
+                                will not receive paint events. Windows only.
+
+    wx.TAB_TRAVERSAL:           Use this to enable tab traversal for
+                                non-dialog windows.
+
+    wx.WANTS_CHARS:             Use this to indicate that the window
+                                wants to get all char/key events for
+                                all keys - even for keys like TAB or
+                                ENTER which are usually used for
+                                dialog navigation and which wouldn't
+                                be generated without this style. If
+                                you need to use this style in order to
+                                get the arrows or etc., but would
+                                still like to have normal keyboard
+                                navigation take place, you should
+                                create and send a wxNavigationKeyEvent
+                                in response to the key events for Tab
+                                and Shift-Tab.
+
+    wx.NO_FULL_REPAINT_ON_RESIZE: Disables repainting the window
+                                  completely when its size is changed
+                                  - you will have to repaint the new
+                                  window area manually if you use this
+                                  style. As of version 2.5.1 this
+                                  style is on by default.  Use
+                                  wx.FULL_REPAINT_ON_RESIZE to
+                                  deactivate it.
+
+    wx.VSCROLL:          Use this style to enable a vertical scrollbar.
+
+    wx.HSCROLL:          Use this style to enable a horizontal scrollbar.
+
+    wx.ALWAYS_SHOW_SB:          If a window has scrollbars, disable them
+                                instead of hiding them when they are
+                                not needed (i.e. when the size of the
+                                window is big enough to not require
+                                the scrollbars to navigate it). This
+                                style is currently only implemented
+                                for wxMSW and wxUniversal and does
+                                nothing on the other platforms.
+
+    wx.CLIP_CHILDREN:           Use this style to eliminate flicker caused by
+                                the background being repainted, then
+                                children being painted over
+                                them. Windows only.
+
+    wx.FULL_REPAINT_ON_RESIZE:  Use this style to force a complete
+                                redraw of the window whenever it is
+                                resized instead of redrawing just the
+                                part of the window affected by
+                                resizing. Note that this was the
+                                behaviour by default before 2.5.1
+                                release and that if you experience
+                                redraw problems with the code which
+                                previously used to work you may want
+                                to try this.
+
+  Extra Styles
+
+    wx.WS_EX_VALIDATE_RECURSIVELY:  By default,
+                                    Validate/TransferDataTo/FromWindow()
+                                    only work on direct children of
+                                    the window (compatible
+                                    behaviour). Set this flag to make
+                                    them recursively descend into all
+                                    subwindows.
+
+    wx.WS_EX_BLOCK_EVENTS:          wx.CommandEvents and the objects of the
+                                    derived classes are forwarded to
+                                    the parent window and so on
+                                    recursively by default. Using this
+                                    flag for the given window allows
+                                    to block this propagation at this
+                                    window, i.e. prevent the events
+                                    from being propagated further
+                                    upwards. Dialogs have this flag on
+                                    by default.
+
+    wx.WS_EX_TRANSIENT              Don't use this window as an implicit parent for
+                                    the other windows: this must be
+                                    used with transient windows as
+                                    otherwise there is the risk of
+                                    creating a dialog/frame with this
+                                    window as a parent which would
+                                    lead to a crash if the parent is
+                                    destroyed before the child.
+
+    wx.WS_EX_PROCESS_IDLE:          This window should always process idle
+                                    events, even if the mode set by
+                                    wx.IdleEvent.SetMode is
+                                    wx.IDLE_PROCESS_SPECIFIED.
+
+    wx.WS_EX_PROCESS_UI_UPDATES     This window should always process UI
+                                    update events, even if the mode
+                                    set by wxUpdateUIEvent::SetMode is
+                                    wxUPDATE_UI_PROCESS_SPECIFIED.
+
+</refdoc>
+      <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>
       <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>

+        <docstring>Construct and show a generic Window.</docstring>
+        <refdoc>
+  Styles
+
+    wx.SIMPLE_BORDER:          Displays a thin border around the window.
+
+    wx.DOUBLE_BORDER:          Displays a double border. Windows and Mac only.
+
+    wx.SUNKEN_BORDER:          Displays a sunken border.
+
+    wx.RAISED_BORDER:          Displays a raised border.
+
+    wx.STATIC_BORDER:           Displays a border suitable for a static
+                                control. Windows only.
+
+    wx.NO_BORDER:               Displays no border, overriding the default
+                                border style for the window.
+
+    wx.TRANSPARENT_WINDOW:      The window is transparent, that is, it
+                                will not receive paint events. Windows only.
+
+    wx.TAB_TRAVERSAL:           Use this to enable tab traversal for
+                                non-dialog windows.
+
+    wx.WANTS_CHARS:             Use this to indicate that the window
+                                wants to get all char/key events for
+                                all keys - even for keys like TAB or
+                                ENTER which are usually used for
+                                dialog navigation and which wouldn't
+                                be generated without this style. If
+                                you need to use this style in order to
+                                get the arrows or etc., but would
+                                still like to have normal keyboard
+                                navigation take place, you should
+                                create and send a wxNavigationKeyEvent
+                                in response to the key events for Tab
+                                and Shift-Tab.
+
+    wx.NO_FULL_REPAINT_ON_RESIZE: Disables repainting the window
+                                  completely when its size is changed
+                                  - you will have to repaint the new
+                                  window area manually if you use this
+                                  style. As of version 2.5.1 this
+                                  style is on by default.  Use
+                                  wx.FULL_REPAINT_ON_RESIZE to
+                                  deactivate it.
+
+    wx.VSCROLL:          Use this style to enable a vertical scrollbar.
+
+    wx.HSCROLL:          Use this style to enable a horizontal scrollbar.
+
+    wx.ALWAYS_SHOW_SB:          If a window has scrollbars, disable them
+                                instead of hiding them when they are
+                                not needed (i.e. when the size of the
+                                window is big enough to not require
+                                the scrollbars to navigate it). This
+                                style is currently only implemented
+                                for wxMSW and wxUniversal and does
+                                nothing on the other platforms.
+
+    wx.CLIP_CHILDREN:           Use this style to eliminate flicker caused by
+                                the background being repainted, then
+                                children being painted over
+                                them. Windows only.
+
+    wx.FULL_REPAINT_ON_RESIZE:  Use this style to force a complete
+                                redraw of the window whenever it is
+                                resized instead of redrawing just the
+                                part of the window affected by
+                                resizing. Note that this was the
+                                behaviour by default before 2.5.1
+                                release and that if you experience
+                                redraw problems with the code which
+                                previously used to work you may want
+                                to try this.
+
+  Extra Styles
+
+    wx.WS_EX_VALIDATE_RECURSIVELY:  By default,
+                                    Validate/TransferDataTo/FromWindow()
+                                    only work on direct children of
+                                    the window (compatible
+                                    behaviour). Set this flag to make
+                                    them recursively descend into all
+                                    subwindows.
+
+    wx.WS_EX_BLOCK_EVENTS:          wx.CommandEvents and the objects of the
+                                    derived classes are forwarded to
+                                    the parent window and so on
+                                    recursively by default. Using this
+                                    flag for the given window allows
+                                    to block this propagation at this
+                                    window, i.e. prevent the events
+                                    from being propagated further
+                                    upwards. Dialogs have this flag on
+                                    by default.
+
+    wx.WS_EX_TRANSIENT              Don't use this window as an implicit parent for
+                                    the other windows: this must be
+                                    used with transient windows as
+                                    otherwise there is the risk of
+                                    creating a dialog/frame with this
+                                    window as a parent which would
+                                    lead to a crash if the parent is
+                                    destroyed before the child.
+
+    wx.WS_EX_PROCESS_IDLE:          This window should always process idle
+                                    events, even if the mode set by
+                                    wx.IdleEvent.SetMode is
+                                    wx.IDLE_PROCESS_SPECIFIED.
+
+    wx.WS_EX_PROCESS_UI_UPDATES     This window should always process UI
+                                    update events, even if the mode
+                                    set by wxUpdateUIEvent::SetMode is
+                                    wxUPDATE_UI_PROCESS_SPECIFIED.
+
+</refdoc>

         <paramlist>
         <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="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">
         <autodoc>PreWindow() -&gt; Window</autodoc>
         </paramlist>
       </constructor>
       <constructor name="PreWindow" overloaded="no">
         <autodoc>PreWindow() -&gt; Window</autodoc>

+        <docstring>Precreate a Window for 2-phase creation.</docstring>
+        <refdoc>
+  Styles
+
+    wx.SIMPLE_BORDER:          Displays a thin border around the window.
+
+    wx.DOUBLE_BORDER:          Displays a double border. Windows and Mac only.
+
+    wx.SUNKEN_BORDER:          Displays a sunken border.
+
+    wx.RAISED_BORDER:          Displays a raised border.
+
+    wx.STATIC_BORDER:           Displays a border suitable for a static
+                                control. Windows only.
+
+    wx.NO_BORDER:               Displays no border, overriding the default
+                                border style for the window.
+
+    wx.TRANSPARENT_WINDOW:      The window is transparent, that is, it
+                                will not receive paint events. Windows only.
+
+    wx.TAB_TRAVERSAL:           Use this to enable tab traversal for
+                                non-dialog windows.
+
+    wx.WANTS_CHARS:             Use this to indicate that the window
+                                wants to get all char/key events for
+                                all keys - even for keys like TAB or
+                                ENTER which are usually used for
+                                dialog navigation and which wouldn't
+                                be generated without this style. If
+                                you need to use this style in order to
+                                get the arrows or etc., but would
+                                still like to have normal keyboard
+                                navigation take place, you should
+                                create and send a wxNavigationKeyEvent
+                                in response to the key events for Tab
+                                and Shift-Tab.
+
+    wx.NO_FULL_REPAINT_ON_RESIZE: Disables repainting the window
+                                  completely when its size is changed
+                                  - you will have to repaint the new
+                                  window area manually if you use this
+                                  style. As of version 2.5.1 this
+                                  style is on by default.  Use
+                                  wx.FULL_REPAINT_ON_RESIZE to
+                                  deactivate it.
+
+    wx.VSCROLL:          Use this style to enable a vertical scrollbar.
+
+    wx.HSCROLL:          Use this style to enable a horizontal scrollbar.
+
+    wx.ALWAYS_SHOW_SB:          If a window has scrollbars, disable them
+                                instead of hiding them when they are
+                                not needed (i.e. when the size of the
+                                window is big enough to not require
+                                the scrollbars to navigate it). This
+                                style is currently only implemented
+                                for wxMSW and wxUniversal and does
+                                nothing on the other platforms.
+
+    wx.CLIP_CHILDREN:           Use this style to eliminate flicker caused by
+                                the background being repainted, then
+                                children being painted over
+                                them. Windows only.
+
+    wx.FULL_REPAINT_ON_RESIZE:  Use this style to force a complete
+                                redraw of the window whenever it is
+                                resized instead of redrawing just the
+                                part of the window affected by
+                                resizing. Note that this was the
+                                behaviour by default before 2.5.1
+                                release and that if you experience
+                                redraw problems with the code which
+                                previously used to work you may want
+                                to try this.
+
+  Extra Styles
+
+    wx.WS_EX_VALIDATE_RECURSIVELY:  By default,
+                                    Validate/TransferDataTo/FromWindow()
+                                    only work on direct children of
+                                    the window (compatible
+                                    behaviour). Set this flag to make
+                                    them recursively descend into all
+                                    subwindows.
+
+    wx.WS_EX_BLOCK_EVENTS:          wx.CommandEvents and the objects of the
+                                    derived classes are forwarded to
+                                    the parent window and so on
+                                    recursively by default. Using this
+                                    flag for the given window allows
+                                    to block this propagation at this
+                                    window, i.e. prevent the events
+                                    from being propagated further
+                                    upwards. Dialogs have this flag on
+                                    by default.
+
+    wx.WS_EX_TRANSIENT              Don't use this window as an implicit parent for
+                                    the other windows: this must be
+                                    used with transient windows as
+                                    otherwise there is the risk of
+                                    creating a dialog/frame with this
+                                    window as a parent which would
+                                    lead to a crash if the parent is
+                                    destroyed before the child.
+
+    wx.WS_EX_PROCESS_IDLE:          This window should always process idle
+                                    events, even if the mode set by
+                                    wx.IdleEvent.SetMode is
+                                    wx.IDLE_PROCESS_SPECIFIED.
+
+    wx.WS_EX_PROCESS_UI_UPDATES     This window should always process UI
+                                    update events, even if the mode
+                                    set by wxUpdateUIEvent::SetMode is
+                                    wxUPDATE_UI_PROCESS_SPECIFIED.
+
+</refdoc>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, String name=PanelNameStr) -&gt; bool</autodoc>

+        <docstring>Create the GUI part of the Window for 2-phase creation mode.</docstring>

         <paramlist>
         <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="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">
         <autodoc>Close(bool force=False) -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="Close" type="bool" overloaded="no">
         <autodoc>Close(bool force=False) -&gt; bool</autodoc>

+        <docstring>This function simply generates a EVT_CLOSE event whose handler usually
+tries to close the window. It doesn't close the window itself,
+however.  If force is False (the default) then the window's close
+handler will be allowed to veto the destruction of the window.
+
+Usually Close is only used with the top level windows (wx.Frame and
+wx.Dialog classes) as the others are not supposed to have any special
+EVT_CLOSE logic.
+
+The close handler should check whether the window is being deleted
+forcibly, using wx.CloseEvent.GetForce, in which case it should
+destroy the window using wx.Window.Destroy.
+
+Note that calling Close does not guarantee that the window will be
+destroyed; but it provides a way to simulate a manual close of a
+window, which may or may not be implemented by destroying the
+window. The default EVT_CLOSE handler for wx.Dialog does not
+necessarily delete the dialog, since it will simply simulate an
+wxID_CANCEL event which is handled by the appropriate button event
+handler and may do anything at all.
+
+To guarantee that the window will be destroyed, call wx.Window.Destroy
+instead.</docstring>

         <paramlist>
           <param name="force" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="Destroy" type="bool" overloaded="no">
         <autodoc>Destroy() -&gt; bool</autodoc>
         <paramlist>
           <param name="force" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="Destroy" type="bool" overloaded="no">
         <autodoc>Destroy() -&gt; bool</autodoc>

-        <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
+        <docstring>Destroys the window safely.  Frames and dialogs are not destroyed
+immediately when this function is called -- they are added to a list
+of windows to be deleted on idle time, when all the window's events
+have been processed. This prevents problems with events being sent to
+non-existent windows.
+
+Returns True if the window has either been successfully deleted, or it
+has been added to the list of windows pending real deletion.</docstring>

       </method>
       <method name="DestroyChildren" type="bool" overloaded="no">
         <autodoc>DestroyChildren() -&gt; bool</autodoc>
       </method>
       <method name="DestroyChildren" type="bool" overloaded="no">
         <autodoc>DestroyChildren() -&gt; bool</autodoc>

+        <docstring>Destroys all children of a window. Called automatically by the destructor.</docstring>

       </method>
       <method name="IsBeingDeleted" type="bool" overloaded="no">
         <autodoc>IsBeingDeleted() -&gt; bool</autodoc>
       </method>
       <method name="IsBeingDeleted" type="bool" overloaded="no">
         <autodoc>IsBeingDeleted() -&gt; bool</autodoc>

+        <docstring>Is the window in the process of being deleted?</docstring>

       </method>
       </method>

-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">

         <autodoc>SetTitle(String title)</autodoc>
         <autodoc>SetTitle(String title)</autodoc>

+        <docstring>Sets the window's title. Applicable only to frames and dialogs.</docstring>

         <paramlist>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">

         <autodoc>GetTitle() -&gt; String</autodoc>
         <autodoc>GetTitle() -&gt; String</autodoc>

+        <docstring>Gets the window's title. Applicable only to frames and dialogs.</docstring>

       </method>
       </method>

-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">

         <autodoc>SetLabel(String label)</autodoc>
         <autodoc>SetLabel(String label)</autodoc>

+        <docstring>Set the text which the window shows in its label if applicable.</docstring>

         <paramlist>
         <paramlist>

-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">

         <autodoc>GetLabel() -&gt; String</autodoc>
         <autodoc>GetLabel() -&gt; String</autodoc>

-      </method>
-      <method name="SetName" type="void" overloaded="no">
+        <docstring>Generic way of getting a label from any window, for identification
+purposes.  The interpretation of this function differs from class to
+class. For frames and dialogs, the value returned is the title. For
+buttons or static text controls, it is the button text. This function
+can be useful for meta-programs (such as testing tools or
+special-needs access programs) which need to identify windows by name.</docstring>
+      </method>
+      <method name="SetName" type="" overloaded="no">

         <autodoc>SetName(String name)</autodoc>
         <autodoc>SetName(String name)</autodoc>

+        <docstring>Sets the window's name.  The window name is used for ressource setting
+in X, it is not the same as the window title/label</docstring>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">

         <autodoc>GetName() -&gt; String</autodoc>
         <autodoc>GetName() -&gt; String</autodoc>

+        <docstring>Returns the window's name.  This name is not guaranteed to be unique;
+it is up to the programmer to supply an appropriate name in the window
+constructor or via wx.Window.SetName.</docstring>

       </method>
       </method>

-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">

         <autodoc>SetId(int winid)</autodoc>
         <autodoc>SetId(int winid)</autodoc>

+        <docstring>Sets the identifier of the window.  Each window has an integer
+identifier. If the application has not provided one, an identifier
+will be generated. Normally, the identifier should be provided on
+creation and should not be modified subsequently.</docstring>

         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>
         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetId" type="int" overloaded="no">
         <autodoc>GetId() -&gt; int</autodoc>

+        <docstring>Returns the identifier of the window.  Each window has an integer
+identifier. If the application has not provided one (or the default Id
+-1 is used) then an unique identifier with a negative value will be
+generated.</docstring>

       </method>
       <staticmethod name="NewControlId" type="int" overloaded="no">
       </method>
       <staticmethod name="NewControlId" type="int" overloaded="no">

-        <autodoc>Window.NewControlId() -&gt; int</autodoc>
+        <autodoc>NewControlId() -&gt; int</autodoc>
+        <docstring>Generate a control id for the controls which were not given one.</docstring>

       </staticmethod>
       <staticmethod name="NextControlId" type="int" overloaded="no">
       </staticmethod>
       <staticmethod name="NextControlId" type="int" overloaded="no">

-        <autodoc>Window.NextControlId(int winid) -&gt; int</autodoc>
+        <autodoc>NextControlId(int winid) -&gt; int</autodoc>
+        <docstring>Get the id of the control following the one with the given
+(autogenerated) id</docstring>

         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PrevControlId" type="int" overloaded="no">
         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="PrevControlId" type="int" overloaded="no">

-        <autodoc>Window.PrevControlId(int winid) -&gt; int</autodoc>
+        <autodoc>PrevControlId(int winid) -&gt; int</autodoc>
+        <docstring>Get the id of the control preceding the one with the given
+(autogenerated) id</docstring>

         <paramlist>
           <param name="winid" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <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>
         <autodoc>SetSize(Size size)</autodoc>

+        <docstring>Sets the size of the window in pixels.</docstring>

         <paramlist>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>SetDimensions(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)</autodoc>

+        <docstring>Sets the position and size of the window in pixels.  The sizeFlags
+parameter indicates the interpretation of the other params if they are
+-1.  wx.SIZE_AUTO*: a -1 indicates that a class-specific default
+shoudl be used.  wx.SIZE_USE_EXISTING: existing dimensions should be
+used if -1 values are supplied.  wxSIZE_ALLOW_MINUS_ONE: allow
+dimensions of -1 and less to be interpreted as real dimensions, not
+default values.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -3730,149 +4152,220 @@ _sys.__wxPythonCleanup = __wxPyCleanup()
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetRect(Rect rect, int sizeFlags=SIZE_AUTO)</autodoc>

+        <docstring>Sets the position and size of the window in pixels using a wx.Rect.</docstring>

         <paramlist>
         <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>
           <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>
         <autodoc>SetSizeWH(int width, int height)</autodoc>

+        <docstring>Sets the size of the window in pixels.</docstring>

         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>Move(Point pt, int flags=SIZE_USE_EXISTING)</autodoc>

+        <docstring>Moves the window to the given position.</docstring>

         <paramlist>
         <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>
           <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>
         <autodoc>MoveXY(int x, int y, int flags=SIZE_USE_EXISTING)</autodoc>

+        <docstring>Moves the window to the given position.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
           <param name="flags" type="int" default="wxSIZE_USE_EXISTING"/>
         </paramlist>
       </method>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
           <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>
         <autodoc>Raise()</autodoc>

+        <docstring>Raises the window to the top of the window hierarchy if it is a
+managed window (dialog or frame).</docstring>

       </method>
       </method>

-      <method name="Lower" type="void" overloaded="no">
+      <method name="Lower" type="" overloaded="no">

         <autodoc>Lower()</autodoc>
         <autodoc>Lower()</autodoc>

+        <docstring>Lowers the window to the bottom of the window hierarchy if it is a
+managed window (dialog or frame).</docstring>

       </method>
       </method>

-      <method name="SetClientSize" type="void" overloaded="no">
+      <method name="SetClientSize" type="" overloaded="no">

         <autodoc>SetClientSize(Size size)</autodoc>
         <autodoc>SetClientSize(Size size)</autodoc>

+        <docstring>This sets the size of the window client area in pixels. Using this
+function to size a window tends to be more device-independent than
+wx.Window.SetSize, since the application need not worry about what
+dimensions the border or title bar have when trying to fit the window
+around panel items, for example.</docstring>

         <paramlist>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetClientSizeWH" type="void" overloaded="no">
+      <method name="SetClientSizeWH" type="" overloaded="no">

         <autodoc>SetClientSizeWH(int width, int height)</autodoc>
         <autodoc>SetClientSizeWH(int width, int height)</autodoc>

+        <docstring>This sets the size of the window client area in pixels. Using this
+function to size a window tends to be more device-independent than
+wx.Window.SetSize, since the application need not worry about what
+dimensions the border or title bar have when trying to fit the window
+around panel items, for example.</docstring>

         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetClientRect(Rect rect)</autodoc>

+        <docstring>This sets the size of the window client area in pixels. Using this
+function to size a window tends to be more device-independent than
+wx.Window.SetSize, since the application need not worry about what
+dimensions the border or title bar have when trying to fit the window
+around panel items, for example.</docstring>

         <paramlist>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">

         <autodoc>GetRect() -&gt; Rect</autodoc>
         <autodoc>GetRect() -&gt; Rect</autodoc>

+        <docstring>Returns the size and position of the window as a wx.Rect object.</docstring>

       </method>
       </method>

-      <method name="GetClientSize" type="wxSize" overloaded="no">
+      <method name="GetClientSize" type="Size" overloaded="no">

         <autodoc>GetClientSize() -&gt; Size</autodoc>
         <autodoc>GetClientSize() -&gt; Size</autodoc>

-        <docstring>Get the window's client size.</docstring>
+        <docstring>This gets the size of the window's 'client area' in pixels. The client
+area is the area which may be drawn on by the programmer, excluding
+title bar, border, scrollbars, etc.</docstring>

       </method>
       </method>

-      <method name="GetClientSizeTuple" type="void" overloaded="no">
+      <method name="GetClientSizeTuple" type="" overloaded="no">

         <autodoc>GetClientSizeTuple() -&gt; (width, height)</autodoc>
         <autodoc>GetClientSizeTuple() -&gt; (width, height)</autodoc>

-        <docstring>Get the window's client size.</docstring>
+        <docstring>This gets the size of the window's 'client area' in pixels. The client
+area is the area which may be drawn on by the programmer, excluding
+title bar, border, scrollbars, etc.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetClientAreaOrigin" type="wxPoint" overloaded="no">
+      <method name="GetClientAreaOrigin" type="Point" overloaded="no">

         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>

+        <docstring>Get the origin of the client area of the window relative to the
+window's top left corner (the client area may be shifted because of
+the borders, scrollbars, other decorations...)</docstring>

       </method>
       </method>

-      <method name="GetClientRect" type="wxRect" overloaded="no">
+      <method name="GetClientRect" type="Rect" overloaded="no">

         <autodoc>GetClientRect() -&gt; Rect</autodoc>
         <autodoc>GetClientRect() -&gt; Rect</autodoc>

+        <docstring>Get the client area position and size as a wx.Rect object.</docstring>

       </method>
       </method>

-      <method name="GetBestSize" type="wxSize" overloaded="no">
+      <method name="GetBestSize" type="Size" overloaded="no">

         <autodoc>GetBestSize() -&gt; Size</autodoc>
         <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">
+        <docstring>This functions returns the best acceptable minimal size for the
+window, if applicable. For example, for a static text control, it will be
+the minimal size such that the control label is not truncated. For
+windows containing subwindows (suzh aswx.Panel), the size returned
+by this function will be the same as the size the window would have
+had after calling Fit.</docstring>
+      </method>
+      <method name="GetBestSizeTuple" type="" overloaded="no">

         <autodoc>GetBestSizeTuple() -&gt; (width, height)</autodoc>
         <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>
+        <docstring>This functions returns the best acceptable minimal size for the
+window, if applicable. For example, for a static text control, it will be
+the minimal size such that the control label is not truncated. For
+windows containing subwindows (suzh aswx.Panel), the size returned
+by this function will be the same as the size the window would have
+had after calling Fit.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetAdjustedBestSize" type="wxSize" overloaded="no">
+      <method name="GetAdjustedBestSize" type="Size" overloaded="no">

         <autodoc>GetAdjustedBestSize() -&gt; Size</autodoc>
         <autodoc>GetAdjustedBestSize() -&gt; Size</autodoc>

-      </method>
-      <method name="Center" type="void" overloaded="no">
+        <docstring>This method is similar to GetBestSize, except in one
+thing. GetBestSize should return the minimum untruncated size of the
+window, while this method will return the largest of BestSize and any
+user specified minimum size. ie. it is the minimum size the window
+should currently be drawn at, not the minimal size it can possibly
+tolerate.</docstring>
+      </method>
+      <method name="Center" type="" overloaded="no">

         <autodoc>Center(int direction=BOTH)</autodoc>
         <autodoc>Center(int direction=BOTH)</autodoc>

+        <docstring>Centers the window.  The parameter specifies the direction for
+cetering, and may be wx.HORIZONTAL, wx.VERTICAL or wx.BOTH. It may
+also include wx.CENTER_ON_SCREEN flag if you want to center the window
+on the entire screen and not on its parent window.  If it is a
+top-level window and has no parent then it will always be centered
+relative to the screen.</docstring>

         <paramlist>
           <param name="direction" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
         <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>
         <autodoc>CenterOnScreen(int dir=BOTH)</autodoc>

+        <docstring>Center on screen (only works for top level windows)</docstring>

         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
         <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>
         <autodoc>CenterOnParent(int dir=BOTH)</autodoc>

+        <docstring>Center with respect to the the parent window</docstring>

         <paramlist>
           <param name="dir" type="int" default="wxBOTH"/>
         </paramlist>
       </method>
         <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>
         <autodoc>Fit()</autodoc>

-      </method>
-      <method name="FitInside" type="void" overloaded="no">
+        <docstring>Sizes the window so that it fits around its subwindows. This function
+won't do anything if there are no subwindows and will only really work
+correctly if sizers are used for the subwindows layout. Also, if the
+window has exactly one subwindow it is better (faster and the result
+is more precise as Fit adds some margin to account for fuzziness of
+its calculations) to call window.SetClientSize(child.GetSize())
+instead of calling Fit.</docstring>
+      </method>
+      <method name="FitInside" type="" overloaded="no">

         <autodoc>FitInside()</autodoc>
         <autodoc>FitInside()</autodoc>

+        <docstring>Similar to Fit, but sizes the interior (virtual) size of a
+window. Mainly useful with scrolled windows to reset scrollbars after
+sizing changes that do not trigger a size event, and/or scrolled
+windows without an interior sizer. This function similarly won't do
+anything if there are no subwindows.</docstring>

       </method>
       </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>
         <autodoc>SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, 
     int incH=-1)</autodoc>

+        <docstring>Allows specification of minimum and maximum window sizes, and window
+size increments. If a pair of values is not set (or set to -1), the
+default values will be used.  If this function is called, the user
+will not be able to size the window outside the given bounds. The
+resizing increments are only significant under Motif or Xt.</docstring>

         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>
         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>


@@ -3882,8 +4375,12 @@ using which it will still look "nice")</docstring>
           <param name="incH" type="int" default="-1"/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetVirtualSizeHints(int minW, int minH, int maxW=-1, int maxH=-1)</autodoc>

+        <docstring>Allows specification of minimum and maximum virtual window sizes. If a
+pair of values is not set (or set to -1), the default values will be
+used.  If this function is called, the user will not be able to size
+the virtual area of the window outside the given bounds.</docstring>

         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>
         <paramlist>
           <param name="minW" type="int" default=""/>
           <param name="minH" type="int" default=""/>


@@ -3903,244 +4400,351 @@ using which it will still look "nice")</docstring>
       <method name="GetMaxHeight" type="int" overloaded="no">
         <autodoc>GetMaxHeight() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>GetMaxSize() -&gt; Size</autodoc>
       </method>

-      <method name="SetVirtualSize" type="void" overloaded="no">
+      <method name="SetVirtualSize" type="" overloaded="no">

         <autodoc>SetVirtualSize(Size size)</autodoc>
         <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>
+        <docstring>Set the the virtual size of a window in pixels.  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>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetVirtualSizeWH" type="void" overloaded="no">
+      <method name="SetVirtualSizeWH" type="" overloaded="no">

         <autodoc>SetVirtualSizeWH(int w, int h)</autodoc>
         <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
-less independent of the screen window size.</docstring>
+        <docstring>Set the the virtual size of a window in pixels.  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="w" type="int" default=""/>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="w" type="int" default=""/>
           <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>
         <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>
+        <docstring>Get the the virtual size of the window in pixels.  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>

-      <method name="GetVirtualSizeTuple" type="void" overloaded="no">
+      <method name="GetVirtualSizeTuple" type="" overloaded="no">

         <autodoc>GetVirtualSizeTuple() -&gt; (width, height)</autodoc>
         <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>
+        <docstring>Get the the virtual size of the window in pixels.  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>
         <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>
         </paramlist>
       </method>

-      <method name="GetBestVirtualSize" type="wxSize" overloaded="no">
+      <method name="GetBestVirtualSize" type="Size" overloaded="no">

         <autodoc>GetBestVirtualSize() -&gt; Size</autodoc>
         <autodoc>GetBestVirtualSize() -&gt; Size</autodoc>

+        <docstring>Return the largest of ClientSize and BestSize (as determined by a
+sizer, interior children, or other means)</docstring>

       </method>
       <method name="Show" type="bool" overloaded="no">
         <autodoc>Show(bool show=True) -&gt; bool</autodoc>
       </method>
       <method name="Show" type="bool" overloaded="no">
         <autodoc>Show(bool show=True) -&gt; bool</autodoc>

+        <docstring>Shows or hides the window. You may need to call Raise for a top level
+window if you want to bring it to top, although this is not needed if
+Show is called immediately after the frame creation.  Returns True if
+the window has been shown or hidden or False if nothing was done
+because it already was in the requested state.</docstring>

         <paramlist>
           <param name="show" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Hide" type="bool" overloaded="no">
         <autodoc>Hide() -&gt; bool</autodoc>
         <paramlist>
           <param name="show" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Hide" type="bool" overloaded="no">
         <autodoc>Hide() -&gt; bool</autodoc>

+        <docstring>Equivalent to calling Show(False).</docstring>

       </method>
       <method name="Enable" type="bool" overloaded="no">
         <autodoc>Enable(bool enable=True) -&gt; bool</autodoc>
       </method>
       <method name="Enable" type="bool" overloaded="no">
         <autodoc>Enable(bool enable=True) -&gt; bool</autodoc>

+        <docstring>Enable or disable the window for user input. Note that when a parent
+window is disabled, all of its children are disabled as well and they
+are reenabled again when the parent is.  Returns true if the window
+has been enabled or disabled, false if nothing was done, i.e. if the
+window had already been in the specified state.</docstring>

         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Disable" type="bool" overloaded="no">
         <autodoc>Disable() -&gt; bool</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="Disable" type="bool" overloaded="no">
         <autodoc>Disable() -&gt; bool</autodoc>

+        <docstring>Disables the window, same as Enable(false).</docstring>

       </method>
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>
       </method>
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>

+        <docstring>Returns true if the window is shown, false if it has been hidden.</docstring>

       </method>
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>
       </method>
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>

+        <docstring>Returns true if the window is enabled for input, false otherwise.</docstring>

       </method>
       </method>

-      <method name="SetWindowStyleFlag" type="void" overloaded="no">
+      <method name="SetWindowStyleFlag" type="" overloaded="no">

         <autodoc>SetWindowStyleFlag(long style)</autodoc>
         <autodoc>SetWindowStyleFlag(long style)</autodoc>

+        <docstring>Sets the style of the window. Please note that some styles cannot be
+changed after the window creation and that Refresh() might be called
+after changing the others for the change to take place immediately.</docstring>

         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetWindowStyleFlag" type="long" overloaded="no">
         <autodoc>GetWindowStyleFlag() -&gt; long</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetWindowStyleFlag" type="long" overloaded="no">
         <autodoc>GetWindowStyleFlag() -&gt; long</autodoc>

-      </method>
-      <method name="SetWindowStyle" type="void" overloaded="no">
-        <autodoc>SetWindowStyle(long style)</autodoc>
-        <paramlist>
-          <param name="style" type="long" default=""/>
-        </paramlist>
-      </method>
-      <method name="GetWindowStyle" type="long" overloaded="no">
-        <autodoc>GetWindowStyle() -&gt; long</autodoc>
+        <docstring>Gets the window style that was passed to the constructor or Create
+method.</docstring>

       </method>
       <method name="HasFlag" type="bool" overloaded="no">
         <autodoc>HasFlag(int flag) -&gt; bool</autodoc>
       </method>
       <method name="HasFlag" type="bool" overloaded="no">
         <autodoc>HasFlag(int flag) -&gt; bool</autodoc>

+        <docstring>Test if the given style is set for this window.</docstring>

         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
       <method name="IsRetained" type="bool" overloaded="no">
         <autodoc>IsRetained() -&gt; bool</autodoc>
         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
       <method name="IsRetained" type="bool" overloaded="no">
         <autodoc>IsRetained() -&gt; bool</autodoc>

+        <docstring>Returns true if the window is retained, false otherwise.  Retained
+windows are only available on X platforms.</docstring>

       </method>
       </method>

-      <method name="SetExtraStyle" type="void" overloaded="no">
+      <method name="SetExtraStyle" type="" overloaded="no">

         <autodoc>SetExtraStyle(long exStyle)</autodoc>
         <autodoc>SetExtraStyle(long exStyle)</autodoc>

+        <docstring>Sets the extra style bits for the window.  Extra styles are the less
+often used style bits which can't be set with the constructor or with
+SetWindowStyleFlag()</docstring>

         <paramlist>
           <param name="exStyle" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetExtraStyle" type="long" overloaded="no">
         <autodoc>GetExtraStyle() -&gt; long</autodoc>
         <paramlist>
           <param name="exStyle" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetExtraStyle" type="long" overloaded="no">
         <autodoc>GetExtraStyle() -&gt; long</autodoc>

+        <docstring>Returns the extra style bits for the window.</docstring>

       </method>
       </method>

-      <method name="MakeModal" type="void" overloaded="no">
+      <method name="MakeModal" type="" overloaded="no">

         <autodoc>MakeModal(bool modal=True)</autodoc>
         <autodoc>MakeModal(bool modal=True)</autodoc>

+        <docstring>Disables all other windows in the application so that the user can
+only interact with this window.  Passing False will reverse this
+effect.</docstring>

         <paramlist>
           <param name="modal" type="bool" default="True"/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetThemeEnabled(bool enableTheme)</autodoc>

+        <docstring>This function tells a window if it should use the system's "theme"
+ code to draw the windows' background instead if its own background
+ drawing code. This will only have an effect on platforms that support
+ the notion of themes in user defined windows. One such platform is
+ GTK+ where windows can have (very colourful) backgrounds defined by a
+ user's selected theme.
+
+Dialogs, notebook pages and the status bar have this flag set to true
+by default so that the default look and feel is simulated best.</docstring>

         <paramlist>
           <param name="enableTheme" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetThemeEnabled" type="bool" overloaded="no">
         <autodoc>GetThemeEnabled() -&gt; bool</autodoc>
         <paramlist>
           <param name="enableTheme" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetThemeEnabled" type="bool" overloaded="no">
         <autodoc>GetThemeEnabled() -&gt; bool</autodoc>

+        <docstring>Return the themeEnabled flag.</docstring>

       </method>
       </method>

-      <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>
         <autodoc>SetFocus()</autodoc>

+        <docstring>Set's the focus to this window, allowing it to receive keyboard input.</docstring>

       </method>
       </method>

-      <method name="SetFocusFromKbd" type="void" overloaded="no">
+      <method name="SetFocusFromKbd" type="" overloaded="no">

         <autodoc>SetFocusFromKbd()</autodoc>
         <autodoc>SetFocusFromKbd()</autodoc>

+        <docstring>Set focus to this window as the result of a keyboard action.  Normally
+only called internally.</docstring>

       </method>
       </method>

-      <staticmethod name="FindFocus" type="wxWindow" overloaded="no">
-        <autodoc>Window.FindFocus() -&gt; Window</autodoc>
+      <staticmethod name="FindFocus" type="Window" overloaded="no">
+        <autodoc>FindFocus() -&gt; Window</autodoc>
+        <docstring>Returns the window or control that currently has the keyboard focus,
+or None.</docstring>

       </staticmethod>
       <method name="AcceptsFocus" type="bool" overloaded="no">
         <autodoc>AcceptsFocus() -&gt; bool</autodoc>
       </staticmethod>
       <method name="AcceptsFocus" type="bool" overloaded="no">
         <autodoc>AcceptsFocus() -&gt; bool</autodoc>

+        <docstring>Can this window have focus?</docstring>

       </method>
       <method name="AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>AcceptsFocusFromKeyboard() -&gt; bool</autodoc>
       </method>
       <method name="AcceptsFocusFromKeyboard" type="bool" overloaded="no">
         <autodoc>AcceptsFocusFromKeyboard() -&gt; bool</autodoc>

+        <docstring>Can this window be given focus by keyboard navigation? if not, the
+only way to give it focus (provided it accepts it at all) is to click
+it.</docstring>

       </method>
       </method>

-      <method name="GetDefaultItem" type="wxWindow" overloaded="no">
+      <method name="GetDefaultItem" type="Window" overloaded="no">

         <autodoc>GetDefaultItem() -&gt; Window</autodoc>
         <autodoc>GetDefaultItem() -&gt; Window</autodoc>

+        <docstring>Get the default child of this parent, i.e. the one which is activated
+by pressing &lt;Enter&gt; such as the OK button on a wx.Dialog.</docstring>

       </method>
       </method>

-      <method name="SetDefaultItem" type="wxWindow" overloaded="no">
+      <method name="SetDefaultItem" type="Window" overloaded="no">

         <autodoc>SetDefaultItem(Window child) -&gt; Window</autodoc>
         <autodoc>SetDefaultItem(Window child) -&gt; Window</autodoc>

+        <docstring>Set this child as default, return the old default.</docstring>

         <paramlist>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTmpDefaultItem" type="void" overloaded="no">
+      <method name="SetTmpDefaultItem" type="" overloaded="no">

         <autodoc>SetTmpDefaultItem(Window win)</autodoc>
         <autodoc>SetTmpDefaultItem(Window win)</autodoc>

+        <docstring>Set this child as temporary default</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="GetChildren" type="PyObject" overloaded="no">
         <autodoc>GetChildren() -&gt; PyObject</autodoc>

+        <docstring>Returns a list of the window's children.  NOTE: Currently this is a
+copy of the child window list maintained by the window, so the return
+value of this function is only valid as long as the window's children
+do not change.</docstring>

       </method>
       </method>

-      <method name="GetParent" type="wxWindow" overloaded="no">
+      <method name="GetParent" type="Window" overloaded="no">

         <autodoc>GetParent() -&gt; Window</autodoc>
         <autodoc>GetParent() -&gt; Window</autodoc>

+        <docstring>Returns the parent window of this window, or None if there isn't one.</docstring>

       </method>
       </method>

-      <method name="GetGrandParent" type="wxWindow" overloaded="no">
+      <method name="GetGrandParent" type="Window" overloaded="no">

         <autodoc>GetGrandParent() -&gt; Window</autodoc>
         <autodoc>GetGrandParent() -&gt; Window</autodoc>

+        <docstring>Returns the parent of the parent of this window, or None if there isn't one.</docstring>

       </method>
       <method name="IsTopLevel" type="bool" overloaded="no">
         <autodoc>IsTopLevel() -&gt; bool</autodoc>
       </method>
       <method name="IsTopLevel" type="bool" overloaded="no">
         <autodoc>IsTopLevel() -&gt; bool</autodoc>

+        <docstring>Returns true if the given window is a top-level one. Currently all
+frames and dialogs are always considered to be top-level windows (even
+if they have a parent window).</docstring>

       </method>
       <method name="Reparent" type="bool" overloaded="no">
         <autodoc>Reparent(Window newParent) -&gt; bool</autodoc>
       </method>
       <method name="Reparent" type="bool" overloaded="no">
         <autodoc>Reparent(Window newParent) -&gt; bool</autodoc>

+        <docstring>Reparents the window, i.e the window will be removed from its current
+parent window (e.g. a non-standard toolbar in a wxFrame) and then
+re-inserted into another. Available on Windows and GTK.  Returns True
+if the parent was changed, False otherwise (error or newParent ==
+oldParent)</docstring>

         <paramlist>
         <paramlist>

-          <param name="newParent" type="p.wxWindow" default=""/>
+          <param name="newParent" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddChild" type="void" overloaded="no">
+      <method name="AddChild" type="" overloaded="no">

         <autodoc>AddChild(Window child)</autodoc>
         <autodoc>AddChild(Window child)</autodoc>

+        <docstring>Adds a child window. This is called automatically by window creation
+functions so should not be required by the application programmer.</docstring>

         <paramlist>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RemoveChild" type="void" overloaded="no">
+      <method name="RemoveChild" type="" overloaded="no">

         <autodoc>RemoveChild(Window child)</autodoc>
         <autodoc>RemoveChild(Window child)</autodoc>

+        <docstring>Removes a child window. This is called automatically by window
+deletion functions so should not be required by the application
+programmer.</docstring>

         <paramlist>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="FindWindowById" type="wxWindow" overloaded="no">
+      <method name="FindWindowById" type="Window" overloaded="no">

         <autodoc>FindWindowById(long winid) -&gt; Window</autodoc>
         <autodoc>FindWindowById(long winid) -&gt; Window</autodoc>

+        <docstring>Find a chld of this window by window ID</docstring>

         <paramlist>
           <param name="winid" type="long" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>FindWindowByName(String name) -&gt; Window</autodoc>

+        <docstring>Find a child of this window by name</docstring>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetEventHandler" type="wxEvtHandler" overloaded="no">
+      <method name="GetEventHandler" type="EvtHandler" overloaded="no">

         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>
         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>

+        <docstring>Returns the event handler for this window. By default, the window is
+its own event handler.</docstring>

       </method>
       </method>

-      <method name="SetEventHandler" type="void" overloaded="no">
+      <method name="SetEventHandler" type="" overloaded="no">

         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>
         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>

+        <docstring>Sets the event handler for this window.  An event handler is an object
+that is capable of processing the events sent to a window. By default,
+the window is its own event handler, but an application may wish to
+substitute another, for example to allow central implementation of
+event-handling for a variety of different window classes.
+
+It is usually better to use wx.Window.PushEventHandler since this sets
+up a chain of event handlers, where an event not handled by one event
+handler is handed to the next one in the chain.</docstring>

         <paramlist>
         <paramlist>

-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="PushEventHandler" type="void" overloaded="no">
+      <method name="PushEventHandler" type="" overloaded="no">

         <autodoc>PushEventHandler(EvtHandler handler)</autodoc>
         <autodoc>PushEventHandler(EvtHandler handler)</autodoc>

+        <docstring>Pushes this event handler onto the event handler stack for the window.
+An event handler is an object that is capable of processing the events
+sent to a window. By default, the window is its own event handler, but
+an application may wish to substitute another, for example to allow
+central implementation of event-handling for a variety of different
+window classes.
+
+wx.Window.PushEventHandler allows an application to set up a chain of
+event handlers, where an event not handled by one event handler is
+handed to the next one in the chain. Use wx.Window.PopEventHandler to
+remove the event handler.</docstring>

         <paramlist>
         <paramlist>

-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="PopEventHandler" type="wxEvtHandler" overloaded="no">
+      <method name="PopEventHandler" type="EvtHandler" overloaded="no">

         <autodoc>PopEventHandler(bool deleteHandler=False) -&gt; EvtHandler</autodoc>
         <autodoc>PopEventHandler(bool deleteHandler=False) -&gt; EvtHandler</autodoc>

+        <docstring>Removes and returns the top-most event handler on the event handler
+stack.  If deleteHandler is True then the wx.EvtHandler object will be
+destroyed after it is popped.</docstring>

         <paramlist>
           <param name="deleteHandler" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="RemoveEventHandler" type="bool" overloaded="no">
         <autodoc>RemoveEventHandler(EvtHandler handler) -&gt; bool</autodoc>
         <paramlist>
           <param name="deleteHandler" type="bool" default="False"/>
         </paramlist>
       </method>
       <method name="RemoveEventHandler" type="bool" overloaded="no">
         <autodoc>RemoveEventHandler(EvtHandler handler) -&gt; bool</autodoc>

+        <docstring>Find the given handler in the event handler chain and remove (but
+not delete) it from the event handler chain, return True if it was
+found and False otherwise (this also results in an assert failure so
+this function should only be called when the handler is supposed to
+be there.)</docstring>

         <paramlist>
         <paramlist>

-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetValidator" type="void" overloaded="no">
+      <method name="SetValidator" type="" overloaded="no">

         <autodoc>SetValidator(Validator validator)</autodoc>
         <autodoc>SetValidator(Validator validator)</autodoc>

+        <docstring>Deletes the current validator (if any) and sets the window validator,
+having called wx.Validator.Clone to create a new validator of this
+type.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="GetValidator" type="wxValidator" overloaded="no">
         <autodoc>GetValidator() -&gt; Validator</autodoc>

+        <docstring>Returns a pointer to the current validator for the window, or None if
+there is none.</docstring>

       </method>
       </method>

-      <method name="SetAcceleratorTable" type="void" overloaded="no">
+      <method name="SetAcceleratorTable" type="" overloaded="no">

         <autodoc>SetAcceleratorTable(AcceleratorTable accel)</autodoc>
         <autodoc>SetAcceleratorTable(AcceleratorTable accel)</autodoc>

+        <docstring>Sets the accelerator table for this window.</docstring>

         <paramlist>
         <paramlist>

-          <param name="accel" type="r.q(const).wxAcceleratorTable" default=""/>
+          <param name="accel" type="AcceleratorTable" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetAcceleratorTable" type="wxAcceleratorTable" overloaded="no">
+      <method name="GetAcceleratorTable" type="AcceleratorTable" overloaded="no">

         <autodoc>GetAcceleratorTable() -&gt; AcceleratorTable</autodoc>
         <autodoc>GetAcceleratorTable() -&gt; AcceleratorTable</autodoc>

+        <docstring>Gets the accelerator table for this window.</docstring>

       </method>
       <method name="RegisterHotKey" type="bool" overloaded="no">
         <autodoc>RegisterHotKey(int hotkeyId, int modifiers, int keycode) -&gt; bool</autodoc>
       </method>
       <method name="RegisterHotKey" type="bool" overloaded="no">
         <autodoc>RegisterHotKey(int hotkeyId, int modifiers, int keycode) -&gt; bool</autodoc>

+        <docstring>Registers a system wide hotkey. Every time the user presses the hotkey
+registered here, this window will receive a hotkey event. It will
+receive the event even if the application is in the background and
+does not have the input focus because the user is working with some
+other application.  To bind an event handler function to this hotkey
+use EVT_HOTKEY with an id equal to hotkeyId.  Returns True if the
+hotkey was registered successfully.</docstring>

         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
           <param name="modifiers" type="int" default=""/>
         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
           <param name="modifiers" type="int" default=""/>


@@ -4149,104 +4753,178 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="UnregisterHotKey" type="bool" overloaded="no">
         <autodoc>UnregisterHotKey(int hotkeyId) -&gt; bool</autodoc>
       </method>
       <method name="UnregisterHotKey" type="bool" overloaded="no">
         <autodoc>UnregisterHotKey(int hotkeyId) -&gt; bool</autodoc>

+        <docstring>Unregisters a system wide hotkey.</docstring>

         <paramlist>
           <param name="hotkeyId" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <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>
         <autodoc>ConvertDialogPointToPixels(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+changes. For the x dimension, the dialog units are multiplied by the
+average character width and then divided by 4. For the y dimension,
+the dialog units are multiplied by the average character height and
+then divided by 8.</docstring>

         <paramlist>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ConvertDialogSizeToPixels" type="wxSize" overloaded="no">
+      <method name="ConvertDialogSizeToPixels" type="Size" overloaded="no">

         <autodoc>ConvertDialogSizeToPixels(Size sz) -&gt; Size</autodoc>
         <autodoc>ConvertDialogSizeToPixels(Size sz) -&gt; Size</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+changes. For the x dimension, the dialog units are multiplied by the
+average character width and then divided by 4. For the y dimension,
+the dialog units are multiplied by the average character height and
+then divided by 8.</docstring>

         <paramlist>
         <paramlist>

-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>DLG_PNT(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+changes. For the x dimension, the dialog units are multiplied by the
+average character width and then divided by 4. For the y dimension,
+the dialog units are multiplied by the average character height and
+then divided by 8.</docstring>

         <paramlist>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>DLG_SZE(Size sz) -&gt; Size</autodoc>

+        <docstring>Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font
+changes. For the x dimension, the dialog units are multiplied by the
+average character width and then divided by 4. For the y dimension,
+the dialog units are multiplied by the average character height and
+then divided by 8.</docstring>

         <paramlist>
         <paramlist>

-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ConvertPixelPointToDialog" type="wxPoint" overloaded="no">
+      <method name="ConvertPixelPointToDialog" type="Point" overloaded="no">

         <autodoc>ConvertPixelPointToDialog(Point pt) -&gt; Point</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="ConvertPixelSizeToDialog" type="wxSize" overloaded="no">
+      <method name="ConvertPixelSizeToDialog" type="Size" overloaded="no">

         <autodoc>ConvertPixelSizeToDialog(Size sz) -&gt; Size</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="WarpPointer" type="void" overloaded="no">
+      <method name="WarpPointer" type="" overloaded="no">

         <autodoc>WarpPointer(int x, int y)</autodoc>
         <autodoc>WarpPointer(int x, int y)</autodoc>

+        <docstring>Moves the pointer to the given position on the window.
+
+NOTE: This function is not supported under Mac because Apple Human
+Interface Guidelines forbid moving the mouse cursor programmatically.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>CaptureMouse()</autodoc>

+        <docstring>Directs all mouse input to this window. Call wx.Window.ReleaseMouse to
+release the capture.
+
+Note that wxWindows maintains the stack of windows having captured the
+mouse and when the mouse is released the capture returns to the window
+which had had captured it previously and it is only really released if
+there were no previous window. In particular, this means that you must
+release the mouse as many times as you capture it.</docstring>

       </method>
       </method>

-      <method name="ReleaseMouse" type="void" overloaded="no">
+      <method name="ReleaseMouse" type="" overloaded="no">

         <autodoc>ReleaseMouse()</autodoc>
         <autodoc>ReleaseMouse()</autodoc>

+        <docstring>Releases mouse input captured with wx.Window.CaptureMouse.</docstring>

       </method>
       </method>

-      <staticmethod name="GetCapture" type="wxWindow" overloaded="no">
-        <autodoc>Window.GetCapture() -&gt; Window</autodoc>
+      <staticmethod name="GetCapture" type="Window" overloaded="no">
+        <autodoc>GetCapture() -&gt; Window</autodoc>
+        <docstring>Returns the window which currently captures the mouse or None</docstring>

       </staticmethod>
       <method name="HasCapture" type="bool" overloaded="no">
         <autodoc>HasCapture() -&gt; bool</autodoc>
       </staticmethod>
       <method name="HasCapture" type="bool" overloaded="no">
         <autodoc>HasCapture() -&gt; bool</autodoc>

+        <docstring>Returns true if this window has the current mouse capture.</docstring>

       </method>
       </method>

-      <method name="Refresh" type="void" overloaded="no">
+      <method name="Refresh" type="" overloaded="no">

         <autodoc>Refresh(bool eraseBackground=True, Rect rect=None)</autodoc>
         <autodoc>Refresh(bool eraseBackground=True, Rect rect=None)</autodoc>

+        <docstring>Mark the specified rectangle (or the whole window) as "dirty" so it
+will be repainted.  Causes an EVT_PAINT event to be generated and sent
+to the window.</docstring>

         <paramlist>
           <param name="eraseBackground" type="bool" default="True"/>
         <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>
         </paramlist>
       </method>

-      <method name="RefreshRect" type="void" overloaded="no">
+      <method name="RefreshRect" type="" overloaded="no">

         <autodoc>RefreshRect(Rect rect)</autodoc>
         <autodoc>RefreshRect(Rect rect)</autodoc>

+        <docstring>Redraws the contents of the given rectangle: the area inside it will
+be repainted.  This is the same as Refresh but has a nicer syntax.</docstring>

         <paramlist>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Update" type="void" overloaded="no">
+      <method name="Update" type="" overloaded="no">

         <autodoc>Update()</autodoc>
         <autodoc>Update()</autodoc>

-      </method>
-      <method name="ClearBackground" type="void" overloaded="no">
+        <docstring>Calling this method immediately repaints the invalidated area of the
+window instead of waiting for the EVT_PAINT event to happen, (normally
+this would usually only happen when the flow of control returns to the
+event loop.)  Notice that this function doesn't refresh the window and
+does nothing if the window has been already repainted.  Use Refresh
+first if you want to immediately redraw the window (or some portion of
+it) unconditionally.</docstring>
+      </method>
+      <method name="ClearBackground" type="" overloaded="no">

         <autodoc>ClearBackground()</autodoc>
         <autodoc>ClearBackground()</autodoc>

+        <docstring>Clears the window by filling it with the current background
+colour. Does not cause an erase background event to be generated.</docstring>

       </method>
       </method>

-      <method name="Freeze" type="void" overloaded="no">
+      <method name="Freeze" type="" overloaded="no">

         <autodoc>Freeze()</autodoc>
         <autodoc>Freeze()</autodoc>

+        <docstring>Freezes the window or, in other words, prevents any updates from
+taking place on screen, the window is not redrawn at all. Thaw must be
+called to reenable window redrawing.
+
+This method is useful for visual appearance optimization (for example,
+it is a good idea to use it before inserting large amount of text into
+a wxTextCtrl under wxGTK) but is not implemented on all platforms nor
+for all controls so it is mostly just a hint to wxWindows and not a
+mandatory directive.</docstring>

       </method>
       </method>

-      <method name="Thaw" type="void" overloaded="no">
+      <method name="Thaw" type="" overloaded="no">

         <autodoc>Thaw()</autodoc>
         <autodoc>Thaw()</autodoc>

+        <docstring>Reenables window updating after a previous call to Freeze.</docstring>

       </method>
       </method>

-      <method name="PrepareDC" type="void" overloaded="no">
+      <method name="PrepareDC" type="" overloaded="no">

         <autodoc>PrepareDC(DC dc)</autodoc>
         <autodoc>PrepareDC(DC dc)</autodoc>

+        <docstring>Call this function to prepare the device context for drawing a
+scrolled image. It sets the device origin according to the current
+scroll position.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="GetUpdateRegion" type="wxRegion" overloaded="no">
         <autodoc>GetUpdateRegion() -&gt; Region</autodoc>

+        <docstring>Returns the region specifying which parts of the window have been
+damaged. Should only be called within an EVT_PAINT handler.</docstring>

       </method>
       </method>

-      <method name="GetUpdateClientRect" type="wxRect" overloaded="no">
+      <method name="GetUpdateClientRect" type="Rect" overloaded="no">

         <autodoc>GetUpdateClientRect() -&gt; Rect</autodoc>
         <autodoc>GetUpdateClientRect() -&gt; Rect</autodoc>

+        <docstring>Get the update rectangle region bounding box in client coords.</docstring>

       </method>
       <method name="IsExposed" type="bool" overloaded="no">
         <autodoc>IsExposed(int x, int y, int w=1, int h=1) -&gt; bool</autodoc>
       </method>
       <method name="IsExposed" type="bool" overloaded="no">
         <autodoc>IsExposed(int x, int y, int w=1, int h=1) -&gt; bool</autodoc>

+        <docstring>Returns true if the given point or rectangle area has been exposed
+since the last repaint. Call this in an paint event handler to
+optimize redrawing by only redrawing those areas, which have been
+exposed.</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -4256,117 +4934,164 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="IsExposedPoint" type="bool" overloaded="no">
         <autodoc>IsExposedPoint(Point pt) -&gt; bool</autodoc>
       </method>
       <method name="IsExposedPoint" type="bool" overloaded="no">
         <autodoc>IsExposedPoint(Point pt) -&gt; bool</autodoc>

+        <docstring>Returns true if the given point or rectangle area has been exposed
+since the last repaint. Call this in an paint event handler to
+optimize redrawing by only redrawing those areas, which have been
+exposed.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="isExposedRect" type="bool" overloaded="no">
         <autodoc>isExposedRect(Rect rect) -&gt; bool</autodoc>

+        <docstring>Returns true if the given point or rectangle area has been exposed
+since the last repaint. Call this in an paint event handler to
+optimize redrawing by only redrawing those areas, which have been
+exposed.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="SetBackgroundColour" type="bool" overloaded="no">
         <autodoc>SetBackgroundColour(Colour colour) -&gt; bool</autodoc>

+        <docstring>Sets the background colour of the window.  Returns True if the colour
+was changed.  The background colour is usually painted by the default
+EVT_ERASE_BACKGROUND event handler function under Windows and
+automatically under GTK.
+
+Note that setting the background colour does not cause an immediate
+refresh, so you may wish to call ClearBackground or Refresh after
+calling this function.
+
+Use this function with care under GTK+ as the new appearance of the
+window might not look equally well when used with themes, i.e GTK+'s
+ability to change its look as the user wishes with run-time loadable
+modules.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="SetForegroundColour" type="bool" overloaded="no">
         <autodoc>SetForegroundColour(Colour colour) -&gt; bool</autodoc>

+        <docstring>Sets the foreground colour of the window.  Returns True is the colour
+was changed.  The interpretation of foreground colour is dependent on
+the window class; it may be the text colour or other colour, or it may
+not be used at all.</docstring>

         <paramlist>
         <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">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
         </paramlist>
       </method>
       <method name="GetBackgroundColour" type="wxColour" overloaded="no">
         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>

+        <docstring>Returns the background colour of the window.</docstring>

       </method>
       <method name="GetForegroundColour" type="wxColour" overloaded="no">
         <autodoc>GetForegroundColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetForegroundColour" type="wxColour" overloaded="no">
         <autodoc>GetForegroundColour() -&gt; Colour</autodoc>

+        <docstring>Returns the foreground colour of the window.  The interpretation of
+foreground colour is dependent on the window class; it may be the text
+colour or other colour, or it may not be used at all.</docstring>

       </method>
       <method name="SetCursor" type="bool" overloaded="no">
         <autodoc>SetCursor(Cursor cursor) -&gt; bool</autodoc>
       </method>
       <method name="SetCursor" type="bool" overloaded="no">
         <autodoc>SetCursor(Cursor cursor) -&gt; bool</autodoc>

+        <docstring>Sets the window's cursor. Notice that the window cursor also sets it
+for the children of the window implicitly.
+
+The cursor may be wx.NullCursor in which case the window cursor will
+be reset back to default.</docstring>

         <paramlist>
         <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">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>
         </paramlist>
       </method>
       <method name="GetCursor" type="wxCursor" overloaded="no">
         <autodoc>GetCursor() -&gt; Cursor</autodoc>

+        <docstring>Return the cursor associated with this window.</docstring>

       </method>
       <method name="SetFont" type="bool" overloaded="no">
         <autodoc>SetFont(Font font) -&gt; bool</autodoc>
       </method>
       <method name="SetFont" type="bool" overloaded="no">
         <autodoc>SetFont(Font font) -&gt; bool</autodoc>

+        <docstring>Sets the font for this window.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="GetFont" type="wxFont" overloaded="no">
         <autodoc>GetFont() -&gt; Font</autodoc>

+        <docstring>Returns a reference to the font for this window.</docstring>

       </method>
       </method>

-      <method name="SetCaret" type="void" overloaded="no">
+      <method name="SetCaret" type="" overloaded="no">

         <autodoc>SetCaret(Caret caret)</autodoc>
         <autodoc>SetCaret(Caret caret)</autodoc>

+        <docstring>Sets the caret associated with the window.</docstring>

         <paramlist>
         <paramlist>

-          <param name="caret" type="p.wxCaret" default=""/>
+          <param name="caret" type="wxCaret" default=""/>

         </paramlist>
       </method>
       <method name="GetCaret" type="wxCaret" overloaded="no">
         <autodoc>GetCaret() -&gt; Caret</autodoc>
         </paramlist>
       </method>
       <method name="GetCaret" type="wxCaret" overloaded="no">
         <autodoc>GetCaret() -&gt; Caret</autodoc>

+        <docstring>Returns the caret associated with the window.</docstring>

       </method>
       <method name="GetCharHeight" type="int" overloaded="no">
         <autodoc>GetCharHeight() -&gt; int</autodoc>
       </method>
       <method name="GetCharHeight" type="int" overloaded="no">
         <autodoc>GetCharHeight() -&gt; int</autodoc>

+        <docstring>Get the (average) character size for the current font.</docstring>

       </method>
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>
       </method>
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>

+        <docstring>Get the (average) character size for the current font.</docstring>

       </method>
       </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>
         <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>
         </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>
         <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>
+        <docstring>Get the width, height, decent and leading of the text using the
+current or specified font.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="ClientToScreenXY" type="void" overloaded="no">
-        <autodoc>ClientToScreenXY(int x, int y)</autodoc>
+      <method name="ClientToScreenXY" type="" overloaded="no">
+        <autodoc>ClientToScreenXY(int x, int y) -&gt; (x,y)</autodoc>
+        <docstring>Converts to screen coordinates from coordinates relative to this window.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="ScreenToClientXY" type="void" overloaded="no">
-        <autodoc>ScreenToClientXY(int x, int y)</autodoc>
+      <method name="ScreenToClientXY" type="" overloaded="no">
+        <autodoc>ScreenToClientXY(int x, int y) -&gt; (x,y)</autodoc>
+        <docstring>Converts from screen to client window coordinates.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="ClientToScreen" type="wxPoint" overloaded="no">
+      <method name="ClientToScreen" type="Point" overloaded="no">

         <autodoc>ClientToScreen(Point pt) -&gt; Point</autodoc>
         <autodoc>ClientToScreen(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts to screen coordinates from coordinates relative to this window.</docstring>

         <paramlist>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ScreenToClient" type="wxPoint" overloaded="no">
+      <method name="ScreenToClient" type="Point" overloaded="no">

         <autodoc>ScreenToClient(Point pt) -&gt; Point</autodoc>
         <autodoc>ScreenToClient(Point pt) -&gt; Point</autodoc>

+        <docstring>Converts from screen to client window coordinates.</docstring>

         <paramlist>
         <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">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>
         </paramlist>
       </method>
       <method name="HitTestXY" type="wxHitTest" overloaded="no">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -4374,239 +5099,403 @@ more or less independent of the screen window size.</docstring>
       </method>
       <method name="HitTest" type="wxHitTest" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
       </method>
       <method name="HitTest" type="wxHitTest" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetBorderFlags" type="wxBorder" overloaded="no">
-        <autodoc>GetBorderFlags(long flags) -&gt; int</autodoc>
+      <method name="GetBorder" type="wxBorder" overloaded="yes">
+        <docstring>Get the window border style from the given flags: this is different
+from simply doing flags &amp; wxBORDER_MASK because it uses
+GetDefaultBorder() to translate wxBORDER_DEFAULT to something
+reasonable.
+</docstring>

         <paramlist>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>

-      <method name="GetBorder" type="wxBorder" overloaded="no">
-        <autodoc>GetBorder() -&gt; int</autodoc>
+      <method name="GetBorder" type="wxBorder" overloaded="yes">
+        <autodoc>GetBorder(long flags) -&gt; int
+GetBorder() -&gt; int</autodoc>
+        <docstring>Get border for the flags of this window</docstring>

       </method>
       </method>

-      <method name="UpdateWindowUI" type="void" overloaded="no">
+      <method name="UpdateWindowUI" type="" overloaded="no">

         <autodoc>UpdateWindowUI(long flags=UPDATE_UI_NONE)</autodoc>
         <autodoc>UpdateWindowUI(long flags=UPDATE_UI_NONE)</autodoc>

+        <docstring>This function sends EVT_UPDATE_UI events to the window. The particular
+implementation depends on the window; for example a wx.ToolBar will
+send an update UI event for each toolbar button, and a wx.Frame will
+send an update UI event for each menubar menu item. You can call this
+function from your application to ensure that your UI is up-to-date at
+a particular point in time (as far as your EVT_UPDATE_UI handlers are
+concerned). This may be necessary if you have called
+wx.UpdateUIEvent.SetMode or wx.UpdateUIEvent.SetUpdateInterval to
+limit the overhead that wxWindows incurs by sending update UI events
+in idle time.
+
+The flags should be a bitlist of one or more of the following values:
+
+    wx.UPDATE_UI_NONE          No particular value
+    wx.UPDATE_UI_RECURSE       Call the function for descendants
+    wx.UPDATE_UI_FROMIDLE      Invoked from OnIdle
+
+If you are calling this function from an OnIdle function, make sure
+you pass the wx.UPDATE_UI_FROMIDLE flag, since this tells the window to
+only update the UI elements that need to be updated in idle time. Some
+windows update their elements only when necessary, for example when a
+menu is about to be shown. The following is an example of how to call
+UpdateWindowUI from an idle function.
+
+    def OnIdle(self, evt):
+        if wx.UpdateUIEvent.CanUpdate(self):
+            self.UpdateWindowUI(wx.UPDATE_UI_FROMIDLE);
+</docstring>

         <paramlist>
           <param name="flags" type="long" default="wxUPDATE_UI_NONE"/>
         </paramlist>
       </method>
       <method name="PopupMenuXY" type="bool" overloaded="no">
         <autodoc>PopupMenuXY(Menu menu, int x, int y) -&gt; bool</autodoc>
         <paramlist>
           <param name="flags" type="long" default="wxUPDATE_UI_NONE"/>
         </paramlist>
       </method>
       <method name="PopupMenuXY" type="bool" overloaded="no">
         <autodoc>PopupMenuXY(Menu menu, int x, int y) -&gt; bool</autodoc>

+        <docstring>Pops up the given menu at the specified coordinates, relative to this
+window, and returns control when the user has dismissed the menu. If a
+menu item is selected, the corresponding menu event is generated and
+will be processed as usual.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="PopupMenu" type="bool" overloaded="no">
         <autodoc>PopupMenu(Menu menu, Point pos) -&gt; bool</autodoc>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
       <method name="PopupMenu" type="bool" overloaded="no">
         <autodoc>PopupMenu(Menu menu, Point pos) -&gt; bool</autodoc>

+        <docstring>Pops up the given menu at the specified coordinates, relative to this
+window, and returns control when the user has dismissed the menu. If a
+menu item is selected, the corresponding menu event is generated and
+will be processed as usual.</docstring>

         <paramlist>
         <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">
         <autodoc>GetHandle() -&gt; long</autodoc>
         </paramlist>
       </method>
       <method name="GetHandle" type="long" overloaded="no">
         <autodoc>GetHandle() -&gt; long</autodoc>

+        <docstring>Returns the platform-specific handle (as a long integer) of the
+physical window.  Currently on wxMac it returns the handle of the
+toplevel parent of the window.</docstring>

       </method>
       <method name="HasScrollbar" type="bool" overloaded="no">
         <autodoc>HasScrollbar(int orient) -&gt; bool</autodoc>
       </method>
       <method name="HasScrollbar" type="bool" overloaded="no">
         <autodoc>HasScrollbar(int orient) -&gt; bool</autodoc>

+        <docstring>Does the window have the scrollbar for this orientation?</docstring>

         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>

-      <method name="SetScrollbar" type="void" overloaded="no">
-        <autodoc>SetScrollbar(int orient, int pos, int thumbvisible, int range, bool refresh=True)</autodoc>
+      <method name="SetScrollbar" type="" overloaded="no">
+        <autodoc>SetScrollbar(int orientation, int pos, int thumbvisible, int range, 
+    bool refresh=True)</autodoc>
+        <docstring>Sets the scrollbar properties of a built-in scrollbar.
+
+    orientation: Determines the scrollbar whose page size is to be
+                 set. May be wx.HORIZONTAL or wx.VERTICAL.
+
+    position:    The position of the scrollbar in scroll units.
+
+    thumbSize:   The size of the thumb, or visible portion of the
+                 scrollbar, in scroll units.
+
+    range:       The maximum position of the scrollbar.
+
+    refresh:     True to redraw the scrollbar, false otherwise.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

           <param name="pos" type="int" default=""/>
           <param name="thumbvisible" type="int" default=""/>
           <param name="range" type="int" default=""/>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>
           <param name="pos" type="int" default=""/>
           <param name="thumbvisible" type="int" default=""/>
           <param name="range" type="int" default=""/>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>

-      <method name="SetScrollPos" type="void" overloaded="no">
-        <autodoc>SetScrollPos(int orient, int pos, bool refresh=True)</autodoc>
+      <method name="SetScrollPos" type="" overloaded="no">
+        <autodoc>SetScrollPos(int orientation, int pos, bool refresh=True)</autodoc>
+        <docstring>Sets the position of one of the built-in scrollbars.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

           <param name="pos" type="int" default=""/>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetScrollPos" type="int" overloaded="no">
           <param name="pos" type="int" default=""/>
           <param name="refresh" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetScrollPos" type="int" overloaded="no">

-        <autodoc>GetScrollPos(int orient) -&gt; int</autodoc>
+        <autodoc>GetScrollPos(int orientation) -&gt; int</autodoc>
+        <docstring>Returns the built-in scrollbar position.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

         </paramlist>
       </method>
       <method name="GetScrollThumb" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetScrollThumb" type="int" overloaded="no">

-        <autodoc>GetScrollThumb(int orient) -&gt; int</autodoc>
+        <autodoc>GetScrollThumb(int orientation) -&gt; int</autodoc>
+        <docstring>Returns the built-in scrollbar thumb size.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

         </paramlist>
       </method>
       <method name="GetScrollRange" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetScrollRange" type="int" overloaded="no">

-        <autodoc>GetScrollRange(int orient) -&gt; int</autodoc>
+        <autodoc>GetScrollRange(int orientation) -&gt; int</autodoc>
+        <docstring>Returns the built-in scrollbar range.</docstring>

         <paramlist>
         <paramlist>

-          <param name="orient" type="int" default=""/>
+          <param name="orientation" type="int" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>ScrollWindow(int dx, int dy, Rect rect=None)</autodoc>

+        <docstring>Physically scrolls the pixels in the window and move child windows
+accordingly.  Use this function to optimise your scrolling
+implementations, to minimise the area that must be redrawn. Note that
+it is rarely required to call this function from a user program.
+
+    dx:   Amount to scroll horizontally.
+
+    dy:   Amount to scroll vertically.
+
+    rect: Rectangle to invalidate. If this is None, the whole window
+          is invalidated. If you pass a rectangle corresponding to the
+          area of the window exposed by the scroll, your painting
+          handler can optimize painting by checking for the
+          invalidated region.</docstring>

         <paramlist>
           <param name="dx" type="int" default=""/>
           <param name="dy" type="int" default=""/>
         <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">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it, scrolls the window by
+the given number of lines down, if lines is positive, or up if lines
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>
         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it,  scrolls the window by
+the given number of pages down, if pages is positive, or up if pages
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>
       </method>
       <method name="LineUp" type="bool" overloaded="no">
         <autodoc>LineUp() -&gt; bool</autodoc>
         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>
       </method>
       <method name="LineUp" type="bool" overloaded="no">
         <autodoc>LineUp() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollLines(-1).</docstring>

       </method>
       <method name="LineDown" type="bool" overloaded="no">
         <autodoc>LineDown() -&gt; bool</autodoc>
       </method>
       <method name="LineDown" type="bool" overloaded="no">
         <autodoc>LineDown() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollLines(1).</docstring>

       </method>
       <method name="PageUp" type="bool" overloaded="no">
         <autodoc>PageUp() -&gt; bool</autodoc>
       </method>
       <method name="PageUp" type="bool" overloaded="no">
         <autodoc>PageUp() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollPages(-1).</docstring>

       </method>
       <method name="PageDown" type="bool" overloaded="no">
         <autodoc>PageDown() -&gt; bool</autodoc>
       </method>
       <method name="PageDown" type="bool" overloaded="no">
         <autodoc>PageDown() -&gt; bool</autodoc>

+        <docstring>This is just a wrapper for ScrollPages(1).</docstring>

       </method>
       </method>

-      <method name="SetHelpText" type="void" overloaded="no">
+      <method name="SetHelpText" type="" overloaded="no">

         <autodoc>SetHelpText(String text)</autodoc>
         <autodoc>SetHelpText(String text)</autodoc>

+        <docstring>Sets the help text to be used as context-sensitive help for this
+window.  Note that the text is actually stored by the current
+wxHelpProvider implementation, and not in the window object itself.</docstring>

         <paramlist>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetHelpTextForId" type="void" overloaded="no">
+      <method name="SetHelpTextForId" type="" overloaded="no">

         <autodoc>SetHelpTextForId(String text)</autodoc>
         <autodoc>SetHelpTextForId(String text)</autodoc>

+        <docstring>Associate this help text with all windows with the same id as this
+one.</docstring>

         <paramlist>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetHelpText" type="wxString" overloaded="no">
+      <method name="GetHelpText" type="String" overloaded="no">

         <autodoc>GetHelpText() -&gt; String</autodoc>
         <autodoc>GetHelpText() -&gt; String</autodoc>

+        <docstring>Gets the help text to be used as context-sensitive help for this
+window.  Note that the text is actually stored by the current
+wxHelpProvider implementation, and not in the window object itself.</docstring>

       </method>
       </method>

-      <method name="SetToolTipString" type="void" overloaded="no">
+      <method name="SetToolTipString" type="" overloaded="no">

         <autodoc>SetToolTipString(String tip)</autodoc>
         <autodoc>SetToolTipString(String tip)</autodoc>

+        <docstring>Attach a tooltip to the window.</docstring>

         <paramlist>
         <paramlist>

-          <param name="tip" type="r.q(const).wxString" default=""/>
+          <param name="tip" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetToolTip" type="void" overloaded="no">
+      <method name="SetToolTip" type="" overloaded="no">

         <autodoc>SetToolTip(ToolTip tip)</autodoc>
         <autodoc>SetToolTip(ToolTip tip)</autodoc>

+        <docstring>Attach a tooltip to the window.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="GetToolTip" type="wxToolTip" overloaded="no">
         <autodoc>GetToolTip() -&gt; ToolTip</autodoc>

+        <docstring>get the associated tooltip or None if none</docstring>

       </method>
       </method>

-      <method name="SetDropTarget" type="void" overloaded="no">
-        <autodoc>SetDropTarget(PyDropTarget dropTarget)</autodoc>
+      <method name="SetDropTarget" type="" overloaded="no">
+        <autodoc>SetDropTarget(DropTarget dropTarget)</autodoc>
+        <docstring>Associates a drop target with this window.  If the window already has
+a drop target, it is deleted.</docstring>

         <paramlist>
         <paramlist>

-          <param name="dropTarget" type="p.wxPyDropTarget" default=""/>
+          <param name="dropTarget" type="wxPyDropTarget" default=""/>

         </paramlist>
       </method>
       <method name="GetDropTarget" type="wxPyDropTarget" overloaded="no">
         </paramlist>
       </method>
       <method name="GetDropTarget" type="wxPyDropTarget" overloaded="no">

-        <autodoc>GetDropTarget() -&gt; PyDropTarget</autodoc>
+        <autodoc>GetDropTarget() -&gt; DropTarget</autodoc>
+        <docstring>Returns the associated drop target, which may be None.</docstring>

       </method>
       </method>

-      <method name="SetConstraints" type="void" overloaded="no">
+      <method name="SetConstraints" type="" overloaded="no">

         <autodoc>SetConstraints(LayoutConstraints constraints)</autodoc>
         <autodoc>SetConstraints(LayoutConstraints constraints)</autodoc>

+        <docstring>Sets the window to have the given layout constraints. If an existing
+layout constraints object is already owned by the window, it will be
+deleted.  Pass None to disassociate and delete the window's current
+constraints.
+
+You must call SetAutoLayout to tell a window to use the constraints
+automatically in its default EVT_SIZE handler; otherwise, you must
+handle EVT_SIZE yourself and call Layout() explicitly. When setting
+both a wx.LayoutConstraints and a wx.Sizer, only the sizer will have
+effect.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="GetConstraints" type="wxLayoutConstraints" overloaded="no">
         <autodoc>GetConstraints() -&gt; LayoutConstraints</autodoc>

+        <docstring>Returns a pointer to the window's layout constraints, or None if there
+are none.</docstring>

       </method>
       </method>

-      <method name="SetAutoLayout" type="void" overloaded="no">
+      <method name="SetAutoLayout" type="" overloaded="no">

         <autodoc>SetAutoLayout(bool autoLayout)</autodoc>
         <autodoc>SetAutoLayout(bool autoLayout)</autodoc>

+        <docstring>Determines whether the Layout function will be called automatically
+when the window is resized.  It is called implicitly by SetSizer but
+if you use SetConstraints you should call it manually or otherwise the
+window layout won't be correctly updated when its size changes.</docstring>

         <paramlist>
           <param name="autoLayout" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAutoLayout" type="bool" overloaded="no">
         <autodoc>GetAutoLayout() -&gt; bool</autodoc>
         <paramlist>
           <param name="autoLayout" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAutoLayout" type="bool" overloaded="no">
         <autodoc>GetAutoLayout() -&gt; bool</autodoc>

+        <docstring>Returns the current autoLayout setting</docstring>

       </method>
       <method name="Layout" type="bool" overloaded="no">
         <autodoc>Layout() -&gt; bool</autodoc>
       </method>
       <method name="Layout" type="bool" overloaded="no">
         <autodoc>Layout() -&gt; bool</autodoc>

+        <docstring>Invokes the constraint-based layout algorithm or the sizer-based
+algorithm for this window.  See SetAutoLayout: when auto layout is on,
+this function gets called automatically by the default EVT_SIZE
+handler when the window is resized.</docstring>

       </method>
       </method>

-      <method name="SetSizer" type="void" overloaded="no">
+      <method name="SetSizer" type="" overloaded="no">

         <autodoc>SetSizer(Sizer sizer, bool deleteOld=True)</autodoc>
         <autodoc>SetSizer(Sizer sizer, bool deleteOld=True)</autodoc>

-        <paramlist>
-          <param name="sizer" type="p.wxSizer" default=""/>
+        <docstring>Sets the window to have the given layout sizer. The window will then
+own the object, and will take care of its deletion. If an existing
+layout sizer object is already owned by the window, it will be deleted
+if the deleteOld parameter is true. Note that this function will also
+call SetAutoLayout implicitly with a True parameter if the sizer is
+non-NoneL and False otherwise.</docstring>
+        <paramlist>
+          <param name="sizer" type="wxSizer" default=""/>

           <param name="deleteOld" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetSizerAndFit(Sizer sizer, bool deleteOld=True)</autodoc>

+        <docstring>The same as SetSizer, except it also sets the size hints for the
+window based on the sizer's minimum size.</docstring>

         <paramlist>
         <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>
           <param name="deleteOld" type="bool" default="True"/>
         </paramlist>
       </method>
       <method name="GetSizer" type="wxSizer" overloaded="no">
         <autodoc>GetSizer() -&gt; Sizer</autodoc>

+        <docstring>Return the sizer associated with the window by a previous call to
+SetSizer or None if there isn't one.</docstring>

       </method>
       </method>

-      <method name="SetContainingSizer" type="void" overloaded="no">
+      <method name="SetContainingSizer" type="" overloaded="no">

         <autodoc>SetContainingSizer(Sizer sizer)</autodoc>
         <autodoc>SetContainingSizer(Sizer sizer)</autodoc>

+        <docstring>This normally does not need to be called by application code. It is
+called internally when a window is added to a sizer, and is used so
+the window can remove itself from the sizer when it is destroyed.</docstring>

         <paramlist>
         <paramlist>

-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>

         </paramlist>
       </method>
       <method name="GetContainingSizer" type="wxSizer" overloaded="no">
         <autodoc>GetContainingSizer() -&gt; Sizer</autodoc>
         </paramlist>
       </method>
       <method name="GetContainingSizer" type="wxSizer" overloaded="no">
         <autodoc>GetContainingSizer() -&gt; Sizer</autodoc>

+        <docstring>Return the sizer that this window is a member of, if any, otherwise None.</docstring>

       </method>
     </class>
     <pythoncode>
 def DLG_PNT(win, point_or_x, y=None):
       </method>
     </class>
     <pythoncode>
 def DLG_PNT(win, point_or_x, y=None):

+    """
+    Convenience function for converting a Point or (x,y) in
+    dialog units to pixel units.
+    """

     if y is None:
         return win.ConvertDialogPointToPixels(point_or_x)
     else:
         return win.ConvertDialogPointToPixels(wx.Point(point_or_x, y))
 
 def DLG_SZE(win, size_width, height=None):
     if y is None:
         return win.ConvertDialogPointToPixels(point_or_x)
     else:
         return win.ConvertDialogPointToPixels(wx.Point(point_or_x, y))
 
 def DLG_SZE(win, size_width, height=None):

+    """
+    Convenience function for converting a Size or (w,h) in
+    dialog units to pixel units.
+    """

     if height is None:
         return win.ConvertDialogSizeToPixels(size_width)
     else:
         return win.ConvertDialogSizeToPixels(wx.Size(size_width, height))
 </pythoncode>
     if height is None:
         return win.ConvertDialogSizeToPixels(size_width)
     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>
       <autodoc>FindWindowById(long id, Window parent=None) -&gt; Window</autodoc>

+      <docstring>Find the first window in the application with the given id. If parent
+is None, the search will start from all top-level frames and dialog
+boxes; if non-None, the search will be limited to the given window
+hierarchy. The search is recursive in both cases.</docstring>

       <paramlist>
         <param name="id" type="long" default=""/>
       <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>
       </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>
       <autodoc>FindWindowByName(String name, Window parent=None) -&gt; Window</autodoc>

+      <docstring>Find a window by its name (as given in a window constructor or Create
+function call). If parent is None, the search will start from all
+top-level frames and dialog boxes; if non-None, the search will be
+limited to the given window hierarchy. The search is recursive in both
+cases.
+
+If no window with such name is found, wx.FindWindowByLabel is called.</docstring>

       <paramlist>
       <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>
       </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>
       <autodoc>FindWindowByLabel(String label, Window parent=None) -&gt; Window</autodoc>

+      <docstring>Find a window by its label. Depending on the type of window, the label
+may be a window title or panel item label. If parent is None, the
+search will start from all top-level frames and dialog boxes; if
+non-None, the search will be limited to the given window
+hierarchy. The search is recursive in both cases.</docstring>

       <paramlist>
       <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>
       </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=""/>
       <autodoc>Window_FromHWND(unsigned long hWnd) -&gt; Window</autodoc>
       <paramlist>
         <param name="hWnd" type="unsigned long" default=""/>


@@ -4616,17 +5505,17 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Validator" oldname="wxValidator" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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">
         </paramlist>
       </method>
       <method name="TransferToWindow" type="bool" overloaded="no">


@@ -4635,35 +5524,35 @@ def DLG_SZE(win, size_width, height=None):
       <method name="TransferFromWindow" type="bool" overloaded="no">
         <autodoc>TransferFromWindow() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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">
         </paramlist>
       </method>
       <staticmethod name="IsSilent" type="bool" overloaded="no">

-        <autodoc>Validator.IsSilent() -&gt; bool</autodoc>
+        <autodoc>IsSilent() -&gt; bool</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetBellOnError" type="void" overloaded="no">
-        <autodoc>Validator.SetBellOnError(int doIt=True)</autodoc>
+      <staticmethod name="SetBellOnError" type="" overloaded="no">
+        <autodoc>SetBellOnError(int doIt=True)</autodoc>

         <paramlist>
           <param name="doIt" type="int" default="True"/>
         </paramlist>
       </staticmethod>
     </class>
     <class name="PyValidator" oldname="wxPyValidator" module="core">
         <paramlist>
           <param name="doIt" type="int" default="True"/>
         </paramlist>
       </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>
       <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>
         <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>
           <param name="incref" type="int" default="True"/>
         </paramlist>
       </method>


@@ -4672,153 +5561,153 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Menu" oldname="wxMenu" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>

-      <method name="Append" type="void" overloaded="no">
-        <autodoc>Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)</autodoc>
+      <method name="Append" type="wxMenuItem" overloaded="no">
+        <autodoc>Append(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>

-      <method name="AppendSeparator" type="void" overloaded="no">
-        <autodoc>AppendSeparator()</autodoc>
+      <method name="AppendSeparator" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendSeparator() -&gt; MenuItem</autodoc>

       </method>
       </method>

-      <method name="AppendCheckItem" type="void" overloaded="no">
-        <autodoc>AppendCheckItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="AppendCheckItem" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendCheckItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="AppendRadioItem" type="void" overloaded="no">
-        <autodoc>AppendRadioItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="AppendRadioItem" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendRadioItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="AppendMenu" type="void" overloaded="no">
-        <autodoc>AppendMenu(int id, String text, Menu submenu, String help=EmptyString)</autodoc>
+      <method name="AppendMenu" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendMenu(int id, String text, Menu submenu, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="AppendItem" type="void" overloaded="no">
-        <autodoc>AppendItem(MenuItem item)</autodoc>
+      <method name="AppendItem" type="wxMenuItem" overloaded="no">
+        <autodoc>AppendItem(MenuItem item) -&gt; MenuItem</autodoc>

         <paramlist>
         <paramlist>

-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Break" type="void" overloaded="no">
+      <method name="Break" type="" overloaded="no">

         <autodoc>Break()</autodoc>
       </method>
         <autodoc>Break()</autodoc>
       </method>

-      <method name="InsertItem" type="bool" overloaded="no">
-        <autodoc>InsertItem(size_t pos, MenuItem item) -&gt; bool</autodoc>
+      <method name="InsertItem" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertItem(size_t pos, MenuItem item) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
         <paramlist>
           <param name="pos" type="size_t" default=""/>

-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Insert" type="void" overloaded="no">
+      <method name="Insert" type="wxMenuItem" overloaded="no">

         <autodoc>Insert(size_t pos, int id, String text, String help=EmptyString, 
         <autodoc>Insert(size_t pos, int id, String text, String help=EmptyString, 

-    int kind=ITEM_NORMAL)</autodoc>
+    int kind=ITEM_NORMAL) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <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>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>

-      <method name="InsertSeparator" type="void" overloaded="no">
-        <autodoc>InsertSeparator(size_t pos)</autodoc>
+      <method name="InsertSeparator" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertSeparator(size_t pos) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>

-      <method name="InsertCheckItem" type="void" overloaded="no">
-        <autodoc>InsertCheckItem(size_t pos, int id, String text, String help=EmptyString)</autodoc>
+      <method name="InsertCheckItem" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertCheckItem(size_t pos, int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="InsertRadioItem" type="void" overloaded="no">
-        <autodoc>InsertRadioItem(size_t pos, int id, String text, String help=EmptyString)</autodoc>
+      <method name="InsertRadioItem" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertRadioItem(size_t pos, int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="InsertMenu" type="void" overloaded="no">
-        <autodoc>InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString)</autodoc>
+      <method name="InsertMenu" type="wxMenuItem" overloaded="no">
+        <autodoc>InsertMenu(size_t pos, int id, String text, Menu submenu, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="PrependItem" type="void" overloaded="no">
-        <autodoc>PrependItem(MenuItem item)</autodoc>
+      <method name="PrependItem" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependItem(MenuItem item) -&gt; MenuItem</autodoc>

         <paramlist>
         <paramlist>

-          <param name="item" type="p.wxMenuItem" default=""/>
+          <param name="item" type="wxMenuItem" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Prepend" type="void" overloaded="no">
-        <autodoc>Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL)</autodoc>
+      <method name="Prepend" type="wxMenuItem" overloaded="no">
+        <autodoc>Prepend(int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
           <param name="kind" type="wxItemKind" default="wxITEM_NORMAL"/>
         </paramlist>
       </method>

-      <method name="PrependSeparator" type="void" overloaded="no">
-        <autodoc>PrependSeparator()</autodoc>
+      <method name="PrependSeparator" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependSeparator() -&gt; MenuItem</autodoc>

       </method>
       </method>

-      <method name="PrependCheckItem" type="void" overloaded="no">
-        <autodoc>PrependCheckItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="PrependCheckItem" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependCheckItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="PrependRadioItem" type="void" overloaded="no">
-        <autodoc>PrependRadioItem(int id, String text, String help=EmptyString)</autodoc>
+      <method name="PrependRadioItem" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependRadioItem(int id, String text, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="PrependMenu" type="void" overloaded="no">
-        <autodoc>PrependMenu(int id, String text, Menu submenu, String help=EmptyString)</autodoc>
+      <method name="PrependMenu" type="wxMenuItem" overloaded="no">
+        <autodoc>PrependMenu(int id, String text, Menu submenu, String help=EmptyString) -&gt; MenuItem</autodoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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">
         </paramlist>
       </method>
       <method name="Remove" type="wxMenuItem" overloaded="no">


@@ -4830,7 +5719,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="RemoveItem" type="wxMenuItem" overloaded="no">
         <autodoc>RemoveItem(MenuItem item) -&gt; MenuItem</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </method>
       <method name="Delete" type="bool" overloaded="no">


@@ -4842,10 +5731,10 @@ def DLG_SZE(win, size_width, height=None):
       <method name="DeleteItem" type="bool" overloaded="no">
         <autodoc>DeleteItem(MenuItem item) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         <autodoc>Destroy()</autodoc>
         <docstring>Deletes the C++ object this Python object is a proxy for.</docstring>
       </method>


@@ -4860,7 +5749,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>
         <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">
         </paramlist>
       </method>
       <method name="GetMenuItemCount" type="size_t" overloaded="no">


@@ -4872,7 +5761,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="FindItem" type="int" overloaded="no">
         <autodoc>FindItem(String item) -&gt; int</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </method>
       <method name="FindItemById" type="wxMenuItem" overloaded="no">


@@ -4887,7 +5776,7 @@ def DLG_SZE(win, size_width, height=None):
           <param name="position" type="size_t" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>Enable(int id, bool enable)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -4900,7 +5789,7 @@ def DLG_SZE(win, size_width, height=None):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>Check(int id, bool check)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -4913,90 +5802,90 @@ def DLG_SZE(win, size_width, height=None):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <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=""/>
         <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>
         </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>
         <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>
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTitle" type="q(const).wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">

         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
         <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>
         <autodoc>SetEventHandler(EvtHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxEvtHandler" default=""/>
+          <param name="handler" type="EvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetEventHandler" type="wxEvtHandler" overloaded="no">
+      <method name="GetEventHandler" type="EvtHandler" overloaded="no">

         <autodoc>GetEventHandler() -&gt; EvtHandler</autodoc>
       </method>
         <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>
         <autodoc>SetInvokingWindow(Window win)</autodoc>
         <paramlist>

-          <param name="win" type="p.wxWindow" default=""/>
+          <param name="win" type="Window" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         </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>
         <autodoc>Attach(wxMenuBarBase menubar)</autodoc>
         <paramlist>

-          <param name="menubar" type="p.wxMenuBarBase" default=""/>
+          <param name="menubar" type="wxMenuBarBase" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetParent(Menu parent)</autodoc>
         <paramlist>

-          <param name="parent" type="p.wxMenu" default=""/>
+          <param name="parent" type="Menu" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetParent" type="wxMenu" overloaded="no">
+      <method name="GetParent" type="Menu" overloaded="no">

         <autodoc>GetParent() -&gt; Menu</autodoc>
       </method>
     </class>
         <autodoc>GetParent() -&gt; Menu</autodoc>
       </method>
     </class>


@@ -5004,7 +5893,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MenuBar" oldname="wxMenuBar" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="MenuBar" overloaded="no">
         <autodoc>__init__(long style=0) -&gt; MenuBar</autodoc>
         <paramlist>


@@ -5014,42 +5903,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>
       <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=""/>
         </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>
         </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>
         <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=""/>
         <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>
         </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>
         <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=""/>
         <autodoc>EnableTop(size_t pos, bool enable)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>


@@ -5062,14 +5951,14 @@ def DLG_SZE(win, size_width, height=None):
           <param name="pos" type="size_t" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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=""/>
         <autodoc>GetLabelTop(size_t pos) -&gt; String</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>


@@ -5078,8 +5967,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>
       <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">
         </paramlist>
       </method>
       <method name="FindItemById" type="wxMenuItem" overloaded="no">


@@ -5091,17 +5980,17 @@ def DLG_SZE(win, size_width, height=None):
       <method name="FindMenu" type="int" overloaded="no">
         <autodoc>FindMenu(String title) -&gt; int</autodoc>
         <paramlist>
       <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>
         </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>
         <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=""/>
         <autodoc>Check(int id, bool check)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -5120,27 +6009,27 @@ def DLG_SZE(win, size_width, height=None):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <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=""/>
         <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>
         </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=""/>
         <autodoc>GetHelpString(int id) -&gt; String</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -5152,13 +6041,13 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsAttached" type="bool" overloaded="no">
         <autodoc>IsAttached() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>Attach(wxFrame frame)</autodoc>
         <paramlist>

-          <param name="frame" type="p.wxFrame" default=""/>
+          <param name="frame" type="wxFrame" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">

         <autodoc>Detach()</autodoc>
       </method>
     </class>
         <autodoc>Detach()</autodoc>
       </method>
     </class>


@@ -5166,30 +6055,30 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MenuItem" oldname="wxMenuItem" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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="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="kind" type="wxItemKind" default="wxITEM_NORMAL"/>

-          <param name="subMenu" type="p.wxMenu" default="NULL"/>
+          <param name="subMenu" type="Menu" default="NULL"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="GetMenu" type="wxMenu" overloaded="no">
+      <method name="GetMenu" type="Menu" overloaded="no">

         <autodoc>GetMenu() -&gt; Menu</autodoc>
       </method>
         <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>
         <autodoc>SetMenu(Menu menu)</autodoc>
         <paramlist>

-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetId(int id)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -5201,28 +6090,28 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsSeparator" type="bool" overloaded="no">
         <autodoc>IsSeparator() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>SetText(String str)</autodoc>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">

         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
         <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>
         <autodoc>GetText() -&gt; String</autodoc>
       </method>

-      <staticmethod name="GetLabelFromText" type="wxString" overloaded="no">
-        <autodoc>MenuItem.GetLabelFromText(String text) -&gt; String</autodoc>
+      <staticmethod name="GetLabelFromText" type="String" overloaded="no">
+        <autodoc>GetLabelFromText(String text) -&gt; String</autodoc>

         <paramlist>
         <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>
         </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=""/>
         <autodoc>SetCheckable(bool checkable)</autodoc>
         <paramlist>
           <param name="checkable" type="bool" default=""/>


@@ -5234,16 +6123,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsSubMenu" type="bool" overloaded="no">
         <autodoc>IsSubMenu() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>SetSubMenu(Menu menu)</autodoc>
         <paramlist>

-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSubMenu" type="wxMenu" overloaded="no">
+      <method name="GetSubMenu" type="Menu" overloaded="no">

         <autodoc>GetSubMenu() -&gt; Menu</autodoc>
       </method>
         <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"/>
         <autodoc>Enable(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>


@@ -5252,7 +6141,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsEnabled" type="bool" overloaded="no">
         <autodoc>IsEnabled() -&gt; bool</autodoc>
       </method>
       <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"/>
         <autodoc>Check(bool check=True)</autodoc>
         <paramlist>
           <param name="check" type="bool" default="True"/>


@@ -5261,37 +6150,37 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>Toggle()</autodoc>
       </method>

-      <method name="SetHelp" type="void" overloaded="no">
+      <method name="SetHelp" type="" overloaded="no">

         <autodoc>SetHelp(String str)</autodoc>
         <paramlist>
         <autodoc>SetHelp(String str)</autodoc>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetHelp" type="q(const).wxString" overloaded="no">
+      <method name="GetHelp" type="String" overloaded="no">

         <autodoc>GetHelp() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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">
         </paramlist>
       </method>
       <staticmethod name="GetDefaultMarginWidth" type="int" overloaded="no">

-        <autodoc>MenuItem.GetDefaultMarginWidth() -&gt; int</autodoc>
+        <autodoc>GetDefaultMarginWidth() -&gt; int</autodoc>

       </staticmethod>
       </staticmethod>

-      <method name="SetBitmap" type="void" overloaded="no">
+      <method name="SetBitmap" type="" overloaded="no">

         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>

-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="wxBitmap" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
     </class>


@@ -5299,51 +6188,63 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Control" oldname="wxControl" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Control" oldname="wxControl" module="core">

-      <baseclass name="wxWindow"/>
+      <docstring>This is the base class for a control or 'widget'.
+
+A control is generally a small window which processes user input and/or
+displays one or more item of data.</docstring>
+      <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>
       <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>

+        <docstring>Create a Control.  Normally you should only call this from a
+subclass' __init__ as a plain old wx.Control is not very useful.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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">
         <autodoc>PreControl() -&gt; Control</autodoc>
         </paramlist>
       </constructor>
       <constructor name="PreControl" overloaded="no">
         <autodoc>PreControl() -&gt; Control</autodoc>

+        <docstring>Precreate a Control control for 2-phase creation</docstring>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=0, Validator validator=DefaultValidator, 
     String name=ControlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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>
         </paramlist>
       </method>

-      <method name="Command" type="void" overloaded="no">
+      <method name="Command" type="" overloaded="no">

         <autodoc>Command(CommandEvent event)</autodoc>
         <autodoc>Command(CommandEvent event)</autodoc>

+        <docstring>Simulates the effect of the user issuing a command to the
+item. See wxCommandEvent.</docstring>

         <paramlist>
         <paramlist>

-          <param name="event" type="r.wxCommandEvent" default=""/>
+          <param name="event" type="CommandEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLabel" type="wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">

         <autodoc>GetLabel() -&gt; String</autodoc>
         <autodoc>GetLabel() -&gt; String</autodoc>

+        <docstring>Return a control's text.</docstring>

       </method>
       </method>

-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">

         <autodoc>SetLabel(String label)</autodoc>
         <autodoc>SetLabel(String label)</autodoc>

+        <docstring>Sets the item's text.</docstring>

         <paramlist>
         <paramlist>

-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -5351,44 +6252,74 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ItemContainer" oldname="wxItemContainer" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ItemContainer" oldname="wxItemContainer" module="core">

+      <docstring>wx.ItemContainer defines an interface which is implemented by all
+controls which have string subitems, each of which may be
+selected, such as wx.ListBox, wx.CheckListBox, wx.Choice and
+wx.ComboBox (which implements an extended interface deriving from
+this one)
+
+It defines the methods for accessing the control's items and
+although each of the derived classes implements them differently,
+they still all conform to the same interface.
+
+The items in a wx.ItemContainer have (non empty) string labels
+and, optionally, client data associated with them.
+</docstring>

       <method name="Append" type="int" overloaded="no">
         <autodoc>Append(String item, PyObject clientData=None) -&gt; int</autodoc>
       <method name="Append" type="int" overloaded="no">
         <autodoc>Append(String item, PyObject clientData=None) -&gt; int</autodoc>

+        <docstring>Adds the item to the control, associating the given data with the
+item if not None.  The return value is the index of the newly
+added item which may be different from the last one if the
+control is sorted (e.g. has wx.LB_SORT or wx.CB_SORT style).</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AppendItems" type="void" overloaded="no">
+      <method name="AppendItems" type="" overloaded="no">

         <autodoc>AppendItems(wxArrayString strings)</autodoc>
         <autodoc>AppendItems(wxArrayString strings)</autodoc>

+        <docstring>Apend several items at once to the control.  Notice that calling
+this method may be much faster than appending the items one by
+one if you need to add a lot of items.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="Insert" type="int" overloaded="no">
         <autodoc>Insert(String item, int pos, PyObject clientData=None) -&gt; int</autodoc>

+        <docstring>Insert an item into the control before the item at the pos index,
+optionally associating some data object with the item.</docstring>

         <paramlist>
         <paramlist>

-          <param name="item" type="r.q(const).wxString" default=""/>
+          <param name="item" type="String" default=""/>

           <param name="pos" type="int" default=""/>
           <param name="pos" type="int" default=""/>

-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="clientData" type="PyObject" default="NULL"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">

         <autodoc>Clear()</autodoc>
         <autodoc>Clear()</autodoc>

+        <docstring>Removes all items from the control.</docstring>

       </method>
       </method>

-      <method name="Delete" type="void" overloaded="no">
+      <method name="Delete" type="" overloaded="no">

         <autodoc>Delete(int n)</autodoc>
         <autodoc>Delete(int n)</autodoc>

+        <docstring>Deletes the item at the zero-based index 'n' from the control.
+Note that it is an error (signalled by a PyAssertionError
+exception if enabled) to remove an item with the index negative
+or greater or equal than the number of items in the control.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
         <autodoc>GetCount() -&gt; int</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">
         <autodoc>GetCount() -&gt; int</autodoc>

+        <docstring>Returns the number of items in the control.</docstring>

       </method>
       <method name="IsEmpty" type="bool" overloaded="no">
         <autodoc>IsEmpty() -&gt; bool</autodoc>
       </method>
       <method name="IsEmpty" type="bool" overloaded="no">
         <autodoc>IsEmpty() -&gt; bool</autodoc>

+        <docstring>Returns True if the control is empty or False if it has some items.</docstring>

       </method>
       </method>

-      <method name="GetString" type="wxString" overloaded="no">
+      <method name="GetString" type="String" overloaded="no">

         <autodoc>GetString(int n) -&gt; String</autodoc>
         <autodoc>GetString(int n) -&gt; String</autodoc>

+        <docstring>Returns the label of the item with the given index.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>


@@ -5396,42 +6327,51 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetStrings" type="wxArrayString" overloaded="no">
         <autodoc>GetStrings() -&gt; wxArrayString</autodoc>
       </method>
       <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>
         <autodoc>SetString(int n, String s)</autodoc>

+        <docstring>Sets the label for the given item.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         <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>
       </method>
       <method name="FindString" type="int" overloaded="no">
         <autodoc>FindString(String s) -&gt; int</autodoc>

+        <docstring>Finds an item whose label matches the given string.  Returns the
+zero-based position of the item, or wx.NOT_FOUND if the string
+was not found.</docstring>

         <paramlist>
         <paramlist>

-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Select" type="void" overloaded="no">
+      <method name="Select" type="" overloaded="no">

         <autodoc>Select(int n)</autodoc>
         <autodoc>Select(int n)</autodoc>

+        <docstring>Sets the item at index 'n' to be the selected item.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>

+        <docstring>Returns the index of the selected item or wx.NOT_FOUND if no item is selected.</docstring>

       </method>
       </method>

-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">

         <autodoc>GetStringSelection() -&gt; String</autodoc>
         <autodoc>GetStringSelection() -&gt; String</autodoc>

+        <docstring>Returns the label of the selected item or an empty string if no item is selected.</docstring>

       </method>
       <method name="GetClientData" type="PyObject" overloaded="no">
         <autodoc>GetClientData(int n) -&gt; PyObject</autodoc>
       </method>
       <method name="GetClientData" type="PyObject" overloaded="no">
         <autodoc>GetClientData(int n) -&gt; PyObject</autodoc>

+        <docstring>Returns the client data associated with the given item, (if any.)</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <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>
         <autodoc>SetClientData(int n, PyObject clientData)</autodoc>

+        <docstring>Associate the given client data with the item at position n.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>

-          <param name="clientData" type="p.PyObject" default=""/>
+          <param name="clientData" type="PyObject" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -5439,14 +6379,17 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ControlWithItems" oldname="wxControlWithItems" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ControlWithItems" oldname="wxControlWithItems" module="core">

-      <baseclass name="wxControl"/>
-      <baseclass name="wxItemContainer"/>
+      <docstring>wx.ControlWithItems combines the wx.ItemContainer class with the
+wx.Control class, and is used for the base class of various
+controls that have items.</docstring>
+      <baseclass name="Control"/>
+      <baseclass name="ItemContainer"/>

     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SizerItem" oldname="wxSizerItem" module="core">
     </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>
       <constructor name="SizerItem" overloaded="no">
         <autodoc>__init__() -&gt; SizerItem</autodoc>
       </constructor>


@@ -5459,74 +6402,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="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>
         </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="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>
         </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="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>
         </paramlist>
       </constructor>

-      <method name="DeleteWindows" type="void" overloaded="no">
+      <method name="DeleteWindows" type="" overloaded="no">

         <autodoc>DeleteWindows()</autodoc>
       </method>
         <autodoc>DeleteWindows()</autodoc>
       </method>

-      <method name="DetachSizer" type="void" overloaded="no">
+      <method name="DetachSizer" type="" overloaded="no">

         <autodoc>DetachSizer()</autodoc>
       </method>
         <autodoc>DetachSizer()</autodoc>
       </method>

-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">

         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetMinSize" type="wxSize" overloaded="no">
+      <method name="GetMinSize" type="Size" overloaded="no">

         <autodoc>GetMinSize() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>SetRatioSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetRatio(float ratio)</autodoc>
         <paramlist>
           <param name="ratio" type="float" default=""/>


@@ -5544,7 +6487,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsSpacer" type="bool" overloaded="no">
         <autodoc>IsSpacer() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetProportion(int proportion)</autodoc>
         <paramlist>
           <param name="proportion" type="int" default=""/>


@@ -5553,7 +6496,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetProportion" type="int" overloaded="no">
         <autodoc>GetProportion() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetFlag(int flag)</autodoc>
         <paramlist>
           <param name="flag" type="int" default=""/>


@@ -5562,7 +6505,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetFlag" type="int" overloaded="no">
         <autodoc>GetFlag() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetBorder(int border)</autodoc>
         <paramlist>
           <param name="border" type="int" default=""/>


@@ -5571,34 +6514,34 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetBorder" type="int" overloaded="no">
         <autodoc>GetBorder() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         </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>
         <autodoc>SetSizer(Sizer sizer)</autodoc>
         <paramlist>

-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="wxSizer" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSpacer" type="q(const).wxSize" overloaded="no">
+      <method name="GetSpacer" type="Size" overloaded="no">

         <autodoc>GetSpacer() -&gt; Size</autodoc>
       </method>
         <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>
         <autodoc>SetSpacer(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>Show(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -5607,7 +6550,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="IsShown" type="bool" overloaded="no">
         <autodoc>IsShown() -&gt; bool</autodoc>
       </method>
       <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">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetUserData" type="PyObject" overloaded="no">


@@ -5615,80 +6558,80 @@ def DLG_SZE(win, size_width, height=None):
       </method>
     </class>
     <class name="Sizer" oldname="wxSizer" module="core">
       </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>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
         </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>
         <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="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>
         </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=""/>
         <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="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>
         </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>
         <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="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>
         </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>
         </paramlist>
       </method>

-      <method name="_SetItemMinSize" type="void" overloaded="no">
+      <method name="_SetItemMinSize" type="" overloaded="no">

         <autodoc>_SetItemMinSize(PyObject item, Size size)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddItem" type="void" overloaded="no">
+      <method name="AddItem" type="" overloaded="no">

         <autodoc>AddItem(SizerItem item)</autodoc>
         <paramlist>
         <autodoc>AddItem(SizerItem item)</autodoc>
         <paramlist>

-          <param name="item" type="p.wxSizerItem" default=""/>
+          <param name="item" type="SizerItem" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="PrependItem" type="void" overloaded="no">
+      <method name="PrependItem" type="" overloaded="no">

         <autodoc>PrependItem(SizerItem item)</autodoc>
         <paramlist>
         <autodoc>PrependItem(SizerItem item)</autodoc>
         <paramlist>

-          <param name="item" type="p.wxSizerItem" default=""/>
+          <param name="item" type="SizerItem" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetDimension(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -5697,86 +6640,86 @@ def DLG_SZE(win, size_width, height=None):
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetMinSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">

         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         <autodoc>GetMinSize() -&gt; Size</autodoc>
       </method>

-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">

         <autodoc>RecalcSizes()</autodoc>
       </method>
         <autodoc>RecalcSizes()</autodoc>
       </method>

-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">

         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>

-      <method name="Layout" type="void" overloaded="no">
+      <method name="Layout" type="" overloaded="no">

         <autodoc>Layout()</autodoc>
       </method>
         <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>
         <autodoc>Fit(Window window) -&gt; Size</autodoc>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="FitInside" type="void" overloaded="no">
+      <method name="FitInside" type="" overloaded="no">

         <autodoc>FitInside(Window window)</autodoc>
         <paramlist>
         <autodoc>FitInside(Window window)</autodoc>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetSizeHints" type="void" overloaded="no">
+      <method name="SetSizeHints" type="" overloaded="no">

         <autodoc>SetSizeHints(Window window)</autodoc>
         <paramlist>
         <autodoc>SetSizeHints(Window window)</autodoc>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetVirtualSizeHints" type="void" overloaded="no">
+      <method name="SetVirtualSizeHints" type="" overloaded="no">

         <autodoc>SetVirtualSizeHints(Window window)</autodoc>
         <paramlist>
         <autodoc>SetVirtualSizeHints(Window window)</autodoc>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
           <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>
         <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>
         </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>
         </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=""/>
         <autodoc>ShowItems(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -5784,15 +6727,15 @@ def DLG_SZE(win, size_width, height=None):
       </method>
     </class>
     <class name="PySizer" oldname="wxPySizer" module="core">
       </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>
       <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -5800,7 +6743,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BoxSizer" oldname="wxBoxSizer" module="core">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="BoxSizer" overloaded="no">
         <autodoc>__init__(int orient=HORIZONTAL) -&gt; BoxSizer</autodoc>
         <paramlist>


@@ -5810,16 +6753,16 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetOrientation" type="int" overloaded="no">
         <autodoc>GetOrientation() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
     </class>


@@ -5827,21 +6770,21 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticBoxSizer" oldname="wxStaticBoxSizer" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <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>
         <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>
         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
     </class>


@@ -5849,7 +6792,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="GridSizer" oldname="wxGridSizer" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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 +6802,31 @@ def DLG_SZE(win, size_width, height=None):
           <param name="hgap" type="int" default="0"/>
         </paramlist>
       </constructor>
           <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>
         <autodoc>RecalcSizes()</autodoc>
       </method>

-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">

         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetHGap(int gap)</autodoc>
         <paramlist>
           <param name="gap" type="int" default=""/>


@@ -5906,7 +6849,7 @@ def DLG_SZE(win, size_width, height=None):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="FlexGridSizer" oldname="wxFlexGridSizer" module="core">
 #---------------------------------------------------------------------------
 </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>
       <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 +6859,39 @@ def DLG_SZE(win, size_width, height=None):
           <param name="hgap" type="int" default="0"/>
         </paramlist>
       </constructor>
           <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>
         <autodoc>RecalcSizes()</autodoc>
       </method>

-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">

         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetFlexibleDirection(int direction)</autodoc>
         <paramlist>
           <param name="direction" type="int" default=""/>


@@ -5957,7 +6900,7 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetFlexibleDirection" type="int" overloaded="no">
         <autodoc>GetFlexibleDirection() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetNonFlexibleGrowMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="wxFlexSizerGrowMode" default=""/>


@@ -5966,10 +6909,10 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetNonFlexibleGrowMode" type="wxFlexSizerGrowMode" overloaded="no">
         <autodoc>GetNonFlexibleGrowMode() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <autodoc>GetColWidths() -&gt; wxArrayInt</autodoc>
       </method>
     </class>


@@ -5990,31 +6933,31 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetCol" type="int" overloaded="no">
         <autodoc>GetCol() -&gt; int</autodoc>
       </method>
       <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>
         <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="__eq__" type="bool" overloaded="no">
         <autodoc>SetCol(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">

-        <autodoc>__eq__(GBPosition p) -&gt; bool</autodoc>
+        <autodoc>__eq__(GBPosition other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="p" type="r.q(const).wxGBPosition" default=""/>
+          <param name="other" type="GBPosition" default=""/>

         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">

-        <autodoc>__ne__(GBPosition p) -&gt; bool</autodoc>
+        <autodoc>__ne__(GBPosition other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="p" type="r.q(const).wxGBPosition" default=""/>
+          <param name="other" type="GBPosition" default=""/>

         </paramlist>
       </method>
         </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"/>
         <autodoc>Set(int row=0, int col=0)</autodoc>
         <paramlist>
           <param name="row" type="int" default="0"/>


@@ -6039,31 +6982,31 @@ def DLG_SZE(win, size_width, height=None):
       <method name="GetColspan" type="int" overloaded="no">
         <autodoc>GetColspan() -&gt; int</autodoc>
       </method>
       <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>
         <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=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>SetColspan(int colspan)</autodoc>
         <paramlist>
           <param name="colspan" type="int" default=""/>
         </paramlist>
       </method>
       <method name="__eq__" type="bool" overloaded="no">

-        <autodoc>__eq__(GBSpan o) -&gt; bool</autodoc>
+        <autodoc>__eq__(GBSpan other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="o" type="r.q(const).wxGBSpan" default=""/>
+          <param name="other" type="GBSpan" default=""/>

         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">

-        <autodoc>__ne__(GBSpan o) -&gt; bool</autodoc>
+        <autodoc>__ne__(GBSpan other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="o" type="r.q(const).wxGBSpan" default=""/>
+          <param name="other" type="GBSpan" default=""/>

         </paramlist>
       </method>
         </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"/>
         <autodoc>Set(int rowspan=1, int colspan=1)</autodoc>
         <paramlist>
           <param name="rowspan" type="int" default="1"/>


@@ -6075,7 +7018,7 @@ def DLG_SZE(win, size_width, height=None):
       </method>
     </class>
     <class name="GBSizerItem" oldname="wxGBSizerItem" module="core">
       </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>
       <constructor name="GBSizerItem" overloaded="no">
         <autodoc>__init__() -&gt; GBSizerItem</autodoc>
       </constructor>


@@ -6083,24 +7026,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>
         <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="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>
         </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="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">
         </paramlist>
       </constructor>
       <constructor name="GBSizerItemSpacer" overloaded="no">


@@ -6109,63 +7052,63 @@ def DLG_SZE(win, size_width, height=None):
         <paramlist>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
         <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="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>
         </paramlist>
       </constructor>

-      <method name="GetPos" type="wxGBPosition" overloaded="no">
+      <method name="GetPos" type="GBPosition" overloaded="no">

         <autodoc>GetPos() -&gt; GBPosition</autodoc>
       </method>
         <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>
         <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>
         </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>
         </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>
         </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>
         </paramlist>
       </method>

-      <method name="GetEndPos" type="void" overloaded="no">
+      <method name="GetEndPos" type="" overloaded="no">

         <autodoc>GetEndPos(int row, int col)</autodoc>
         <paramlist>
         <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>
         </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>
         <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">
         </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>
       <constructor name="GridBagSizer" overloaded="no">
         <autodoc>__init__(int vgap=0, int hgap=0) -&gt; GridBagSizer</autodoc>
         <paramlist>


@@ -6177,40 +7120,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>
         <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="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>
         </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>
         </paramlist>
       </method>

-      <method name="GetEmptyCellSize" type="wxSize" overloaded="no">
+      <method name="GetEmptyCellSize" type="Size" overloaded="no">

         <autodoc>GetEmptyCellSize() -&gt; Size</autodoc>
       </method>
         <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>
         <autodoc>SetEmptyCellSize(Size sz)</autodoc>
         <paramlist>

-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetItemPosition" type="wxGBPosition" overloaded="yes">
+      <method name="GetItemPosition" type="GBPosition" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetItemPosition" type="wxGBPosition" overloaded="yes">
+      <method name="GetItemPosition" type="GBPosition" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="Sizer" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>GetItemPosition(Window window) -&gt; GBPosition
 GetItemPosition(Sizer sizer) -&gt; GBPosition
 GetItemPosition(size_t index) -&gt; GBPosition</autodoc>


@@ -6220,14 +7163,14 @@ GetItemPosition(size_t index) -&gt; GBPosition</autodoc>
       </method>
       <method name="SetItemPosition" type="bool" overloaded="yes">
         <paramlist>
       </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>
         </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">
         </paramlist>
       </method>
       <method name="SetItemPosition" type="bool" overloaded="yes">


@@ -6236,20 +7179,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=""/>
 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>
         </paramlist>
       </method>

-      <method name="GetItemSpan" type="wxGBSpan" overloaded="yes">
+      <method name="GetItemSpan" type="GBSpan" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetItemSpan" type="wxGBSpan" overloaded="yes">
+      <method name="GetItemSpan" type="GBSpan" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="sizer" type="p.wxSizer" default=""/>
+          <param name="sizer" type="Sizer" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>GetItemSpan(Window window) -&gt; GBSpan
 GetItemSpan(Sizer sizer) -&gt; GBSpan
 GetItemSpan(size_t index) -&gt; GBSpan</autodoc>


@@ -6259,14 +7202,14 @@ GetItemSpan(size_t index) -&gt; GBSpan</autodoc>
       </method>
       <method name="SetItemSpan" type="bool" overloaded="yes">
         <paramlist>
       </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>
         </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">
         </paramlist>
       </method>
       <method name="SetItemSpan" type="bool" overloaded="yes">


@@ -6275,58 +7218,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=""/>
 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>
         </paramlist>
       </method>

-      <method name="FindItem" type="wxGBSizerItem" overloaded="yes">
+      <method name="FindItem" type="GBSizerItem" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="FindItemAtPosition" type="wxGBSizerItem" overloaded="no">
+      <method name="FindItemAtPosition" type="GBSizerItem" overloaded="no">

         <autodoc>FindItemAtPosition(GBPosition pos) -&gt; GBSizerItem</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="FindItemAtPoint" type="wxGBSizerItem" overloaded="no">
+      <method name="FindItemAtPoint" type="GBSizerItem" overloaded="no">

         <autodoc>FindItemAtPoint(Point pt) -&gt; GBSizerItem</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="FindItemWithData" type="wxGBSizerItem" overloaded="no">
+      <method name="FindItemWithData" type="GBSizerItem" overloaded="no">

         <autodoc>FindItemWithData(Object userData) -&gt; GBSizerItem</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">

         <autodoc>RecalcSizes()</autodoc>
       </method>
         <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>
         <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>
         </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>
         </paramlist>
       </method>
     </class>


@@ -6334,86 +7277,138 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IndividualLayoutConstraint" oldname="wxIndividualLayoutConstraint" module="core">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="IndividualLayoutConstraint" oldname="wxIndividualLayoutConstraint" module="core">

-      <baseclass name="wxObject"/>
-      <method name="Set" type="void" overloaded="no">
+      <docstring>Objects of this class are stored in the wx.LayoutConstraint class as one of
+eight possible constraints that a window can be involved in.  You will never
+need to create an instance of wx.IndividualLayoutConstraint, rather you should
+use create a wx.LayoutContstraints instance and use the individual contstraints
+that it contains.
+
+Constraints are initially set to have the relationship wx.Unconstrained, which
+means that their values should be calculated by looking at known constraints.
+
+The Edge specifies the type of edge or dimension of a window.
+
+ Edges
+
+    wx.Left  The left edge.
+    wx.Top  The top edge.
+    wx.Right  The right edge.
+    wx.Bottom  The bottom edge.
+    wx.CentreX  The x-coordinate of the centre of the window.
+    wx.CentreY  The y-coordinate of the centre of the window. 
+
+
+The Relationship specifies the relationship that this edge or dimension has
+with another specified edge or dimension. Normally, the user doesn't use these
+directly because functions such as Below and RightOf are a convenience for
+using the more general Set function.
+
+ Relationships
+
+    wx.Unconstrained  The edge or dimension is unconstrained
+                        (the default for edges.)
+    wx.AsIs          The edge or dimension is to be taken from the current
+                        window position or size (the default for dimensions.)
+    wx.Above          The edge should be above another edge.
+    wx.Below          The edge should be below another edge.
+    wx.LeftOf          The edge should be to the left of another edge.
+    wx.RightOf          The edge should be to the right of another edge.
+    wx.SameAs          The edge or dimension should be the same as another edge
+                        or dimension.
+    wx.PercentOf  The edge or dimension should be a percentage of another
+                        edge or dimension.
+    wx.Absolute  The edge or dimension should be a given absolute value.
+
+</docstring>
+      <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=""/>
         <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>
           <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>
         <autodoc>LeftOf(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
         <paramlist>

-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>

           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <autodoc>RightOf(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
         <paramlist>

-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>

           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <autodoc>Above(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
         <paramlist>

-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>

           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <autodoc>Below(Window sibling, int marg=0)</autodoc>

+        <docstring>Sibling relationship</docstring>

         <paramlist>
         <paramlist>

-          <param name="sibling" type="p.wxWindow" default=""/>
+          <param name="sibling" type="Window" default=""/>

           <param name="marg" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <autodoc>SameAs(Window otherW, int edge, int marg=0)</autodoc>

+        <docstring>'Same edge' alignment</docstring>

         <paramlist>
         <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>
           <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>
         <autodoc>PercentOf(Window otherW, int wh, int per)</autodoc>

+        <docstring>The edge is a percentage of the other window's edge</docstring>

         <paramlist>
         <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>
           <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>
         <autodoc>Absolute(int val)</autodoc>

+        <docstring>Edge has absolute value</docstring>

         <paramlist>
           <param name="val" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>Unconstrained()</autodoc>

+        <docstring>Dimension is unconstrained</docstring>

       </method>
       </method>

-      <method name="AsIs" type="void" overloaded="no">
+      <method name="AsIs" type="" overloaded="no">

         <autodoc>AsIs()</autodoc>
         <autodoc>AsIs()</autodoc>

+        <docstring>Dimension is 'as is' (use current size settings)</docstring>

       </method>
       </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>
         <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>
         <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=""/>
         <autodoc>SetValue(int v)</autodoc>
         <paramlist>
           <param name="v" type="int" default=""/>


@@ -6422,7 +7417,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="GetMargin" type="int" overloaded="no">
         <autodoc>GetMargin() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetMargin(int m)</autodoc>
         <paramlist>
           <param name="m" type="int" default=""/>


@@ -6440,7 +7435,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="GetDone" type="bool" overloaded="no">
         <autodoc>GetDone() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetDone(bool d)</autodoc>
         <paramlist>
           <param name="d" type="bool" default=""/>


@@ -6449,7 +7444,7 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       <method name="GetRelationship" type="wxRelationship" overloaded="no">
         <autodoc>GetRelationship() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetRelationship(int r)</autodoc>
         <paramlist>
           <param name="r" type="wxRelationship" default=""/>


@@ -6457,44 +7452,73 @@ CheckForIntersection(GBPosition pos, GBSpan span, GBSizerItem excludeItem=None)
       </method>
       <method name="ResetIfWin" type="bool" overloaded="no">
         <autodoc>ResetIfWin(Window otherW) -&gt; bool</autodoc>
       </method>
       <method name="ResetIfWin" type="bool" overloaded="no">
         <autodoc>ResetIfWin(Window otherW) -&gt; bool</autodoc>

+        <docstring>Reset constraint if it mentions otherWin</docstring>

         <paramlist>
         <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>
       </method>
       <method name="SatisfyConstraint" type="bool" overloaded="no">
         <autodoc>SatisfyConstraint(LayoutConstraints constraints, Window win) -&gt; bool</autodoc>

+        <docstring>Try to satisfy constraint</docstring>

         <paramlist>
         <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>
       </method>
       <method name="GetEdge" type="int" overloaded="no">
         <autodoc>GetEdge(int which, Window thisWin, Window other) -&gt; int</autodoc>

+        <docstring>Get the value of this edge or dimension, or if this
+is not determinable, -1.</docstring>

         <paramlist>
           <param name="which" type="wxEdge" default=""/>
         <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">
         </paramlist>
       </method>
     </class>
     <class name="LayoutConstraints" oldname="wxLayoutConstraints" module="core">

-      <baseclass name="wxObject"/>
+      <docstring>Note: constraints are now deprecated and you should use sizers instead.
+
+Objects of this class can be associated with a window to define its layout
+constraints, with respect to siblings or its parent.
+
+The class consists of the following eight constraints of class
+wx.IndividualLayoutConstraint, some or all of which should be accessed
+directly to set the appropriate constraints.
+
+    * left: represents the left hand edge of the window
+    * right: represents the right hand edge of the window
+    * top: represents the top edge of the window
+    * bottom: represents the bottom edge of the window
+    * width: represents the width of the window
+    * height: represents the height of the window
+    * centreX: represents the horizontal centre point of the window
+    * centreY: represents the vertical centre point of the window 
+
+Most constraints are initially set to have the relationship wxUnconstrained,
+which means that their values should be calculated by looking at known
+constraints. The exceptions are width and height, which are set to wxAsIs to
+ensure that if the user does not specify a constraint, the existing width and
+height will be used, to be compatible with panel items which often have take a
+default size. If the constraint is wxAsIs, the dimension will not be changed.
+</docstring>
+      <baseclass name="Object"/>

       <constructor name="LayoutConstraints" overloaded="no">
         <autodoc>__init__() -&gt; LayoutConstraints</autodoc>
       </constructor>
       <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>
       <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">
         </paramlist>
       </method>
       <method name="AreSatisfied" type="bool" overloaded="no">


@@ -6735,7 +7759,7 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="GDIObject" oldname="wxGDIObject" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="GDIObject" overloaded="no">
         <autodoc>__init__() -&gt; GDIObject</autodoc>
       </constructor>


@@ -6745,7 +7769,7 @@ _core._wxPyFixStockObjects()
       <method name="GetVisible" type="bool" overloaded="no">
         <autodoc>GetVisible() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetVisible(bool visible)</autodoc>
         <paramlist>
           <param name="visible" type="bool" default=""/>


@@ -6759,9 +7783,25 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Colour" oldname="wxColour" module="gdi">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Colour" oldname="wxColour" module="gdi">

-      <baseclass name="wxObject"/>
+      <docstring>A colour is an object representing a combination of Red, Green, and Blue (RGB)
+intensity values, and is used to determine drawing colours, window colours,
+etc.  Valid RGB values are in the range 0 to 255.
+
+In wxPython there are typemaps that will automatically convert from a colour
+name, or from a "#RRGGBB" colour hex value string to a wx.Colour object when
+calling C++ methods that expect a wxColour.  This means that the following are
+all equivallent:
+
+    win.SetBackgroundColour(wxColour(0,0,255))
+    win.SetBackgroundColour("BLUE")
+    win.SetBackgroundColour("#0000FF")
+
+You can retrieve the various current system colour settings with
+wx.SystemSettings.GetColour.</docstring>
+      <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>
       <constructor name="Colour" overloaded="no">
         <autodoc>__init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -&gt; Colour</autodoc>

+        <docstring>Constructs a colour from red, green and blue values.</docstring>

         <paramlist>
           <param name="red" type="unsigned char" default="0"/>
           <param name="green" type="unsigned char" default="0"/>
         <paramlist>
           <param name="red" type="unsigned char" default="0"/>
           <param name="green" type="unsigned char" default="0"/>


@@ -6770,12 +7810,14 @@ _core._wxPyFixStockObjects()
       </constructor>
       <constructor name="NamedColour" overloaded="no">
         <autodoc>NamedColour(String colorName) -&gt; Colour</autodoc>
       </constructor>
       <constructor name="NamedColour" overloaded="no">
         <autodoc>NamedColour(String colorName) -&gt; Colour</autodoc>

+        <docstring>Constructs a colour object using a colour name listed in wx.TheColourDatabase.</docstring>

         <paramlist>
         <paramlist>

-          <param name="colorName" type="r.q(const).wxString" default=""/>
+          <param name="colorName" type="String" default=""/>

         </paramlist>
       </constructor>
       <constructor name="ColourRGB" overloaded="no">
         <autodoc>ColourRGB(unsigned long colRGB) -&gt; Colour</autodoc>
         </paramlist>
       </constructor>
       <constructor name="ColourRGB" overloaded="no">
         <autodoc>ColourRGB(unsigned long colRGB) -&gt; Colour</autodoc>

+        <docstring>Constructs a colour from a packed RGB value.</docstring>

         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>
         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>


@@ -6785,61 +7827,87 @@ _core._wxPyFixStockObjects()
       </destructor>
       <method name="Red" type="unsigned char" overloaded="no">
         <autodoc>Red() -&gt; unsigned char</autodoc>
       </destructor>
       <method name="Red" type="unsigned char" overloaded="no">
         <autodoc>Red() -&gt; unsigned char</autodoc>

+        <docstring>Returns the red intensity.</docstring>

       </method>
       <method name="Green" type="unsigned char" overloaded="no">
         <autodoc>Green() -&gt; unsigned char</autodoc>
       </method>
       <method name="Green" type="unsigned char" overloaded="no">
         <autodoc>Green() -&gt; unsigned char</autodoc>

+        <docstring>Returns the green intensity.</docstring>

       </method>
       <method name="Blue" type="unsigned char" overloaded="no">
         <autodoc>Blue() -&gt; unsigned char</autodoc>
       </method>
       <method name="Blue" type="unsigned char" overloaded="no">
         <autodoc>Blue() -&gt; unsigned char</autodoc>

+        <docstring>Returns the blue intensity.</docstring>

       </method>
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>

+        <docstring>Returns True if the colour object is valid (the colour has been
+initialised with RGB values).</docstring>

       </method>
       </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>
         <autodoc>Set(unsigned char red, unsigned char green, unsigned char blue)</autodoc>

+        <docstring>Sets the RGB intensity values.</docstring>

         <paramlist>
           <param name="red" type="unsigned char" default=""/>
           <param name="green" type="unsigned char" default=""/>
           <param name="blue" type="unsigned char" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="red" type="unsigned char" default=""/>
           <param name="green" type="unsigned char" default=""/>
           <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>
         <autodoc>SetRGB(unsigned long colRGB)</autodoc>

+        <docstring>Sets the RGB intensity values from a packed RGB value.</docstring>

         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="colRGB" type="unsigned long" default=""/>
         </paramlist>
       </method>

+      <method name="SetFromName" type="" overloaded="no">
+        <autodoc>SetFromName(String colourName)</autodoc>
+        <docstring>Sets the RGB intensity values using a colour name listed in wx.TheColourDatabase.</docstring>
+        <paramlist>
+          <param name="colourName" type="String" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetPixel" type="long" overloaded="no">
+        <autodoc>GetPixel() -&gt; long</autodoc>
+        <docstring>Returns a pixel value which is platform-dependent. On Windows, a
+COLORREF is returned. On X, an allocated pixel value is returned.
+-1 is returned if the pixel is invalid (on X, unallocated).</docstring>
+      </method>

       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Colour colour) -&gt; bool</autodoc>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(Colour colour) -&gt; bool</autodoc>

+        <docstring>Compare colours for equality</docstring>

         <paramlist>
         <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>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         <autodoc>__ne__(Colour colour) -&gt; bool</autodoc>

+        <docstring>Compare colours for inequality</docstring>

         <paramlist>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
-        </paramlist>
-      </method>
-      <method name="InitFromName" type="void" overloaded="no">
-        <autodoc>InitFromName(String colourName)</autodoc>
-        <paramlist>
-          <param name="colourName" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
       <method name="Get" type="PyObject" overloaded="no">
         </paramlist>
       </method>
       <method name="Get" type="PyObject" overloaded="no">

-        <autodoc>Get() -&gt; PyObject</autodoc>
+        <autodoc>Get() -&gt; (r, g, b)</autodoc>
+        <docstring>Returns the RGB intensity values as a tuple.</docstring>
+      </method>
+      <method name="GetRGB" type="unsigned long" overloaded="no">
+        <autodoc>GetRGB() -&gt; unsigned long</autodoc>
+        <docstring>Return the colour as a packed RGB value</docstring>

       </method>
     </class>
       </method>
     </class>

+    <pythoncode>
+    Color = Colour
+    NamedColor = NamedColour
+    ColorRGB = ColourRGB
+</pythoncode>

     <class name="Palette" oldname="wxPalette" module="gdi">
     <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=""/>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxPalette" overloaded="no">


@@ -6857,9 +7925,9 @@ _core._wxPyFixStockObjects()
         <autodoc>GetRGB(int pixel) -&gt; (R,G,B)</autodoc>
         <paramlist>
           <param name="pixel" type="int" default=""/>
         <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">
         </paramlist>
       </method>
       <method name="Ok" type="bool" overloaded="no">


@@ -6870,11 +7938,11 @@ _core._wxPyFixStockObjects()
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Pen" oldname="wxPen" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <param name="width" type="int" default="1"/>
           <param name="style" type="int" default="wxSOLID"/>
         </paramlist>


@@ -6885,7 +7953,7 @@ _core._wxPyFixStockObjects()
       <method name="GetCap" type="int" overloaded="no">
         <autodoc>GetCap() -&gt; int</autodoc>
       </method>
       <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">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetJoin" type="int" overloaded="no">


@@ -6900,56 +7968,68 @@ _core._wxPyFixStockObjects()
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <autodoc>SetColour(Colour colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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=""/>
         <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">
         <autodoc>GetDashes() -&gt; PyObject</autodoc>
       </method>
         </paramlist>
       </method>
       <method name="GetDashes" type="PyObject" overloaded="no">
         <autodoc>GetDashes() -&gt; PyObject</autodoc>
       </method>

+      <method name="__eq__" type="bool" overloaded="no">
+        <autodoc>__eq__(Pen other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="Pen" default=""/>
+        </paramlist>
+      </method>
+      <method name="__ne__" type="bool" overloaded="no">
+        <autodoc>__ne__(Pen other) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="other" type="Pen" default=""/>
+        </paramlist>
+      </method>

       <method name="GetDashCount" type="int" overloaded="no">
         <autodoc>GetDashCount() -&gt; int</autodoc>
       </method>
     </class>
     <class name="PyPen" oldname="wxPyPen" module="gdi">
       <method name="GetDashCount" type="int" overloaded="no">
         <autodoc>GetDashCount() -&gt; int</autodoc>
       </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>
       <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>
           <param name="width" type="int" default="1"/>
           <param name="style" type="int" default="wxSOLID"/>
         </paramlist>


@@ -6957,11 +8037,11 @@ _core._wxPyFixStockObjects()
       <destructor name="~wxPyPen" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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=""/>
         <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>
         </paramlist>
       </method>
     </class>


@@ -6972,37 +8052,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>
     <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>
       <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>
           <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>
         <autodoc>SetColour(Colour col)</autodoc>
         <paramlist>

-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetStipple(Bitmap stipple)</autodoc>
         <paramlist>

-          <param name="stipple" type="r.q(const).wxBitmap" default=""/>
+          <param name="stipple" type="wxBitmap" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetStyle" type="int" overloaded="no">


@@ -7016,12 +8096,12 @@ background of rectangles, ellipses, etc. It has a colour and a style.</docstring
       </method>
     </class>
     <class name="Bitmap" oldname="wxBitmap" module="gdi">
       </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>
       <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>
           <param name="type" type="wxBitmapType" default="wxBITMAP_TYPE_ANY"/>
         </paramlist>
       </constructor>


@@ -7040,7 +8120,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>
         <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">
         </paramlist>
       </constructor>
       <constructor name="BitmapFromImage" overloaded="no">


@@ -7050,7 +8130,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>
 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>
           <param name="depth" type="int" default="-1"/>
         </paramlist>
       </constructor>


@@ -7058,7 +8138,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>
         <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">
         </paramlist>
       </constructor>
       <constructor name="BitmapFromBits" overloaded="no">


@@ -7068,7 +8148,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>
 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"/>
           <param name="width" type="int" default=""/>
           <param name="height" type="int" default=""/>
           <param name="depth" type="int" default="1"/>


@@ -7093,7 +8173,7 @@ platform dependent.</docstring>
         <docstring>Gets the colour depth of the bitmap. A value of 1 indicates a
 monochrome bitmap.</docstring>
       </method>
         <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
         <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 +8184,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>
         <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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="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>
         </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="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>
         </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>
         <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>
         <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>
         <autodoc>SetDepth(int depth)</autodoc>
         <docstring>Set the depth property (does not affect the bitmap data).</docstring>
         <paramlist>


@@ -7176,31 +8256,25 @@ 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>
 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">
       <constructor name="Mask" overloaded="no">

-        <autodoc>__init__(Bitmap bitmap) -&gt; Mask</autodoc>
-        <docstring>Constructs a mask from a monochrome bitmap.</docstring>
+        <autodoc>__init__(Bitmap bitmap, Colour colour=NullColour) -&gt; Mask</autodoc>
+        <docstring>Constructs a mask from a bitmap and a colour in that bitmap that indicates
+the transparent portions of the mask, by default BLACK is used.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
-        </paramlist>
-      </constructor>
-      <constructor name="MaskColour" overloaded="no">
-        <autodoc>MaskColour(Bitmap bitmap, Colour colour) -&gt; Mask</autodoc>
-        <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="wxNullColour"/>

         </paramlist>
       </constructor>
     </class>
         </paramlist>
       </constructor>
     </class>

+    <pythoncode> MaskColour = Mask </pythoncode>

     <class name="Icon" oldname="wxIcon" module="gdi">
     <class name="Icon" oldname="wxIcon" module="gdi">

-      <baseclass name="wxGDIObject"/>
+      <baseclass name="GDIObject"/>

       <constructor name="Icon" overloaded="no">
       <constructor name="Icon" overloaded="no">

-        <autodoc>__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -&gt; Icon</autodoc>
+        <autodoc>__init__(String name, int type, int desiredWidth=-1, int desiredHeight=-1) -&gt; Icon</autodoc>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="flags" type="long" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="type" type="wxBitmapType" default=""/>

           <param name="desiredWidth" type="int" default="-1"/>
           <param name="desiredHeight" type="int" default="-1"/>
         </paramlist>
           <param name="desiredWidth" type="int" default="-1"/>
           <param name="desiredHeight" type="int" default="-1"/>
         </paramlist>


@@ -7211,29 +8285,29 @@ background.</docstring>
       <constructor name="IconFromLocation" overloaded="no">
         <autodoc>IconFromLocation(IconLocation loc) -&gt; Icon</autodoc>
         <paramlist>
       <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>
         </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>
         </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">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="LoadFile" type="bool" overloaded="no">
         </paramlist>
       </constructor>
       <destructor name="~wxIcon" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="LoadFile" type="bool" overloaded="no">

-        <autodoc>LoadFile(String name, long flags) -&gt; bool</autodoc>
+        <autodoc>LoadFile(String name, int type) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
-          <param name="flags" type="long" default=""/>
+          <param name="name" type="String" default=""/>
+          <param name="type" type="wxBitmapType" default=""/>

         </paramlist>
       </method>
       <method name="Ok" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="Ok" type="bool" overloaded="no">


@@ -7248,28 +8322,28 @@ background.</docstring>
       <method name="GetDepth" type="int" overloaded="no">
         <autodoc>GetDepth() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <autodoc>CopyFromBitmap(Bitmap bmp)</autodoc>
         <paramlist>

-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -7277,7 +8351,7 @@ background.</docstring>
       <constructor name="IconLocation" overloaded="no">
         <autodoc>__init__(String filename=&amp;wxPyEmptyString, int num=0) -&gt; IconLocation</autodoc>
         <paramlist>
       <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>
           <param name="num" type="int" default="0"/>
         </paramlist>
       </constructor>


@@ -7287,16 +8361,16 @@ background.</docstring>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>SetFileName(String filename)</autodoc>
         <paramlist>

-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFileName" type="q(const).wxString" overloaded="no">
+      <method name="GetFileName" type="String" overloaded="no">

         <autodoc>GetFileName() -&gt; String</autodoc>
       </method>
         <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=""/>
         <autodoc>SetIndex(int num)</autodoc>
         <paramlist>
           <param name="num" type="int" default=""/>


@@ -7313,72 +8387,120 @@ background.</docstring>
       <constructor name="IconBundleFromFile" overloaded="no">
         <autodoc>IconBundleFromFile(String file, long type) -&gt; IconBundle</autodoc>
         <paramlist>
       <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="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>
         </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>
         <autodoc>AddIcon(Icon icon)</autodoc>
         <paramlist>

-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddIconFromFile" type="void" overloaded="no">
+      <method name="AddIconFromFile" type="" overloaded="no">

         <autodoc>AddIconFromFile(String file, long type)</autodoc>
         <paramlist>
         <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>
           <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>
         <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">
         </paramlist>
       </method>
     </class>
     <class name="Cursor" oldname="wxCursor" module="gdi">

-      <baseclass name="wxGDIObject"/>
+      <docstring>A cursor is a small bitmap usually used for denoting where the
+mouse pointer is, with a picture that might indicate the
+interpretation of a mouse click.
+
+A single cursor object may be used in many windows (any subwindow
+type). The wxWindows convention is to set the cursor for a
+window, as in X, rather than to set it globally as in MS Windows,
+although a global wx.SetCursor function is also available for use
+on MS Windows.</docstring>
+      <baseclass name="GDIObject"/>

       <constructor name="Cursor" overloaded="no">
       <constructor name="Cursor" overloaded="no">

-        <autodoc>__init__(String cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -&gt; Cursor</autodoc>
+        <autodoc>__init__(String cursorName, long type, int hotSpotX=0, int hotSpotY=0) -&gt; Cursor</autodoc>
+        <docstring>Construct a Cursor from a file.  Specify the type of file using
+wx.BITAMP_TYPE* constants, and specify the hotspot if not using a
+.cur file.
+
+This cursor is not available on wxGTK, use wx.StockCursor,
+wx.CursorFromImage, or wx.CursorFromBits instead.</docstring>

         <paramlist>
         <paramlist>

-          <param name="cursorName" type="p.q(const).wxString" default=""/>
-          <param name="flags" type="long" default=""/>
+          <param name="cursorName" type="String" default=""/>
+          <param name="type" type="long" default=""/>

           <param name="hotSpotX" type="int" default="0"/>
           <param name="hotSpotY" type="int" default="0"/>
         </paramlist>
       </constructor>
       <constructor name="StockCursor" overloaded="no">
         <autodoc>StockCursor(int id) -&gt; Cursor</autodoc>
           <param name="hotSpotX" type="int" default="0"/>
           <param name="hotSpotY" type="int" default="0"/>
         </paramlist>
       </constructor>
       <constructor name="StockCursor" overloaded="no">
         <autodoc>StockCursor(int id) -&gt; Cursor</autodoc>

+        <docstring>Create a cursor using one of the stock cursors.  Note that not
+all cursors are available on all platforms.</docstring>
+        <refdoc>
+  Stock Cursor IDs
+
+    wx.CURSOR_ARROW             A standard arrow cursor.
+    wx.CURSOR_RIGHT_ARROW       A standard arrow cursor pointing to the right.
+    wx.CURSOR_BLANK             Transparent cursor.
+    wx.CURSOR_BULLSEYE          Bullseye cursor.
+    wx.CURSOR_CHAR              Rectangular character cursor.
+    wx.CURSOR_CROSS             A cross cursor.
+    wx.CURSOR_HAND              A hand cursor.
+    wx.CURSOR_IBEAM             An I-beam cursor (vertical line).
+    wx.CURSOR_LEFT_BUTTON       Represents a mouse with the left button depressed.
+    wx.CURSOR_MAGNIFIER         A magnifier icon.
+    wx.CURSOR_MIDDLE_BUTTON     Represents a mouse with the middle button depressed.
+    wx.CURSOR_NO_ENTRY          A no-entry sign cursor.
+    wx.CURSOR_PAINT_BRUSH       A paintbrush cursor.
+    wx.CURSOR_PENCIL            A pencil cursor.
+    wx.CURSOR_POINT_LEFT        A cursor that points left.
+    wx.CURSOR_POINT_RIGHT       A cursor that points right.
+    wx.CURSOR_QUESTION_ARROW    An arrow and question mark.
+    wx.CURSOR_RIGHT_BUTTON      Represents a mouse with the right button depressed.
+    wx.CURSOR_SIZENESW          A sizing cursor pointing NE-SW.
+    wx.CURSOR_SIZENS            A sizing cursor pointing N-S.
+    wx.CURSOR_SIZENWSE          A sizing cursor pointing NW-SE.
+    wx.CURSOR_SIZEWE            A sizing cursor pointing W-E.
+    wx.CURSOR_SIZING            A general sizing cursor.
+    wx.CURSOR_SPRAYCAN          A spraycan cursor.
+    wx.CURSOR_WAIT              A wait cursor.
+    wx.CURSOR_WATCH             A watch cursor.
+    wx.CURSOR_ARROWWAIT         A cursor with both an arrow and an hourglass, (windows.)
+
+</refdoc>

         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CursorFromImage" overloaded="no">
         <autodoc>CursorFromImage(Image image) -&gt; Cursor</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CursorFromImage" overloaded="no">
         <autodoc>CursorFromImage(Image image) -&gt; Cursor</autodoc>

+        <docstring>Constructs a cursor from a wxImage. The cursor is monochrome,
+colors with the RGB elements all greater than 127 will be
+foreground, colors less than this background. The mask (if any)
+will be used as transparent.
+
+In MSW the foreground will be white and the background black. The
+cursor is resized to 32x32 In GTK, the two most frequent colors
+will be used for foreground and background. The cursor will be
+displayed at the size of the image. On MacOS the cursor is
+resized to 16x16 and currently only shown as black/white (mask
+respected).</docstring>

         <paramlist>
         <paramlist>

-          <param name="image" type="r.q(const).wxImage" 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="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="image" type="Image" default=""/>

         </paramlist>
       </constructor>
       <destructor name="~wxCursor" overloaded="no">
         </paramlist>
       </constructor>
       <destructor name="~wxCursor" overloaded="no">


@@ -7392,7 +8514,7 @@ background.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Region" oldname="wxRegion" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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 +8527,8 @@ background.</docstring>
       <constructor name="RegionFromBitmap" overloaded="no">
         <autodoc>RegionFromBitmap(Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -&gt; Region</autodoc>
         <paramlist>
       <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>
           <param name="tolerance" type="int" default="0"/>
         </paramlist>
       </constructor>


@@ -7414,14 +8536,14 @@ background.</docstring>
         <autodoc>RegionFromPoints(int points, Point points_array, int fillStyle=WINDING_RULE) -&gt; Region</autodoc>
         <paramlist>
           <param name="points" type="int" default=""/>
         <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>
           <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">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="Offset" type="bool" overloaded="no">


@@ -7441,13 +8563,13 @@ background.</docstring>
       <method name="ContainsPoint" type="wxRegionContain" overloaded="no">
         <autodoc>ContainsPoint(Point pt) -&gt; int</autodoc>
         <paramlist>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="ContainsRectDim" type="wxRegionContain" overloaded="no">


@@ -7459,7 +8581,7 @@ background.</docstring>
           <param name="h" type="int" default=""/>
         </paramlist>
       </method>
           <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">
         <autodoc>GetBox() -&gt; Rect</autodoc>
       </method>
       <method name="Intersect" type="bool" overloaded="no">


@@ -7474,13 +8596,13 @@ background.</docstring>
       <method name="IntersectRect" type="bool" overloaded="no">
         <autodoc>IntersectRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="IsEmpty" type="bool" overloaded="no">


@@ -7498,13 +8620,13 @@ background.</docstring>
       <method name="UnionRect" type="bool" overloaded="no">
         <autodoc>UnionRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="Subtract" type="bool" overloaded="no">


@@ -7519,13 +8641,13 @@ background.</docstring>
       <method name="SubtractRect" type="bool" overloaded="no">
         <autodoc>SubtractRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="Xor" type="bool" overloaded="no">


@@ -7540,33 +8662,33 @@ background.</docstring>
       <method name="XorRect" type="bool" overloaded="no">
         <autodoc>XorRect(Rect rect) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         </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>
         <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">
           <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>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxRegionIterator" overloaded="no">


@@ -7590,16 +8712,16 @@ background.</docstring>
       <method name="GetHeight" type="int" overloaded="no">
         <autodoc>GetHeight() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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">
         <autodoc>Next()</autodoc>
       </method>
       <method name="__nonzero__" type="bool" overloaded="no">


@@ -7619,13 +8741,13 @@ background.</docstring>
       <destructor name="~wxNativeFontInfo" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <autodoc>Init()</autodoc>
       </method>

-      <method name="InitFromFont" type="void" overloaded="no">
+      <method name="InitFromFont" type="" overloaded="no">

         <autodoc>InitFromFont(Font font)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">


@@ -7640,7 +8762,7 @@ background.</docstring>
       <method name="GetUnderlined" type="bool" overloaded="no">
         <autodoc>GetUnderlined() -&gt; bool</autodoc>
       </method>
       <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">
         <autodoc>GetFaceName() -&gt; String</autodoc>
       </method>
       <method name="GetFamily" type="wxFontFamily" overloaded="no">


@@ -7649,43 +8771,43 @@ background.</docstring>
       <method name="GetEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>GetEncoding() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetFaceName(String facename)</autodoc>
         <paramlist>

-          <param name="facename" type="wxString" default=""/>
+          <param name="facename" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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=""/>
         <autodoc>SetEncoding(int encoding)</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>


@@ -7694,22 +8816,22 @@ background.</docstring>
       <method name="FromString" type="bool" overloaded="no">
         <autodoc>FromString(String s) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </paramlist>
       </method>

-      <method name="ToString" type="wxString" overloaded="no">
+      <method name="ToString" type="String" overloaded="no">

         <autodoc>ToString() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="ToUserString" type="wxString" overloaded="no">
+      <method name="ToUserString" type="String" overloaded="no">

         <autodoc>ToUserString() -&gt; String</autodoc>
       </method>
     </class>
         <autodoc>ToUserString() -&gt; String</autodoc>
       </method>
     </class>


@@ -7720,19 +8842,19 @@ background.</docstring>
       <destructor name="~wxNativeEncodingInfo" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
       <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>
         </paramlist>
       </method>

-      <method name="ToString" type="wxString" overloaded="no">
+      <method name="ToString" type="String" overloaded="no">

         <autodoc>ToString() -&gt; String</autodoc>
       </method>
     </class>
         <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=""/>
       <autodoc>GetNativeFontEncoding(int encoding) -&gt; NativeEncodingInfo</autodoc>
       <paramlist>
         <param name="encoding" type="wxFontEncoding" default=""/>


@@ -7741,7 +8863,7 @@ background.</docstring>
     <method name="TestFontEncoding" oldname="wxTestFontEncoding" type="bool" overloaded="no">
       <autodoc>TestFontEncoding(NativeEncodingInfo info) -&gt; bool</autodoc>
       <paramlist>
     <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>
       </paramlist>
     </method>
     <pythoncode>


@@ -7754,63 +8876,63 @@ background.</docstring>
       <destructor name="~wxFontMapper" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <destructor name="~wxFontMapper" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>

-      <staticmethod name="Get" type="wxFontMapper" overloaded="no">
-        <autodoc>FontMapper.Get() -&gt; FontMapper</autodoc>
+      <staticmethod name="Get" type="FontMapper" overloaded="no">
+        <autodoc>Get() -&gt; FontMapper</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Set" type="wxFontMapper" overloaded="no">
-        <autodoc>FontMapper.Set(FontMapper mapper) -&gt; FontMapper</autodoc>
+      <staticmethod name="Set" type="FontMapper" overloaded="no">
+        <autodoc>Set(FontMapper mapper) -&gt; FontMapper</autodoc>

         <paramlist>
         <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>
         </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>
       <staticmethod name="GetSupportedEncodingsCount" type="size_t" overloaded="no">
           <param name="interactive" type="bool" default="True"/>
         </paramlist>
       </method>
       <staticmethod name="GetSupportedEncodingsCount" type="size_t" overloaded="no">

-        <autodoc>FontMapper.GetSupportedEncodingsCount() -&gt; size_t</autodoc>
+        <autodoc>GetSupportedEncodingsCount() -&gt; size_t</autodoc>

       </staticmethod>
       <staticmethod name="GetEncoding" type="wxFontEncoding" overloaded="no">
       </staticmethod>
       <staticmethod name="GetEncoding" type="wxFontEncoding" overloaded="no">

-        <autodoc>FontMapper.GetEncoding(size_t n) -&gt; int</autodoc>
+        <autodoc>GetEncoding(size_t n) -&gt; int</autodoc>

         <paramlist>
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetEncodingName" type="wxString" overloaded="no">
-        <autodoc>FontMapper.GetEncodingName(int encoding) -&gt; String</autodoc>
+      <staticmethod name="GetEncodingName" type="String" overloaded="no">
+        <autodoc>GetEncodingName(int encoding) -&gt; String</autodoc>

         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetEncodingDescription" type="wxString" overloaded="no">
-        <autodoc>FontMapper.GetEncodingDescription(int encoding) -&gt; String</autodoc>
+      <staticmethod name="GetEncodingDescription" type="String" overloaded="no">
+        <autodoc>GetEncodingDescription(int encoding) -&gt; String</autodoc>

         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
         <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>
         <autodoc>SetConfig(ConfigBase config)</autodoc>
         <paramlist>

-          <param name="config" type="p.wxConfigBase" default=""/>
+          <param name="config" type="wxConfigBase" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetConfigPath" type="void" overloaded="no">
+      <method name="SetConfigPath" type="" overloaded="no">

         <autodoc>SetConfigPath(String prefix)</autodoc>
         <paramlist>
         <autodoc>SetConfigPath(String prefix)</autodoc>
         <paramlist>

-          <param name="prefix" type="r.q(const).wxString" default=""/>
+          <param name="prefix" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <staticmethod name="GetDefaultConfigPath" type="q(const).wxString" overloaded="no">
-        <autodoc>FontMapper.GetDefaultConfigPath() -&gt; String</autodoc>
+      <staticmethod name="GetDefaultConfigPath" type="String" overloaded="no">
+        <autodoc>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=""/>
       </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>
           <param name="interactive" type="bool" default="True"/>
         </paramlist>
       </method>


@@ -7818,19 +8940,19 @@ background.</docstring>
         <autodoc>IsEncodingAvailable(int encoding, String facename=EmptyString) -&gt; bool</autodoc>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetDialogParent" type="void" overloaded="no">
+      <method name="SetDialogParent" type="" overloaded="no">

         <autodoc>SetDialogParent(Window parent)</autodoc>
         <paramlist>
         <autodoc>SetDialogParent(Window parent)</autodoc>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDialogTitle" type="void" overloaded="no">
+      <method name="SetDialogTitle" type="" overloaded="no">

         <autodoc>SetDialogTitle(String title)</autodoc>
         <paramlist>
         <autodoc>SetDialogTitle(String title)</autodoc>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -7838,7 +8960,7 @@ background.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Font" oldname="wxFont" module="gdi">
 #---------------------------------------------------------------------------
 </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, 
       <constructor name="Font" overloaded="no">
         <autodoc>__init__(int pointSize, int family, int style, int weight, bool underline=False, 
     String face=EmptyString, 


@@ -7849,20 +8971,20 @@ background.</docstring>
           <param name="style" type="int" default=""/>
           <param name="weight" type="int" default=""/>
           <param name="underline" type="bool" default="False"/>
           <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="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>
         </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">
         </paramlist>
       </constructor>
       <constructor name="Font2" overloaded="no">


@@ -7872,7 +8994,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="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>
           <param name="encoding" type="wxFontEncoding" default="wxFONTENCODING_DEFAULT"/>
         </paramlist>
       </constructor>


@@ -7883,15 +9005,15 @@ background.</docstring>
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <method name="__eq__" type="bool" overloaded="no">

-        <autodoc>__eq__(Font font) -&gt; bool</autodoc>
+        <autodoc>__eq__(Font other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="other" type="Font" default=""/>

         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="__ne__" type="bool" overloaded="no">

-        <autodoc>__ne__(Font font) -&gt; bool</autodoc>
+        <autodoc>__ne__(Font other) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="other" type="Font" default=""/>

         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="GetPointSize" type="int" overloaded="no">


@@ -7909,94 +9031,94 @@ background.</docstring>
       <method name="GetUnderlined" type="bool" overloaded="no">
         <autodoc>GetUnderlined() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetFaceName(String faceName)</autodoc>
         <paramlist>

-          <param name="faceName" type="r.q(const).wxString" default=""/>
+          <param name="faceName" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <autodoc>SetNativeFontInfo(NativeFontInfo info)</autodoc>
         <paramlist>

-          <param name="info" type="r.q(const).wxNativeFontInfo" default=""/>
+          <param name="info" type="NativeFontInfo" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetNativeFontInfoFromString" type="void" overloaded="no">
+      <method name="SetNativeFontInfoFromString" type="" overloaded="no">

         <autodoc>SetNativeFontInfoFromString(String info)</autodoc>
         <paramlist>
         <autodoc>SetNativeFontInfoFromString(String info)</autodoc>
         <paramlist>

-          <param name="info" type="r.q(const).wxString" default=""/>
+          <param name="info" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetNativeFontInfoUserDesc" type="void" overloaded="no">
+      <method name="SetNativeFontInfoUserDesc" type="" overloaded="no">

         <autodoc>SetNativeFontInfoUserDesc(String info)</autodoc>
         <paramlist>
         <autodoc>SetNativeFontInfoUserDesc(String info)</autodoc>
         <paramlist>

-          <param name="info" type="r.q(const).wxString" default=""/>
+          <param name="info" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFamilyString" type="wxString" overloaded="no">
+      <method name="GetFamilyString" type="String" overloaded="no">

         <autodoc>GetFamilyString() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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"/>
         <autodoc>SetNoAntiAliasing(bool no=True)</autodoc>
         <paramlist>
           <param name="no" type="bool" default="True"/>


@@ -8006,10 +9128,10 @@ background.</docstring>
         <autodoc>GetNoAntiAliasing() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultEncoding" type="wxFontEncoding" overloaded="no">
         <autodoc>GetNoAntiAliasing() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultEncoding" type="wxFontEncoding" overloaded="no">

-        <autodoc>Font.GetDefaultEncoding() -&gt; int</autodoc>
+        <autodoc>GetDefaultEncoding() -&gt; int</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetDefaultEncoding" type="void" overloaded="no">
-        <autodoc>Font.SetDefaultEncoding(int encoding)</autodoc>
+      <staticmethod name="SetDefaultEncoding" type="" overloaded="no">
+        <autodoc>SetDefaultEncoding(int encoding)</autodoc>

         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>
         <paramlist>
           <param name="encoding" type="wxFontEncoding" default=""/>
         </paramlist>


@@ -8025,11 +9147,11 @@ background.</docstring>
       <destructor name="~wxPyFontEnumerator" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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>
           <param name="incref" type="bool" default=""/>
         </paramlist>
       </method>


@@ -8043,7 +9165,7 @@ background.</docstring>
       <method name="EnumerateEncodings" type="bool" overloaded="no">
         <autodoc>EnumerateEncodings(String facename=EmptyString) -&gt; bool</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </method>
       <method name="GetEncodings" type="PyObject" overloaded="no">


@@ -8058,8 +9180,8 @@ background.</docstring>
 </pythoncode>
     <class name="LanguageInfo" oldname="wxLanguageInfo" module="gdi">
       <property name="Language" type="int" readonly="no"/>
 </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">
     </class>
     <class name="Locale" oldname="wxLocale" module="gdi">
       <constructor name="Locale" overloaded="no">


@@ -8077,9 +9199,9 @@ background.</docstring>
     bool bLoadDefault=True, 
     bool bConvertEncoding=False) -&gt; bool</autodoc>
         <paramlist>
     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>
           <param name="bLoadDefault" type="bool" default="True"/>
           <param name="bConvertEncoding" type="bool" default="False"/>
         </paramlist>


@@ -8092,96 +9214,96 @@ background.</docstring>
         </paramlist>
       </method>
       <staticmethod name="GetSystemLanguage" type="int" overloaded="no">
         </paramlist>
       </method>
       <staticmethod name="GetSystemLanguage" type="int" overloaded="no">

-        <autodoc>Locale.GetSystemLanguage() -&gt; int</autodoc>
+        <autodoc>GetSystemLanguage() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="GetSystemEncoding" type="wxFontEncoding" overloaded="no">
       </staticmethod>
       <staticmethod name="GetSystemEncoding" type="wxFontEncoding" overloaded="no">

-        <autodoc>Locale.GetSystemEncoding() -&gt; int</autodoc>
+        <autodoc>GetSystemEncoding() -&gt; int</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="GetSystemEncodingName" type="wxString" overloaded="no">
-        <autodoc>Locale.GetSystemEncodingName() -&gt; String</autodoc>
+      <staticmethod name="GetSystemEncodingName" type="String" overloaded="no">
+        <autodoc>GetSystemEncodingName() -&gt; String</autodoc>

       </staticmethod>
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
       </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>
         <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>
         <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>
         <autodoc>GetCanonicalName() -&gt; String</autodoc>
       </method>

-      <staticmethod name="AddCatalogLookupPathPrefix" type="void" overloaded="no">
-        <autodoc>Locale.AddCatalogLookupPathPrefix(String prefix)</autodoc>
+      <staticmethod name="AddCatalogLookupPathPrefix" type="" overloaded="no">
+        <autodoc>AddCatalogLookupPathPrefix(String prefix)</autodoc>

         <paramlist>
         <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>
         </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>
         </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>
         </paramlist>
       </method>

-      <staticmethod name="GetLanguageInfo" type="q(const).wxLanguageInfo" overloaded="no">
-        <autodoc>Locale.GetLanguageInfo(int lang) -&gt; LanguageInfo</autodoc>
+      <staticmethod name="GetLanguageInfo" type="LanguageInfo" overloaded="no">
+        <autodoc>GetLanguageInfo(int lang) -&gt; LanguageInfo</autodoc>

         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetLanguageName" type="wxString" overloaded="no">
-        <autodoc>Locale.GetLanguageName(int lang) -&gt; String</autodoc>
+      <staticmethod name="GetLanguageName" type="String" overloaded="no">
+        <autodoc>GetLanguageName(int lang) -&gt; String</autodoc>

         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="lang" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="FindLanguageInfo" type="q(const).wxLanguageInfo" overloaded="no">
-        <autodoc>Locale.FindLanguageInfo(String locale) -&gt; LanguageInfo</autodoc>
+      <staticmethod name="FindLanguageInfo" type="LanguageInfo" overloaded="no">
+        <autodoc>FindLanguageInfo(String locale) -&gt; LanguageInfo</autodoc>

         <paramlist>
         <paramlist>

-          <param name="locale" type="r.q(const).wxString" default=""/>
+          <param name="locale" type="String" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="AddLanguage" type="void" overloaded="no">
-        <autodoc>Locale.AddLanguage(LanguageInfo info)</autodoc>
+      <staticmethod name="AddLanguage" type="" overloaded="no">
+        <autodoc>AddLanguage(LanguageInfo info)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="info" type="r.q(const).wxLanguageInfo" default=""/>
+          <param name="info" type="LanguageInfo" default=""/>

         </paramlist>
       </staticmethod>
         </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>
         <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>
         </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>
         <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>
       <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>
       <paramlist>

-        <param name="sz" type="r.q(const).wxString" default=""/>
+        <param name="str" type="String" default=""/>

       </paramlist>
     </method>
       </paramlist>
     </method>

-    <method name="GetTranslation" oldname="wxGetTranslation" type="wxString" overloaded="yes">
-      <autodoc>GetTranslation(String sz) -&gt; String
-GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
+    <method name="GetTranslation" oldname="wxGetTranslation" type="String" overloaded="yes">
+      <autodoc>GetTranslation(String str) -&gt; String
+GetTranslation(String str, String strPlural, size_t n) -&gt; String</autodoc>

       <paramlist>
       <paramlist>

-        <param name="sz1" type="r.q(const).wxString" default=""/>
-        <param name="sz2" type="r.q(const).wxString" default=""/>
+        <param name="str" type="String" default=""/>
+        <param name="strPlural" type="String" default=""/>

         <param name="n" type="size_t" default=""/>
       </paramlist>
     </method>
         <param name="n" type="size_t" default=""/>
       </paramlist>
     </method>


@@ -8189,7 +9311,7 @@ GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="EncodingConverter" oldname="wxEncodingConverter" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="EncodingConverter" overloaded="no">
         <autodoc>__init__() -&gt; EncodingConverter</autodoc>
       </constructor>


@@ -8204,27 +9326,27 @@ GetTranslation(String sz1, String sz2, size_t n) -&gt; String</autodoc>
           <param name="method" type="int" default="wxCONVERT_STRICT"/>
         </paramlist>
       </method>
           <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>
         <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">
         </paramlist>
       </method>
       <staticmethod name="GetPlatformEquivalents" type="wxFontEncodingArray" overloaded="no">

-        <autodoc>EncodingConverter.GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -&gt; wxFontEncodingArray</autodoc>
+        <autodoc>GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -&gt; wxFontEncodingArray</autodoc>

         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
           <param name="platform" type="int" default="wxPLATFORM_CURRENT"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetAllEquivalents" type="wxFontEncodingArray" overloaded="no">
         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
           <param name="platform" type="int" default="wxPLATFORM_CURRENT"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetAllEquivalents" type="wxFontEncodingArray" overloaded="no">

-        <autodoc>EncodingConverter.GetAllEquivalents(int enc) -&gt; wxFontEncodingArray</autodoc>
+        <autodoc>GetAllEquivalents(int enc) -&gt; wxFontEncodingArray</autodoc>

         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CanConvert" type="bool" overloaded="no">
         <paramlist>
           <param name="enc" type="wxFontEncoding" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="CanConvert" type="bool" overloaded="no">

-        <autodoc>EncodingConverter.CanConvert(int encIn, int encOut) -&gt; bool</autodoc>
+        <autodoc>CanConvert(int encIn, int encOut) -&gt; bool</autodoc>

         <paramlist>
           <param name="encIn" type="wxFontEncoding" default=""/>
           <param name="encOut" type="wxFontEncoding" default=""/>
         <paramlist>
           <param name="encIn" type="wxFontEncoding" default=""/>
           <param name="encOut" type="wxFontEncoding" default=""/>


@@ -8255,14 +9377,14 @@ if wx.Platform == "__WXMSW__":
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DC" oldname="wxDC" module="gdi">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DC" oldname="wxDC" module="gdi">

-      <baseclass name="wxObject"/>
+      <baseclass name="Object"/>

       <destructor name="~wxDC" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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">
         <autodoc>EndDrawing()</autodoc>
       </method>
       <method name="FloodFillXY" type="bool" overloaded="no">


@@ -8270,32 +9392,32 @@ if wx.Platform == "__WXMSW__":
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <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="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>
           <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>
         <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>
         <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>
         </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=""/>
         <autodoc>DrawLineXY(int x1, int y1, int x2, int y2)</autodoc>
         <paramlist>
           <param name="x1" type="int" default=""/>


@@ -8304,27 +9426,27 @@ if wx.Platform == "__WXMSW__":
           <param name="y2" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         </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>
         <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>
         <autodoc>CrossHair(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>DrawArcXY(int x1, int y1, int x2, int y2, int xc, int yc)</autodoc>
         <paramlist>
           <param name="x1" type="int" default=""/>


@@ -8335,15 +9457,15 @@ if wx.Platform == "__WXMSW__":
           <param name="yc" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         </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=""/>
         <autodoc>DrawCheckMarkXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8352,13 +9474,13 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>DrawCheckMark(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>DrawEllipticArcXY(int x, int y, int w, int h, double sa, double ea)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8369,29 +9491,29 @@ if wx.Platform == "__WXMSW__":
           <param name="ea" type="double" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
         <autodoc>DrawPoint(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>DrawRectangleXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8400,20 +9522,20 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="DrawRectangleRect" type="void" overloaded="no">
+      <method name="DrawRectangleRect" type="" overloaded="no">

         <autodoc>DrawRectangleRect(Rect rect)</autodoc>
         <paramlist>
         <autodoc>DrawRectangleRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>DrawRoundedRectangleXY(int x, int y, int width, int height, double radius)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8423,22 +9545,22 @@ if wx.Platform == "__WXMSW__":
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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=""/>
         <autodoc>DrawCircleXY(int x, int y, int radius)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8446,14 +9568,14 @@ if wx.Platform == "__WXMSW__":
           <param name="radius" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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=""/>
         <autodoc>DrawEllipseXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8462,80 +9584,80 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="DrawEllipseRect" type="void" overloaded="no">
+      <method name="DrawEllipseRect" type="" overloaded="no">

         <autodoc>DrawEllipseRect(Rect rect)</autodoc>
         <paramlist>
         <autodoc>DrawEllipseRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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>
         </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>
         <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>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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>
         </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>
         <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>
           <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>
         <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>
           <param name="angle" type="double" default=""/>
         </paramlist>
       </method>


@@ -8548,7 +9670,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="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"/>
           <param name="xsrc" type="int" default=""/>
           <param name="ysrc" type="int" default=""/>
           <param name="rop" type="int" default="wxCOPY"/>


@@ -8561,118 +9683,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>
         <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="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>
         </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=""/>
         <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>
           <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=""/>
         <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>
           <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>
         <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>
           <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>
         <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>
           <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=""/>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="EndDoc" type="void" overloaded="no">
+      <method name="EndDoc" type="" overloaded="no">

         <autodoc>EndDoc()</autodoc>
       </method>
         <autodoc>EndDoc()</autodoc>
       </method>

-      <method name="StartPage" type="void" overloaded="no">
+      <method name="StartPage" type="" overloaded="no">

         <autodoc>StartPage()</autodoc>
       </method>
         <autodoc>StartPage()</autodoc>
       </method>

-      <method name="EndPage" type="void" overloaded="no">
+      <method name="EndPage" type="" overloaded="no">

         <autodoc>EndPage()</autodoc>
       </method>
         <autodoc>EndPage()</autodoc>
       </method>

-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">

         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPen" type="void" overloaded="no">
+      <method name="SetPen" type="" overloaded="no">

         <autodoc>SetPen(Pen pen)</autodoc>
         <paramlist>
         <autodoc>SetPen(Pen pen)</autodoc>
         <paramlist>

-          <param name="pen" type="r.q(const).wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBrush" type="void" overloaded="no">
+      <method name="SetBrush" type="" overloaded="no">

         <autodoc>SetBrush(Brush brush)</autodoc>
         <paramlist>
         <autodoc>SetBrush(Brush brush)</autodoc>
         <paramlist>

-          <param name="brush" type="r.q(const).wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackground" type="void" overloaded="no">
+      <method name="SetBackground" type="" overloaded="no">

         <autodoc>SetBackground(Brush brush)</autodoc>
         <paramlist>
         <autodoc>SetBackground(Brush brush)</autodoc>
         <paramlist>

-          <param name="brush" type="r.q(const).wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetPalette(Palette palette)</autodoc>
         <paramlist>

-          <param name="palette" type="r.q(const).wxPalette" default=""/>
+          <param name="palette" type="Palette" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetClippingRegionXY(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -8681,38 +9803,38 @@ if wx.Platform == "__WXMSW__":
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetClippingRect" type="void" overloaded="no">
+      <method name="SetClippingRect" type="" overloaded="no">

         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>
         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetClippingRegionAsRegion" type="void" overloaded="no">
+      <method name="SetClippingRegionAsRegion" type="" overloaded="no">

         <autodoc>SetClippingRegionAsRegion(Region region)</autodoc>
         <paramlist>
         <autodoc>SetClippingRegionAsRegion(Region region)</autodoc>
         <paramlist>

-          <param name="region" type="r.q(const).wxRegion" default=""/>
+          <param name="region" type="Region" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DestroyClippingRegion" type="void" overloaded="no">
+      <method name="DestroyClippingRegion" type="" overloaded="no">

         <autodoc>DestroyClippingRegion()</autodoc>
       </method>
         <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>
         <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>
         </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">
         <autodoc>GetClippingRect() -&gt; Rect</autodoc>
       </method>
       <method name="GetCharHeight" type="int" overloaded="no">


@@ -8721,65 +9843,71 @@ if wx.Platform == "__WXMSW__":
       <method name="GetCharWidth" type="int" overloaded="no">
         <autodoc>GetCharWidth() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetPartialTextExtents" type="wxArrayInt" overloaded="no">
+        <autodoc>GetPartialTextExtents(String text) -&gt; wxArrayInt</autodoc>
+        <paramlist>
+          <param name="text" type="String" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetSize" type="Size" overloaded="no">

         <autodoc>GetSize() -&gt; Size</autodoc>
         <docstring>Get the DC size in device units.</docstring>
       </method>
         <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>
         <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>
         </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>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="DeviceToLogicalX" type="int" overloaded="no">


@@ -8839,7 +9967,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="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">
         <autodoc>GetPPI() -&gt; Size</autodoc>
       </method>
       <method name="Ok" type="bool" overloaded="no">


@@ -8848,108 +9976,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="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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetTextForeground(Colour colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTextBackground" type="void" overloaded="no">
+      <method name="SetTextBackground" type="" overloaded="no">

         <autodoc>SetTextBackground(Colour colour)</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         <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>
         </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>
         <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>
         <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>
         <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>
         </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>
         <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=""/>
         <autodoc>SetAxisOrientation(bool xLeftRight, bool yBottomUp)</autodoc>
         <paramlist>
           <param name="xLeftRight" type="bool" default=""/>


@@ -8959,13 +10087,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="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>
         <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=""/>
         <autodoc>SetOptimization(bool opt)</autodoc>
         <paramlist>
           <param name="opt" type="bool" default=""/>


@@ -8974,14 +10102,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="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>
         <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">
         <autodoc>ResetBoundingBox()</autodoc>
       </method>
       <method name="MinX" type="int" overloaded="no">


@@ -8996,63 +10124,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="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>
         <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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </paramlist>
       </method>
     </class>


@@ -9060,20 +10188,20 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MemoryDC" oldname="wxMemoryDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="SelectObject" type="void" overloaded="no">
+      <method name="SelectObject" type="" overloaded="no">

         <autodoc>SelectObject(Bitmap bitmap)</autodoc>
         <paramlist>
         <autodoc>SelectObject(Bitmap bitmap)</autodoc>
         <paramlist>

-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -9081,32 +10209,42 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BufferedDC" oldname="wxBufferedDC" module="gdi">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BufferedDC" oldname="wxBufferedDC" module="gdi">

-      <baseclass name="wxMemoryDC"/>
-      <constructor name="BufferedDC" overloaded="no">
-        <autodoc>__init__(DC dc, Bitmap buffer) -&gt; BufferedDC</autodoc>
+      <baseclass name="MemoryDC"/>
+      <constructor name="BufferedDC" overloaded="yes">
+        <paramlist>
+          <param name="dc" type="DC" default=""/>
+          <param name="buffer" type="Bitmap" default=""/>
+        </paramlist>
+      </constructor>
+      <constructor name="BufferedDC" overloaded="yes">
+        <autodoc>__init__(DC dc, Bitmap buffer) -&gt; BufferedDC
+__init__(DC dc, Size area) -&gt; BufferedDC</autodoc>

         <paramlist>
         <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="area" type="Size" default=""/>

         </paramlist>
       </constructor>
       <constructor name="BufferedDCInternalBuffer" overloaded="no">
         <autodoc>BufferedDCInternalBuffer(DC dc, Size area) -&gt; BufferedDC</autodoc>
         <paramlist>
         </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>
         </paramlist>
       </constructor>

-      <method name="UnMask" type="void" overloaded="no">
+      <destructor name="~wxBufferedDC" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>
+      <method name="UnMask" type="" overloaded="no">

         <autodoc>UnMask()</autodoc>
       </method>
     </class>
     <class name="BufferedPaintDC" oldname="wxBufferedPaintDC" module="gdi">
         <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>
       <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>
         </paramlist>
       </constructor>
     </class>


@@ -9114,20 +10252,20 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScreenDC" oldname="wxScreenDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="EndDrawingOnTop" type="bool" overloaded="no">


@@ -9138,11 +10276,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ClientDC" oldname="wxClientDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>
     </class>


@@ -9150,11 +10288,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PaintDC" oldname="wxPaintDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>
     </class>


@@ -9162,11 +10300,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="WindowDC" oldname="wxWindowDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>
     </class>


@@ -9174,11 +10312,11 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MirrorDC" oldname="wxMirrorDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <param name="mirror" type="bool" default=""/>
         </paramlist>
       </constructor>


@@ -9187,71 +10325,323 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PostScriptDC" oldname="wxPostScriptDC" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </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>
         <autodoc>SetPrintData(wxPrintData data)</autodoc>
         <paramlist>

-          <param name="data" type="r.q(const).wxPrintData" default=""/>
+          <param name="data" type="wxPrintData" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <staticmethod name="SetResolution" type="void" overloaded="no">
-        <autodoc>PostScriptDC.SetResolution(int ppi)</autodoc>
+      <staticmethod name="SetResolution" type="" overloaded="no">
+        <autodoc>SetResolution(int ppi)</autodoc>

         <paramlist>
           <param name="ppi" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetResolution" type="int" overloaded="no">
         <paramlist>
           <param name="ppi" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetResolution" type="int" overloaded="no">

-        <autodoc>PostScriptDC.GetResolution() -&gt; int</autodoc>
+        <autodoc>GetResolution() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MetaFile" oldname="wxMetaFile" module="gdi">
       </staticmethod>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </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>
       <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">
         </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>
       <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="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">
         </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>
       <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>
     <pythoncode>
         </paramlist>
       </constructor>
     </class>
     <pythoncode>

+    class DC_old(DC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = DC.FloodFillXY
+        GetPixel = DC.GetPixelXY
+        DrawLine = DC.DrawLineXY
+        CrossHair = DC.CrossHairXY
+        DrawArc = DC.DrawArcXY
+        DrawCheckMark = DC.DrawCheckMarkXY
+        DrawEllipticArc = DC.DrawEllipticArcXY
+        DrawPoint = DC.DrawPointXY
+        DrawRectangle = DC.DrawRectangleXY
+        DrawRoundedRectangle = DC.DrawRoundedRectangleXY
+        DrawCircle = DC.DrawCircleXY
+        DrawEllipse = DC.DrawEllipseXY
+        DrawIcon = DC.DrawIconXY
+        DrawBitmap = DC.DrawBitmapXY
+        DrawText = DC.DrawTextXY
+        DrawRotatedText = DC.DrawRotatedTextXY
+        Blit = DC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class MemoryDC_old(MemoryDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = MemoryDC.FloodFillXY
+        GetPixel = MemoryDC.GetPixelXY
+        DrawLine = MemoryDC.DrawLineXY
+        CrossHair = MemoryDC.CrossHairXY
+        DrawArc = MemoryDC.DrawArcXY
+        DrawCheckMark = MemoryDC.DrawCheckMarkXY
+        DrawEllipticArc = MemoryDC.DrawEllipticArcXY
+        DrawPoint = MemoryDC.DrawPointXY
+        DrawRectangle = MemoryDC.DrawRectangleXY
+        DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY
+        DrawCircle = MemoryDC.DrawCircleXY
+        DrawEllipse = MemoryDC.DrawEllipseXY
+        DrawIcon = MemoryDC.DrawIconXY
+        DrawBitmap = MemoryDC.DrawBitmapXY
+        DrawText = MemoryDC.DrawTextXY
+        DrawRotatedText = MemoryDC.DrawRotatedTextXY
+        Blit = MemoryDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class BufferedDC_old(BufferedDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = BufferedDC.FloodFillXY
+        GetPixel = BufferedDC.GetPixelXY
+        DrawLine = BufferedDC.DrawLineXY
+        CrossHair = BufferedDC.CrossHairXY
+        DrawArc = BufferedDC.DrawArcXY
+        DrawCheckMark = BufferedDC.DrawCheckMarkXY
+        DrawEllipticArc = BufferedDC.DrawEllipticArcXY
+        DrawPoint = BufferedDC.DrawPointXY
+        DrawRectangle = BufferedDC.DrawRectangleXY
+        DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY
+        DrawCircle = BufferedDC.DrawCircleXY
+        DrawEllipse = BufferedDC.DrawEllipseXY
+        DrawIcon = BufferedDC.DrawIconXY
+        DrawBitmap = BufferedDC.DrawBitmapXY
+        DrawText = BufferedDC.DrawTextXY
+        DrawRotatedText = BufferedDC.DrawRotatedTextXY
+        Blit = BufferedDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class BufferedPaintDC_old(BufferedPaintDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = BufferedPaintDC.FloodFillXY
+        GetPixel = BufferedPaintDC.GetPixelXY
+        DrawLine = BufferedPaintDC.DrawLineXY
+        CrossHair = BufferedPaintDC.CrossHairXY
+        DrawArc = BufferedPaintDC.DrawArcXY
+        DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY
+        DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY
+        DrawPoint = BufferedPaintDC.DrawPointXY
+        DrawRectangle = BufferedPaintDC.DrawRectangleXY
+        DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY
+        DrawCircle = BufferedPaintDC.DrawCircleXY
+        DrawEllipse = BufferedPaintDC.DrawEllipseXY
+        DrawIcon = BufferedPaintDC.DrawIconXY
+        DrawBitmap = BufferedPaintDC.DrawBitmapXY
+        DrawText = BufferedPaintDC.DrawTextXY
+        DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY
+        Blit = BufferedPaintDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class ScreenDC_old(ScreenDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = ScreenDC.FloodFillXY
+        GetPixel = ScreenDC.GetPixelXY
+        DrawLine = ScreenDC.DrawLineXY
+        CrossHair = ScreenDC.CrossHairXY
+        DrawArc = ScreenDC.DrawArcXY
+        DrawCheckMark = ScreenDC.DrawCheckMarkXY
+        DrawEllipticArc = ScreenDC.DrawEllipticArcXY
+        DrawPoint = ScreenDC.DrawPointXY
+        DrawRectangle = ScreenDC.DrawRectangleXY
+        DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY
+        DrawCircle = ScreenDC.DrawCircleXY
+        DrawEllipse = ScreenDC.DrawEllipseXY
+        DrawIcon = ScreenDC.DrawIconXY
+        DrawBitmap = ScreenDC.DrawBitmapXY
+        DrawText = ScreenDC.DrawTextXY
+        DrawRotatedText = ScreenDC.DrawRotatedTextXY
+        Blit = ScreenDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class ClientDC_old(ClientDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = ClientDC.FloodFillXY
+        GetPixel = ClientDC.GetPixelXY
+        DrawLine = ClientDC.DrawLineXY
+        CrossHair = ClientDC.CrossHairXY
+        DrawArc = ClientDC.DrawArcXY
+        DrawCheckMark = ClientDC.DrawCheckMarkXY
+        DrawEllipticArc = ClientDC.DrawEllipticArcXY
+        DrawPoint = ClientDC.DrawPointXY
+        DrawRectangle = ClientDC.DrawRectangleXY
+        DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY
+        DrawCircle = ClientDC.DrawCircleXY
+        DrawEllipse = ClientDC.DrawEllipseXY
+        DrawIcon = ClientDC.DrawIconXY
+        DrawBitmap = ClientDC.DrawBitmapXY
+        DrawText = ClientDC.DrawTextXY
+        DrawRotatedText = ClientDC.DrawRotatedTextXY
+        Blit = ClientDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class PaintDC_old(PaintDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = PaintDC.FloodFillXY
+        GetPixel = PaintDC.GetPixelXY
+        DrawLine = PaintDC.DrawLineXY
+        CrossHair = PaintDC.CrossHairXY
+        DrawArc = PaintDC.DrawArcXY
+        DrawCheckMark = PaintDC.DrawCheckMarkXY
+        DrawEllipticArc = PaintDC.DrawEllipticArcXY
+        DrawPoint = PaintDC.DrawPointXY
+        DrawRectangle = PaintDC.DrawRectangleXY
+        DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY
+        DrawCircle = PaintDC.DrawCircleXY
+        DrawEllipse = PaintDC.DrawEllipseXY
+        DrawIcon = PaintDC.DrawIconXY
+        DrawBitmap = PaintDC.DrawBitmapXY
+        DrawText = PaintDC.DrawTextXY
+        DrawRotatedText = PaintDC.DrawRotatedTextXY
+        Blit = PaintDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class WindowDC_old(WindowDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = WindowDC.FloodFillXY
+        GetPixel = WindowDC.GetPixelXY
+        DrawLine = WindowDC.DrawLineXY
+        CrossHair = WindowDC.CrossHairXY
+        DrawArc = WindowDC.DrawArcXY
+        DrawCheckMark = WindowDC.DrawCheckMarkXY
+        DrawEllipticArc = WindowDC.DrawEllipticArcXY
+        DrawPoint = WindowDC.DrawPointXY
+        DrawRectangle = WindowDC.DrawRectangleXY
+        DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY
+        DrawCircle = WindowDC.DrawCircleXY
+        DrawEllipse = WindowDC.DrawEllipseXY
+        DrawIcon = WindowDC.DrawIconXY
+        DrawBitmap = WindowDC.DrawBitmapXY
+        DrawText = WindowDC.DrawTextXY
+        DrawRotatedText = WindowDC.DrawRotatedTextXY
+        Blit = WindowDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class MirrorDC_old(MirrorDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = MirrorDC.FloodFillXY
+        GetPixel = MirrorDC.GetPixelXY
+        DrawLine = MirrorDC.DrawLineXY
+        CrossHair = MirrorDC.CrossHairXY
+        DrawArc = MirrorDC.DrawArcXY
+        DrawCheckMark = MirrorDC.DrawCheckMarkXY
+        DrawEllipticArc = MirrorDC.DrawEllipticArcXY
+        DrawPoint = MirrorDC.DrawPointXY
+        DrawRectangle = MirrorDC.DrawRectangleXY
+        DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY
+        DrawCircle = MirrorDC.DrawCircleXY
+        DrawEllipse = MirrorDC.DrawEllipseXY
+        DrawIcon = MirrorDC.DrawIconXY
+        DrawBitmap = MirrorDC.DrawBitmapXY
+        DrawText = MirrorDC.DrawTextXY
+        DrawRotatedText = MirrorDC.DrawRotatedTextXY
+        Blit = MirrorDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class PostScriptDC_old(PostScriptDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = PostScriptDC.FloodFillXY
+        GetPixel = PostScriptDC.GetPixelXY
+        DrawLine = PostScriptDC.DrawLineXY
+        CrossHair = PostScriptDC.CrossHairXY
+        DrawArc = PostScriptDC.DrawArcXY
+        DrawCheckMark = PostScriptDC.DrawCheckMarkXY
+        DrawEllipticArc = PostScriptDC.DrawEllipticArcXY
+        DrawPoint = PostScriptDC.DrawPointXY
+        DrawRectangle = PostScriptDC.DrawRectangleXY
+        DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY
+        DrawCircle = PostScriptDC.DrawCircleXY
+        DrawEllipse = PostScriptDC.DrawEllipseXY
+        DrawIcon = PostScriptDC.DrawIconXY
+        DrawBitmap = PostScriptDC.DrawBitmapXY
+        DrawText = PostScriptDC.DrawTextXY
+        DrawRotatedText = PostScriptDC.DrawRotatedTextXY
+        Blit = PostScriptDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class MetaFileDC_old(MetaFileDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = MetaFileDC.FloodFillXY
+        GetPixel = MetaFileDC.GetPixelXY
+        DrawLine = MetaFileDC.DrawLineXY
+        CrossHair = MetaFileDC.CrossHairXY
+        DrawArc = MetaFileDC.DrawArcXY
+        DrawCheckMark = MetaFileDC.DrawCheckMarkXY
+        DrawEllipticArc = MetaFileDC.DrawEllipticArcXY
+        DrawPoint = MetaFileDC.DrawPointXY
+        DrawRectangle = MetaFileDC.DrawRectangleXY
+        DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY
+        DrawCircle = MetaFileDC.DrawCircleXY
+        DrawEllipse = MetaFileDC.DrawEllipseXY
+        DrawIcon = MetaFileDC.DrawIconXY
+        DrawBitmap = MetaFileDC.DrawBitmapXY
+        DrawText = MetaFileDC.DrawTextXY
+        DrawRotatedText = MetaFileDC.DrawRotatedTextXY
+        Blit = MetaFileDC.BlitXY
+    </pythoncode>
+    <pythoncode>
+    class PrinterDC_old(PrinterDC):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = PrinterDC.FloodFillXY
+        GetPixel = PrinterDC.GetPixelXY
+        DrawLine = PrinterDC.DrawLineXY
+        CrossHair = PrinterDC.CrossHairXY
+        DrawArc = PrinterDC.DrawArcXY
+        DrawCheckMark = PrinterDC.DrawCheckMarkXY
+        DrawEllipticArc = PrinterDC.DrawEllipticArcXY
+        DrawPoint = PrinterDC.DrawPointXY
+        DrawRectangle = PrinterDC.DrawRectangleXY
+        DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY
+        DrawCircle = PrinterDC.DrawCircleXY
+        DrawEllipse = PrinterDC.DrawEllipseXY
+        DrawIcon = PrinterDC.DrawIconXY
+        DrawBitmap = PrinterDC.DrawBitmapXY
+        DrawText = PrinterDC.DrawTextXY
+        DrawRotatedText = PrinterDC.DrawRotatedTextXY
+        Blit = PrinterDC.BlitXY
+    </pythoncode>
+    <pythoncode>

 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ImageList" oldname="wxImageList" module="gdi">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="ImageList" overloaded="no">
         <autodoc>__init__(int width, int height, int mask=True, int initialCount=1) -&gt; ImageList</autodoc>
         <paramlist>


@@ -9267,28 +10657,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>
       <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>
         </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>
         </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=""/>
         </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">
         </paramlist>
       </method>
       <method name="Draw" type="bool" overloaded="no">


@@ -9296,11 +10686,11 @@ Works for single as well as multi-line strings.</docstring>
     bool solidBackground=False) -&gt; bool</autodoc>
         <paramlist>
           <param name="index" type="int" default=""/>
     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="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">
         </paramlist>
       </method>
       <method name="GetImageCount" type="int" overloaded="no">


@@ -9315,12 +10705,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="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=""/>
         <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>
         </paramlist>
       </method>
     </class>


@@ -9328,25 +10718,25 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PenList" oldname="wxPenList" module="gdi">
 #---------------------------------------------------------------------------
 </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>
         <autodoc>AddPen(Pen pen)</autodoc>
         <paramlist>

-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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">
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">


@@ -9354,24 +10744,24 @@ Works for single as well as multi-line strings.</docstring>
       </method>
     </class>
     <class name="BrushList" oldname="wxBrushList" module="gdi">
       </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>
         <autodoc>AddBrush(Brush brush)</autodoc>
         <paramlist>

-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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">
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">


@@ -9379,36 +10769,36 @@ Works for single as well as multi-line strings.</docstring>
       </method>
     </class>
     <class name="ColourDatabase" oldname="wxColourDatabase" module="gdi">
       </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="FindName" type="wxString" overloaded="no">
+      <method name="FindName" type="String" overloaded="no">

         <autodoc>FindName(Colour colour) -&gt; String</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddColour" type="void" overloaded="no">
+      <method name="AddColour" type="" overloaded="no">

         <autodoc>AddColour(String name, Colour colour)</autodoc>
         <paramlist>
         <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>
         </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>
         <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=""/>
           <param name="red" type="int" default=""/>
           <param name="green" type="int" default=""/>
           <param name="blue" type="int" default=""/>


@@ -9416,14 +10806,14 @@ Works for single as well as multi-line strings.</docstring>
       </method>
     </class>
     <class name="FontList" oldname="wxFontList" module="gdi">
       </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>
         <autodoc>AddFont(Font font)</autodoc>
         <paramlist>

-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </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>
         <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 +10823,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="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>
           <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>
         <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">
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">


@@ -9450,84 +10840,85 @@ Works for single as well as multi-line strings.</docstring>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>

+    <pythoncode> NullColor = NullColour </pythoncode>

     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Effects" oldname="wxEffects" module="gdi">
     <pythoncode>
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetHighlightColour(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLightShadow" type="void" overloaded="no">
+      <method name="SetLightShadow" type="" overloaded="no">

         <autodoc>SetLightShadow(Colour c)</autodoc>
         <paramlist>
         <autodoc>SetLightShadow(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFaceColour" type="void" overloaded="no">
+      <method name="SetFaceColour" type="" overloaded="no">

         <autodoc>SetFaceColour(Colour c)</autodoc>
         <paramlist>
         <autodoc>SetFaceColour(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetMediumShadow" type="void" overloaded="no">
+      <method name="SetMediumShadow" type="" overloaded="no">

         <autodoc>SetMediumShadow(Colour c)</autodoc>
         <paramlist>
         <autodoc>SetMediumShadow(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDarkShadow" type="void" overloaded="no">
+      <method name="SetDarkShadow" type="" overloaded="no">

         <autodoc>SetDarkShadow(Colour c)</autodoc>
         <paramlist>
         <autodoc>SetDarkShadow(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </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>
         <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="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>
         </paramlist>
       </method>
     </class>


@@ -9539,18 +10930,18 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Panel" oldname="wxPanel" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PrePanel" overloaded="no">


@@ -9560,16 +10951,17 @@ Works for single as well as multi-line strings.</docstring>
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
     String name=PanelNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
     String name=PanelNameStr) -&gt; bool</autodoc>

+        <docstring>Create the GUI part of the Window for 2-phase creation mode.</docstring>

         <paramlist>
         <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="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>
         </paramlist>
       </method>

-      <method name="InitDialog" type="void" overloaded="no">
+      <method name="InitDialog" type="" overloaded="no">

         <autodoc>InitDialog()</autodoc>
       </method>
     </class>
         <autodoc>InitDialog()</autodoc>
       </method>
     </class>


@@ -9577,18 +10969,18 @@ Works for single as well as multi-line strings.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrolledWindow" oldname="wxScrolledWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreScrolledWindow" overloaded="no">


@@ -9598,16 +10990,17 @@ Works for single as well as multi-line strings.</docstring>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
     String name=PanelNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
     String name=PanelNameStr) -&gt; bool</autodoc>

+        <docstring>Create the GUI part of the Window for 2-phase creation mode.</docstring>

         <paramlist>
         <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="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>
         </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>
         <autodoc>SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, int noUnitsX, 
     int noUnitsY, int xPos=0, int yPos=0, bool noRefresh=False)</autodoc>
         <paramlist>


@@ -9620,7 +11013,7 @@ Works for single as well as multi-line strings.</docstring>
           <param name="noRefresh" type="bool" default="False"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>Scroll(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -9633,44 +11026,44 @@ Works for single as well as multi-line strings.</docstring>
           <param name="orient" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </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=""/>
         <autodoc>SetScale(double xs, double ys)</autodoc>
         <paramlist>
           <param name="xs" type="double" default=""/>


@@ -9683,56 +11076,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="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>
         <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>
         </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=""/>
         <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>
         </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>
         <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>
         </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=""/>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="SetTargetWindow" type="void" overloaded="no">
+      <method name="SetTargetWindow" type="" overloaded="no">

         <autodoc>SetTargetWindow(Window target)</autodoc>
         <paramlist>
         <autodoc>SetTargetWindow(Window target)</autodoc>
         <paramlist>

-          <param name="target" type="p.wxWindow" default=""/>
+          <param name="target" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTargetWindow" type="wxWindow" overloaded="no">
+      <method name="GetTargetWindow" type="Window" overloaded="no">

         <autodoc>GetTargetWindow() -&gt; Window</autodoc>
       </method>
     </class>
         <autodoc>GetTargetWindow() -&gt; Window</autodoc>
       </method>
     </class>


@@ -9740,17 +11133,17 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TopLevelWindow" oldname="wxTopLevelWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
         <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>
         <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"/>
         <autodoc>Iconize(bool iconize=True)</autodoc>
         <paramlist>
           <param name="iconize" type="bool" default="True"/>


@@ -9762,19 +11155,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="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>
         <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>
         <autodoc>SetIcon(Icon icon)</autodoc>
         <paramlist>

-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetIcons" type="void" overloaded="no">
+      <method name="SetIcons" type="" overloaded="no">

         <autodoc>SetIcons(wxIconBundle icons)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="ShowFullScreen" type="bool" overloaded="no">


@@ -9787,19 +11180,21 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="IsFullScreen" type="bool" overloaded="no">
         <autodoc>IsFullScreen() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>SetTitle(String title)</autodoc>

+        <docstring>Sets the window's title. Applicable only to frames and dialogs.</docstring>

         <paramlist>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">

         <autodoc>GetTitle() -&gt; String</autodoc>
         <autodoc>GetTitle() -&gt; String</autodoc>

+        <docstring>Gets the window's title. Applicable only to frames and dialogs.</docstring>

       </method>
       <method name="SetShape" type="bool" overloaded="no">
         <autodoc>SetShape(Region region) -&gt; bool</autodoc>
         <paramlist>
       </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>
         </paramlist>
       </method>
     </class>


@@ -9807,19 +11202,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Frame" oldname="wxFrame" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreFrame" overloaded="no">


@@ -9830,28 +11225,31 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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>
         </paramlist>
       </method>

-      <method name="GetClientAreaOrigin" type="wxPoint" overloaded="no">
+      <method name="GetClientAreaOrigin" type="Point" overloaded="no">

         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>
         <autodoc>GetClientAreaOrigin() -&gt; Point</autodoc>

+        <docstring>Get the origin of the client area of the window relative to the
+window's top left corner (the client area may be shifted because of
+the borders, scrollbars, other decorations...)</docstring>

       </method>
       </method>

-      <method name="SendSizeEvent" type="void" overloaded="no">
+      <method name="SendSizeEvent" type="" overloaded="no">

         <autodoc>SendSizeEvent()</autodoc>
       </method>
         <autodoc>SendSizeEvent()</autodoc>
       </method>

-      <method name="SetMenuBar" type="void" overloaded="no">
+      <method name="SetMenuBar" type="" overloaded="no">

         <autodoc>SetMenuBar(MenuBar menubar)</autodoc>
         <paramlist>
         <autodoc>SetMenuBar(MenuBar menubar)</autodoc>
         <paramlist>

-          <param name="menubar" type="p.wxMenuBar" default=""/>
+          <param name="menubar" type="MenuBar" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetMenuBar() -&gt; MenuBar</autodoc>
       </method>
       <method name="ProcessCommand" type="bool" overloaded="no">


@@ -9867,46 +11265,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="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>
         </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>
         <autodoc>SetStatusBar(StatusBar statBar)</autodoc>
         <paramlist>

-          <param name="statBar" type="p.wxStatusBar" default=""/>
+          <param name="statBar" type="wxStatusBar" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetStatusText" type="void" overloaded="no">
+      <method name="SetStatusText" type="" overloaded="no">

         <autodoc>SetStatusText(String text, int number=0)</autodoc>
         <paramlist>
         <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>
           <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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="PushStatusText" type="void" overloaded="no">
+      <method name="PushStatusText" type="" overloaded="no">

         <autodoc>PushStatusText(String text, int number=0)</autodoc>
         <paramlist>
         <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>
           <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>
         <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=""/>
         <autodoc>SetStatusBarPane(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -9920,29 +11318,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"/>
         <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>
         </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>
         <autodoc>SetToolBar(wxToolBar toolbar)</autodoc>
         <paramlist>

-          <param name="toolbar" type="p.wxToolBar" default=""/>
+          <param name="toolbar" type="wxToolBar" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DoGiveHelp" type="void" overloaded="no">
+      <method name="DoGiveHelp" type="" overloaded="no">

         <autodoc>DoGiveHelp(String text, bool show)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -9950,19 +11348,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Dialog" oldname="wxDialog" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreDialog" overloaded="no">


@@ -9973,16 +11371,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>
     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="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>
         </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=""/>
         <autodoc>SetReturnCode(int returnCode)</autodoc>
         <paramlist>
           <param name="returnCode" type="int" default=""/>


@@ -9991,31 +11389,25 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       <method name="GetReturnCode" type="int" overloaded="no">
         <autodoc>GetReturnCode() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         </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>
         <autodoc>CreateButtonSizer(long flags) -&gt; Sizer</autodoc>
         <paramlist>
           <param name="flags" type="long" default=""/>
         </paramlist>
       </method>

-      <method name="SetModal" type="void" overloaded="no">
-        <autodoc>SetModal(bool flag)</autodoc>
-        <paramlist>
-          <param name="flag" type="bool" default=""/>
-        </paramlist>
-      </method>

       <method name="IsModal" type="bool" overloaded="no">
         <autodoc>IsModal() -&gt; bool</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">
         <autodoc>ShowModal() -&gt; int</autodoc>
       </method>
       <method name="IsModal" type="bool" overloaded="no">
         <autodoc>IsModal() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>EndModal(int retCode)</autodoc>
         <paramlist>
           <param name="retCode" type="int" default=""/>


@@ -10029,19 +11421,19 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MiniFrame" oldname="wxMiniFrame" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreMiniFrame" overloaded="no">


@@ -10052,13 +11444,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>
     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="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>
         </paramlist>
       </method>
     </class>


@@ -10066,50 +11458,50 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplashScreenWindow" oldname="wxSplashScreenWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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>
           <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>
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>

-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>

         </paramlist>
       </method>
         </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">
         <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>
       <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="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="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>
           <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">
         <autodoc>GetSplashWindow() -&gt; SplashScreenWindow</autodoc>
       </method>
       <method name="GetTimeout" type="int" overloaded="no">


@@ -10120,14 +11512,14 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StatusBar" oldname="wxStatusBar" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreStatusBar" overloaded="no">


@@ -10136,13 +11528,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>
       <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="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>
         </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"/>
         <autodoc>SetFieldsCount(int number=1)</autodoc>
         <paramlist>
           <param name="number" type="int" default="1"/>


@@ -10151,46 +11543,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="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>
         <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>
           <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>
         <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>
         <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>
           <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>
         <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=""/>
         <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>
         </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>
         <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=""/>
         <autodoc>SetMinHeight(int height)</autodoc>
         <paramlist>
           <param name="height" type="int" default=""/>


@@ -10207,41 +11599,41 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplitterWindow" oldname="wxSplitterWindow" module="windows">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SplitterWindow" oldname="wxSplitterWindow" module="windows">

-      <baseclass name="wxWindow"/>
+      <baseclass name="Window"/>

       <constructor name="SplitterWindow" overloaded="no">
       <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>
+        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=SP_3D, String name=SplitterNameStr) -&gt; SplitterWindow</autodoc>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>

           <param name="style" type="long" default="wxSP_3D"/>
           <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">
         <autodoc>PreSplitterWindow() -&gt; SplitterWindow</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         </paramlist>
       </constructor>
       <constructor name="PreSplitterWindow" overloaded="no">
         <autodoc>PreSplitterWindow() -&gt; SplitterWindow</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, Point point=DefaultPosition, 
-    Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -&gt; bool</autodoc>
+        <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+    long style=SP_3D, String name=SplitterNameStr) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>

           <param name="style" type="long" default="wxSP_3D"/>
           <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>
         </paramlist>
       </method>

-      <method name="GetWindow1" type="wxWindow" overloaded="no">
+      <method name="GetWindow1" type="Window" overloaded="no">

         <autodoc>GetWindow1() -&gt; Window</autodoc>
       </method>
         <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>
         <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=""/>
         <autodoc>SetSplitMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -10250,51 +11642,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="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>
         <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>
         </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="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="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>
         </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>
         </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>
         <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=""/>
         <autodoc>SetBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>


@@ -10306,7 +11698,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="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=""/>
         <autodoc>SetSashPosition(int position, bool redraw=True)</autodoc>
         <paramlist>
           <param name="position" type="int" default=""/>


@@ -10316,7 +11708,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="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=""/>
         <autodoc>SetMinimumPaneSize(int min)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>


@@ -10333,10 +11725,10 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
           <param name="tolerance" type="int" default="5"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>SetNeedUpdating(bool needUpdating)</autodoc>
         <paramlist>
           <param name="needUpdating" type="bool" default=""/>


@@ -10347,15 +11739,15 @@ CalcUnscrolledPosition(int x, int y) -&gt; (ux, uy)</autodoc>
       </method>
     </class>
     <class name="SplitterEvent" oldname="wxSplitterEvent" module="windows">
       </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"/>
       <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>
         </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=""/>
         <autodoc>SetSashPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -10364,7 +11756,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="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">
         <autodoc>GetWindowBeingRemoved() -&gt; Window</autodoc>
       </method>
       <method name="GetX" type="int" overloaded="no">


@@ -10384,18 +11776,18 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SashWindow" oldname="wxSashWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreSashWindow" overloaded="no">


@@ -10406,15 +11798,15 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
     long style=wxCLIP_CHILDREN|wxSW_3D, 
     String name=SashNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="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>
         </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=""/>
         <autodoc>SetSashVisible(int edge, bool sash)</autodoc>
         <paramlist>
           <param name="edge" type="wxSashEdgePosition" default=""/>


@@ -10427,7 +11819,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="edge" type="wxSashEdgePosition" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetSashBorder(int edge, bool border)</autodoc>
         <paramlist>
           <param name="edge" type="wxSashEdgePosition" default=""/>


@@ -10446,7 +11838,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="edge" type="wxSashEdgePosition" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetDefaultBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>


@@ -10455,7 +11847,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="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=""/>
         <autodoc>SetExtraBorderSize(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>


@@ -10464,13 +11856,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="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>
         <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=""/>
         <autodoc>SetMinimumSizeY(int min)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>


@@ -10482,13 +11874,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="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>
         <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=""/>
         <autodoc>SetMaximumSizeY(int max)</autodoc>
         <paramlist>
           <param name="max" type="int" default=""/>


@@ -10508,12 +11900,12 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="tolerance" type="int" default="2"/>
         </paramlist>
       </method>
           <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">
         <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>
       <constructor name="SashEvent" overloaded="no">
         <autodoc>__init__(int id=0, int edge=SASH_NONE) -&gt; SashEvent</autodoc>
         <paramlist>


@@ -10521,7 +11913,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="edge" type="wxSashEdgePosition" default="wxSASH_NONE"/>
         </paramlist>
       </constructor>
           <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=""/>
         <autodoc>SetEdge(int edge)</autodoc>
         <paramlist>
           <param name="edge" type="wxSashEdgePosition" default=""/>


@@ -10530,16 +11922,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="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>
         <autodoc>SetDragRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetDragRect" type="wxRect" overloaded="no">
+      <method name="GetDragRect" type="Rect" overloaded="no">

         <autodoc>GetDragRect() -&gt; Rect</autodoc>
       </method>
         <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=""/>
         <autodoc>SetDragStatus(int status)</autodoc>
         <paramlist>
           <param name="status" type="wxSashDragStatus" default=""/>


@@ -10557,14 +11949,14 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="QueryLayoutInfoEvent" oldname="wxQueryLayoutInfoEvent" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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=""/>
         <autodoc>SetRequestedLength(int length)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>


@@ -10573,7 +11965,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="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=""/>
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>


@@ -10582,16 +11974,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="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>
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">

         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
         <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=""/>
         <autodoc>SetOrientation(int orient)</autodoc>
         <paramlist>
           <param name="orient" type="wxLayoutOrientation" default=""/>


@@ -10600,7 +11992,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="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=""/>
         <autodoc>SetAlignment(int align)</autodoc>
         <paramlist>
           <param name="align" type="wxLayoutAlignment" default=""/>


@@ -10611,14 +12003,14 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
     </class>
     <class name="CalculateLayoutEvent" oldname="wxCalculateLayoutEvent" module="windows">
       </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>
       <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=""/>
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>


@@ -10627,13 +12019,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="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>
         <autodoc>SetRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetRect" type="wxRect" overloaded="no">
+      <method name="GetRect" type="Rect" overloaded="no">

         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
     </class>
         <autodoc>GetRect() -&gt; Rect</autodoc>
       </method>
     </class>


@@ -10642,18 +12034,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">
     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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreSashLayoutWindow" overloaded="no">


@@ -10664,12 +12056,12 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
     long style=wxCLIP_CHILDREN|wxSW_3D, 
     String name=SashLayoutNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="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">
         </paramlist>
       </method>
       <method name="GetAlignment" type="wxLayoutAlignment" overloaded="no">


@@ -10678,19 +12070,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="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>
         <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>
         <autodoc>SetDefaultSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetOrientation(int orientation)</autodoc>
         <paramlist>
           <param name="orientation" type="wxLayoutOrientation" default=""/>


@@ -10698,7 +12090,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
     </class>
     <class name="LayoutAlgorithm" oldname="wxLayoutAlgorithm" module="windows">
       </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>
       <constructor name="LayoutAlgorithm" overloaded="no">
         <autodoc>__init__() -&gt; LayoutAlgorithm</autodoc>
       </constructor>


@@ -10708,22 +12100,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>
       <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>
         </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>
         </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>
         </paramlist>
       </method>
     </class>


@@ -10731,11 +12123,11 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PopupWindow" oldname="wxPopupWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <param name="flags" type="int" default="wxBORDER_NONE"/>
         </paramlist>
       </constructor>


@@ -10745,15 +12137,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>
       <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>
           <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -10761,31 +12153,31 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PopupTransientWindow" oldname="wxPyPopupTransientWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="Popup" type="void" overloaded="no">
+      <method name="Popup" type="" overloaded="no">

         <autodoc>Popup(Window focus=None)</autodoc>
         <paramlist>
         <autodoc>Popup(Window focus=None)</autodoc>
         <paramlist>

-          <param name="focus" type="p.wxWindow" default="NULL"/>
+          <param name="focus" type="Window" default="NULL"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Dismiss" type="void" overloaded="no">
+      <method name="Dismiss" type="" overloaded="no">

         <autodoc>Dismiss()</autodoc>
       </method>
     </class>
         <autodoc>Dismiss()</autodoc>
       </method>
     </class>


@@ -10793,23 +12185,23 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TipWindow" oldname="wxTipWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="maxLength" type="int" default="100"/>

-          <param name="rectBound" type="p.wxRect" default="NULL"/>
+          <param name="rectBound" type="Rect" default="NULL"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="SetBoundingRect" type="void" overloaded="no">
+      <method name="SetBoundingRect" type="" overloaded="no">

         <autodoc>SetBoundingRect(Rect rectBound)</autodoc>
         <paramlist>
         <autodoc>SetBoundingRect(Rect rectBound)</autodoc>
         <paramlist>

-          <param name="rectBound" type="r.q(const).wxRect" default=""/>
+          <param name="rectBound" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Close" type="void" overloaded="no">
+      <method name="Close" type="" overloaded="no">

         <autodoc>Close()</autodoc>
       </method>
     </class>
         <autodoc>Close()</autodoc>
       </method>
     </class>


@@ -10817,42 +12209,42 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="VScrolledWindow" oldname="wxPyVScrolledWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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>
         </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>
         <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>
         </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="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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetLineCount(size_t count)</autodoc>
         <paramlist>
           <param name="count" type="size_t" default=""/>


@@ -10866,23 +12258,31 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>
       </method>
       <method name="ScrollLines" type="bool" overloaded="no">
         <autodoc>ScrollLines(int lines) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it, scrolls the window by
+the given number of lines down, if lines is positive, or up if lines
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>
         <paramlist>
           <param name="lines" type="int" default=""/>
         </paramlist>
       </method>
       <method name="ScrollPages" type="bool" overloaded="no">
         <autodoc>ScrollPages(int pages) -&gt; bool</autodoc>

+        <docstring>If the platform and window class supports it,  scrolls the window by
+the given number of pages down, if pages is positive, or up if pages
+is negative.  Returns True if the window was scrolled, False if it was
+already on top/bottom and nothing was done.</docstring>

         <paramlist>
           <param name="pages" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <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>
         <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=""/>
         <autodoc>RefreshLines(size_t from, size_t to)</autodoc>
         <paramlist>
           <param name="from" type="size_t" default=""/>


@@ -10891,6 +12291,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
       <method name="HitTestXT" type="int" overloaded="no">
         <autodoc>HitTestXT(int x, int y) -&gt; int</autodoc>
       </method>
       <method name="HitTestXT" type="int" overloaded="no">
         <autodoc>HitTestXT(int x, int y) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -10898,11 +12299,12 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>RefreshAll()</autodoc>
       </method>
       <method name="GetLineCount" type="size_t" overloaded="no">


@@ -10922,39 +12324,39 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
       </method>
     </class>
     <class name="VListBox" oldname="wxPyVListBox" module="windows">
       </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>
       <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="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="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>
         </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>
         <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>
         </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="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="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">
         </paramlist>
       </method>
       <method name="GetItemCount" type="size_t" overloaded="no">


@@ -10984,31 +12386,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>
       <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>
         </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>
         </paramlist>
       </method>

-      <method name="GetMargins" type="wxPoint" overloaded="no">
+      <method name="GetMargins" type="Point" overloaded="no">

         <autodoc>GetMargins() -&gt; Point</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetSelection(int selection)</autodoc>
         <paramlist>
           <param name="selection" type="int" default=""/>


@@ -11028,7 +12430,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
           <param name="to" type="size_t" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>Toggle(size_t item)</autodoc>
         <paramlist>
           <param name="item" type="size_t" default=""/>


@@ -11040,66 +12442,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="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>
         <autodoc>SetMargins(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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">
         </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>
       <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="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="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>
         </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>
         <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>
         </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="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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyVListBoxNameStr"/>
+          <param name="name" type="String" default="wxPyVListBoxNameStr"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RefreshAll" type="void" overloaded="no">
+      <method name="RefreshAll" type="" overloaded="no">

         <autodoc>RefreshAll()</autodoc>
       </method>
         <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=""/>
         <autodoc>SetItemCount(size_t count)</autodoc>
         <paramlist>
           <param name="count" type="size_t" default=""/>


@@ -11110,7 +12512,7 @@ EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TaskBarIcon" oldname="wxTaskBarIcon" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="TaskBarIcon" overloaded="no">
         <autodoc>__init__() -&gt; TaskBarIcon</autodoc>
       </constructor>


@@ -11126,8 +12528,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>
       <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">
         </paramlist>
       </method>
       <method name="RemoveIcon" type="bool" overloaded="no">


@@ -11136,17 +12538,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>
       <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">
         </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=""/>
       <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>
         </paramlist>
       </constructor>
     </class>


@@ -11163,402 +12565,672 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ColourData" oldname="wxColourData" module="windows">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ColourData" oldname="wxColourData" module="windows">

-      <baseclass name="wxObject"/>
+      <docstring>This class holds a variety of information related to colour dialogs.</docstring>
+      <baseclass name="Object"/>

       <constructor name="ColourData" overloaded="no">
         <autodoc>__init__() -&gt; ColourData</autodoc>
       <constructor name="ColourData" overloaded="no">
         <autodoc>__init__() -&gt; ColourData</autodoc>

+        <docstring>Constructor, sets default values.</docstring>

       </constructor>
       <destructor name="~wxColourData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="GetChooseFull" type="bool" overloaded="no">
         <autodoc>GetChooseFull() -&gt; bool</autodoc>
       </constructor>
       <destructor name="~wxColourData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <method name="GetChooseFull" type="bool" overloaded="no">
         <autodoc>GetChooseFull() -&gt; bool</autodoc>

+        <docstring>Under Windows, determines whether the Windows colour dialog will display
+the full dialog with custom colour selection controls. Has no meaning
+under other platforms.  The default value is true.</docstring>

       </method>
       </method>

-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">

         <autodoc>GetColour() -&gt; Colour</autodoc>
         <autodoc>GetColour() -&gt; Colour</autodoc>

+        <docstring>Gets the colour (pre)selected by the dialog.</docstring>

       </method>
       </method>

-      <method name="GetCustomColour" type="wxColour" overloaded="no">
+      <method name="GetCustomColour" type="Colour" overloaded="no">

         <autodoc>GetCustomColour(int i) -&gt; Colour</autodoc>
         <autodoc>GetCustomColour(int i) -&gt; Colour</autodoc>

+        <docstring>Gets the i'th custom colour associated with the colour dialog. i should
+be an integer between 0 and 15. The default custom colours are all white.</docstring>

         <paramlist>
           <param name="i" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetChooseFull(int flag)</autodoc>

+        <docstring>Under Windows, tells the Windows colour dialog to display the full dialog
+with custom colour selection controls. Under other platforms, has no effect.
+The default value is true.</docstring>

         <paramlist>
           <param name="flag" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetColour(Colour colour)</autodoc>

+        <docstring>Sets the default colour for the colour dialog.  The default colour is black.</docstring>

         <paramlist>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetCustomColour" type="void" overloaded="no">
+      <method name="SetCustomColour" type="" overloaded="no">

         <autodoc>SetCustomColour(int i, Colour colour)</autodoc>
         <autodoc>SetCustomColour(int i, Colour colour)</autodoc>

+        <docstring>Sets the i'th custom colour for the colour dialog. i should be an integer
+between 0 and 15. The default custom colours are all white.</docstring>

         <paramlist>
           <param name="i" type="int" default=""/>
         <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">
         </paramlist>
       </method>
     </class>
     <class name="ColourDialog" oldname="wxColourDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>This class represents the colour chooser dialog.</docstring>
+      <baseclass name="Dialog"/>

       <constructor name="ColourDialog" overloaded="no">
         <autodoc>__init__(Window parent, ColourData data=None) -&gt; ColourDialog</autodoc>
       <constructor name="ColourDialog" overloaded="no">
         <autodoc>__init__(Window parent, ColourData data=None) -&gt; ColourDialog</autodoc>

+        <docstring>Constructor. Pass a parent window, and optionally a ColourData, which
+will be copied to the colour dialog's internal ColourData instance.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </constructor>

-      <method name="GetColourData" type="wxColourData" overloaded="no">
+      <method name="GetColourData" type="ColourData" overloaded="no">

         <autodoc>GetColourData() -&gt; ColourData</autodoc>
         <autodoc>GetColourData() -&gt; ColourData</autodoc>

-      </method>
-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
+        <docstring>Returns a reference to the ColourData used by the dialog.</docstring>

       </method>
     </class>
     <class name="DirDialog" oldname="wxDirDialog" module="windows">
       </method>
     </class>
     <class name="DirDialog" oldname="wxDirDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>This class represents the directory chooser dialog.</docstring>
+      <refdoc>
+ Styles
+    wxDD_NEW_DIR_BUTTON     Add "Create new directory" button and allow
+                            directory names to be editable. On Windows the new
+                            directory button is only available with recent
+                            versions of the common dialogs.</refdoc>
+      <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>
       <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"/>
+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>
+        <refdoc>
+ Styles
+    wxDD_NEW_DIR_BUTTON     Add "Create new directory" button and allow
+                            directory names to be editable. On Windows the new
+                            directory button is only available with recent
+                            versions of the common dialogs.</refdoc>
+        <paramlist>
+          <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="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>
         </paramlist>
       </constructor>

-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">

         <autodoc>GetPath() -&gt; String</autodoc>
         <autodoc>GetPath() -&gt; String</autodoc>

+        <docstring>Returns the default or user-selected path.</docstring>

       </method>
       </method>

-      <method name="GetMessage" type="wxString" overloaded="no">
+      <method name="GetMessage" type="String" overloaded="no">

         <autodoc>GetMessage() -&gt; String</autodoc>
         <autodoc>GetMessage() -&gt; String</autodoc>

+        <docstring>Returns the message that will be displayed on the dialog.</docstring>

       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>

+        <docstring>Returns the dialog style.</docstring>

       </method>
       </method>

-      <method name="SetMessage" type="void" overloaded="no">
+      <method name="SetMessage" type="" overloaded="no">

         <autodoc>SetMessage(String message)</autodoc>
         <autodoc>SetMessage(String message)</autodoc>

+        <docstring>Sets the message that will be displayed on the dialog.</docstring>

         <paramlist>
         <paramlist>

-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPath" type="void" overloaded="no">
+      <method name="SetPath" type="" overloaded="no">

         <autodoc>SetPath(String path)</autodoc>
         <autodoc>SetPath(String path)</autodoc>

+        <docstring>Sets the default path.</docstring>

         <paramlist>
         <paramlist>

-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="FileDialog" oldname="wxFileDialog" module="windows">
     </class>
     <class name="FileDialog" oldname="wxFileDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>This class represents the file chooser dialog.</docstring>
+      <refdoc>
+In Windows, this is the common file selector dialog. In X, this is a file
+selector box with somewhat less functionality. The path and filename are
+distinct elements of a full file pathname. If path is "", the current
+directory will be used. If filename is "", no default filename will be
+supplied. The wildcard determines what files are displayed in the file
+selector, and file extension supplies a type extension for the required
+filename.
+
+Both the X and Windows versions implement a wildcard filter. Typing a filename
+containing wildcards (*, ?) in the filename text item, and clicking on Ok,
+will result in only those files matching the pattern being displayed. The
+wildcard may be a specification for multiple types of file with a description
+for each, such as:
+
+   "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
+
+ Styles
+    wx.OPEN              This is an open dialog.
+
+    wx.SAVE              This is a save dialog.
+
+    wx.HIDE_READONLY     For open dialog only: hide the checkbox allowing to
+                         open the file in read-only mode.
+
+    wx.OVERWRITE_PROMPT  For save dialog only: prompt for a confirmation if a
+                         file will be overwritten.
+
+    wx.MULTIPLE          For open dialog only: allows selecting multiple files.
+
+    wx.CHANGE_DIR        Change the current working directory to the directory
+                         where the file(s) chosen by the user are.
+</refdoc>
+      <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>
       <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>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>
+        <refdoc>
+In Windows, this is the common file selector dialog. In X, this is a file
+selector box with somewhat less functionality. The path and filename are
+distinct elements of a full file pathname. If path is "", the current
+directory will be used. If filename is "", no default filename will be
+supplied. The wildcard determines what files are displayed in the file
+selector, and file extension supplies a type extension for the required
+filename.
+
+Both the X and Windows versions implement a wildcard filter. Typing a filename
+containing wildcards (*, ?) in the filename text item, and clicking on Ok,
+will result in only those files matching the pattern being displayed. The
+wildcard may be a specification for multiple types of file with a description
+for each, such as:
+
+   "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
+
+ Styles
+    wx.OPEN              This is an open dialog.
+
+    wx.SAVE              This is a save dialog.
+
+    wx.HIDE_READONLY     For open dialog only: hide the checkbox allowing to
+                         open the file in read-only mode.
+
+    wx.OVERWRITE_PROMPT  For save dialog only: prompt for a confirmation if a
+                         file will be overwritten.
+
+    wx.MULTIPLE          For open dialog only: allows selecting multiple files.
+
+    wx.CHANGE_DIR        Change the current working directory to the directory
+                         where the file(s) chosen by the user are.
+</refdoc>

         <paramlist>
         <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="style" type="long" default="0"/>

-          <param name="pos" type="r.q(const).wxPoint" default="wxDefaultPosition"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="SetMessage" type="void" overloaded="no">
+      <method name="SetMessage" type="" overloaded="no">

         <autodoc>SetMessage(String message)</autodoc>
         <autodoc>SetMessage(String message)</autodoc>

+        <docstring>Sets the message that will be displayed on the dialog.</docstring>

         <paramlist>
         <paramlist>

-          <param name="message" type="r.q(const).wxString" default=""/>
+          <param name="message" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPath" type="void" overloaded="no">
+      <method name="SetPath" type="" overloaded="no">

         <autodoc>SetPath(String path)</autodoc>
         <autodoc>SetPath(String path)</autodoc>

+        <docstring>Sets the path (the combined directory and filename that will
+be returned when the dialog is dismissed).</docstring>

         <paramlist>
         <paramlist>

-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDirectory" type="void" overloaded="no">
+      <method name="SetDirectory" type="" overloaded="no">

         <autodoc>SetDirectory(String dir)</autodoc>
         <autodoc>SetDirectory(String dir)</autodoc>

+        <docstring>Sets the default directory.</docstring>

         <paramlist>
         <paramlist>

-          <param name="dir" type="r.q(const).wxString" default=""/>
+          <param name="dir" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFilename" type="void" overloaded="no">
+      <method name="SetFilename" type="" overloaded="no">

         <autodoc>SetFilename(String name)</autodoc>
         <autodoc>SetFilename(String name)</autodoc>

+        <docstring>Sets the default filename.</docstring>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetWildcard" type="void" overloaded="no">
+      <method name="SetWildcard" type="" overloaded="no">

         <autodoc>SetWildcard(String wildCard)</autodoc>
         <autodoc>SetWildcard(String wildCard)</autodoc>

+        <docstring>Sets the wildcard, which can contain multiple file types, for example:
+    "BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"</docstring>

         <paramlist>
         <paramlist>

-          <param name="wildCard" type="r.q(const).wxString" default=""/>
+          <param name="wildCard" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetStyle" type="void" overloaded="no">
+      <method name="SetStyle" type="" overloaded="no">

         <autodoc>SetStyle(long style)</autodoc>
         <autodoc>SetStyle(long style)</autodoc>

+        <docstring>Sets the dialog style.</docstring>

         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetFilterIndex(int filterIndex)</autodoc>

+        <docstring>Sets the default filter index, starting from zero.</docstring>

         <paramlist>
           <param name="filterIndex" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>GetMessage() -&gt; String</autodoc>

+        <docstring>Returns the message that will be displayed on the dialog.</docstring>

       </method>
       </method>

-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">

         <autodoc>GetPath() -&gt; String</autodoc>
         <autodoc>GetPath() -&gt; String</autodoc>

+        <docstring>Returns the full path (directory and filename) of the selected file.</docstring>

       </method>
       </method>

-      <method name="GetDirectory" type="wxString" overloaded="no">
+      <method name="GetDirectory" type="String" overloaded="no">

         <autodoc>GetDirectory() -&gt; String</autodoc>
         <autodoc>GetDirectory() -&gt; String</autodoc>

+        <docstring>Returns the default directory.</docstring>

       </method>
       </method>

-      <method name="GetFilename" type="wxString" overloaded="no">
+      <method name="GetFilename" type="String" overloaded="no">

         <autodoc>GetFilename() -&gt; String</autodoc>
         <autodoc>GetFilename() -&gt; String</autodoc>

+        <docstring>Returns the default filename.</docstring>

       </method>
       </method>

-      <method name="GetWildcard" type="wxString" overloaded="no">
+      <method name="GetWildcard" type="String" overloaded="no">

         <autodoc>GetWildcard() -&gt; String</autodoc>
         <autodoc>GetWildcard() -&gt; String</autodoc>

+        <docstring>Returns the file dialog wildcard.</docstring>

       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
       <method name="GetStyle" type="long" overloaded="no">
         <autodoc>GetStyle() -&gt; long</autodoc>

+        <docstring>Returns the dialog style.</docstring>

       </method>
       <method name="GetFilterIndex" type="int" overloaded="no">
         <autodoc>GetFilterIndex() -&gt; int</autodoc>
       </method>
       <method name="GetFilterIndex" type="int" overloaded="no">
         <autodoc>GetFilterIndex() -&gt; int</autodoc>

+        <docstring>Returns the index into the list of filters supplied, optionally, in
+the wildcard parameter. Before the dialog is shown, this is the index
+which will be used when the dialog is first displayed. After the dialog
+is shown, this is the index selected by the user.</docstring>

       </method>
       <method name="GetFilenames" type="PyObject" overloaded="no">
         <autodoc>GetFilenames() -&gt; PyObject</autodoc>
       </method>
       <method name="GetFilenames" type="PyObject" overloaded="no">
         <autodoc>GetFilenames() -&gt; PyObject</autodoc>

+        <docstring>Returns a list of filenames chosen in the dialog.  This function should
+only be used with the dialogs which have wx.MULTIPLE style, use
+GetFilename for the others.</docstring>

       </method>
       <method name="GetPaths" type="PyObject" overloaded="no">
         <autodoc>GetPaths() -&gt; PyObject</autodoc>
       </method>
       <method name="GetPaths" type="PyObject" overloaded="no">
         <autodoc>GetPaths() -&gt; PyObject</autodoc>

+        <docstring>Fills the array paths with the full paths of the files chosen. This
+function should only be used with the dialogs which have wx.MULTIPLE style,
+use GetPath for the others.</docstring>

       </method>
     </class>
     <class name="MultiChoiceDialog" oldname="wxMultiChoiceDialog" module="windows">
       </method>
     </class>
     <class name="MultiChoiceDialog" oldname="wxMultiChoiceDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>A simple dialog with a multi selection listbox.</docstring>
+      <baseclass name="Dialog"/>

       <constructor name="MultiChoiceDialog" overloaded="no">
       <constructor name="MultiChoiceDialog" overloaded="no">

-        <autodoc>__init__(Window parent, String message, String caption, int LCOUNT, 
-    String choices, long style=CHOICEDLG_STYLE, 
+        <autodoc>__init__(Window parent, String message, String caption,
+    List choices=[], long style=CHOICEDLG_STYLE,

     Point pos=DefaultPosition) -&gt; MultiChoiceDialog</autodoc>
     Point pos=DefaultPosition) -&gt; MultiChoiceDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
         <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="LCOUNT" type="int" default=""/>
-          <param name="choices" type="p.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="0"/>
+          <param name="choices_array" type="String" default=""/>

           <param name="style" type="long" default="wxCHOICEDLG_STYLE"/>
           <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>
         </paramlist>
       </constructor>

-      <method name="SetSelections" type="void" overloaded="no">
-        <autodoc>SetSelections(wxArrayInt selections)</autodoc>
+      <method name="SetSelections" type="" overloaded="no">
+        <autodoc>SetSelections(List selections)</autodoc>
+        <docstring>Specify the items in the list that shoudl be selected, using a list of integers.</docstring>

         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetSelections" type="PyObject" overloaded="no">

-        <autodoc>GetSelections() -&gt; PyObject</autodoc>
+        <autodoc>GetSelections() -&gt; [selections]</autodoc>
+        <docstring>Returns a list of integers representing the items that are selected.</docstring>

       </method>
     </class>
     <class name="SingleChoiceDialog" oldname="wxSingleChoiceDialog" module="windows">
       </method>
     </class>
     <class name="SingleChoiceDialog" oldname="wxSingleChoiceDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>A simple dialog with a single selection listbox.</docstring>
+      <baseclass name="Dialog"/>

       <constructor name="SingleChoiceDialog" overloaded="no">
       <constructor name="SingleChoiceDialog" overloaded="no">

-        <autodoc>__init__(Window parent, String message, String caption, int choices, 
-    String choices_array, long style=CHOICEDLG_STYLE, 
+        <autodoc>__init__(Window parent, String message, String caption,
+    List choices=[], long style=CHOICEDLG_STYLE,

     Point pos=DefaultPosition) -&gt; SingleChoiceDialog</autodoc>
     Point pos=DefaultPosition) -&gt; SingleChoiceDialog</autodoc>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
         <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" 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="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>
         </paramlist>
       </constructor>
       <method name="GetSelection" type="int" overloaded="no">
         <autodoc>GetSelection() -&gt; int</autodoc>

+        <docstring>Get the index of teh currently selected item.</docstring>

       </method>
       </method>

-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">

         <autodoc>GetStringSelection() -&gt; String</autodoc>
         <autodoc>GetStringSelection() -&gt; String</autodoc>

+        <docstring>Returns the string value of the currently selected item</docstring>

       </method>
       </method>

-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">

         <autodoc>SetSelection(int sel)</autodoc>
         <autodoc>SetSelection(int sel)</autodoc>

+        <docstring>Set the current selected item to sel</docstring>

         <paramlist>
           <param name="sel" type="int" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="sel" type="int" default=""/>
         </paramlist>
       </method>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="TextEntryDialog" oldname="wxTextEntryDialog" module="windows">
     </class>
     <class name="TextEntryDialog" oldname="wxTextEntryDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>A dialog with text control, [ok] and [cancel] buttons</docstring>
+      <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>
       <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>

+        <docstring>Constructor.  Use ShowModal method to show the dialog.</docstring>

         <paramlist>
         <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="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>
         </paramlist>
       </constructor>

-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">

         <autodoc>GetValue() -&gt; String</autodoc>
         <autodoc>GetValue() -&gt; String</autodoc>

+        <docstring>Returns the text that the user has entered if the user has pressed OK,
+or the original value if the user has pressed Cancel.</docstring>

       </method>
       </method>

-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">

         <autodoc>SetValue(String value)</autodoc>
         <autodoc>SetValue(String value)</autodoc>

+        <docstring>Sets the default text value.</docstring>

         <paramlist>
         <paramlist>

-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="FontData" oldname="wxFontData" module="windows">
     </class>
     <class name="FontData" oldname="wxFontData" module="windows">

-      <baseclass name="wxObject"/>
+      <docstring>This class holds a variety of information related to font dialogs.</docstring>
+      <baseclass name="Object"/>

       <constructor name="FontData" overloaded="no">
         <autodoc>__init__() -&gt; FontData</autodoc>
       <constructor name="FontData" overloaded="no">
         <autodoc>__init__() -&gt; FontData</autodoc>

+        <docstring>This class holds a variety of information related to font dialogs.</docstring>

       </constructor>
       <destructor name="~wxFontData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       </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>
         <autodoc>EnableEffects(bool enable)</autodoc>

+        <docstring>Enables or disables 'effects' under MS Windows only. This refers
+to the controls for manipulating colour, strikeout and underline
+properties.  The default value is true.</docstring>

         <paramlist>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAllowSymbols" type="bool" overloaded="no">
         <autodoc>GetAllowSymbols() -&gt; bool</autodoc>
         <paramlist>
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="GetAllowSymbols" type="bool" overloaded="no">
         <autodoc>GetAllowSymbols() -&gt; bool</autodoc>

+        <docstring>Under MS Windows, returns a flag determining whether symbol fonts can be
+selected. Has no effect on other platforms. The default value is true.</docstring>

       </method>
       </method>

-      <method name="GetColour" type="wxColour" overloaded="no">
+      <method name="GetColour" type="Colour" overloaded="no">

         <autodoc>GetColour() -&gt; Colour</autodoc>
         <autodoc>GetColour() -&gt; Colour</autodoc>

+        <docstring>Gets the colour associated with the font dialog. The default value is black.</docstring>

       </method>
       </method>

-      <method name="GetChosenFont" type="wxFont" overloaded="no">
+      <method name="GetChosenFont" type="Font" overloaded="no">

         <autodoc>GetChosenFont() -&gt; Font</autodoc>
         <autodoc>GetChosenFont() -&gt; Font</autodoc>

+        <docstring>Gets the font chosen by the user.</docstring>

       </method>
       <method name="GetEnableEffects" type="bool" overloaded="no">
         <autodoc>GetEnableEffects() -&gt; bool</autodoc>
       </method>
       <method name="GetEnableEffects" type="bool" overloaded="no">
         <autodoc>GetEnableEffects() -&gt; bool</autodoc>

+        <docstring>Determines whether 'effects' are enabled under Windows.</docstring>

       </method>
       </method>

-      <method name="GetInitialFont" type="wxFont" overloaded="no">
+      <method name="GetInitialFont" type="Font" overloaded="no">

         <autodoc>GetInitialFont() -&gt; Font</autodoc>
         <autodoc>GetInitialFont() -&gt; Font</autodoc>

+        <docstring>Gets the font that will be initially used by the font dialog. This should have
+previously been set by the application.</docstring>

       </method>
       <method name="GetShowHelp" type="bool" overloaded="no">
         <autodoc>GetShowHelp() -&gt; bool</autodoc>
       </method>
       <method name="GetShowHelp" type="bool" overloaded="no">
         <autodoc>GetShowHelp() -&gt; bool</autodoc>

+        <docstring>Returns true if the Help button will be shown (Windows only).  The default
+value is false.</docstring>

       </method>
       </method>

-      <method name="SetAllowSymbols" type="void" overloaded="no">
+      <method name="SetAllowSymbols" type="" overloaded="no">

         <autodoc>SetAllowSymbols(bool allowSymbols)</autodoc>
         <autodoc>SetAllowSymbols(bool allowSymbols)</autodoc>

+        <docstring>Under MS Windows, determines whether symbol fonts can be selected. Has no
+effect on other platforms.  The default value is true.</docstring>

         <paramlist>
           <param name="allowSymbols" type="bool" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetChosenFont(Font font)</autodoc>

+        <docstring>Sets the font that will be returned to the user (for internal use only).</docstring>

         <paramlist>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">

         <autodoc>SetColour(Colour colour)</autodoc>
         <autodoc>SetColour(Colour colour)</autodoc>

+        <docstring>Sets the colour that will be used for the font foreground colour.  The default
+colour is black.</docstring>

         <paramlist>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetInitialFont" type="void" overloaded="no">
+      <method name="SetInitialFont" type="" overloaded="no">

         <autodoc>SetInitialFont(Font font)</autodoc>
         <autodoc>SetInitialFont(Font font)</autodoc>

+        <docstring>Sets the font that will be initially used by the font dialog.</docstring>

         <paramlist>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetRange" type="void" overloaded="no">
+      <method name="SetRange" type="" overloaded="no">

         <autodoc>SetRange(int min, int max)</autodoc>
         <autodoc>SetRange(int min, int max)</autodoc>

+        <docstring>Sets the valid range for the font point size (Windows only).  The default is
+0, 0 (unrestricted range).</docstring>

         <paramlist>
           <param name="min" type="int" default=""/>
           <param name="max" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetShowHelp(bool showHelp)</autodoc>

+        <docstring>Determines whether the Help button will be displayed in the font dialog
+(Windows only).  The default value is false.</docstring>

         <paramlist>
           <param name="showHelp" type="bool" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FontDialog" oldname="wxFontDialog" module="windows">
         <paramlist>
           <param name="showHelp" type="bool" default=""/>
         </paramlist>
       </method>
     </class>
     <class name="FontDialog" oldname="wxFontDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>This class represents the font chooser dialog.</docstring>
+      <baseclass name="Dialog"/>

       <constructor name="FontDialog" overloaded="no">
         <autodoc>__init__(Window parent, FontData data) -&gt; FontDialog</autodoc>
       <constructor name="FontDialog" overloaded="no">
         <autodoc>__init__(Window parent, FontData data) -&gt; FontDialog</autodoc>

+        <docstring>Constructor. Pass a parent window and the FontData object to be
+used to initialize the dialog controls.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </constructor>

-      <method name="GetFontData" type="wxFontData" overloaded="no">
+      <method name="GetFontData" type="FontData" overloaded="no">

         <autodoc>GetFontData() -&gt; FontData</autodoc>
         <autodoc>GetFontData() -&gt; FontData</autodoc>

-      </method>
-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
+        <docstring>Returns a reference to the internal FontData used by the FontDialog.</docstring>

       </method>
     </class>
     <class name="MessageDialog" oldname="wxMessageDialog" module="windows">
       </method>
     </class>
     <class name="MessageDialog" oldname="wxMessageDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>This class provides a dialog that shows a single or multi-line message, with
+a choice of OK, Yes, No and Cancel buttons.</docstring>
+      <refdoc>
+  Styles
+    wx.OK:                Show an OK button.
+
+    wx.CANCEL:            Show a Cancel button.
+
+    wx.YES_NO:            Show Yes and No buttons.
+
+    wx.YES_DEFAULT:       Used with wxYES_NO, makes Yes button the default - which is the default behaviour.
+
+    wx.NO_DEFAULT:        Used with wxYES_NO, makes No button the default.
+
+    wx.ICON_EXCLAMATION:  Shows an exclamation mark icon.
+
+    wx.ICON_HAND:         Shows an error icon.
+
+    wx.ICON_ERROR:        Shows an error icon - the same as wxICON_HAND.
+
+    wx.ICON_QUESTION:     Shows a question mark icon.
+
+    wx.ICON_INFORMATION:  Shows an information (i) icon.
+
+    wx.STAY_ON_TOP:       The message box stays on top of all other window, even those of the other applications (Windows only).
+</refdoc>
+      <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>
       <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>

+        <docstring>This class provides a dialog that shows a single or multi-line message, with
+a choice of OK, Yes, No and Cancel buttons.</docstring>
+        <refdoc>
+  Styles
+    wx.OK:                Show an OK button.
+
+    wx.CANCEL:            Show a Cancel button.
+
+    wx.YES_NO:            Show Yes and No buttons.
+
+    wx.YES_DEFAULT:       Used with wxYES_NO, makes Yes button the default - which is the default behaviour.
+
+    wx.NO_DEFAULT:        Used with wxYES_NO, makes No button the default.
+
+    wx.ICON_EXCLAMATION:  Shows an exclamation mark icon.
+
+    wx.ICON_HAND:         Shows an error icon.
+
+    wx.ICON_ERROR:        Shows an error icon - the same as wxICON_HAND.
+
+    wx.ICON_QUESTION:     Shows a question mark icon.
+
+    wx.ICON_INFORMATION:  Shows an information (i) icon.
+
+    wx.STAY_ON_TOP:       The message box stays on top of all other window, even those of the other applications (Windows only).
+</refdoc>

         <paramlist>
         <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="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>
         </paramlist>
       </constructor>

-      <method name="ShowModal" type="int" overloaded="no">
-        <autodoc>ShowModal() -&gt; int</autodoc>
-      </method>

     </class>
     <class name="ProgressDialog" oldname="wxProgressDialog" module="windows">
     </class>
     <class name="ProgressDialog" oldname="wxProgressDialog" module="windows">

-      <baseclass name="wxFrame"/>
+      <docstring>A dialog that shows a short message and a progress bar. Optionally, it can
+display an ABORT button.</docstring>
+      <refdoc>
+  Styles
+
+    wx.PD_APP_MODAL:            Make the progress dialog modal. If this flag is
+                                not given, it is only "locally" modal - that is
+                                the input to the parent window is disabled,
+                                but not to the other ones.
+
+    wx.PD_AUTO_HIDE:            Causes the progress dialog to disappear from screen 
+                                as soon as the maximum value of the progress
+                                meter has been reached.
+
+    wx.PD_CAN_ABORT:            This flag tells the dialog that it should have
+                                a "Cancel" button which the user may press. If
+                                this happens, the next call to Update() will
+                                return false.
+
+    wx.PD_ELAPSED_TIME:         This flag tells the dialog that it should show
+                                elapsed time (since creating the dialog).
+
+    wx.PD_ESTIMATED_TIME:  This flag tells the dialog that it should show
+                                estimated time.
+
+    wx.PD_REMAINING_TIME:  This flag tells the dialog that it should show
+                                remaining time.
+</refdoc>
+      <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>
       <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>

+        <docstring>Constructor. Creates the dialog, displays it and disables user input for other
+windows, or, if wxPD_APP_MODAL flag is not given, for its parent window only.</docstring>
+        <refdoc>
+  Styles
+
+    wx.PD_APP_MODAL:            Make the progress dialog modal. If this flag is
+                                not given, it is only "locally" modal - that is
+                                the input to the parent window is disabled,
+                                but not to the other ones.
+
+    wx.PD_AUTO_HIDE:            Causes the progress dialog to disappear from screen 
+                                as soon as the maximum value of the progress
+                                meter has been reached.
+
+    wx.PD_CAN_ABORT:            This flag tells the dialog that it should have
+                                a "Cancel" button which the user may press. If
+                                this happens, the next call to Update() will
+                                return false.
+
+    wx.PD_ELAPSED_TIME:         This flag tells the dialog that it should show
+                                elapsed time (since creating the dialog).
+
+    wx.PD_ESTIMATED_TIME:  This flag tells the dialog that it should show
+                                estimated time.
+
+    wx.PD_REMAINING_TIME:  This flag tells the dialog that it should show
+                                remaining time.
+</refdoc>

         <paramlist>
         <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="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>
       <method name="Update" type="bool" overloaded="no">
         <autodoc>Update(int value, String newmsg=EmptyString) -&gt; bool</autodoc>
           <param name="style" type="int" default="wxPD_AUTO_HIDE|wxPD_APP_MODAL"/>
         </paramlist>
       </constructor>
       <method name="Update" type="bool" overloaded="no">
         <autodoc>Update(int value, String newmsg=EmptyString) -&gt; bool</autodoc>

+        <docstring>Updates the dialog, setting the progress bar to the new value and, if given
+changes the message above it. Returns true unless the Cancel button has been
+pressed.
+
+If false is returned, the application can either immediately destroy the
+dialog or ask the user for the confirmation and if the abort is not confirmed
+the dialog may be resumed with Resume function.</docstring>

         <paramlist>
           <param name="value" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="Resume" type="void" overloaded="no">
+      <method name="Resume" type="" overloaded="no">

         <autodoc>Resume()</autodoc>
         <autodoc>Resume()</autodoc>

+        <docstring>Can be used to continue with the dialog, after the user had chosen to abort.</docstring>

       </method>
     </class>
     <pythoncode>
       </method>
     </class>
     <pythoncode>


@@ -11576,9 +13248,11 @@ EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 </pythoncode>
     <class name="FindDialogEvent" oldname="wxFindDialogEvent" module="windows">
 EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
 </pythoncode>
     <class name="FindDialogEvent" oldname="wxFindDialogEvent" module="windows">

-      <baseclass name="wxCommandEvent"/>
+      <docstring>Events for the FindReplaceDialog</docstring>
+      <baseclass name="CommandEvent"/>

       <constructor name="FindDialogEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; FindDialogEvent</autodoc>
       <constructor name="FindDialogEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; FindDialogEvent</autodoc>

+        <docstring>Events for the FindReplaceDialog</docstring>

         <paramlist>
           <param name="commandType" type="wxEventType" default="wxEVT_NULL"/>
           <param name="id" type="int" default="0"/>
         <paramlist>
           <param name="commandType" type="wxEventType" default="wxEVT_NULL"/>
           <param name="id" type="int" default="0"/>


@@ -11586,39 +13260,63 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </constructor>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </constructor>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>

+        <docstring>Get the currently selected flags: this is the combination of
+wx.FR_DOWN, wx.FR_WHOLEWORD and wx.FR_MATCHCASE flags.</docstring>

       </method>
       </method>

-      <method name="GetFindString" type="q(const).wxString" overloaded="no">
+      <method name="GetFindString" type="String" overloaded="no">

         <autodoc>GetFindString() -&gt; String</autodoc>
         <autodoc>GetFindString() -&gt; String</autodoc>

+        <docstring>Return the string to find (never empty).</docstring>

       </method>
       </method>

-      <method name="GetReplaceString" type="q(const).wxString" overloaded="no">
+      <method name="GetReplaceString" type="String" overloaded="no">

         <autodoc>GetReplaceString() -&gt; String</autodoc>
         <autodoc>GetReplaceString() -&gt; String</autodoc>

+        <docstring>Return the string to replace the search string with (only
+for replace and replace all events).</docstring>

       </method>
       <method name="GetDialog" type="wxFindReplaceDialog" overloaded="no">
         <autodoc>GetDialog() -&gt; FindReplaceDialog</autodoc>
       </method>
       <method name="GetDialog" type="wxFindReplaceDialog" overloaded="no">
         <autodoc>GetDialog() -&gt; FindReplaceDialog</autodoc>

+        <docstring>Return the pointer to the dialog which generated this event.</docstring>

       </method>
       </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>
         <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>
         <autodoc>SetFindString(String str)</autodoc>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetReplaceString" type="void" overloaded="no">
+      <method name="SetReplaceString" type="" overloaded="no">

         <autodoc>SetReplaceString(String str)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
     </class>
     <class name="FindReplaceData" oldname="wxFindReplaceData" module="windows">

-      <baseclass name="wxObject"/>
+      <docstring>FindReplaceData holds the data for FindReplaceDialog. It is used to initialize
+the dialog with the default values and will keep the last values from the
+dialog when it is closed. It is also updated each time a wxFindDialogEvent is
+generated so instead of using the wxFindDialogEvent methods you can also
+directly query this object.
+
+Note that all SetXXX() methods may only be called before showing the dialog
+and calling them has no effect later.
+
+ Flags
+    wxFR_DOWN:          downward search/replace selected (otherwise, upwards)
+
+    wxFR_WHOLEWORD:     whole word search/replace selected
+
+    wxFR_MATCHCASE:     case sensitive search/replace selected (otherwise,
+                        case insensitive)
+</docstring>
+      <baseclass name="Object"/>

       <constructor name="FindReplaceData" overloaded="no">
         <autodoc>__init__(int flags=0) -&gt; FindReplaceData</autodoc>
       <constructor name="FindReplaceData" overloaded="no">
         <autodoc>__init__(int flags=0) -&gt; FindReplaceData</autodoc>

+        <docstring>Constuctor initializes the flags to default value (0).</docstring>

         <paramlist>
           <param name="flags" type="int" default="0"/>
         </paramlist>
         <paramlist>
           <param name="flags" type="int" default="0"/>
         </paramlist>


@@ -11626,66 +13324,115 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <destructor name="~wxFindReplaceData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <autodoc>GetFindString() -&gt; String</autodoc>

+        <docstring>Get the string to find.</docstring>

       </method>
       </method>

-      <method name="GetReplaceString" type="q(const).wxString" overloaded="no">
+      <method name="GetReplaceString" type="String" overloaded="no">

         <autodoc>GetReplaceString() -&gt; String</autodoc>
         <autodoc>GetReplaceString() -&gt; String</autodoc>

+        <docstring>Get the replacement string.</docstring>

       </method>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>
       </method>
       <method name="GetFlags" type="int" overloaded="no">
         <autodoc>GetFlags() -&gt; int</autodoc>

+        <docstring>Get the combination of flag values.</docstring>

       </method>
       </method>

-      <method name="SetFlags" type="void" overloaded="no">
+      <method name="SetFlags" type="" overloaded="no">

         <autodoc>SetFlags(int flags)</autodoc>
         <autodoc>SetFlags(int flags)</autodoc>

+        <docstring>Set the flags to use to initialize the controls of the dialog.</docstring>

         <paramlist>
           <param name="flags" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetFindString(String str)</autodoc>

+        <docstring>Set the string to find (used as initial value by the dialog).</docstring>

         <paramlist>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetReplaceString" type="void" overloaded="no">
+      <method name="SetReplaceString" type="" overloaded="no">

         <autodoc>SetReplaceString(String str)</autodoc>
         <autodoc>SetReplaceString(String str)</autodoc>

+        <docstring>Set the replacement string (used as initial value by the dialog).</docstring>

         <paramlist>
         <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">
         </paramlist>
       </method>
     </class>
     <class name="FindReplaceDialog" oldname="wxFindReplaceDialog" module="windows">

-      <baseclass name="wxDialog"/>
+      <docstring>FindReplaceDialog is a standard modeless dialog which is used to allow the
+user to search for some text (and possibly replace it with something
+else). The actual searching is supposed to be done in the owner window which
+is the parent of this dialog. Note that it means that unlike for the other
+standard dialogs this one must have a parent window. Also note that there is
+no way to use this dialog in a modal way; it is always, by design and
+implementation, modeless.</docstring>
+      <refdoc>
+ Styles
+    wx.FR_REPLACEDIALOG:        replace dialog (otherwise find dialog)
+
+    wx.FR_NOUPDOWN:             don't allow changing the search direction
+
+    wx.FR_NOMATCHCASE:          don't allow case sensitive searching
+
+    wx.FR_NOWHOLEWORD:          don't allow whole word searching
+</refdoc>
+      <baseclass name="Dialog"/>

       <constructor name="FindReplaceDialog" overloaded="no">
         <autodoc>__init__(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; FindReplaceDialog</autodoc>
       <constructor name="FindReplaceDialog" overloaded="no">
         <autodoc>__init__(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; FindReplaceDialog</autodoc>

+        <docstring>Create a FindReplaceDialog.  The parent and data parameters must be
+non-None.  Use Show to display the dialog.</docstring>
+        <refdoc>
+ Styles
+    wx.FR_REPLACEDIALOG:        replace dialog (otherwise find dialog)
+
+    wx.FR_NOUPDOWN:             don't allow changing the search direction
+
+    wx.FR_NOMATCHCASE:          don't allow case sensitive searching
+
+    wx.FR_NOWHOLEWORD:          don't allow whole word searching
+</refdoc>

         <paramlist>
         <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>
       <constructor name="PreFindReplaceDialog" overloaded="no">
         <autodoc>PreFindReplaceDialog() -&gt; FindReplaceDialog</autodoc>
           <param name="style" type="int" default="0"/>
         </paramlist>
       </constructor>
       <constructor name="PreFindReplaceDialog" overloaded="no">
         <autodoc>PreFindReplaceDialog() -&gt; FindReplaceDialog</autodoc>

+        <docstring>Precreate a FindReplaceDialog for 2-phase creation</docstring>
+        <refdoc>
+ Styles
+    wx.FR_REPLACEDIALOG:        replace dialog (otherwise find dialog)
+
+    wx.FR_NOUPDOWN:             don't allow changing the search direction
+
+    wx.FR_NOMATCHCASE:          don't allow case sensitive searching
+
+    wx.FR_NOWHOLEWORD:          don't allow whole word searching
+</refdoc>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, FindReplaceData data, String title, 
     int style=0) -&gt; bool</autodoc>

+        <docstring>Create the dialog, for 2-phase create.</docstring>

         <paramlist>
         <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>
           <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>
         <autodoc>GetData() -&gt; FindReplaceData</autodoc>

+        <docstring>Get the FindReplaceData object used by this dialog.</docstring>

       </method>
       </method>

-      <method name="SetData" type="void" overloaded="no">
+      <method name="SetData" type="" overloaded="no">

         <autodoc>SetData(FindReplaceData data)</autodoc>
         <autodoc>SetData(FindReplaceData data)</autodoc>

+        <docstring>Set the FindReplaceData object used by this dialog.</docstring>

         <paramlist>
         <paramlist>

-          <param name="data" type="p.wxFindReplaceData" default=""/>
+          <param name="data" type="FindReplaceData" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -11693,19 +13440,19 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="MDIParentFrame" oldname="wxMDIParentFrame" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreMDIParentFrame" overloaded="no">


@@ -11716,25 +13463,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>
     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="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>
         </paramlist>
       </method>

-      <method name="ActivateNext" type="void" overloaded="no">
+      <method name="ActivateNext" type="" overloaded="no">

         <autodoc>ActivateNext()</autodoc>
       </method>
         <autodoc>ActivateNext()</autodoc>
       </method>

-      <method name="ActivatePrevious" type="void" overloaded="no">
+      <method name="ActivatePrevious" type="" overloaded="no">

         <autodoc>ActivatePrevious()</autodoc>
       </method>
         <autodoc>ActivatePrevious()</autodoc>
       </method>

-      <method name="ArrangeIcons" type="void" overloaded="no">
+      <method name="ArrangeIcons" type="" overloaded="no">

         <autodoc>ArrangeIcons()</autodoc>
       </method>
         <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">
         <autodoc>Cascade()</autodoc>
       </method>
       <method name="GetActiveChild" type="wxMDIChildFrame" overloaded="no">


@@ -11743,27 +13490,27 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetClientWindow" type="wxMDIClientWindow" overloaded="no">
         <autodoc>GetClientWindow() -&gt; MDIClientWindow</autodoc>
       </method>
       <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>
         <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">
         <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>
       <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="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">
         </paramlist>
       </constructor>
       <constructor name="PreMDIChildFrame" overloaded="no">


@@ -11774,34 +13521,34 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
     Size size=DefaultSize, long style=DEFAULT_FRAME_STYLE, 
     String name=FrameNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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>
         </paramlist>
       </method>

-      <method name="Activate" type="void" overloaded="no">
+      <method name="Activate" type="" overloaded="no">

         <autodoc>Activate()</autodoc>
       </method>
         <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>
         <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">
         <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>
       <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>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>


@@ -11811,7 +13558,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>
       <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>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </method>


@@ -11820,27 +13567,27 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PyWindow" oldname="wxPyWindow" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -11849,7 +13596,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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 +13606,48 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         <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">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">


@@ -11918,44 +13665,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_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>
         <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>
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">

         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
         <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">
         </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>
       <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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -11964,7 +13711,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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 +13721,48 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         <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">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">


@@ -12033,19 +13780,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_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>
         <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>
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">

         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -12053,7 +13800,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="PrintData" oldname="wxPrintData" module="windows">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="PrintData" overloaded="no">
         <autodoc>__init__() -&gt; PrintData</autodoc>
       </constructor>


@@ -12072,7 +13819,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <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">
         <autodoc>GetPrinterName() -&gt; String</autodoc>
       </method>
       <method name="GetColour" type="bool" overloaded="no">


@@ -12084,79 +13831,79 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetPaperId" type="wxPaperSize" overloaded="no">
         <autodoc>GetPaperId() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetPrinterName(String name)</autodoc>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <autodoc>SetPaperSize(Size sz)</autodoc>
         <paramlist>

-          <param name="sz" type="r.q(const).wxSize" default=""/>
+          <param name="sz" type="Size" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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">
         <autodoc>GetFontMetricPath() -&gt; String</autodoc>
       </method>
       <method name="GetPrinterScaleX" type="double" overloaded="no">


@@ -12174,114 +13921,123 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetPrintMode" type="wxPrintMode" overloaded="no">
         <autodoc>GetPrintMode() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>SetPrinterCommand(String command)</autodoc>
         <paramlist>

-          <param name="command" type="r.q(const).wxString" default=""/>
+          <param name="command" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPrinterOptions" type="void" overloaded="no">
+      <method name="SetPrinterOptions" type="" overloaded="no">

         <autodoc>SetPrinterOptions(String options)</autodoc>
         <paramlist>
         <autodoc>SetPrinterOptions(String options)</autodoc>
         <paramlist>

-          <param name="options" type="r.q(const).wxString" default=""/>
+          <param name="options" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPreviewCommand" type="void" overloaded="no">
+      <method name="SetPreviewCommand" type="" overloaded="no">

         <autodoc>SetPreviewCommand(String command)</autodoc>
         <paramlist>
         <autodoc>SetPreviewCommand(String command)</autodoc>
         <paramlist>

-          <param name="command" type="r.q(const).wxString" default=""/>
+          <param name="command" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFilename" type="void" overloaded="no">
+      <method name="SetFilename" type="" overloaded="no">

         <autodoc>SetFilename(String filename)</autodoc>
         <paramlist>
         <autodoc>SetFilename(String filename)</autodoc>
         <paramlist>

-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFontMetricPath" type="void" overloaded="no">
+      <method name="SetFontMetricPath" type="" overloaded="no">

         <autodoc>SetFontMetricPath(String path)</autodoc>
         <paramlist>
         <autodoc>SetFontMetricPath(String path)</autodoc>
         <paramlist>

-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         </paramlist>
       </method>
         <autodoc>SetPrintMode(int printMode)</autodoc>
         <paramlist>
           <param name="printMode" type="wxPrintMode" default=""/>
         </paramlist>
       </method>

+      <method name="GetOutputStream" type="OutputStream" overloaded="no">
+        <autodoc>GetOutputStream() -&gt; OutputStream</autodoc>
+      </method>
+      <method name="SetOutputStream" type="" overloaded="no">
+        <autodoc>SetOutputStream(OutputStream outputstream)</autodoc>
+        <paramlist>
+          <param name="outputstream" type="OutputStream" default=""/>
+        </paramlist>
+      </method>

     </class>
     <class name="PageSetupDialogData" oldname="wxPageSetupDialogData" module="windows">
     </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>
       <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>EnablePrinter(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>


@@ -12308,95 +14064,95 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetDefaultInfo" type="bool" overloaded="no">
         <autodoc>GetDefaultInfo() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetMarginTopLeft(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetMarginBottomRight" type="void" overloaded="no">
+      <method name="SetMarginBottomRight" type="" overloaded="no">

         <autodoc>SetMarginBottomRight(Point pt)</autodoc>
         <paramlist>
         <autodoc>SetMarginBottomRight(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetMinMarginTopLeft" type="void" overloaded="no">
+      <method name="SetMinMarginTopLeft" type="" overloaded="no">

         <autodoc>SetMinMarginTopLeft(Point pt)</autodoc>
         <paramlist>
         <autodoc>SetMinMarginTopLeft(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetMinMarginBottomRight" type="void" overloaded="no">
+      <method name="SetMinMarginBottomRight" type="" overloaded="no">

         <autodoc>SetMinMarginBottomRight(Point pt)</autodoc>
         <paramlist>
         <autodoc>SetMinMarginBottomRight(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetPaperSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetPrintData" type="void" overloaded="no">
+      <method name="SetPrintData" type="" overloaded="no">

         <autodoc>SetPrintData(PrintData printData)</autodoc>
         <paramlist>
         <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">
         </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>
       <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>
         </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">
         <autodoc>GetPageSetupData() -&gt; PageSetupDialogData</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">


@@ -12404,7 +14160,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="PrintDialogData" oldname="wxPrintDialogData" module="windows">
       </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>
       <constructor name="PrintDialogData" overloaded="no">
         <autodoc>__init__() -&gt; PrintDialogData</autodoc>
       </constructor>


@@ -12441,85 +14197,85 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetSetupDialog" type="bool" overloaded="no">
         <autodoc>GetSetupDialog() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>EnableHelp(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>


@@ -12540,29 +14296,29 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetPrintDialogData" type="wxPrintDialogData" overloaded="no">
+      <method name="GetPrintDialogData" type="PrintDialogData" overloaded="no">

         <autodoc>GetPrintDialogData() -&gt; PrintDialogData</autodoc>
       </method>
         <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">
         <autodoc>GetPrintDC() -&gt; DC</autodoc>
       </method>
       <method name="ShowModal" type="int" overloaded="no">


@@ -12570,148 +14326,148 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="Printer" oldname="wxPrinter" module="windows">
       </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>
       <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>
         </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>
         <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>
         </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>
         <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>
           <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>
         <autodoc>PrintDialog(Window parent) -&gt; DC</autodoc>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </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">
         <autodoc>GetAbort() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetLastError" type="wxPrinterError" overloaded="no">
         </paramlist>
       </method>
       <method name="GetAbort" type="bool" overloaded="no">
         <autodoc>GetAbort() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetLastError" type="wxPrinterError" overloaded="no">

-        <autodoc>Printer.GetLastError() -&gt; int</autodoc>
+        <autodoc>GetLastError() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <class name="Printout" oldname="wxPyPrintout" module="windows">
       </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetTitle" type="wxString" overloaded="no">
+      <method name="GetTitle" type="String" overloaded="no">

         <autodoc>GetTitle() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetDC(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="p.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </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>
         <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>
         <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>
         </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=""/>
         <autodoc>SetIsPreview(bool p)</autodoc>
         <paramlist>
           <param name="p" type="bool" default=""/>


@@ -12724,16 +14480,16 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="endPage" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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">
         <autodoc>base_OnPreparePrinting()</autodoc>
       </method>
       <method name="base_HasPage" type="bool" overloaded="no">


@@ -12742,55 +14498,55 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="page" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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">
         </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>
       <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="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">
         </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>
       <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="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>
         </paramlist>
       </constructor>

-      <method name="Initialize" type="void" overloaded="no">
+      <method name="Initialize" type="" overloaded="no">

         <autodoc>Initialize()</autodoc>
       </method>
         <autodoc>Initialize()</autodoc>
       </method>

-      <method name="CreateControlBar" type="void" overloaded="no">
+      <method name="CreateControlBar" type="" overloaded="no">

         <autodoc>CreateControlBar()</autodoc>
       </method>
         <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">
         <autodoc>CreateCanvas()</autodoc>
       </method>
       <method name="GetControlBar" type="wxPreviewControlBar" overloaded="no">


@@ -12798,25 +14554,25 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       </method>
     </class>
     <class name="PreviewControlBar" oldname="wxPreviewControlBar" module="windows">
       </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>
       <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="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="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>
         </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=""/>
         <autodoc>SetZoomControl(int zoom)</autodoc>
         <paramlist>
           <param name="zoom" type="int" default=""/>


@@ -12825,30 +14581,30 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetPrintPreview" type="wxPrintPreview" overloaded="no">
         <autodoc>GetPrintPreview() -&gt; PrintPreview</autodoc>
       </method>
       <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>
         <autodoc>OnNext()</autodoc>
       </method>

-      <method name="OnPrevious" type="void" overloaded="no">
+      <method name="OnPrevious" type="" overloaded="no">

         <autodoc>OnPrevious()</autodoc>
       </method>
         <autodoc>OnPrevious()</autodoc>
       </method>

-      <method name="OnFirst" type="void" overloaded="no">
+      <method name="OnFirst" type="" overloaded="no">

         <autodoc>OnFirst()</autodoc>
       </method>
         <autodoc>OnFirst()</autodoc>
       </method>

-      <method name="OnLast" type="void" overloaded="no">
+      <method name="OnLast" type="" overloaded="no">

         <autodoc>OnLast()</autodoc>
       </method>
         <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">
         <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>
       <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">
         </paramlist>
       </constructor>
       <method name="SetCurrentPage" type="bool" overloaded="no">


@@ -12860,48 +14616,48 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="GetCurrentPage" type="int" overloaded="no">
         <autodoc>GetCurrentPage() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>SetPrintout(Printout printout)</autodoc>
         <paramlist>

-          <param name="printout" type="p.wxPyPrintout" default=""/>
+          <param name="printout" type="Printout" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPrintout" type="wxPyPrintout" overloaded="no">
+      <method name="GetPrintout" type="Printout" overloaded="no">

         <autodoc>GetPrintout() -&gt; Printout</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetFrame(Frame frame)</autodoc>
         <paramlist>

-          <param name="frame" type="p.wxFrame" default=""/>
+          <param name="frame" type="Frame" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetCanvas" type="void" overloaded="no">
+      <method name="SetCanvas" type="" overloaded="no">

         <autodoc>SetCanvas(PreviewCanvas canvas)</autodoc>
         <paramlist>
         <autodoc>SetCanvas(PreviewCanvas canvas)</autodoc>
         <paramlist>

-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFrame" type="wxFrame" overloaded="no">
+      <method name="GetFrame" type="Frame" overloaded="no">

         <autodoc>GetFrame() -&gt; Frame</autodoc>
       </method>
         <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>
         <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>
         </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">
         </paramlist>
       </method>
       <method name="RenderPage" type="bool" overloaded="no">


@@ -12910,16 +14666,16 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="pageNum" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>AdjustScrollbars(PreviewCanvas canvas)</autodoc>
         <paramlist>

-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPrintDialogData" type="wxPrintDialogData" overloaded="no">
+      <method name="GetPrintDialogData" type="PrintDialogData" overloaded="no">

         <autodoc>GetPrintDialogData() -&gt; PrintDialogData</autodoc>
       </method>
         <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=""/>
         <autodoc>SetZoom(int percent)</autodoc>
         <paramlist>
           <param name="percent" type="int" default=""/>


@@ -12937,7 +14693,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
       <method name="Ok" type="bool" overloaded="no">
         <autodoc>Ok() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetOk(bool ok)</autodoc>
         <paramlist>
           <param name="ok" type="bool" default=""/>


@@ -12949,25 +14705,25 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="interactive" type="bool" default=""/>
         </paramlist>
       </method>
           <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">
         <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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="base_SetCurrentPage" type="bool" overloaded="no">


@@ -12979,15 +14735,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>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="base_RenderPage" type="bool" overloaded="no">


@@ -12996,7 +14752,7 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="pageNum" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_SetZoom(int percent)</autodoc>
         <paramlist>
           <param name="percent" type="int" default=""/>


@@ -13008,88 +14764,88 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
           <param name="interactive" type="bool" default=""/>
         </paramlist>
       </method>
           <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">
         <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>
       <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="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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetPreviewCanvas" type="void" overloaded="no">
+      <method name="SetPreviewCanvas" type="" overloaded="no">

         <autodoc>SetPreviewCanvas(PreviewCanvas canvas)</autodoc>
         <paramlist>
         <autodoc>SetPreviewCanvas(PreviewCanvas canvas)</autodoc>
         <paramlist>

-          <param name="canvas" type="p.wxPreviewCanvas" default=""/>
+          <param name="canvas" type="PreviewCanvas" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetControlBar" type="void" overloaded="no">
+      <method name="SetControlBar" type="" overloaded="no">

         <autodoc>SetControlBar(PreviewControlBar bar)</autodoc>
         <paramlist>
         <autodoc>SetControlBar(PreviewControlBar bar)</autodoc>
         <paramlist>

-          <param name="bar" type="p.wxPreviewControlBar" default=""/>
+          <param name="bar" type="PreviewControlBar" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_Initialize" type="void" overloaded="no">
+      <method name="base_Initialize" type="" overloaded="no">

         <autodoc>base_Initialize()</autodoc>
       </method>
         <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>
         <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">
         <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>
       <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="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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyPanelNameStr"/>
+          <param name="name" type="String" default="wxPyPanelNameStr"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetPrintPreview" type="void" overloaded="no">
+      <method name="SetPrintPreview" type="" overloaded="no">

         <autodoc>SetPrintPreview(PrintPreview preview)</autodoc>
         <paramlist>
         <autodoc>SetPrintPreview(PrintPreview preview)</autodoc>
         <paramlist>

-          <param name="preview" type="p.wxPrintPreview" default=""/>
+          <param name="preview" type="PrintPreview" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_CreateButtons" type="void" overloaded="no">
+      <method name="base_CreateButtons" type="" overloaded="no">

         <autodoc>base_CreateButtons()</autodoc>
       </method>
         <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=""/>
         <autodoc>base_SetZoomControl(int zoom)</autodoc>
         <paramlist>
           <param name="zoom" type="int" default=""/>


@@ -13119,21 +14875,21 @@ indeed almost any other window.</docstring>
  Events
      EVT_BUTTON:    Sent when the button is clicked.
 </refdoc>
  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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreButton" overloaded="no">


@@ -13146,42 +14902,46 @@ 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>
     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="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="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>
         </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>
         <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">
-        <autodoc>Button.GetDefaultSize() -&gt; Size</autodoc>
+      <staticmethod name="GetDefaultSize" type="Size" overloaded="no">
+        <autodoc>GetDefaultSize() -&gt; Size</autodoc>

       </staticmethod>
     </class>
     <class name="BitmapButton" oldname="wxBitmapButton" module="controls">
       </staticmethod>
     </class>
     <class name="BitmapButton" oldname="wxBitmapButton" module="controls">

-      <docstring>A Buttont that contains a bitmap.</docstring>
-      <baseclass name="wxButton"/>
+      <docstring>A Button that contains a bitmap.  A bitmap button can be supplied with a
+single bitmap, and wxWindows will draw all button states using this bitmap. If
+the application needs more control, additional bitmaps for the selected state,
+unpressed focused state, and greyed-out state may be supplied.
+</docstring>
+      <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, 
     Validator validator=DefaultValidator, 
     String name=ButtonNameStr) -&gt; BitmapButton</autodoc>
       <constructor name="BitmapButton" overloaded="no">
         <autodoc>__init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=BU_AUTODRAW, 
     Validator validator=DefaultValidator, 
     String name=ButtonNameStr) -&gt; BitmapButton</autodoc>

-        <docstring>Create and show a button.</docstring>
+        <docstring>Create and show a button with a bitmap for the label.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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">
         </paramlist>
       </constructor>
       <constructor name="PreBitmapButton" overloaded="no">


@@ -13195,62 +14955,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>
     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="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="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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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=""/>
         <autodoc>SetMargins(int x, int y)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -13268,136 +15028,207 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckBox" oldname="wxCheckBox" module="controls">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckBox" oldname="wxCheckBox" module="controls">

-      <baseclass name="wxControl"/>
+      <docstring>A checkbox is a labelled box which by default is either on (checkmark is
+visible) or off (no checkmark). Optionally (When the wxCHK_3STATE style flag
+is set) it can have a third state, called the mixed or undetermined
+state. Often this is used as a "Does Not Apply" state.</docstring>
+      <refdoc>
+ Styles
+    wx.CHK_2STATE:  Create a 2-state checkbox. This is the default.
+    wx.CHK_3STATE:  Create a 3-state checkbox.
+    wx.CHK_ALLOW_3RD_STATE_FOR_USER: By default a user can't set a 3-state
+                                     checkbox to the third state. It can only
+                                     be done from code. Using this flags
+                                     allows the user to set the checkbox to
+                                     the third state by clicking.
+    wx.ALIGN_RIGHT:  Makes the text appear on the left of the checkbox.
+
+ Events
+    EVT_CHECKBOX:       Sent when checkbox is clicked.
+</refdoc>
+      <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>
       <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>

+        <docstring>Creates and shows a CheckBox control</docstring>
+        <refdoc>
+ Styles
+    wx.CHK_2STATE:  Create a 2-state checkbox. This is the default.
+    wx.CHK_3STATE:  Create a 3-state checkbox.
+    wx.CHK_ALLOW_3RD_STATE_FOR_USER: By default a user can't set a 3-state
+                                     checkbox to the third state. It can only
+                                     be done from code. Using this flags
+                                     allows the user to set the checkbox to
+                                     the third state by clicking.
+    wx.ALIGN_RIGHT:  Makes the text appear on the left of the checkbox.
+
+ Events
+    EVT_CHECKBOX:       Sent when checkbox is clicked.
+</refdoc>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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">
         <autodoc>PreCheckBox() -&gt; CheckBox</autodoc>
         </paramlist>
       </constructor>
       <constructor name="PreCheckBox" overloaded="no">
         <autodoc>PreCheckBox() -&gt; CheckBox</autodoc>

+        <docstring>Precreate a CheckBox for 2-phase creation.</docstring>
+        <refdoc>
+ Styles
+    wx.CHK_2STATE:  Create a 2-state checkbox. This is the default.
+    wx.CHK_3STATE:  Create a 3-state checkbox.
+    wx.CHK_ALLOW_3RD_STATE_FOR_USER: By default a user can't set a 3-state
+                                     checkbox to the third state. It can only
+                                     be done from code. Using this flags
+                                     allows the user to set the checkbox to
+                                     the third state by clicking.
+    wx.ALIGN_RIGHT:  Makes the text appear on the left of the checkbox.
+
+ Events
+    EVT_CHECKBOX:       Sent when checkbox is clicked.
+</refdoc>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; bool</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, String label, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=0, 
     Validator validator=DefaultValidator, String name=CheckBoxNameStr) -&gt; bool</autodoc>

+        <docstring>Actually create the GUI CheckBox for 2-phase creation.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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">
         <autodoc>GetValue() -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="GetValue" type="bool" overloaded="no">
         <autodoc>GetValue() -&gt; bool</autodoc>

+        <docstring>Gets the state of a 2-state CheckBox.  Returns True if it is checked,
+False otherwise.</docstring>

       </method>
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>
       </method>
       <method name="IsChecked" type="bool" overloaded="no">
         <autodoc>IsChecked() -&gt; bool</autodoc>

+        <docstring>Similar to GetValue, but raises an exception if it is not a 2-state CheckBox.</docstring>

       </method>
       </method>

-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">

         <autodoc>SetValue(bool state)</autodoc>
         <autodoc>SetValue(bool state)</autodoc>

+        <docstring>Set the state of a 2-state CheckBox.  Pass True for checked,
+False for unchecked.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>
       <method name="Get3StateValue" type="wxCheckBoxState" overloaded="no">
         <autodoc>Get3StateValue() -&gt; int</autodoc>

+        <docstring>Returns wx.CHK_UNCHECKED when the CheckBox is unchecked, wx.CHK_CHECKED when
+it is checked and wx.CHK_UNDETERMINED when it's in the undetermined state.
+Raises an exceptiion when the function is used with a 2-state CheckBox.</docstring>

       </method>
       </method>

-      <method name="Set3StateValue" type="void" overloaded="no">
+      <method name="Set3StateValue" type="" overloaded="no">

         <autodoc>Set3StateValue(int state)</autodoc>
         <autodoc>Set3StateValue(int state)</autodoc>

+        <docstring>Sets the CheckBox to the given state.  The state parameter can be
+one of the following: wx.CHK_UNCHECKED (Check is off), wx.CHK_CHECKED
+(Check is on) or wx.CHK_UNDETERMINED (Check is mixed). Raises an
+exception  when the CheckBox is a 2-state checkbox and setting the state
+to wx.CHK_UNDETERMINED.</docstring>

         <paramlist>
           <param name="state" type="wxCheckBoxState" default=""/>
         </paramlist>
       </method>
       <method name="Is3State" type="bool" overloaded="no">
         <autodoc>Is3State() -&gt; bool</autodoc>
         <paramlist>
           <param name="state" type="wxCheckBoxState" default=""/>
         </paramlist>
       </method>
       <method name="Is3State" type="bool" overloaded="no">
         <autodoc>Is3State() -&gt; bool</autodoc>

+        <docstring>Returns whether or not the CheckBox is a 3-state CheckBox.</docstring>

       </method>
       <method name="Is3rdStateAllowedForUser" type="bool" overloaded="no">
         <autodoc>Is3rdStateAllowedForUser() -&gt; bool</autodoc>
       </method>
       <method name="Is3rdStateAllowedForUser" type="bool" overloaded="no">
         <autodoc>Is3rdStateAllowedForUser() -&gt; bool</autodoc>

+        <docstring>Returns whether or not the user can set the CheckBox to the third state.</docstring>

       </method>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Choice" oldname="wxChoice" module="controls">
       </method>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Choice" oldname="wxChoice" module="controls">

-      <baseclass name="wxControlWithItems"/>
+      <docstring>A Choice control is used to select one of a list of strings. Unlike a ListBox,
+only the selection is visible until the user pulls down the menu of choices.</docstring>
+      <refdoc>
+ Events
+    EVT_CHOICE:         Sent when an item in the list is selected.
+</refdoc>
+      <baseclass name="ControlWithItems"/>

       <constructor name="Choice" overloaded="no">
       <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, 
+        <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
+    List choices=[], long style=0, Validator validator=DefaultValidator,

     String name=ChoiceNameStr) -&gt; Choice</autodoc>
     String name=ChoiceNameStr) -&gt; Choice</autodoc>

+        <docstring>Create and show a Choice control</docstring>
+        <refdoc>
+ Events
+    EVT_CHOICE:         Sent when an item in the list is selected.
+</refdoc>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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">
         <autodoc>PreChoice() -&gt; Choice</autodoc>
         </paramlist>
       </constructor>
       <constructor name="PreChoice" overloaded="no">
         <autodoc>PreChoice() -&gt; Choice</autodoc>

+        <docstring>Precreate a Choice control for 2-phase creation.</docstring>
+        <refdoc>
+ Events
+    EVT_CHOICE:         Sent when an item in the list is selected.
+</refdoc>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
+        <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
+    List choices=[], long style=0, Validator validator=DefaultValidator,

     String name=ChoiceNameStr) -&gt; bool</autodoc>
     String name=ChoiceNameStr) -&gt; bool</autodoc>

+        <docstring>Actually create the GUI Choice control for 2-phase creation</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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>
         </paramlist>
       </method>

-      <method name="GetColumns" type="int" overloaded="no">
-        <autodoc>GetColumns() -&gt; int</autodoc>
-      </method>
-      <method name="SetColumns" type="void" overloaded="no">
-        <autodoc>SetColumns(int n=1)</autodoc>
-        <paramlist>
-          <param name="n" type="q(const).int" default="1"/>
-        </paramlist>
-      </method>
-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">

         <autodoc>SetSelection(int n)</autodoc>
         <autodoc>SetSelection(int n)</autodoc>

+        <docstring>Select the n'th item (zero based) in the list.</docstring>

         <paramlist>
         <paramlist>

-          <param name="n" type="q(const).int" default=""/>
+          <param name="n" type="int" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetStringSelection" type="void" overloaded="no">
+      <method name="SetStringSelection" type="" overloaded="no">

         <autodoc>SetStringSelection(String string)</autodoc>
         <autodoc>SetStringSelection(String string)</autodoc>

+        <docstring>Select the item with the specifed string</docstring>

         <paramlist>
         <paramlist>

-          <param name="string" type="r.q(const).wxString" default=""/>
+          <param name="string" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetString" type="void" overloaded="no">
-        <autodoc>SetString(int n, String s)</autodoc>
+      <method name="SetString" type="" overloaded="no">
+        <autodoc>SetString(int n, String string)</autodoc>
+        <docstring>Set the label for the n'th item (zero based) in the list.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>

-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="string" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -13405,111 +15236,182 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ComboBox" oldname="wxComboBox" module="controls">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ComboBox" oldname="wxComboBox" module="controls">

-      <baseclass name="wxControl"/>
-      <baseclass name="wxItemContainer"/>
+      <docstring>A combobox is like a combination of an edit control and a listbox. It can be
+displayed as static list with editable or read-only text field; or a drop-down
+list with text field.</docstring>
+      <refdoc>
+ Styles
+    wx.CB_SIMPLE:  Creates a combobox with a permanently displayed list.
+                        Windows only.
+
+    wx.CB_DROPDOWN:  Creates a combobox with a drop-down list.
+
+    wx.CB_READONLY:  Same as wxCB_DROPDOWN but only the strings specified as
+                        the combobox choices can be selected, it is impossible
+                        to select (even from a program) a string which is not in
+                        the choices list.
+
+    wx.CB_SORT:  Sorts the entries in the list alphabetically.
+
+ Events
+
+    EVT_COMBOBOX:  Sent when an item on the list is selected.
+    EVT_TEXT:          Sent when the combobox text changes.
+</refdoc>
+      <baseclass name="Control"/>
+      <baseclass name="ItemContainer"/>

       <constructor name="ComboBox" overloaded="no">
       <constructor name="ComboBox" overloaded="no">

-        <autodoc>__init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
-    Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
-    String name=ComboBoxNameStr) -&gt; ComboBox</autodoc>
+        <autodoc>__init__(Window parent, int id, String value=EmptyString,
+    Point pos=DefaultPosition, Size size=DefaultSize,
+     List choices=[], long style=0, Validator validator=DefaultValidator,
+     String name=ComboBoxNameStr) -&gt; ComboBox</autodoc>
+        <docstring>Constructor, creates and shows a ComboBox control.</docstring>
+        <refdoc>
+ Styles
+    wx.CB_SIMPLE:  Creates a combobox with a permanently displayed list.
+                        Windows only.
+
+    wx.CB_DROPDOWN:  Creates a combobox with a drop-down list.
+
+    wx.CB_READONLY:  Same as wxCB_DROPDOWN but only the strings specified as
+                        the combobox choices can be selected, it is impossible
+                        to select (even from a program) a string which is not in
+                        the choices list.
+
+    wx.CB_SORT:  Sorts the entries in the list alphabetically.
+
+ Events
+
+    EVT_COMBOBOX:  Sent when an item on the list is selected.
+    EVT_TEXT:          Sent when the combobox text changes.
+</refdoc>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <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="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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">
         <autodoc>PreComboBox() -&gt; ComboBox</autodoc>
         </paramlist>
       </constructor>
       <constructor name="PreComboBox" overloaded="no">
         <autodoc>PreComboBox() -&gt; ComboBox</autodoc>

+        <docstring>Precreate a ComboBox control for 2-phase creation.</docstring>
+        <refdoc>
+ Styles
+    wx.CB_SIMPLE:  Creates a combobox with a permanently displayed list.
+                        Windows only.
+
+    wx.CB_DROPDOWN:  Creates a combobox with a drop-down list.
+
+    wx.CB_READONLY:  Same as wxCB_DROPDOWN but only the strings specified as
+                        the combobox choices can be selected, it is impossible
+                        to select (even from a program) a string which is not in
+                        the choices list.
+
+    wx.CB_SORT:  Sorts the entries in the list alphabetically.
+
+ Events
+
+    EVT_COMBOBOX:  Sent when an item on the list is selected.
+    EVT_TEXT:          Sent when the combobox text changes.
+</refdoc>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
-    Size size=DefaultSize, 
-    int choices=0, String choices_array=None, 
-    long style=0, Validator validator=DefaultValidator, 
-    String name=ComboBoxNameStr) -&gt; bool</autodoc>
+        <autodoc>Create(Window parent, int id, String value=EmptyString,
+    Point pos=DefaultPosition, Size size=DefaultSize,
+    List choices=[], long style=0, Validator validator=DefaultValidator,
+    String name=ChoiceNameStr) -&gt; bool</autodoc>
+        <docstring>Actually create the GUI wxComboBox control for 2-phase creation</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <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="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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="wxPyChoiceNameStr"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">

         <autodoc>GetValue() -&gt; String</autodoc>
         <autodoc>GetValue() -&gt; String</autodoc>

+        <docstring>Returns the current value in the combobox text field.</docstring>

       </method>
       </method>

-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">

         <autodoc>SetValue(String value)</autodoc>
         <paramlist>
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>

-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">

         <autodoc>Copy()</autodoc>
         <autodoc>Copy()</autodoc>

+        <docstring>Copies the selected text to the clipboard.</docstring>

       </method>
       </method>

-      <method name="Cut" type="void" overloaded="no">
+      <method name="Cut" type="" overloaded="no">

         <autodoc>Cut()</autodoc>
         <autodoc>Cut()</autodoc>

+        <docstring>Copies the selected text to the clipboard and removes the selection.</docstring>

       </method>
       </method>

-      <method name="Paste" type="void" overloaded="no">
+      <method name="Paste" type="" overloaded="no">

         <autodoc>Paste()</autodoc>
         <autodoc>Paste()</autodoc>

+        <docstring>Pastes text from the clipboard to the text field.</docstring>

       </method>
       </method>

-      <method name="SetInsertionPoint" type="void" overloaded="no">
+      <method name="SetInsertionPoint" type="" overloaded="no">

         <autodoc>SetInsertionPoint(long pos)</autodoc>
         <autodoc>SetInsertionPoint(long pos)</autodoc>

+        <docstring>Sets the insertion point in the combobox text field.</docstring>

         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetInsertionPoint" type="long" overloaded="no">
         <autodoc>GetInsertionPoint() -&gt; long</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetInsertionPoint" type="long" overloaded="no">
         <autodoc>GetInsertionPoint() -&gt; long</autodoc>

+        <docstring>Returns the insertion point for the combobox's text field.</docstring>

       </method>
       <method name="GetLastPosition" type="long" overloaded="no">
         <autodoc>GetLastPosition() -&gt; long</autodoc>
       </method>
       <method name="GetLastPosition" type="long" overloaded="no">
         <autodoc>GetLastPosition() -&gt; long</autodoc>

+        <docstring>Returns the last position in the combobox text field.</docstring>

       </method>
       </method>

-      <method name="Replace" type="void" overloaded="no">
+      <method name="Replace" type="" overloaded="no">

         <autodoc>Replace(long from, long to, String value)</autodoc>
         <autodoc>Replace(long from, long to, String value)</autodoc>

+        <docstring>Replaces the text between two positions with the given text, in the
+combobox text field.</docstring>

         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetSelection" type="void" overloaded="no">
+      <method name="SetSelection" type="" overloaded="no">

         <autodoc>SetSelection(int n)</autodoc>
         <autodoc>SetSelection(int n)</autodoc>

+        <docstring>Selects the text between the two positions, in the combobox text field.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <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>
         <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>
         <autodoc>SetInsertionPointEnd()</autodoc>

+        <docstring>Sets the insertion point at the end of the combobox text field.</docstring>

       </method>
       </method>

-      <method name="Remove" type="void" overloaded="no">
+      <method name="Remove" type="" overloaded="no">

         <autodoc>Remove(long from, long to)</autodoc>
         <autodoc>Remove(long from, long to)</autodoc>

+        <docstring>Removes the text between the two positions in the combobox text field.</docstring>

         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>
         <paramlist>
           <param name="from" type="long" default=""/>
           <param name="to" type="long" default=""/>


@@ -13520,21 +15422,21 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Gauge" oldname="wxGauge" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreGauge" overloaded="no">


@@ -13546,17 +15448,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>
     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="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="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>
         </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=""/>
         <autodoc>SetRange(int range)</autodoc>
         <paramlist>
           <param name="range" type="int" default=""/>


@@ -13565,7 +15467,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="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=""/>
         <autodoc>SetValue(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -13577,7 +15479,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="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=""/>
         <autodoc>SetShadowWidth(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>


@@ -13586,7 +15488,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="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=""/>
         <autodoc>SetBezelFace(int w)</autodoc>
         <paramlist>
           <param name="w" type="int" default=""/>


@@ -13600,19 +15502,19 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticBox" oldname="wxStaticBox" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreStaticBox" overloaded="no">


@@ -13623,13 +15525,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>
     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="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="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>
         </paramlist>
       </method>
     </class>


@@ -13637,18 +15539,18 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticLine" oldname="wxStaticLine" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreStaticLine" overloaded="no">


@@ -13659,38 +15561,38 @@ 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>
     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="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="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">
         <autodoc>IsVertical() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultSize" type="int" overloaded="no">
         </paramlist>
       </method>
       <method name="IsVertical" type="bool" overloaded="no">
         <autodoc>IsVertical() -&gt; bool</autodoc>
       </method>
       <staticmethod name="GetDefaultSize" type="int" overloaded="no">

-        <autodoc>StaticLine.GetDefaultSize() -&gt; int</autodoc>
+        <autodoc>GetDefaultSize() -&gt; int</autodoc>

       </staticmethod>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticText" oldname="wxStaticText" module="controls">
       </staticmethod>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreStaticText" overloaded="no">


@@ -13701,13 +15603,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>
     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="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="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>
         </paramlist>
       </method>
     </class>


@@ -13715,19 +15617,19 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="StaticBitmap" oldname="wxStaticBitmap" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreStaticBitmap" overloaded="no">


@@ -13738,28 +15640,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>
     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="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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyStaticBitmapNameStr"/>
+          <param name="name" type="String" default="wxPyStaticBitmapNameStr"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">

         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
         <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>
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>

-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetIcon" type="void" overloaded="no">
+      <method name="SetIcon" type="" overloaded="no">

         <autodoc>SetIcon(Icon icon)</autodoc>
         <paramlist>
         <autodoc>SetIcon(Icon icon)</autodoc>
         <paramlist>

-          <param name="icon" type="r.q(const).wxIcon" default=""/>
+          <param name="icon" type="Icon" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -13767,22 +15669,21 @@ unselected state, and for all other states if no other bitmaps are provided.</do
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListBox" oldname="wxListBox" module="controls">
 #---------------------------------------------------------------------------
 </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, 
       <constructor name="ListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; ListBox</autodoc>
         <paramlist>
     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="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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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">
         </paramlist>
       </constructor>
       <constructor name="PreListBox" overloaded="no">


@@ -13790,40 +15691,41 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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>
         </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>
         <autodoc>Insert(String item, int pos, PyObject clientData=None)</autodoc>

+        <docstring>Insert an item into the control before the item at the pos index,
+optionally associating some data object with the item.</docstring>

         <paramlist>
         <paramlist>

-          <param name="item" type="r.q(const).wxString" default=""/>
+          <param name="item" type="String" default=""/>

           <param name="pos" type="int" default=""/>
           <param name="pos" type="int" default=""/>

-          <param name="clientData" type="p.PyObject" default="NULL"/>
+          <param name="clientData" type="PyObject" default="NULL"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="InsertItems" type="void" overloaded="no">
+      <method name="InsertItems" type="" overloaded="no">

         <autodoc>InsertItems(wxArrayString items, int pos)</autodoc>
         <paramlist>
         <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>
           <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>
         <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">
         </paramlist>
       </method>
       <method name="IsSelected" type="bool" overloaded="no">


@@ -13832,26 +15734,27 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <autodoc>Select(int n)</autodoc>

+        <docstring>Sets the item at index 'n' to be the selected item.</docstring>

         <paramlist>
           <param name="n" type="int" default=""/>
         </paramlist>
       </method>
         <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>
         <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"/>
         <autodoc>DeselectAll(int itemToLeaveSelected=-1)</autodoc>
         <paramlist>
           <param name="itemToLeaveSelected" type="int" default="-1"/>


@@ -13860,61 +15763,81 @@ 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>
       <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>
           <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>
         <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>
         <autodoc>SetFirstItemStr(String s)</autodoc>
         <paramlist>

-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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">
         <autodoc>IsSorted() -&gt; bool</autodoc>
       </method>
         </paramlist>
       </method>
       <method name="IsSorted" type="bool" overloaded="no">
         <autodoc>IsSorted() -&gt; bool</autodoc>
       </method>

+      <method name="SetItemForegroundColour" type="" overloaded="no">
+        <autodoc>SetItemForegroundColour(int item, Colour c)</autodoc>
+        <paramlist>
+          <param name="item" type="int" default=""/>
+          <param name="c" type="Colour" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetItemBackgroundColour" type="" overloaded="no">
+        <autodoc>SetItemBackgroundColour(int item, Colour c)</autodoc>
+        <paramlist>
+          <param name="item" type="int" default=""/>
+          <param name="c" type="Colour" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetItemFont" type="" overloaded="no">
+        <autodoc>SetItemFont(int item, Font f)</autodoc>
+        <paramlist>
+          <param name="item" type="int" default=""/>
+          <param name="f" type="Font" default=""/>
+        </paramlist>
+      </method>

     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="CheckListBox" oldname="wxCheckListBox" module="controls">
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </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, 
       <constructor name="CheckListBox" overloaded="no">
         <autodoc>__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; CheckListBox</autodoc>
         <paramlist>
     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="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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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">
         </paramlist>
       </constructor>
       <constructor name="PreCheckListBox" overloaded="no">


@@ -13922,19 +15845,18 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

-    int choices=0, String choices_array=None, 
+    wxArrayString choices=wxPyEmptyStringArray, 

     long style=0, Validator validator=DefaultValidator, 
     String name=ListBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="style" type="long" default="0"/>
           <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">
         </paramlist>
       </method>
       <method name="IsChecked" type="bool" overloaded="no">


@@ -13943,7 +15865,7 @@ unselected state, and for all other states if no other bitmaps are provided.</do
           <param name="index" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>Check(int index, int check=True)</autodoc>
         <paramlist>
           <param name="index" type="int" default=""/>


@@ -13955,12 +15877,14 @@ unselected state, and for all other states if no other bitmaps are provided.</do
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>
       </method>
       <method name="HitTest" type="int" overloaded="no">
         <autodoc>HitTest(Point pt) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
         <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">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>
         </paramlist>
       </method>
       <method name="HitTestXY" type="int" overloaded="no">
         <autodoc>HitTestXY(int x, int y) -&gt; int</autodoc>

+        <docstring>Test where the given (in client coords) point lies</docstring>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -13977,59 +15901,62 @@ 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>
 __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>
           <param name="alignment" type="wxTextAttrAlignment" default="wxTEXT_ALIGNMENT_DEFAULT"/>
         </paramlist>
       </constructor>

-      <method name="Init" type="void" overloaded="no">
+      <destructor name="~wxTextAttr" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>
+      <method name="Init" type="" overloaded="no">

         <autodoc>Init()</autodoc>
       </method>
         <autodoc>Init()</autodoc>
       </method>

-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">

         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>

-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">

         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>

-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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>
         <autodoc>SetTabs(wxArrayInt tabs)</autodoc>
         <paramlist>

-          <param name="tabs" type="r.q(const).wxArrayInt" default=""/>
+          <param name="tabs" type="wxArrayInt" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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=""/>
         <autodoc>SetFlags(long flags)</autodoc>
         <paramlist>
           <param name="flags" type="long" default=""/>


@@ -14062,19 +15989,19 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="flag" type="long" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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">
         <autodoc>GetTabs() -&gt; wxArrayInt</autodoc>
       </method>
       <method name="GetLeftIndent" type="long" overloaded="no">


@@ -14089,31 +16016,31 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       <method name="IsDefault" type="bool" overloaded="no">
         <autodoc>IsDefault() -&gt; bool</autodoc>
       </method>
       <method name="IsDefault" type="bool" overloaded="no">
         <autodoc>IsDefault() -&gt; bool</autodoc>
       </method>

-      <staticmethod name="Combine" type="wxTextAttr" overloaded="no">
-        <autodoc>TextAttr.Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -&gt; TextAttr</autodoc>
+      <staticmethod name="Combine" type="TextAttr" overloaded="no">
+        <autodoc>Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -&gt; TextAttr</autodoc>

         <paramlist>
         <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">
         </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreTextCtrl" overloaded="no">


@@ -14125,26 +16052,26 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
     long style=0, Validator validator=DefaultValidator, 
     String name=TextCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="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>
         </paramlist>
       </method>

-      <method name="GetValue" type="wxString" overloaded="no">
+      <method name="GetValue" type="String" overloaded="no">

         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
         <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>
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>

-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>GetRange(long from, long to) -&gt; String</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>


@@ -14157,7 +16084,7 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="lineNo" type="long" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>GetLineText(long lineNo) -&gt; String</autodoc>
         <paramlist>
           <param name="lineNo" type="long" default=""/>


@@ -14178,29 +16105,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="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>
         <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>
         </paramlist>
       </method>

-      <method name="GetStringSelection" type="wxString" overloaded="no">
+      <method name="GetStringSelection" type="String" overloaded="no">

         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>
         <autodoc>GetStringSelection() -&gt; String</autodoc>
       </method>

-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">

         <autodoc>Clear()</autodoc>
       </method>
         <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=""/>
         <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>
         </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=""/>
         <autodoc>Remove(long from, long to)</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>


@@ -14210,43 +16137,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>
       <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>
         </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>
         </paramlist>
       </method>

-      <method name="MarkDirty" type="void" overloaded="no">
+      <method name="MarkDirty" type="" overloaded="no">

         <autodoc>MarkDirty()</autodoc>
       </method>
         <autodoc>MarkDirty()</autodoc>
       </method>

-      <method name="DiscardEdits" type="void" overloaded="no">
+      <method name="DiscardEdits" type="" overloaded="no">

         <autodoc>DiscardEdits()</autodoc>
       </method>
         <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>
         <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>
         <autodoc>WriteText(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AppendText" type="void" overloaded="no">
+      <method name="AppendText" type="" overloaded="no">

         <autodoc>AppendText(String text)</autodoc>
         <paramlist>
         <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>
         </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">
         </paramlist>
       </method>
       <method name="SetStyle" type="bool" overloaded="no">


@@ -14254,23 +16181,23 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
         <paramlist>
           <param name="start" type="long" default=""/>
           <param name="end" type="long" default=""/>
         <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=""/>
         </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>
         </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>
         </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">
         <autodoc>GetDefaultStyle() -&gt; TextAttr</autodoc>
       </method>
       <method name="XYToPosition" type="long" overloaded="no">


@@ -14280,27 +16207,38 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
           <param name="y" type="long" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <autodoc>ShowPosition(long pos)</autodoc>
         <paramlist>
           <param name="pos" type="long" default=""/>
         </paramlist>
       </method>

-      <method name="Copy" type="void" overloaded="no">
+      <method name="HitTest" type="wxTextCtrlHitTestResult" overloaded="no">
+        <autodoc>HitTest(Point pt) -&gt; (result, row, col)</autodoc>
+        <docstring>Find the character at position given in pixels.
+NB: pt is in device coords (not adjusted for the client area
+origin nor scrolling)</docstring>
+        <paramlist>
+          <param name="pt" type="Point" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+          <param name="OUTPUT" type="long" default=""/>
+        </paramlist>
+      </method>
+      <method name="Copy" type="" overloaded="no">

         <autodoc>Copy()</autodoc>
       </method>
         <autodoc>Copy()</autodoc>
       </method>

-      <method name="Cut" type="void" overloaded="no">
+      <method name="Cut" type="" overloaded="no">

         <autodoc>Cut()</autodoc>
       </method>
         <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">
         <autodoc>Paste()</autodoc>
       </method>
       <method name="CanCopy" type="bool" overloaded="no">


@@ -14312,10 +16250,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="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>
         <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">
         <autodoc>Redo()</autodoc>
       </method>
       <method name="CanUndo" type="bool" overloaded="no">


@@ -14324,13 +16262,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="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>
         <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">
         <autodoc>SetInsertionPointEnd()</autodoc>
       </method>
       <method name="GetInsertionPoint" type="long" overloaded="no">


@@ -14339,29 +16277,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="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>
         <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>
         <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>
         <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>
         <autodoc>write(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>GetString(long from, long to) -&gt; String</autodoc>
         <paramlist>
           <param name="from" type="long" default=""/>


@@ -14370,17 +16308,17 @@ __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont,
       </method>
     </class>
     <class name="TextUrlEvent" oldname="wxTextUrlEvent" module="controls">
       </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=""/>
       <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>
           <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">
         <autodoc>GetMouseEvent() -&gt; MouseEvent</autodoc>
       </method>
       <method name="GetURLStart" type="long" overloaded="no">


@@ -14400,19 +16338,19 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ScrollBar" oldname="wxScrollBar" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreScrollBar" overloaded="no">


@@ -14422,14 +16360,15 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=SB_HORIZONTAL, 
     Validator validator=DefaultValidator, String name=ScrollBarNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=SB_HORIZONTAL, 
     Validator validator=DefaultValidator, String name=ScrollBarNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" default="-1"/>
           <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="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">
         </paramlist>
       </method>
       <method name="GetThumbPosition" type="int" overloaded="no">


@@ -14447,15 +16386,28 @@ 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="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>
         <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>
         <autodoc>SetScrollbar(int position, int thumbSize, int range, int pageSize, 
     bool refresh=True)</autodoc>

+        <docstring>Sets the scrollbar properties of a built-in scrollbar.
+
+    orientation: Determines the scrollbar whose page size is to be
+                 set. May be wx.HORIZONTAL or wx.VERTICAL.
+
+    position:    The position of the scrollbar in scroll units.
+
+    thumbSize:   The size of the thumb, or visible portion of the
+                 scrollbar, in scroll units.
+
+    range:       The maximum position of the scrollbar.
+
+    refresh:     True to redraw the scrollbar, false otherwise.</docstring>

         <paramlist>
           <param name="position" type="int" default=""/>
           <param name="thumbSize" type="int" default=""/>
         <paramlist>
           <param name="position" type="int" default=""/>
           <param name="thumbSize" type="int" default=""/>


@@ -14469,18 +16421,18 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SpinButton" oldname="wxSpinButton" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreSpinButton" overloaded="no">


@@ -14491,12 +16443,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>
     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="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="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">
         </paramlist>
       </method>
       <method name="GetValue" type="int" overloaded="no">


@@ -14508,25 +16460,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="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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetRange(int minVal, int maxVal)</autodoc>
         <paramlist>
           <param name="minVal" type="int" default=""/>


@@ -14538,23 +16490,23 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
       </method>
     </class>
     <class name="SpinCtrl" oldname="wxSpinCtrl" module="controls">
       </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreSpinCtrl" overloaded="no">


@@ -14566,34 +16518,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>
     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="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="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>
         </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>
         <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>
         <autodoc>SetValueString(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetRange(int minVal, int maxVal)</autodoc>
         <paramlist>
           <param name="minVal" type="int" default=""/>


@@ -14606,66 +16558,86 @@ 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="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>
         <autodoc>SetSelection(long from, long to)</autodoc>
         <paramlist>

-          <param name="from" type="long" default=""/>
-          <param name="to" type="long" default=""/>
+          <param name="from" type="long" default=""/>
+          <param name="to" type="long" default=""/>
+        </paramlist>
+      </method>
+    </class>
+    <class name="SpinEvent" oldname="wxSpinEvent" module="controls">
+      <baseclass name="NotifyEvent"/>
+      <constructor name="SpinEvent" overloaded="no">
+        <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -&gt; SpinEvent</autodoc>
+        <paramlist>
+          <param name="commandType" type="wxEventType" default="wxEVT_NULL"/>
+          <param name="winid" type="int" default="0"/>
+        </paramlist>
+      </constructor>
+      <method name="GetPosition" type="int" overloaded="no">
+        <autodoc>GetPosition() -&gt; int</autodoc>
+      </method>
+      <method name="SetPosition" type="" overloaded="no">
+        <autodoc>SetPosition(int pos)</autodoc>
+        <paramlist>
+          <param name="pos" type="int" default=""/>

         </paramlist>
       </method>
     </class>
     <pythoncode>
         </paramlist>
       </method>
     </class>
     <pythoncode>

-EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
+EVT_SPIN_UP   = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)
+EVT_SPIN_DOWN = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEDOWN, 1)
+EVT_SPIN      = wx.PyEventBinder( wx.wxEVT_SCROLL_THUMBTRACK, 1)
+EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)

 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="RadioBox" oldname="wxRadioBox" module="controls">
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="RadioBox" oldname="wxRadioBox" module="controls">

-      <baseclass name="wxControl"/>
+      <baseclass name="Control"/>

       <constructor name="RadioBox" overloaded="no">
       <constructor name="RadioBox" overloaded="no">

-        <autodoc>__init__(Window parent, int id, String label, Point point=DefaultPosition, 
-    Size size=DefaultSize, int choices=0, 
-    String choices_array=None, int majorDimension=0, 
+        <autodoc>__init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+    int majorDimension=0, 

     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; RadioBox</autodoc>
         <paramlist>
     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="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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <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">
         <autodoc>PreRadioBox() -&gt; RadioBox</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         </paramlist>
       </constructor>
       <constructor name="PreRadioBox" overloaded="no">
         <autodoc>PreRadioBox() -&gt; RadioBox</autodoc>
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, String label, Point point=DefaultPosition, 
-    Size size=DefaultSize, int choices=0, 
-    String choices_array=None, int majorDimension=0, 
+        <autodoc>Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+    Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+    int majorDimension=0, 

     long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=RadioBoxNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="choices" type="int" default="0"/>
-          <param name="choices_array" type="p.wxString" default="NULL"/>
+          <param name="label" type="String" default=""/>
+          <param name="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>
+          <param name="choices" type="wxArrayString" default="wxPyEmptyStringArray"/>

           <param name="majorDimension" type="int" default="0"/>
           <param name="style" type="long" default="wxRA_HORIZONTAL"/>
           <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>
         </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=""/>
         <autodoc>SetSelection(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -14674,13 +16646,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="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>
         <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">
         </paramlist>
       </method>
       <method name="GetCount" type="int" overloaded="no">


@@ -14689,30 +16661,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>
       <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>
         </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>
         <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=""/>
         <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>
         </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>
         <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=""/>
         <autodoc>ShowItem(int n, bool show=True)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -14738,20 +16710,20 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="RadioButton" oldname="wxRadioButton" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreRadioButton" overloaded="no">


@@ -14762,20 +16734,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>
     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="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="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>
         </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=""/>
         <autodoc>SetValue(bool value)</autodoc>
         <paramlist>
           <param name="value" type="bool" default=""/>


@@ -14786,23 +16758,23 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Slider" oldname="wxSlider" module="controls">
 #---------------------------------------------------------------------------
 </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, 
       <constructor name="Slider" overloaded="no">
         <autodoc>__init__(Window parent, int id, int value, int minValue, int maxValue, 

-    Point point=DefaultPosition, Size size=DefaultSize, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 

     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; Slider</autodoc>
         <paramlist>
     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="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="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>

           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
           <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">
         </paramlist>
       </constructor>
       <constructor name="PreSlider" overloaded="no">


@@ -14810,32 +16782,32 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, int value, int minValue, int maxValue, 
       </constructor>
       <method name="Create" type="bool" overloaded="no">
         <autodoc>Create(Window parent, int id, int value, int minValue, int maxValue, 

-    Point point=DefaultPosition, Size size=DefaultSize, 
+    Point pos=DefaultPosition, Size size=DefaultSize, 

     long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
     String name=SliderNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="pos" type="Point" default="wxDefaultPosition"/>
+          <param name="size" type="Size" default="wxDefaultSize"/>

           <param name="style" type="long" default="wxSL_HORIZONTAL"/>
           <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>
         </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>
         <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=""/>
         <autodoc>SetRange(int minValue, int maxValue)</autodoc>
         <paramlist>
           <param name="minValue" type="int" default=""/>


@@ -14848,25 +16820,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="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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetPageSize(int pageSize)</autodoc>
         <paramlist>
           <param name="pageSize" type="int" default=""/>


@@ -14878,7 +16850,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="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=""/>
         <autodoc>SetThumbLength(int lenPixels)</autodoc>
         <paramlist>
           <param name="lenPixels" type="int" default=""/>


@@ -14887,26 +16859,26 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetThumbLength" type="int" overloaded="no">
         <autodoc>GetThumbLength() -&gt; int</autodoc>
       </method>
       <method name="GetThumbLength" type="int" overloaded="no">
         <autodoc>GetThumbLength() -&gt; int</autodoc>
       </method>

-      <method name="SetTickFreq" type="void" overloaded="no">
-        <autodoc>SetTickFreq(int n, int pos)</autodoc>
+      <method name="SetTickFreq" type="" overloaded="no">
+        <autodoc>SetTickFreq(int n, int pos=1)</autodoc>

         <paramlist>
           <param name="n" type="int" default=""/>
         <paramlist>
           <param name="n" type="int" default=""/>

-          <param name="pos" type="int" default=""/>
+          <param name="pos" type="int" default="1"/>

         </paramlist>
       </method>
       <method name="GetTickFreq" type="int" overloaded="no">
         <autodoc>GetTickFreq() -&gt; int</autodoc>
       </method>
         </paramlist>
       </method>
       <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>
         <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>
         <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">
         <autodoc>ClearSel()</autodoc>
       </method>
       <method name="GetSelEnd" type="int" overloaded="no">


@@ -14915,7 +16887,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="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=""/>
         <autodoc>SetSelection(int min, int max)</autodoc>
         <paramlist>
           <param name="min" type="int" default=""/>


@@ -14930,20 +16902,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">
     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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreToggleButton" overloaded="no">


@@ -14954,17 +16926,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>
     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="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="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>
         </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=""/>
         <autodoc>SetValue(bool value)</autodoc>
         <paramlist>
           <param name="value" type="bool" default=""/>


@@ -14973,10 +16945,11 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       <method name="GetValue" type="bool" overloaded="no">
         <autodoc>GetValue() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>SetLabel(String label)</autodoc>

+        <docstring>Sets the item's text.</docstring>

         <paramlist>
         <paramlist>

-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -14984,11 +16957,11 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BookCtrl" oldname="wxBookCtrl" module="controls">
 #---------------------------------------------------------------------------
 </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="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=""/>
         <autodoc>GetPage(size_t n) -&gt; Window</autodoc>
         <paramlist>
           <param name="n" type="size_t" default=""/>


@@ -15001,28 +16974,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=""/>
         <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>
         </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>
         <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>
         <autodoc>SetImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">

         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetImageList() -&gt; ImageList</autodoc>
       </method>
       <method name="GetPageImage" type="int" overloaded="no">


@@ -15038,16 +17011,16 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
           <param name="imageId" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetPageSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CalcSizeFromPage" type="wxSize" overloaded="no">
+      <method name="CalcSizeFromPage" type="Size" overloaded="no">

         <autodoc>CalcSizeFromPage(Size sizePage) -&gt; Size</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="DeletePage" type="bool" overloaded="no">


@@ -15068,8 +17041,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>
       <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>
           <param name="select" type="bool" default="False"/>
           <param name="imageId" type="int" default="-1"/>
         </paramlist>


@@ -15079,8 +17052,8 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
     int imageId=-1) -&gt; bool</autodoc>
         <paramlist>
           <param name="n" type="size_t" default=""/>
     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>
           <param name="select" type="bool" default="False"/>
           <param name="imageId" type="int" default="-1"/>
         </paramlist>


@@ -15091,7 +17064,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
           <param name="n" type="size_t" default=""/>
         </paramlist>
       </method>
           <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"/>
         <autodoc>AdvanceSelection(bool forward=True)</autodoc>
         <paramlist>
           <param name="forward" type="bool" default="True"/>


@@ -15099,7 +17072,7 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
       </method>
     </class>
     <class name="BookCtrlEvent" oldname="wxBookCtrlEvent" module="controls">
       </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>
       <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 +17086,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="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=""/>
         <autodoc>SetSelection(int nSel)</autodoc>
         <paramlist>
           <param name="nSel" type="int" default=""/>


@@ -15122,7 +17095,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="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=""/>
         <autodoc>SetOldSelection(int nOldSel)</autodoc>
         <paramlist>
           <param name="nOldSel" type="int" default=""/>


@@ -15133,17 +17106,17 @@ EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Notebook" oldname="wxNotebook" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreNotebook" overloaded="no">


@@ -15153,46 +17126,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>
         <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="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="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>
         </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>
         <autodoc>SetPadding(Size padding)</autodoc>
         <paramlist>

-          <param name="padding" type="r.q(const).wxSize" default=""/>
+          <param name="padding" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTabSize" type="void" overloaded="no">
+      <method name="SetTabSize" type="" overloaded="no">

         <autodoc>SetTabSize(Size sz)</autodoc>
         <paramlist>
         <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>
         </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>
+        <docstring>Returns the tab which is hit, and flags indicating where using wx.NB_HITTEST_ flags.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="CalcSizeFromPage" type="wxSize" overloaded="no">
+      <method name="CalcSizeFromPage" type="Size" overloaded="no">

         <autodoc>CalcSizeFromPage(Size sizePage) -&gt; Size</autodoc>
         <paramlist>
         <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">
         </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>
       <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 +17217,17 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Listbook" oldname="wxListbook" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreListbook" overloaded="no">


@@ -15264,12 +17237,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>
         <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="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="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">
         </paramlist>
       </method>
       <method name="IsVertical" type="bool" overloaded="no">


@@ -15277,7 +17250,7 @@ class NotebookPage(wx.Panel):
       </method>
     </class>
     <class name="ListbookEvent" oldname="wxListbookEvent" module="controls">
       </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>
       <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 +17270,38 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="BookCtrlSizer" oldname="wxBookCtrlSizer" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">

         <autodoc>RecalcSizes()</autodoc>
       </method>
         <autodoc>RecalcSizes()</autodoc>
       </method>

-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">

         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
         <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">
         <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>
       <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>
         </paramlist>
       </constructor>

-      <method name="RecalcSizes" type="void" overloaded="no">
+      <method name="RecalcSizes" type="" overloaded="no">

         <autodoc>RecalcSizes()</autodoc>
       </method>
         <autodoc>RecalcSizes()</autodoc>
       </method>

-      <method name="CalcMin" type="wxSize" overloaded="no">
+      <method name="CalcMin" type="Size" overloaded="no">

         <autodoc>CalcMin() -&gt; Size</autodoc>
       </method>
         <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>
         <autodoc>GetNotebook() -&gt; Notebook</autodoc>
       </method>
     </class>


@@ -15336,11 +17309,11 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ToolBarToolBase" oldname="wxToolBarToolBase" module="controls">
 #---------------------------------------------------------------------------
 </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="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">
         <autodoc>GetControl() -&gt; Control</autodoc>
       </method>
       <method name="GetToolBar" type="wxToolBarBase" overloaded="no">


@@ -15370,22 +17343,22 @@ class NotebookPage(wx.Panel):
       <method name="CanBeToggled" type="bool" overloaded="no">
         <autodoc>CanBeToggled() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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>
         <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>
         <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">
         <autodoc>GetLongHelp() -&gt; String</autodoc>
       </method>
       <method name="Enable" type="bool" overloaded="no">


@@ -15394,7 +17367,7 @@ class NotebookPage(wx.Panel):
           <param name="enable" type="bool" default=""/>
         </paramlist>
       </method>
           <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">
         <autodoc>Toggle()</autodoc>
       </method>
       <method name="SetToggle" type="bool" overloaded="no">


@@ -15406,71 +17379,71 @@ class NotebookPage(wx.Panel):
       <method name="SetShortHelp" type="bool" overloaded="no">
         <autodoc>SetShortHelp(String help) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         </paramlist>
       </method>

-      <method name="SetNormalBitmap" type="void" overloaded="no">
+      <method name="SetNormalBitmap" type="" overloaded="no">

         <autodoc>SetNormalBitmap(Bitmap bmp)</autodoc>
         <paramlist>
         <autodoc>SetNormalBitmap(Bitmap bmp)</autodoc>
         <paramlist>

-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDisabledBitmap" type="void" overloaded="no">
+      <method name="SetDisabledBitmap" type="" overloaded="no">

         <autodoc>SetDisabledBitmap(Bitmap bmp)</autodoc>
         <paramlist>
         <autodoc>SetDisabledBitmap(Bitmap bmp)</autodoc>
         <paramlist>

-          <param name="bmp" type="r.q(const).wxBitmap" default=""/>
+          <param name="bmp" type="Bitmap" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLabel" type="void" overloaded="no">
+      <method name="SetLabel" type="" overloaded="no">

         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>
         <autodoc>SetLabel(String label)</autodoc>
         <paramlist>

-          <param name="label" type="r.q(const).wxString" default=""/>
+          <param name="label" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Detach" type="void" overloaded="no">
+      <method name="Detach" type="" overloaded="no">

         <autodoc>Detach()</autodoc>
       </method>
         <autodoc>Detach()</autodoc>
       </method>

-      <method name="Attach" type="void" overloaded="no">
+      <method name="Attach" type="" overloaded="no">

         <autodoc>Attach(ToolBarBase tbar)</autodoc>
         <paramlist>
         <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>
         </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>
         <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">
         </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=""/>
         <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="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>
         </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, 
         <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 +17451,57 @@ class NotebookPage(wx.Panel):
         <paramlist>
           <param name="pos" type="size_t" default=""/>
           <param name="id" type="int" default=""/>
         <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="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>
         </paramlist>
       </method>

-      <method name="AddToolItem" type="wxToolBarToolBase" overloaded="no">
+      <method name="AddToolItem" type="ToolBarToolBase" overloaded="no">

         <autodoc>AddToolItem(ToolBarToolBase tool) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
         <autodoc>AddToolItem(ToolBarToolBase tool) -&gt; ToolBarToolBase</autodoc>
         <paramlist>

-          <param name="tool" type="p.wxToolBarToolBase" default=""/>
+          <param name="tool" type="ToolBarToolBase" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="AddControl" type="wxToolBarToolBase" overloaded="no">
+      <method name="AddControl" type="ToolBarToolBase" overloaded="no">

         <autodoc>AddControl(Control control) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
         <autodoc>AddControl(Control control) -&gt; ToolBarToolBase</autodoc>
         <paramlist>

-          <param name="control" type="p.wxControl" default=""/>
+          <param name="control" type="Control" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </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>
         <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>
         <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>
         <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=""/>
         <autodoc>RemoveTool(int id) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -15546,27 +17519,27 @@ class NotebookPage(wx.Panel):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetToggle(int id, bool toggle)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -15579,11 +17552,11 @@ class NotebookPage(wx.Panel):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetToolPos" type="int" overloaded="no">


@@ -15604,61 +17577,61 @@ class NotebookPage(wx.Panel):
           <param name="id" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <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=""/>
         <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>
         </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>
         <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>
         <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>
         <autodoc>SetMargins(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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">
         <autodoc>GetMargins() -&gt; Size</autodoc>
       </method>
       <method name="GetToolPacking" type="int" overloaded="no">


@@ -15667,13 +17640,13 @@ class NotebookPage(wx.Panel):
       <method name="GetToolSeparation" type="int" overloaded="no">
         <autodoc>GetToolSeparation() -&gt; int</autodoc>
       </method>
       <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>
         <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=""/>
         <autodoc>SetMaxRowsCols(int rows, int cols)</autodoc>
         <paramlist>
           <param name="rows" type="int" default=""/>


@@ -15686,26 +17659,26 @@ class NotebookPage(wx.Panel):
       <method name="GetMaxCols" type="int" overloaded="no">
         <autodoc>GetMaxCols() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>SetToolBitmapSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetToolBitmapSize" type="wxSize" overloaded="no">
+      <method name="GetToolBitmapSize" type="Size" overloaded="no">

         <autodoc>GetToolBitmapSize() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         <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=""/>
         <autodoc>FindById(int toolid) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="toolid" type="int" default=""/>


@@ -15716,18 +17689,18 @@ class NotebookPage(wx.Panel):
       </method>
     </class>
     <class name="ToolBar" oldname="wxToolBar" module="controls">
       </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreToolBar" overloaded="no">


@@ -15738,15 +17711,15 @@ class NotebookPage(wx.Panel):
     long style=wxNO_BORDER|wxTB_HORIZONTAL, 
     String name=wxPyToolBarNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="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>
         </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=""/>
         <autodoc>FindToolForPosition(int x, int y) -&gt; ToolBarToolBase</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -15765,27 +17738,27 @@ class NotebookPage(wx.Panel):
         <autodoc>__init__(Colour colText=wxNullColour, Colour colBack=wxNullColour, 
     Font font=wxNullFont) -&gt; ListItemAttr</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </constructor>

-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">

         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>

-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">

         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>

-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">

         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="HasTextColour" type="bool" overloaded="no">


@@ -15797,16 +17770,16 @@ class NotebookPage(wx.Panel):
       <method name="HasFont" type="bool" overloaded="no">
         <autodoc>HasFont() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>

-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">

         <autodoc>Destroy()</autodoc>
       </method>
     </class>
         <autodoc>Destroy()</autodoc>
       </method>
     </class>


@@ -15814,95 +17787,95 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListItem" oldname="wxListItem" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <autodoc>Clear()</autodoc>
       </method>

-      <method name="ClearAttributes" type="void" overloaded="no">
+      <method name="ClearAttributes" type="" overloaded="no">

         <autodoc>ClearAttributes()</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetText(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>

-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">

         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>

-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">

         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetMask" type="long" overloaded="no">


@@ -15917,7 +17890,7 @@ class NotebookPage(wx.Panel):
       <method name="GetState" type="long" overloaded="no">
         <autodoc>GetState() -&gt; long</autodoc>
       </method>
       <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">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetImage" type="int" overloaded="no">


@@ -15932,19 +17905,19 @@ class NotebookPage(wx.Panel):
       <method name="GetAlign" type="wxListColumnFormat" overloaded="no">
         <autodoc>GetAlign() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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"/>
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
       <property name="m_mask" type="long" readonly="no"/>


@@ -15952,7 +17925,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_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"/>
       <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 +17935,7 @@ class NotebookPage(wx.Panel):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListEvent" oldname="wxListEvent" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="ListEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; ListEvent</autodoc>
         <paramlist>


@@ -15974,8 +17947,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_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>
       <method name="GetKeyCode" type="int" overloaded="no">
         <autodoc>GetKeyCode() -&gt; int</autodoc>
       </method>


@@ -15985,13 +17958,13 @@ class NotebookPage(wx.Panel):
       <method name="GetColumn" type="int" overloaded="no">
         <autodoc>GetColumn() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetImage" type="int" overloaded="no">


@@ -16003,7 +17976,7 @@ class NotebookPage(wx.Panel):
       <method name="GetMask" type="long" overloaded="no">
         <autodoc>GetMask() -&gt; long</autodoc>
       </method>
       <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">
         <autodoc>GetItem() -&gt; ListItem</autodoc>
       </method>
       <method name="GetCacheFrom" type="long" overloaded="no">


@@ -16015,7 +17988,7 @@ class NotebookPage(wx.Panel):
       <method name="IsEditCancelled" type="bool" overloaded="no">
         <autodoc>IsEditCancelled() -&gt; bool</autodoc>
       </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=""/>
         <autodoc>SetEditCanceled(bool editCancelled)</autodoc>
         <paramlist>
           <param name="editCancelled" type="bool" default=""/>


@@ -16051,19 +18024,19 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListCtrl" oldname="wxPyListCtrl" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreListCtrl" overloaded="no">


@@ -16073,36 +18046,54 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_ICON, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_ICON, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" default="-1"/>
           <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="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>
         </paramlist>
       </method>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
       </method>
       <method name="SetForegroundColour" type="bool" overloaded="no">
         <autodoc>SetForegroundColour(Colour col) -&gt; bool</autodoc>

+        <docstring>Sets the foreground colour of the window.  Returns True is the colour
+was changed.  The interpretation of foreground colour is dependent on
+the window class; it may be the text colour or other colour, or it may
+not be used at all.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="SetBackgroundColour" type="bool" overloaded="no">
         <autodoc>SetBackgroundColour(Colour col) -&gt; bool</autodoc>

+        <docstring>Sets the background colour of the window.  Returns True if the colour
+was changed.  The background colour is usually painted by the default
+EVT_ERASE_BACKGROUND event handler function under Windows and
+automatically under GTK.
+
+Note that setting the background colour does not cause an immediate
+refresh, so you may wish to call ClearBackground or Refresh after
+calling this function.
+
+Use this function with care under GTK+ as the new appearance of the
+window might not look equally well when used with themes, i.e GTK+'s
+ability to change its look as the user wishes with run-time loadable
+modules.</docstring>

         <paramlist>
         <paramlist>

-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>GetColumn(int col) -&gt; ListItem</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>


@@ -16112,7 +18103,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=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetColumnWidth" type="int" overloaded="no">


@@ -16131,10 +18122,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="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>
         <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=""/>
         <autodoc>GetItem(long itemId, int col=0) -&gt; ListItem</autodoc>
         <paramlist>
           <param name="itemId" type="long" default=""/>


@@ -16144,7 +18135,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>
       <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">
         </paramlist>
       </method>
       <method name="SetStringItem" type="long" overloaded="no">


@@ -16152,7 +18143,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=""/>
         <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>
           <param name="imageId" type="int" default="-1"/>
         </paramlist>
       </method>


@@ -16179,17 +18170,17 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="selImage" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetItemData" type="long" overloaded="no">


@@ -16205,13 +18196,13 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="data" type="long" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>GetItemRect(long item, int code=LIST_RECT_BOUNDS) -&gt; Rect</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>


@@ -16222,7 +18213,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=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetItemCount" type="int" overloaded="no">


@@ -16231,10 +18222,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="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>
         <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=""/>
         <autodoc>SetItemSpacing(int spacing, bool isSmall=False)</autodoc>
         <paramlist>
           <param name="spacing" type="int" default=""/>


@@ -16244,27 +18235,30 @@ 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="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>
         <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>
         <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>
         </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>
         <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>
         <autodoc>SetWindowStyleFlag(long style)</autodoc>

+        <docstring>Sets the style of the window. Please note that some styles cannot be
+changed after the window creation and that Refresh() might be called
+after changing the others for the change to take place immediately.</docstring>

         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>
         <paramlist>
           <param name="style" type="long" default=""/>
         </paramlist>


@@ -16277,36 +18271,36 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
           <param name="state" type="int" default="wxLIST_STATE_DONTCARE"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>RefreshItems(long itemFrom, long itemTo)</autodoc>
         <paramlist>
           <param name="itemFrom" type="long" default=""/>


@@ -16337,10 +18331,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="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>
         <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=""/>
         <autodoc>EditLabel(long item)</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>


@@ -16356,7 +18350,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=""/>
         <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>
           <param name="partial" type="bool" default="False"/>
         </paramlist>
       </method>


@@ -16371,7 +18365,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=""/>
         <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>
           <param name="direction" type="int" default=""/>
         </paramlist>
       </method>


@@ -16380,21 +18374,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>
         <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>
         </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=""/>
         </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">
         </paramlist>
       </method>
       <method name="InsertImageItem" type="long" overloaded="no">


@@ -16408,7 +18402,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=""/>
         <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>
           <param name="imageIndex" type="int" default=""/>
         </paramlist>
       </method>


@@ -16416,7 +18410,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=""/>
         <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">
         </paramlist>
       </method>
       <method name="InsertColumn" type="long" overloaded="no">


@@ -16424,12 +18418,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=""/>
     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>
           <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=""/>
         <autodoc>SetItemCount(long count)</autodoc>
         <paramlist>
           <param name="count" type="long" default=""/>


@@ -16442,27 +18436,27 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
           <param name="dy" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <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=""/>
         <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>
         </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=""/>
         <autodoc>GetItemBackgroundColour(long item) -&gt; Colour</autodoc>
         <paramlist>
           <param name="item" type="long" default=""/>


@@ -16471,10 +18465,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>
       <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>
         </paramlist>
       </method>

-      <method name="GetMainWindow" type="wxWindow" overloaded="no">
+      <method name="GetMainWindow" type="Window" overloaded="no">

         <autodoc>GetMainWindow() -&gt; Window</autodoc>
       </method>
     </class>
         <autodoc>GetMainWindow() -&gt; Window</autodoc>
       </method>
     </class>


@@ -16482,19 +18476,19 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ListView" oldname="wxListView" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreListView" overloaded="no">


@@ -16504,24 +18498,25 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_REPORT, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>
         <autodoc>Create(Window parent, int id=-1, Point pos=DefaultPosition, 
     Size size=DefaultSize, long style=LC_REPORT, 
     Validator validator=DefaultValidator, String name=ListCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" default="-1"/>
           <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="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>
         </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>
         <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=""/>
         <autodoc>Focus(long index)</autodoc>
         <paramlist>
           <param name="index" type="long" default=""/>


@@ -16545,14 +18540,14 @@ giving details in the second return value (see wxLIST_HITTEST_... flags.)</docst
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>ClearColumnImage(int col)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>


@@ -16578,43 +18573,43 @@ 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>
       <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>
         </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>
         </paramlist>
       </method>

-      <property name="m_pItem" type="wxTreeItemIdValue" readonly="no"/>
+      <property name="m_pItem" type="" readonly="no"/>

     </class>
     <class name="TreeItemData" oldname="wxPyTreeItemData" module="controls">
       <constructor name="wxPyTreeItemData" overloaded="no">
         <autodoc>__init__(PyObject obj=None) -&gt; TreeItemData</autodoc>
         <paramlist>
     </class>
     <class name="TreeItemData" oldname="wxPyTreeItemData" module="controls">
       <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>
         </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>
         <autodoc>SetData(PyObject obj)</autodoc>
         <paramlist>

-          <param name="obj" type="p.PyObject" default=""/>
+          <param name="obj" type="PyObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetId" type="q(const).wxTreeItemId" overloaded="no">
+      <method name="GetId" type="TreeItemId" overloaded="no">

         <autodoc>GetId() -&gt; TreeItemId</autodoc>
       </method>
         <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>
         <autodoc>SetId(TreeItemId id)</autodoc>
         <paramlist>

-          <param name="id" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="id" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">

         <autodoc>Destroy()</autodoc>
       </method>
     </class>
         <autodoc>Destroy()</autodoc>
       </method>
     </class>


@@ -16645,7 +18640,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">
 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>
       <constructor name="TreeEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=wxEVT_NULL, int id=0) -&gt; TreeEvent</autodoc>
         <paramlist>


@@ -16653,67 +18648,67 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
           <param name="id" type="int" default="0"/>
         </paramlist>
       </constructor>
           <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>
         <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>
         <autodoc>SetItem(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetOldItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetOldItem" type="TreeItemId" overloaded="no">

         <autodoc>GetOldItem() -&gt; TreeItemId</autodoc>
       </method>
         <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>
         <autodoc>SetOldItem(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPoint" type="wxPoint" overloaded="no">
+      <method name="GetPoint" type="Point" overloaded="no">

         <autodoc>GetPoint() -&gt; Point</autodoc>
       </method>
         <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>
         <autodoc>SetPoint(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetKeyEvent(KeyEvent evt)</autodoc>
         <paramlist>

-          <param name="evt" type="r.q(const).wxKeyEvent" default=""/>
+          <param name="evt" type="KeyEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLabel" type="q(const).wxString" overloaded="no">
+      <method name="GetLabel" type="String" overloaded="no">

         <autodoc>GetLabel() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         </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>
         <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>
         <autodoc>SetToolTip(String toolTip)</autodoc>
         <paramlist>

-          <param name="toolTip" type="r.q(const).wxString" default=""/>
+          <param name="toolTip" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -16721,20 +18716,20 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="TreeCtrl" oldname="wxPyTreeCtrl" module="controls">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreTreeCtrl" overloaded="no">


@@ -16745,21 +18740,22 @@ EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeCtrlNameStr) -&gt; bool</autodoc>
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" default="-1"/>
           <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="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>
         </paramlist>
       </method>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetCount" type="size_t" overloaded="no">


@@ -16768,7 +18764,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="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=""/>
         <autodoc>SetIndent(unsigned int indent)</autodoc>
         <paramlist>
           <param name="indent" type="unsigned int" default=""/>


@@ -16777,381 +18773,394 @@ 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="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>
         <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>
         <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>
         <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>
         <autodoc>SetImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetStateImageList" type="void" overloaded="no">
+      <method name="SetStateImageList" type="" overloaded="no">

         <autodoc>SetStateImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>SetStateImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">

         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AssignStateImageList" type="void" overloaded="no">
+      <method name="AssignStateImageList" type="" overloaded="no">

         <autodoc>AssignStateImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>AssignStateImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetItemText" type="wxString" overloaded="no">
+      <method name="GetItemText" type="String" overloaded="no">

         <autodoc>GetItemText(TreeItemId item) -&gt; String</autodoc>
         <paramlist>
         <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>
         </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>
           <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>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="GetItemTextColour" type="wxColour" overloaded="no">
+      <method name="GetItemTextColour" type="Colour" overloaded="no">

         <autodoc>GetItemTextColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetItemBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetItemBackgroundColour" type="Colour" overloaded="no">

         <autodoc>GetItemBackgroundColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetItemFont" type="wxFont" overloaded="no">
+      <method name="GetItemFont" type="Font" overloaded="no">

         <autodoc>GetItemFont(TreeItemId item) -&gt; Font</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemText" type="void" overloaded="no">
+      <method name="SetItemText" type="" overloaded="no">

         <autodoc>SetItemText(TreeItemId item, String text)</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemPyData" type="void" overloaded="no">
+      <method name="SetItemPyData" type="" overloaded="no">

         <autodoc>SetItemPyData(TreeItemId item, PyObject obj)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemHasChildren" type="void" overloaded="no">
+      <method name="SetItemHasChildren" type="" overloaded="no">

         <autodoc>SetItemHasChildren(TreeItemId item, bool has=True)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemBackgroundColour" type="void" overloaded="no">
+      <method name="SetItemBackgroundColour" type="" overloaded="no">

         <autodoc>SetItemBackgroundColour(TreeItemId item, Colour col)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemFont" type="void" overloaded="no">
+      <method name="SetItemFont" type="" overloaded="no">

         <autodoc>SetItemFont(TreeItemId item, Font font)</autodoc>
         <paramlist>
         <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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
           <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>
         <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>
         <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>
         <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>
         </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">
         </paramlist>
       </method>
       <method name="GetNextChild" type="PyObject" overloaded="no">

-        <autodoc>GetNextChild(TreeItemId item, wxTreeItemIdValue cookie) -&gt; PyObject</autodoc>
+        <autodoc>GetNextChild(TreeItemId item, void cookie) -&gt; PyObject</autodoc>

         <paramlist>
         <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="" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLastChild" type="wxTreeItemId" overloaded="no">
+      <method name="GetLastChild" type="TreeItemId" overloaded="no">

         <autodoc>GetLastChild(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetNextSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetNextSibling" type="TreeItemId" overloaded="no">

         <autodoc>GetNextSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetPrevSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevSibling" type="TreeItemId" overloaded="no">

         <autodoc>GetPrevSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetFirstVisibleItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetFirstVisibleItem" type="TreeItemId" overloaded="no">

         <autodoc>GetFirstVisibleItem() -&gt; TreeItemId</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetPrevVisible" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevVisible" type="TreeItemId" overloaded="no">

         <autodoc>GetPrevVisible(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </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>
         <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="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>
         </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>
         <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="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>
         </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>
         <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="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>
         </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>
         <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="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="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>
         </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>
         <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="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>
         </paramlist>
       </method>

-      <method name="Delete" type="void" overloaded="no">
+      <method name="Delete" type="" overloaded="no">

         <autodoc>Delete(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Delete(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DeleteChildren" type="void" overloaded="no">
+      <method name="DeleteChildren" type="" overloaded="no">

         <autodoc>DeleteChildren(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>DeleteChildren(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DeleteAllItems" type="void" overloaded="no">
+      <method name="DeleteAllItems" type="" overloaded="no">

         <autodoc>DeleteAllItems()</autodoc>
       </method>
         <autodoc>DeleteAllItems()</autodoc>
       </method>

-      <method name="Expand" type="void" overloaded="no">
+      <method name="Expand" type="" overloaded="no">

         <autodoc>Expand(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Expand(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Collapse" type="void" overloaded="no">
+      <method name="Collapse" type="" overloaded="no">

         <autodoc>Collapse(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Collapse(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CollapseAndReset" type="void" overloaded="no">
+      <method name="CollapseAndReset" type="" overloaded="no">

         <autodoc>CollapseAndReset(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>CollapseAndReset(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">

         <autodoc>Toggle(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Toggle(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Unselect" type="void" overloaded="no">
+      <method name="Unselect" type="" overloaded="no">

         <autodoc>Unselect()</autodoc>
       </method>
         <autodoc>Unselect()</autodoc>
       </method>

-      <method name="UnselectAll" type="void" overloaded="no">
+      <method name="UnselectItem" type="" overloaded="no">
+        <autodoc>UnselectItem(TreeItemId item)</autodoc>
+        <paramlist>
+          <param name="item" type="TreeItemId" default=""/>
+        </paramlist>
+      </method>
+      <method name="UnselectAll" type="" overloaded="no">

         <autodoc>UnselectAll()</autodoc>
       </method>
         <autodoc>UnselectAll()</autodoc>
       </method>

-      <method name="SelectItem" type="void" overloaded="no">
-        <autodoc>SelectItem(TreeItemId item)</autodoc>
+      <method name="SelectItem" type="" overloaded="no">
+        <autodoc>SelectItem(TreeItemId item, bool select=True)</autodoc>
+        <paramlist>
+          <param name="item" type="TreeItemId" default=""/>
+          <param name="select" type="bool" default="True"/>
+        </paramlist>
+      </method>
+      <method name="ToggleItemSelection" type="" overloaded="no">
+        <autodoc>ToggleItemSelection(TreeItemId item)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="EnsureVisible" type="void" overloaded="no">
+      <method name="EnsureVisible" type="" overloaded="no">

         <autodoc>EnsureVisible(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>EnsureVisible(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ScrollTo" type="void" overloaded="no">
+      <method name="ScrollTo" type="" overloaded="no">

         <autodoc>ScrollTo(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>ScrollTo(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="EditLabel" type="void" overloaded="no">
+      <method name="EditLabel" type="" overloaded="no">

         <autodoc>EditLabel(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>EditLabel(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetEditControl" type="wxTextCtrl" overloaded="no">
+      <method name="GetEditControl" type="TextCtrl" overloaded="no">

         <autodoc>GetEditControl() -&gt; TextCtrl</autodoc>
       </method>
         <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>
         <autodoc>SortChildren(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </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
         <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 +19168,14 @@ and the where return value is set to a bitmask of wxTREE_HITTEST_xxx
 constants.
 </docstring>
         <paramlist>
 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>
         </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>
           <param name="textOnly" type="bool" default="False"/>
         </paramlist>
       </method>


@@ -17175,7 +19184,7 @@ constants.
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="GenericDirCtrl" oldname="wxGenericDirCtrl" module="controls">
 #---------------------------------------------------------------------------
 </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, 
       <constructor name="GenericDirCtrl" overloaded="no">
         <autodoc>__init__(Window parent, int id=-1, String dir=DirDialogDefaultFolderStr, 
     Point pos=DefaultPosition, Size size=DefaultSize, 


@@ -17183,15 +19192,15 @@ constants.
     String filter=EmptyString, 
     int defaultFilter=0, String name=TreeCtrlNameStr) -&gt; GenericDirCtrl</autodoc>
         <paramlist>
     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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreGenericDirCtrl" overloaded="no">


@@ -17204,45 +19213,45 @@ constants.
     String filter=EmptyString, 
     int defaultFilter=0, String name=TreeCtrlNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="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>
         </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>
         </paramlist>
       </method>

-      <method name="GetDefaultPath" type="wxString" overloaded="no">
+      <method name="GetDefaultPath" type="String" overloaded="no">

         <autodoc>GetDefaultPath() -&gt; String</autodoc>
       </method>
         <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>
         <autodoc>SetDefaultPath(String path)</autodoc>
         <paramlist>

-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPath" type="wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">

         <autodoc>GetPath() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetPath(String path)</autodoc>
         <paramlist>

-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>ShowHidden(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -17251,62 +19260,62 @@ constants.
       <method name="GetShowHidden" type="bool" overloaded="no">
         <autodoc>GetShowHidden() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="DoResize" type="void" overloaded="no">
+      <method name="DoResize" type="" overloaded="no">

         <autodoc>DoResize()</autodoc>
       </method>
         <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">
         <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>
       <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>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>


@@ -17317,17 +19326,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>
         <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>
           <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>
         <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>
           <param name="defaultFilter" type="int" default=""/>
         </paramlist>
       </method>


@@ -17336,29 +19345,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">
 #---------------------------------------------------------------------------
 </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>
       <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="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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -17367,7 +19376,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>
           <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=""/>
         <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 +19386,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>
           <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         <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">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">


@@ -17436,19 +19445,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_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>
         <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>
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">

         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -17462,49 +19471,104 @@ 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">
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 </pythoncode>
     <class name="HelpEvent" oldname="wxHelpEvent" module="controls">

-      <baseclass name="wxCommandEvent"/>
+      <docstring>A help event is sent when the user has requested
+context-sensitive help. This can either be caused by the
+application requesting context-sensitive help mode via
+wx.ContextHelp, or (on MS Windows) by the system generating a
+WM_HELP message when the user pressed F1 or clicked on the query
+button in a dialog caption.
+
+A help event is sent to the window that the user clicked on, and
+is propagated up the window hierarchy until the event is
+processed or there are no more event handlers. The application
+should call event.GetId to check the identity of the clicked-on
+window, and then either show some suitable help or call
+event.Skip if the identifier is unrecognised. Calling Skip is
+important because it allows wxWindows to generate further events
+for ancestors of the clicked-on window. Otherwise it would be
+impossible to show help for container windows, since processing
+would stop after the first window found.
+
+ Events
+    EVT_HELP            Sent when the user has requested context-
+                        sensitive help.
+    EVT_HELP_RANGE      Allows to catch EVT_HELP for a range of IDs
+</docstring>
+      <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"/>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetPosition" type="q(const).wxPoint" overloaded="no">
+      <method name="GetPosition" type="Point" overloaded="no">

         <autodoc>GetPosition() -&gt; Point</autodoc>
         <autodoc>GetPosition() -&gt; Point</autodoc>

+        <docstring>Returns the left-click position of the mouse, in screen
+coordinates. This allows the application to position the help
+appropriately.</docstring>

       </method>
       </method>

-      <method name="SetPosition" type="void" overloaded="no">
+      <method name="SetPosition" type="" overloaded="no">

         <autodoc>SetPosition(Point pos)</autodoc>
         <autodoc>SetPosition(Point pos)</autodoc>

+        <docstring>Sets the left-click position of the mouse, in screen coordinates.</docstring>

         <paramlist>
         <paramlist>

-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLink" type="q(const).wxString" overloaded="no">
+      <method name="GetLink" type="String" overloaded="no">

         <autodoc>GetLink() -&gt; String</autodoc>
         <autodoc>GetLink() -&gt; String</autodoc>

+        <docstring>Get an optional link to further help</docstring>

       </method>
       </method>

-      <method name="SetLink" type="void" overloaded="no">
+      <method name="SetLink" type="" overloaded="no">

         <autodoc>SetLink(String link)</autodoc>
         <autodoc>SetLink(String link)</autodoc>

+        <docstring>Set an optional link to further help</docstring>

         <paramlist>
         <paramlist>

-          <param name="link" type="r.q(const).wxString" default=""/>
+          <param name="link" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTarget" type="q(const).wxString" overloaded="no">
+      <method name="GetTarget" type="String" overloaded="no">

         <autodoc>GetTarget() -&gt; String</autodoc>
         <autodoc>GetTarget() -&gt; String</autodoc>

+        <docstring>Get an optional target to display help in. E.g. a window specification</docstring>

       </method>
       </method>

-      <method name="SetTarget" type="void" overloaded="no">
+      <method name="SetTarget" type="" overloaded="no">

         <autodoc>SetTarget(String target)</autodoc>
         <autodoc>SetTarget(String target)</autodoc>

+        <docstring>Set an optional target to display help in. E.g. a window specification</docstring>

         <paramlist>
         <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">
         </paramlist>
       </method>
     </class>
     <class name="ContextHelp" oldname="wxContextHelp" module="controls">

-      <baseclass name="wxObject"/>
+      <docstring>This class changes the cursor to a query and puts the application
+into a 'context-sensitive help mode'. When the user left-clicks
+on a window within the specified window, a EVT_HELP event is sent
+to that control, and the application may respond to it by popping
+up some help.
+
+There are a couple of ways to invoke this behaviour implicitly:
+
+    * Use the wx.DIALOG_EX_CONTEXTHELP extended style for a
+      dialog (Windows only). This will put a question mark in the
+      titlebar, and Windows will put the application into
+      context-sensitive help mode automatically, with further
+      programming.
+
+    * Create a wx.ContextHelpButton, whose predefined behaviour
+      is to create a context help object. Normally you will write
+      your application so that this button is only added to a
+      dialog for non-Windows platforms (use
+      wx.DIALOG_EX_CONTEXTHELP on Windows).
+</docstring>
+      <baseclass name="Object"/>

       <constructor name="ContextHelp" overloaded="no">
         <autodoc>__init__(Window window=None, bool doNow=True) -&gt; ContextHelp</autodoc>
       <constructor name="ContextHelp" overloaded="no">
         <autodoc>__init__(Window window=None, bool doNow=True) -&gt; ContextHelp</autodoc>

+        <docstring>Constructs a context help object, calling BeginContextHelp if
+doNow is true (the default).
+
+If window is None, the top window is used.</docstring>

         <paramlist>
         <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>
           <param name="doNow" type="bool" default="True"/>
         </paramlist>
       </constructor>


@@ -17513,139 +19577,199 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </destructor>
       <method name="BeginContextHelp" type="bool" overloaded="no">
         <autodoc>BeginContextHelp(Window window=None) -&gt; bool</autodoc>
       </destructor>
       <method name="BeginContextHelp" type="bool" overloaded="no">
         <autodoc>BeginContextHelp(Window window=None) -&gt; bool</autodoc>

+        <docstring>Puts the application into context-sensitive help mode. window is
+the window which will be used to catch events; if NULL, the top
+window will be used.
+
+Returns true if the application was successfully put into
+context-sensitive help mode. This function only returns when the
+event loop has finished.</docstring>

         <paramlist>
         <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">
         <autodoc>EndContextHelp() -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="EndContextHelp" type="bool" overloaded="no">
         <autodoc>EndContextHelp() -&gt; bool</autodoc>

+        <docstring>Ends context-sensitive help mode. Not normally called by the
+application.</docstring>

       </method>
     </class>
     <class name="ContextHelpButton" oldname="wxContextHelpButton" module="controls">
       </method>
     </class>
     <class name="ContextHelpButton" oldname="wxContextHelpButton" module="controls">

-      <baseclass name="wxBitmapButton"/>
+      <docstring>Instances of this class may be used to add a question mark button
+that when pressed, puts the application into context-help
+mode. It does this by creating a wx.ContextHelp object which
+itself generates a EVT_HELP event when the user clicks on a
+window.
+
+On Windows, you may add a question-mark icon to a dialog by use
+of the wx.DIALOG_EX_CONTEXTHELP extra style, but on other
+platforms you will have to add a button explicitly, usually next
+to OK, Cancel or similar buttons.
+</docstring>
+      <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>
       <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>

+        <docstring>Constructor, creating and showing a context help button.</docstring>

         <paramlist>
         <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="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">
           <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">
-        <autodoc>HelpProvider.Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
+      <docstring>wx.HelpProvider is an abstract class used by a program
+implementing context-sensitive help to show the help text for the
+given window.
+
+The current help provider must be explicitly set by the
+application using wx.HelpProvider.Set().</docstring>
+      <staticmethod name="Set" type="HelpProvider" overloaded="no">
+        <autodoc>Set(HelpProvider helpProvider) -&gt; HelpProvider</autodoc>
+        <docstring>Sset the current, application-wide help provider. Returns the
+previous one.  Unlike some other classes, the help provider is
+not created on demand. This must be explicitly done by the
+application.</docstring>

         <paramlist>
         <paramlist>

-          <param name="helpProvider" type="p.wxHelpProvider" default=""/>
+          <param name="helpProvider" type="HelpProvider" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Get" type="wxHelpProvider" overloaded="no">
-        <autodoc>HelpProvider.Get() -&gt; HelpProvider</autodoc>
+      <staticmethod name="Get" type="HelpProvider" overloaded="no">
+        <autodoc>Get() -&gt; HelpProvider</autodoc>
+        <docstring>Return the current application-wide help provider.</docstring>

       </staticmethod>
       </staticmethod>

-      <method name="GetHelp" type="wxString" overloaded="no">
+      <method name="GetHelp" type="String" overloaded="no">

         <autodoc>GetHelp(Window window) -&gt; String</autodoc>
         <autodoc>GetHelp(Window window) -&gt; String</autodoc>

+        <docstring>Gets the help string for this window. Its interpretation is
+dependent on the help provider except that empty string always
+means that no help is associated with the window.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="ShowHelp" type="bool" overloaded="no">
         <autodoc>ShowHelp(Window window) -&gt; bool</autodoc>

+        <docstring>Shows help for the given window. Uses GetHelp internally if
+applicable.
+
+Returns true if it was done, or false if no help was available
+for this window.</docstring>

         <paramlist>
         <paramlist>

-          <param name="window" type="p.wxWindow" default=""/>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddHelp" type="void" overloaded="no">
+      <method name="AddHelp" type="" overloaded="no">

         <autodoc>AddHelp(Window window, String text)</autodoc>
         <autodoc>AddHelp(Window window, String text)</autodoc>

+        <docstring>Associates the text with the given window.</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddHelpById" type="void" overloaded="no">
+      <method name="AddHelpById" type="" overloaded="no">

         <autodoc>AddHelpById(int id, String text)</autodoc>
         <autodoc>AddHelpById(int id, String text)</autodoc>

+        <docstring>This version associates the given text with all windows with this
+id. May be used to set the same help string for all Cancel
+buttons in the application, for example.</docstring>

         <paramlist>
           <param name="id" type="int" default=""/>
         <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="RemoveHelp" type="" overloaded="no">
+        <autodoc>RemoveHelp(Window window)</autodoc>
+        <docstring>Removes the association between the window pointer and the help
+text. This is called by the wx.Window destructor. Without this,
+the table of help strings will fill up and when window pointers
+are reused, the wrong help string will be found.</docstring>
+        <paramlist>
+          <param name="window" type="Window" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>Destroy()</autodoc>
       </method>
     </class>
     <class name="SimpleHelpProvider" oldname="wxSimpleHelpProvider" module="controls">

-      <baseclass name="wxHelpProvider"/>
+      <docstring>wx.SimpleHelpProvider is an implementation of wx.HelpProvider
+which supports only plain text help strings, and shows the string
+associated with the control (if any) in a tooltip.</docstring>
+      <baseclass name="HelpProvider"/>

       <constructor name="SimpleHelpProvider" overloaded="no">
         <autodoc>__init__() -&gt; SimpleHelpProvider</autodoc>
       <constructor name="SimpleHelpProvider" overloaded="no">
         <autodoc>__init__() -&gt; SimpleHelpProvider</autodoc>

+        <docstring>wx.SimpleHelpProvider is an implementation of wx.HelpProvider
+which supports only plain text help strings, and shows the string
+associated with the control (if any) in a tooltip.</docstring>

       </constructor>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DragImage" oldname="wxGenericDragImage" module="controls">
       </constructor>
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
 </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>
       <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>
         </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>
         </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>
         </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>
         </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>
           <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>
         <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>
         </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="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>
         </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">
         </paramlist>
       </method>
       <method name="EndDrag" type="bool" overloaded="no">


@@ -17654,7 +19778,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>
       <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">
         </paramlist>
       </method>
       <method name="Show" type="bool" overloaded="no">


@@ -17663,33 +19787,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="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>
         <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>
         </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>
         </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>
         </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>
           <param name="eraseOld" type="bool" default=""/>
           <param name="drawNew" type="bool" default=""/>
         </paramlist>


@@ -17703,75 +19827,75 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SystemSettings" oldname="wxSystemSettings" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="SystemSettings" oldname="wxSystemSettings" module="misc">

-      <staticmethod name="GetColour" type="wxColour" overloaded="no">
-        <autodoc>SystemSettings.GetColour(int index) -&gt; Colour</autodoc>
+      <staticmethod name="GetColour" type="Colour" overloaded="no">
+        <autodoc>GetColour(int index) -&gt; Colour</autodoc>

         <paramlist>
           <param name="index" type="wxSystemColour" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="index" type="wxSystemColour" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetFont" type="wxFont" overloaded="no">
-        <autodoc>SystemSettings.GetFont(int index) -&gt; Font</autodoc>
+      <staticmethod name="GetFont" type="Font" overloaded="no">
+        <autodoc>GetFont(int index) -&gt; Font</autodoc>

         <paramlist>
           <param name="index" type="wxSystemFont" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMetric" type="int" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemFont" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetMetric" type="int" overloaded="no">

-        <autodoc>SystemSettings.GetMetric(int index) -&gt; int</autodoc>
+        <autodoc>GetMetric(int index) -&gt; int</autodoc>

         <paramlist>
           <param name="index" type="wxSystemMetric" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasFeature" type="bool" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemMetric" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="HasFeature" type="bool" overloaded="no">

-        <autodoc>SystemSettings.HasFeature(int index) -&gt; bool</autodoc>
+        <autodoc>HasFeature(int index) -&gt; bool</autodoc>

         <paramlist>
           <param name="index" type="wxSystemFeature" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetScreenType" type="wxSystemScreenType" overloaded="no">
         <paramlist>
           <param name="index" type="wxSystemFeature" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetScreenType" type="wxSystemScreenType" overloaded="no">

-        <autodoc>SystemSettings.GetScreenType() -&gt; int</autodoc>
+        <autodoc>GetScreenType() -&gt; int</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetScreenType" type="void" overloaded="no">
-        <autodoc>SystemSettings.SetScreenType(int screen)</autodoc>
+      <staticmethod name="SetScreenType" type="" overloaded="no">
+        <autodoc>SetScreenType(int screen)</autodoc>

         <paramlist>
           <param name="screen" type="wxSystemScreenType" default=""/>
         </paramlist>
       </staticmethod>
     </class>
     <class name="SystemOptions" oldname="wxSystemOptions" module="misc">
         <paramlist>
           <param name="screen" type="wxSystemScreenType" default=""/>
         </paramlist>
       </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>
       <constructor name="SystemOptions" overloaded="no">
         <autodoc>__init__() -&gt; SystemOptions</autodoc>
       </constructor>

-      <staticmethod name="SetOption" type="void" overloaded="no">
-        <autodoc>SystemOptions.SetOption(String name, String value)</autodoc>
+      <staticmethod name="SetOption" type="" overloaded="no">
+        <autodoc>SetOption(String name, String value)</autodoc>

         <paramlist>
         <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>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetOptionInt" type="void" overloaded="no">
-        <autodoc>SystemOptions.SetOptionInt(String name, int value)</autodoc>
+      <staticmethod name="SetOptionInt" type="" overloaded="no">
+        <autodoc>SetOptionInt(String name, int value)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

           <param name="value" type="int" default=""/>
         </paramlist>
       </staticmethod>
           <param name="value" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetOption" type="wxString" overloaded="no">
-        <autodoc>SystemOptions.GetOption(String name) -&gt; String</autodoc>
+      <staticmethod name="GetOption" type="String" overloaded="no">
+        <autodoc>GetOption(String name) -&gt; String</autodoc>

         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetOptionInt" type="int" overloaded="no">

-        <autodoc>SystemOptions.GetOptionInt(String name) -&gt; int</autodoc>
+        <autodoc>GetOptionInt(String name) -&gt; int</autodoc>

         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="HasOption" type="bool" overloaded="no">

-        <autodoc>SystemOptions.HasOption(String name) -&gt; bool</autodoc>
+        <autodoc>HasOption(String name) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </staticmethod>
     </class>
         </paramlist>
       </staticmethod>
     </class>


@@ -17781,7 +19905,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="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=""/>
       <autodoc>RegisterId(long id)</autodoc>
       <paramlist>
         <param name="id" type="long" default=""/>


@@ -17790,10 +19914,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="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>
       <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">
       <autodoc>EndBusyCursor()</autodoc>
     </method>
     <method name="GetElapsedTime" oldname="wxGetElapsedTime" type="long" overloaded="no">


@@ -17802,36 +19926,36 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <param name="resetTimer" type="bool" default="True"/>
       </paramlist>
     </method>
         <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>
       <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>
       </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>
       <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>
       </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>
       <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>
       </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">
       <autodoc>GetOsDescription() -&gt; String</autodoc>
     </method>
     <method name="GetFreeMemory" oldname="wxGetFreeMemory" type="long" overloaded="no">


@@ -17843,61 +19967,61 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <param name="wFlags" type="wxShutdownFlags" default=""/>
       </paramlist>
     </method>
         <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>
       <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>
       <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>
       <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>
       <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>
       </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>
       <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>
       <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>
       <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>
       <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>
       <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>
       <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>
       <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>
       </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>
       <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, 
       <autodoc>FileSelector(String message=FileSelectorPromptStr, String default_path=EmptyString, 
     String default_filename=EmptyString, 
     String default_extension=EmptyString, 


@@ -17905,83 +20029,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>
     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="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>
         <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>
       <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>
       </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>
       <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>
       </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>
       <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="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>
       </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>
       <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>
         <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>
       <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>
       </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>
       <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" 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"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
         <param name="centre" type="bool" default="True"/>


@@ -17994,11 +20118,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>
     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" 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"/>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
         <param name="centre" type="bool" default="True"/>


@@ -18011,10 +20135,10 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
     Window parent=None, int x=-1, 
     int y=-1) -&gt; int</autodoc>
       <paramlist>
     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="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>
         <param name="x" type="int" default="-1"/>
         <param name="y" type="int" default="-1"/>
       </paramlist>


@@ -18024,14 +20148,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>
     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="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">
       </paramlist>
     </method>
     <method name="ColourDisplay" oldname="wxColourDisplay" type="bool" overloaded="no">


@@ -18043,69 +20167,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="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>
       <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>
       </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>
       <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>
       <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>
       </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>
       <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>
       <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>
       </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>
       <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>
       <autodoc>SetCursor(Cursor cursor)</autodoc>
       <paramlist>

-        <param name="cursor" type="r.wxCursor" default=""/>
+        <param name="cursor" type="Cursor" default=""/>

       </paramlist>
     </method>
       </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>
       <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>
       </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>
       <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>
       <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>
       </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>
       <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>
       </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>
       <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">
       </paramlist>
     </method>
     <method name="GetKeyState" oldname="wxGetKeyState" type="bool" overloaded="no">


@@ -18114,13 +20238,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
         <param name="key" type="wxKeyCode" default=""/>
       </paramlist>
     </method>
         <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>
       <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>
       <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">
       <autodoc>MutexGuiLeave()</autodoc>
     </method>
     <class name="MutexGuiLocker" oldname="wxMutexGuiLocker" module="misc">


@@ -18138,33 +20262,33 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ToolTip" oldname="wxToolTip" module="misc">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="SetTip" type="void" overloaded="no">
+      <method name="SetTip" type="" overloaded="no">

         <autodoc>SetTip(String tip)</autodoc>
         <paramlist>
         <autodoc>SetTip(String tip)</autodoc>
         <paramlist>

-          <param name="tip" type="r.q(const).wxString" default=""/>
+          <param name="tip" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTip" type="wxString" overloaded="no">
+      <method name="GetTip" type="String" overloaded="no">

         <autodoc>GetTip() -&gt; String</autodoc>
       </method>
         <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>
         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>

-      <staticmethod name="Enable" type="void" overloaded="no">
-        <autodoc>ToolTip.Enable(bool flag)</autodoc>
+      <staticmethod name="Enable" type="" overloaded="no">
+        <autodoc>Enable(bool flag)</autodoc>

         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="flag" type="bool" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetDelay" type="void" overloaded="no">
-        <autodoc>ToolTip.SetDelay(long milliseconds)</autodoc>
+      <staticmethod name="SetDelay" type="" overloaded="no">
+        <autodoc>SetDelay(long milliseconds)</autodoc>

         <paramlist>
           <param name="milliseconds" type="long" default=""/>
         </paramlist>
         <paramlist>
           <param name="milliseconds" type="long" default=""/>
         </paramlist>


@@ -18174,8 +20298,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>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxCaret" overloaded="no">


@@ -18187,69 +20311,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="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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetSize" type="wxSize" overloaded="no">
+      <method name="GetSize" type="Size" overloaded="no">

         <autodoc>GetSize() -&gt; Size</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetWindow" type="wxWindow" overloaded="no">
+      <method name="GetWindow" type="Window" overloaded="no">

         <autodoc>GetWindow() -&gt; Window</autodoc>
       </method>
         <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>
         <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>
         <autodoc>Move(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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=""/>
       <autodoc>Caret_SetBlinkTime(int milliseconds)</autodoc>
       <paramlist>
         <param name="milliseconds" type="int" default=""/>


@@ -18259,7 +20383,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>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxBusyCursor" overloaded="no">


@@ -18270,7 +20394,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>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxWindowDisabler" overloaded="no">


@@ -18278,11 +20402,11 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </destructor>
     </class>
     <class name="BusyInfo" oldname="wxBusyInfo" module="misc">
       </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>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxBusyInfo" overloaded="no">


@@ -18293,16 +20417,16 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <constructor name="StopWatch" overloaded="no">
         <autodoc>__init__() -&gt; StopWatch</autodoc>
       </constructor>
       <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>
         <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>
         <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">
         <autodoc>Resume()</autodoc>
       </method>
       <method name="Time" type="long" overloaded="no">


@@ -18310,7 +20434,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       </method>
     </class>
     <class name="FileHistory" oldname="wxFileHistory" module="misc">
       </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>
       <constructor name="FileHistory" overloaded="no">
         <autodoc>__init__(int maxFiles=9) -&gt; FileHistory</autodoc>
         <paramlist>


@@ -18320,13 +20444,13 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <destructor name="~wxFileHistory" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <autodoc>AddFileToHistory(String file)</autodoc>
         <paramlist>

-          <param name="file" type="r.q(const).wxString" default=""/>
+          <param name="file" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>RemoveFileFromHistory(int i)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>


@@ -18335,40 +20459,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="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>
         <autodoc>UseMenu(Menu menu)</autodoc>
         <paramlist>

-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RemoveMenu" type="void" overloaded="no">
+      <method name="RemoveMenu" type="" overloaded="no">

         <autodoc>RemoveMenu(Menu menu)</autodoc>
         <paramlist>
         <autodoc>RemoveMenu(Menu menu)</autodoc>
         <paramlist>

-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Load" type="void" overloaded="no">
+      <method name="Load" type="" overloaded="no">

         <autodoc>Load(ConfigBase config)</autodoc>
         <paramlist>
         <autodoc>Load(ConfigBase config)</autodoc>
         <paramlist>

-          <param name="config" type="r.wxConfigBase" default=""/>
+          <param name="config" type="wxConfigBase" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Save" type="void" overloaded="no">
+      <method name="Save" type="" overloaded="no">

         <autodoc>Save(ConfigBase config)</autodoc>
         <paramlist>
         <autodoc>Save(ConfigBase config)</autodoc>
         <paramlist>

-          <param name="config" type="r.wxConfigBase" default=""/>
+          <param name="config" type="wxConfigBase" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddFilesToMenu" type="void" overloaded="no">
+      <method name="AddFilesToMenu" type="" overloaded="no">

         <autodoc>AddFilesToMenu()</autodoc>
       </method>
         <autodoc>AddFilesToMenu()</autodoc>
       </method>

-      <method name="AddFilesToThisMenu" type="void" overloaded="no">
+      <method name="AddFilesToThisMenu" type="" overloaded="no">

         <autodoc>AddFilesToThisMenu(Menu menu)</autodoc>
         <paramlist>
         <autodoc>AddFilesToThisMenu(Menu menu)</autodoc>
         <paramlist>

-          <param name="menu" type="p.wxMenu" default=""/>
+          <param name="menu" type="Menu" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>GetHistoryFile(int i) -&gt; String</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>


@@ -18382,8 +20506,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>
       <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">
         </paramlist>
       </constructor>
       <constructor name="PreSingleInstanceChecker" overloaded="no">


@@ -18395,19 +20519,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>
       <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>
         </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>
       <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>
         <param name="method" type="int" default=""/>
       </paramlist>
     </method>


@@ -18418,47 +20542,47 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
       <destructor name="~wxTipProvider" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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>
         <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">
         </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>
       <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>
         <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>
         </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>
         <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>
       <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>
         <param name="currentTip" type="size_t" default=""/>
       </paramlist>
     </method>


@@ -18466,28 +20590,28 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Timer" oldname="wxPyTimer" module="misc">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetOwner" type="void" overloaded="no">
+      <method name="SetOwner" type="" overloaded="no">

         <autodoc>SetOwner(EvtHandler owner, int id=-1)</autodoc>
         <paramlist>
         <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>
           <param name="id" type="int" default="-1"/>
         </paramlist>
       </method>


@@ -18498,7 +20622,7 @@ EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
           <param name="oneShot" type="bool" default="False"/>
         </paramlist>
       </method>
           <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">
         <autodoc>Stop()</autodoc>
       </method>
       <method name="IsRunning" type="bool" overloaded="no">


@@ -18530,7 +20654,7 @@ EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
                    
 </pythoncode>
     <class name="TimerEvent" oldname="wxTimerEvent" module="misc">
                    
 </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>
       <constructor name="TimerEvent" overloaded="no">
         <autodoc>__init__(int timerid=0, int interval=0) -&gt; TimerEvent</autodoc>
         <paramlist>


@@ -18545,14 +20669,14 @@ EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
     <class name="TimerRunner" oldname="wxTimerRunner" module="misc">
       <constructor name="TimerRunner" overloaded="yes">
         <paramlist>
     <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>
         </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>
           <param name="milli" type="int" default=""/>
           <param name="oneShot" type="bool" default="False"/>
         </paramlist>


@@ -18560,7 +20684,7 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
       <destructor name="~wxTimerRunner" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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=""/>
         <autodoc>Start(int milli, bool oneShot=False)</autodoc>
         <paramlist>
           <param name="milli" type="int" default=""/>


@@ -18576,161 +20700,161 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
         <autodoc>__init__() -&gt; Log</autodoc>
       </constructor>
       <staticmethod name="IsEnabled" type="bool" overloaded="no">
         <autodoc>__init__() -&gt; Log</autodoc>
       </constructor>
       <staticmethod name="IsEnabled" type="bool" overloaded="no">

-        <autodoc>Log.IsEnabled() -&gt; bool</autodoc>
+        <autodoc>IsEnabled() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="EnableLogging" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="EnableLogging" type="bool" overloaded="no">

-        <autodoc>Log.EnableLogging(bool doIt=True) -&gt; bool</autodoc>
+        <autodoc>EnableLogging(bool doIt=True) -&gt; bool</autodoc>

         <paramlist>
           <param name="doIt" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="doIt" type="bool" default="True"/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="OnLog" type="void" overloaded="no">
-        <autodoc>Log.OnLog(wxLogLevel level, wxChar szString, time_t t)</autodoc>
+      <staticmethod name="OnLog" type="" overloaded="no">
+        <autodoc>OnLog(wxLogLevel level, wxChar szString, time_t t)</autodoc>

         <paramlist>
           <param name="level" type="wxLogLevel" default=""/>
         <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>
           <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>
         <autodoc>Flush()</autodoc>
       </method>

-      <staticmethod name="FlushActive" type="void" overloaded="no">
-        <autodoc>Log.FlushActive()</autodoc>
+      <staticmethod name="FlushActive" type="" overloaded="no">
+        <autodoc>FlushActive()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="GetActiveTarget" type="wxLog" overloaded="no">
-        <autodoc>Log.GetActiveTarget() -&gt; Log</autodoc>
+      <staticmethod name="GetActiveTarget" type="Log" overloaded="no">
+        <autodoc>GetActiveTarget() -&gt; Log</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetActiveTarget" type="wxLog" overloaded="no">
-        <autodoc>Log.SetActiveTarget(Log pLogger) -&gt; Log</autodoc>
+      <staticmethod name="SetActiveTarget" type="Log" overloaded="no">
+        <autodoc>SetActiveTarget(Log pLogger) -&gt; Log</autodoc>

         <paramlist>
         <paramlist>

-          <param name="pLogger" type="p.wxLog" default=""/>
+          <param name="pLogger" type="Log" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Suspend" type="void" overloaded="no">
-        <autodoc>Log.Suspend()</autodoc>
+      <staticmethod name="Suspend" type="" overloaded="no">
+        <autodoc>Suspend()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Resume" type="void" overloaded="no">
-        <autodoc>Log.Resume()</autodoc>
+      <staticmethod name="Resume" type="" overloaded="no">
+        <autodoc>Resume()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetVerbose" type="void" overloaded="no">
-        <autodoc>Log.SetVerbose(bool bVerbose=True)</autodoc>
+      <staticmethod name="SetVerbose" type="" overloaded="no">
+        <autodoc>SetVerbose(bool bVerbose=True)</autodoc>

         <paramlist>
           <param name="bVerbose" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="bVerbose" type="bool" default="True"/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="SetLogLevel" type="void" overloaded="no">
-        <autodoc>Log.SetLogLevel(wxLogLevel logLevel)</autodoc>
+      <staticmethod name="SetLogLevel" type="" overloaded="no">
+        <autodoc>SetLogLevel(wxLogLevel logLevel)</autodoc>

         <paramlist>
           <param name="logLevel" type="wxLogLevel" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="logLevel" type="wxLogLevel" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="DontCreateOnDemand" type="void" overloaded="no">
-        <autodoc>Log.DontCreateOnDemand()</autodoc>
+      <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
+        <autodoc>DontCreateOnDemand()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetTraceMask" type="void" overloaded="no">
-        <autodoc>Log.SetTraceMask(wxTraceMask ulMask)</autodoc>
+      <staticmethod name="SetTraceMask" type="" overloaded="no">
+        <autodoc>SetTraceMask(wxTraceMask ulMask)</autodoc>

         <paramlist>
           <param name="ulMask" type="wxTraceMask" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="ulMask" type="wxTraceMask" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="AddTraceMask" type="void" overloaded="no">
-        <autodoc>Log.AddTraceMask(String str)</autodoc>
+      <staticmethod name="AddTraceMask" type="" overloaded="no">
+        <autodoc>AddTraceMask(String str)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="RemoveTraceMask" type="void" overloaded="no">
-        <autodoc>Log.RemoveTraceMask(String str)</autodoc>
+      <staticmethod name="RemoveTraceMask" type="" overloaded="no">
+        <autodoc>RemoveTraceMask(String str)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="ClearTraceMasks" type="void" overloaded="no">
-        <autodoc>Log.ClearTraceMasks()</autodoc>
+      <staticmethod name="ClearTraceMasks" type="" overloaded="no">
+        <autodoc>ClearTraceMasks()</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="GetTraceMasks" type="q(const).wxArrayString" overloaded="no">
-        <autodoc>Log.GetTraceMasks() -&gt; wxArrayString</autodoc>
+      <staticmethod name="GetTraceMasks" type="wxArrayString" overloaded="no">
+        <autodoc>GetTraceMasks() -&gt; wxArrayString</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="SetTimestamp" type="void" overloaded="no">
-        <autodoc>Log.SetTimestamp(wxChar ts)</autodoc>
+      <staticmethod name="SetTimestamp" type="" overloaded="no">
+        <autodoc>SetTimestamp(wxChar ts)</autodoc>

         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetVerbose" type="bool" overloaded="no">

-        <autodoc>Log.GetVerbose() -&gt; bool</autodoc>
+        <autodoc>GetVerbose() -&gt; bool</autodoc>

       </staticmethod>
       <staticmethod name="GetTraceMask" type="wxTraceMask" overloaded="no">
       </staticmethod>
       <staticmethod name="GetTraceMask" type="wxTraceMask" overloaded="no">

-        <autodoc>Log.GetTraceMask() -&gt; wxTraceMask</autodoc>
+        <autodoc>GetTraceMask() -&gt; wxTraceMask</autodoc>

       </staticmethod>
       <staticmethod name="IsAllowedTraceMask" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="IsAllowedTraceMask" type="bool" overloaded="no">

-        <autodoc>Log.IsAllowedTraceMask(wxChar mask) -&gt; bool</autodoc>
+        <autodoc>IsAllowedTraceMask(wxChar mask) -&gt; bool</autodoc>

         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="GetLogLevel" type="wxLogLevel" overloaded="no">

-        <autodoc>Log.GetLogLevel() -&gt; wxLogLevel</autodoc>
+        <autodoc>GetLogLevel() -&gt; wxLogLevel</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="GetTimestamp" type="q(const).wxChar" overloaded="no">
-        <autodoc>Log.GetTimestamp() -&gt; wxChar</autodoc>
+      <staticmethod name="GetTimestamp" type="wxChar" overloaded="no">
+        <autodoc>GetTimestamp() -&gt; wxChar</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="TimeStamp" type="wxString" overloaded="no">
-        <autodoc>Log.TimeStamp() -&gt; String</autodoc>
+      <staticmethod name="TimeStamp" type="String" overloaded="no">
+        <autodoc>TimeStamp() -&gt; String</autodoc>

       </staticmethod>
       </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">
         <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">
       <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>
       <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">
         </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">
       <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>
       <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>
           <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>
         <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>
         <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>
         <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=""/>
         <autodoc>PassMessages(bool bDoPass)</autodoc>
         <paramlist>
           <param name="bDoPass" type="bool" default=""/>


@@ -18738,20 +20862,20 @@ __init__(wxTimer timer, int milli, bool oneShot=False) -&gt; TimerRunner</autodo
       </method>
     </class>
     <class name="LogChain" oldname="wxLogChain" module="misc">
       </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="SetLog" type="void" overloaded="no">
+      <method name="SetLog" type="" overloaded="no">

         <autodoc>SetLog(Log logger)</autodoc>
         <paramlist>
         <autodoc>SetLog(Log logger)</autodoc>
         <paramlist>

-          <param name="logger" type="p.wxLog" default=""/>
+          <param name="logger" type="Log" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>PassMessages(bool bDoPass)</autodoc>
         <paramlist>
           <param name="bDoPass" type="bool" default=""/>


@@ -18760,106 +20884,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="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>
         <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>
       <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>
       <autodoc>LogFatalError(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogError(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogWarning(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogMessage(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogInfo(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogDebug(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogVerbose(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <autodoc>LogStatus(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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>
       <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>
       </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>
       <autodoc>LogSysError(String msg)</autodoc>
       <paramlist>

-        <param name="msg" type="r.q(const).wxString" default=""/>
+        <param name="msg" type="String" default=""/>

       </paramlist>
     </method>
       </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=""/>
       <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>
       </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>
       <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>
       </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=""/>
       <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>
       </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>
       <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">
       </paramlist>
     </method>
     <class name="LogNull" oldname="wxLogNull" module="misc">


@@ -18871,15 +20995,15 @@ LogTrace(String mask, String msg)</autodoc>
       </destructor>
     </class>
     <class name="PyLog" oldname="wxPyLog" module="misc">
       </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>
       <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -18887,55 +21011,55 @@ LogTrace(String mask, String msg)</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Process" oldname="wxPyProcess" module="misc">
 #---------------------------------------------------------------------------
 </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>
       <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>
       <staticmethod name="Kill" type="wxKillError" overloaded="no">
           <param name="id" type="int" default="-1"/>
         </paramlist>
       </constructor>
       <staticmethod name="Kill" type="wxKillError" overloaded="no">

-        <autodoc>Process.Kill(int pid, int sig=SIGTERM) -&gt; int</autodoc>
+        <autodoc>Kill(int pid, int sig=SIGTERM) -&gt; int</autodoc>

         <paramlist>
           <param name="pid" type="int" default=""/>
           <param name="sig" type="wxSignal" default="wxSIGTERM"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Exists" type="bool" overloaded="no">
         <paramlist>
           <param name="pid" type="int" default=""/>
           <param name="sig" type="wxSignal" default="wxSIGTERM"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="Exists" type="bool" overloaded="no">

-        <autodoc>Process.Exists(int pid) -&gt; bool</autodoc>
+        <autodoc>Exists(int pid) -&gt; bool</autodoc>

         <paramlist>
           <param name="pid" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="pid" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Open" type="wxPyProcess" overloaded="no">
-        <autodoc>Process.Open(String cmd, int flags=EXEC_ASYNC) -&gt; Process</autodoc>
+      <staticmethod name="Open" type="Process" overloaded="no">
+        <autodoc>Open(String cmd, int flags=EXEC_ASYNC) -&gt; Process</autodoc>

         <paramlist>
         <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>
           <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>
         <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>
         </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>
         <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>
         <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">
         <autodoc>Detach()</autodoc>
       </method>
       <method name="GetInputStream" type="wxInputStream" overloaded="no">


@@ -18944,10 +21068,10 @@ LogTrace(String mask, String msg)</autodoc>
       <method name="GetErrorStream" type="wxInputStream" overloaded="no">
         <autodoc>GetErrorStream() -&gt; InputStream</autodoc>
       </method>
       <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>
         <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">
         <autodoc>CloseOutput()</autodoc>
       </method>
       <method name="IsInputOpened" type="bool" overloaded="no">


@@ -18961,7 +21085,7 @@ LogTrace(String mask, String msg)</autodoc>
       </method>
     </class>
     <class name="ProcessEvent" oldname="wxProcessEvent" module="misc">
       </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>
       <constructor name="ProcessEvent" overloaded="no">
         <autodoc>__init__(int id=0, int pid=0, int exitcode=0) -&gt; ProcessEvent</autodoc>
         <paramlist>


@@ -18985,9 +21109,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>
     <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="flags" type="int" default="wxEXEC_ASYNC"/>

-        <param name="process" type="p.wxPyProcess" default="NULL"/>
+        <param name="process" type="Process" default="NULL"/>

       </paramlist>
     </method>
     <pythoncode>
       </paramlist>
     </method>
     <pythoncode>


@@ -19003,7 +21127,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       <destructor name="~wxJoystick" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetZPosition" type="int" overloaded="no">


@@ -19030,7 +21154,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="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=""/>
         <autodoc>SetMovementThreshold(int threshold)</autodoc>
         <paramlist>
           <param name="threshold" type="int" default=""/>


@@ -19048,7 +21172,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="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">
         <autodoc>GetProductName() -&gt; String</autodoc>
       </method>
       <method name="GetXMin" type="int" overloaded="no">


@@ -19129,7 +21253,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>
       <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>
           <param name="pollingFreq" type="int" default="0"/>
         </paramlist>
       </method>


@@ -19138,7 +21262,7 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
       </method>
     </class>
     <class name="JoystickEvent" oldname="wxJoystickEvent" module="misc">
       </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>
       <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 +21273,12 @@ EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
           <param name="change" type="int" default="0"/>
         </paramlist>
       </constructor>
           <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"/>
       <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">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="GetZPosition" type="int" overloaded="no">


@@ -19169,31 +21293,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="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>
         <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>
         <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>
         <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>
         <autodoc>SetPosition(Point pos)</autodoc>
         <paramlist>

-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetZPosition(int zPos)</autodoc>
         <paramlist>
           <param name="zPos" type="int" default=""/>


@@ -19243,33 +21367,59 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>
     <pythoncode>
 #---------------------------------------------------------------------------
 </pythoncode>

-    <class name="Wave" oldname="wxWave" module="misc">
-      <constructor name="Wave" overloaded="no">
-        <autodoc>__init__(String fileName, bool isResource=False) -&gt; Wave</autodoc>
+    <class name="Sound" oldname="wxSound" module="misc">
+      <constructor name="Sound" overloaded="yes"/>
+      <constructor name="Sound" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="fileName" type="r.q(const).wxString" default=""/>
-          <param name="isResource" type="bool" default="False"/>
+          <param name="fileName" type="String" default=""/>
+          <param name="isResource" type="bool" default="false"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <constructor name="WaveData" overloaded="no">
-        <autodoc>WaveData(String data) -&gt; Wave</autodoc>
+      <constructor name="Sound" overloaded="yes">
+        <autodoc>__init__() -&gt; Sound
+__init__(String fileName, bool isResource=false) -&gt; Sound
+__init__(int size, wxByte data) -&gt; Sound</autodoc>

         <paramlist>
         <paramlist>

-          <param name="data" type="r.q(const).wxString" default=""/>
+          <param name="size" type="int" default=""/>
+          <param name="data" type="wxByte" default=""/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <destructor name="~wxWave" overloaded="no">
+      <destructor name="~wxSound" overloaded="no">

         <autodoc>__del__()</autodoc>
       </destructor>
         <autodoc>__del__()</autodoc>
       </destructor>

+      <method name="Create" type="bool" overloaded="yes">
+        <paramlist>
+          <param name="fileName" type="String" default=""/>
+          <param name="isResource" type="bool" default="false"/>
+        </paramlist>
+      </method>
+      <method name="Create" type="bool" overloaded="yes">
+        <autodoc>Create(String fileName, bool isResource=false) -&gt; bool
+Create(int size, wxByte data) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="size" type="int" default=""/>
+          <param name="data" type="wxByte" default=""/>
+        </paramlist>
+      </method>

       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
       <method name="Play" type="bool" overloaded="no">
       <method name="IsOk" type="bool" overloaded="no">
         <autodoc>IsOk() -&gt; bool</autodoc>
       </method>
       <method name="Play" type="bool" overloaded="no">

-        <autodoc>Play(bool async=True, bool looped=False) -&gt; bool</autodoc>
+        <autodoc>Play(unsigned int flags=SOUND_ASYNC) -&gt; bool</autodoc>

         <paramlist>
         <paramlist>

-          <param name="async" type="bool" default="True"/>
-          <param name="looped" type="bool" default="False"/>
+          <param name="flags" type="unsigned int" default="wxSOUND_ASYNC"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

+      <staticmethod name="PlaySound" type="bool" overloaded="no">
+        <autodoc>PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="filename" type="String" default=""/>
+          <param name="flags" type="unsigned int" default="wxSOUND_ASYNC"/>
+        </paramlist>
+      </staticmethod>
+      <staticmethod name="Stop" type="" overloaded="no">
+        <autodoc>Stop()</autodoc>
+      </staticmethod>

     </class>
     <pythoncode>
 #---------------------------------------------------------------------------
     </class>
     <pythoncode>
 #---------------------------------------------------------------------------


@@ -19278,16 +21428,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>
       <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>
         </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">
         </paramlist>
       </constructor>
       <constructor name="NullFileTypeInfo" overloaded="no">


@@ -19296,41 +21446,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="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>
         <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>
           <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>
         <autodoc>SetShortDesc(String shortDesc)</autodoc>
         <paramlist>

-          <param name="shortDesc" type="r.q(const).wxString" default=""/>
+          <param name="shortDesc" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetMimeType" type="q(const).wxString" overloaded="no">
+      <method name="GetMimeType" type="String" overloaded="no">

         <autodoc>GetMimeType() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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">
         <autodoc>GetIconFile() -&gt; String</autodoc>
       </method>
       <method name="GetIconIndex" type="int" overloaded="no">


@@ -19341,7 +21491,7 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <constructor name="FileType" overloaded="no">
         <autodoc>__init__(FileTypeInfo ftInfo) -&gt; FileType</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </constructor>
       <destructor name="~wxFileType" overloaded="no">


@@ -19356,7 +21506,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="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">
         <autodoc>GetIcon() -&gt; Icon</autodoc>
       </method>
       <method name="GetIconInfo" type="PyObject" overloaded="no">


@@ -19368,48 +21518,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>
       <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>
         </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>
         </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>
         </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="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>
           <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">
-        <autodoc>FileType.ExpandCommand(String command, String filename, String mimetype=EmptyString) -&gt; String</autodoc>
+      <staticmethod name="ExpandCommand" type="String" overloaded="no">
+        <autodoc>ExpandCommand(String command, String filename, String mimetype=EmptyString) -&gt; String</autodoc>

         <paramlist>
         <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>
         </paramlist>
       </staticmethod>
     </class>


@@ -19421,66 +21571,66 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="IsOfType" type="bool" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <staticmethod name="IsOfType" type="bool" overloaded="no">

-        <autodoc>MimeTypesManager.IsOfType(String mimeType, String wildcard) -&gt; bool</autodoc>
+        <autodoc>IsOfType(String mimeType, String wildcard) -&gt; bool</autodoc>

         <paramlist>
         <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>
         </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"/>
         <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>
         </paramlist>
       </method>

-      <method name="ClearData" type="void" overloaded="no">
+      <method name="ClearData" type="" overloaded="no">

         <autodoc>ClearData()</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetFileTypeFromMimeType" type="wxFileType" overloaded="no">
+      <method name="GetFileTypeFromMimeType" type="FileType" overloaded="no">

         <autodoc>GetFileTypeFromMimeType(String mimeType) -&gt; FileType</autodoc>
         <paramlist>
         <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>
         </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="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>
         </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>
         <autodoc>AddFallback(FileTypeInfo ft)</autodoc>
         <paramlist>

-          <param name="ft" type="r.q(const).wxFileTypeInfo" default=""/>
+          <param name="ft" type="FileTypeInfo" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Associate" type="wxFileType" overloaded="no">
+      <method name="Associate" type="FileType" overloaded="no">

         <autodoc>Associate(FileTypeInfo ftInfo) -&gt; FileType</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>
     </class>


@@ -19491,53 +21641,53 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN,
       <constructor name="wxPyArtProvider" overloaded="no">
         <autodoc>__init__() -&gt; ArtProvider</autodoc>
       </constructor>
       <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>
         <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>
         </paramlist>
       </method>

-      <staticmethod name="PushProvider" type="void" overloaded="no">
-        <autodoc>ArtProvider.PushProvider(ArtProvider provider)</autodoc>
+      <staticmethod name="PushProvider" type="" overloaded="no">
+        <autodoc>PushProvider(ArtProvider provider)</autodoc>

         <docstring>Add new provider to the top of providers stack.</docstring>
         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="PopProvider" type="bool" overloaded="no">

-        <autodoc>ArtProvider.PopProvider() -&gt; bool</autodoc>
+        <autodoc>PopProvider() -&gt; bool</autodoc>

         <docstring>Remove latest added provider and delete it.</docstring>
       </staticmethod>
       <staticmethod name="RemoveProvider" type="bool" overloaded="no">
         <docstring>Remove latest added provider and delete it.</docstring>
       </staticmethod>
       <staticmethod name="RemoveProvider" type="bool" overloaded="no">

-        <autodoc>ArtProvider.RemoveProvider(ArtProvider provider) -&gt; bool</autodoc>
+        <autodoc>RemoveProvider(ArtProvider provider) -&gt; bool</autodoc>

         <docstring>Remove provider. The provider must have been added previously!
 The provider is _not_ deleted.</docstring>
         <paramlist>
         <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>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetBitmap" type="wxBitmap" overloaded="no">
-        <autodoc>ArtProvider.GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Bitmap</autodoc>
+      <staticmethod name="GetBitmap" type="Bitmap" overloaded="no">
+        <autodoc>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>
         <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>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetIcon" type="wxIcon" overloaded="no">
-        <autodoc>ArtProvider.GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -&gt; Icon</autodoc>
+      <staticmethod name="GetIcon" type="Icon" overloaded="no">
+        <autodoc>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>
         <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>
         </paramlist>
       </staticmethod>

-      <method name="Destroy" type="void" overloaded="no">
+      <method name="Destroy" type="" overloaded="no">

         <autodoc>Destroy()</autodoc>
       </method>
     </class>
         <autodoc>Destroy()</autodoc>
       </method>
     </class>


@@ -19545,225 +21695,302 @@ wx.NullIcon if no provider provides it.</docstring>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ConfigBase" oldname="wxConfigBase" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ConfigBase" oldname="wxConfigBase" module="misc">

+      <docstring>wx.ConfigBase class defines the basic interface of all config
+classes. It can not be used by itself (it is an abstract base
+class) and you will always use one of its derivations: wx.Config
+or wx.FileConfig.
+
+wx.ConfigBase organizes the items in a tree-like structure
+(modeled after the Unix/Dos filesystem). There are groups
+(directories) and keys (files).  There is always one current
+group given by the current path.  As in the file system case, to
+specify a key in the config class you must use a path to it.
+Config classes also support the notion of the current group,
+which makes it possible to use relative paths.
+
+Keys are pairs "key_name = value" where value may be of string, integer
+floating point or boolean, you can not store binary data without first
+encoding it as a string.  For performance reasons items should be kept small,
+no more than a couple kilobytes.
+</docstring>

       <destructor name="~wxConfigBase" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <destructor name="~wxConfigBase" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>

-      <staticmethod name="Set" type="wxConfigBase" overloaded="no">
-        <autodoc>ConfigBase.Set(ConfigBase pConfig) -&gt; ConfigBase</autodoc>
+      <staticmethod name="Set" type="ConfigBase" overloaded="no">
+        <autodoc>Set(ConfigBase config) -&gt; ConfigBase</autodoc>
+        <docstring>Sets the global config object (the one returned by Get) and
+returns a reference to the previous global config object.</docstring>

         <paramlist>
         <paramlist>

-          <param name="pConfig" type="p.wxConfigBase" default=""/>
+          <param name="config" type="ConfigBase" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Get" type="wxConfigBase" overloaded="no">
-        <autodoc>ConfigBase.Get(bool createOnDemand=True) -&gt; ConfigBase</autodoc>
+      <staticmethod name="Get" type="ConfigBase" overloaded="no">
+        <autodoc>Get(bool createOnDemand=True) -&gt; ConfigBase</autodoc>
+        <docstring>Returns the current global config object, creating one if neccessary.</docstring>

         <paramlist>
           <param name="createOnDemand" type="bool" default="True"/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="createOnDemand" type="bool" default="True"/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Create" type="wxConfigBase" overloaded="no">
-        <autodoc>ConfigBase.Create() -&gt; ConfigBase</autodoc>
+      <staticmethod name="Create" type="ConfigBase" overloaded="no">
+        <autodoc>Create() -&gt; ConfigBase</autodoc>
+        <docstring>Create and return a new global config object.  This function will
+create the "best" implementation of wx.Config available for the
+current platform.</docstring>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="DontCreateOnDemand" type="void" overloaded="no">
-        <autodoc>ConfigBase.DontCreateOnDemand()</autodoc>
+      <staticmethod name="DontCreateOnDemand" type="" overloaded="no">
+        <autodoc>DontCreateOnDemand()</autodoc>
+        <docstring>Should Get() try to create a new log object if there isn't a current one?</docstring>

       </staticmethod>
       </staticmethod>

-      <method name="SetPath" type="void" overloaded="no">
-        <autodoc>SetPath(String strPath)</autodoc>
+      <method name="SetPath" type="" overloaded="no">
+        <autodoc>SetPath(String path)</autodoc>
+        <docstring>Set current path: if the first character is '/', it's the absolute path,
+otherwise it's a relative path. '..' is supported. If the strPath
+doesn't exist it is created.</docstring>

         <paramlist>
         <paramlist>

-          <param name="strPath" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPath" type="q(const).wxString" overloaded="no">
+      <method name="GetPath" type="String" overloaded="no">

         <autodoc>GetPath() -&gt; String</autodoc>
         <autodoc>GetPath() -&gt; String</autodoc>

+        <docstring>Retrieve the current path (always as absolute path)</docstring>

       </method>
       <method name="GetFirstGroup" type="PyObject" overloaded="no">
       </method>
       <method name="GetFirstGroup" type="PyObject" overloaded="no">

-        <autodoc>GetFirstGroup() -&gt; PyObject</autodoc>
+        <autodoc>GetFirstGroup() -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the subgroups in a config object.  Returns
+a tuple containing a flag indicating there are more items, the
+name of the current item, and an index to pass to GetNextGroup to
+fetch the next item.</docstring>

       </method>
       <method name="GetNextGroup" type="PyObject" overloaded="no">
       </method>
       <method name="GetNextGroup" type="PyObject" overloaded="no">

-        <autodoc>GetNextGroup(long index) -&gt; PyObject</autodoc>
+        <autodoc>GetNextGroup(long index) -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the subgroups in a config object.  Returns
+a tuple containing a flag indicating there are more items, the
+name of the current item, and an index to pass to GetNextGroup to
+fetch the next item.</docstring>

         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstEntry" type="PyObject" overloaded="no">
         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetFirstEntry" type="PyObject" overloaded="no">

-        <autodoc>GetFirstEntry() -&gt; PyObject</autodoc>
+        <autodoc>GetFirstEntry() -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the entries in the current group in a config
+object.  Returns a tuple containing a flag indicating there are
+more items, the name of the current item, and an index to pass to
+GetNextGroup to fetch the next item.</docstring>

       </method>
       <method name="GetNextEntry" type="PyObject" overloaded="no">
       </method>
       <method name="GetNextEntry" type="PyObject" overloaded="no">

-        <autodoc>GetNextEntry(long index) -&gt; PyObject</autodoc>
+        <autodoc>GetNextEntry(long index) -&gt; (more, value, index)</autodoc>
+        <docstring>Allows enumerating the entries in the current group in a config
+object.  Returns a tuple containing a flag indicating there are
+more items, the name of the current item, and an index to pass to
+GetNextGroup to fetch the next item.</docstring>

         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetNumberOfEntries" type="size_t" overloaded="no">
         <paramlist>
           <param name="index" type="long" default=""/>
         </paramlist>
       </method>
       <method name="GetNumberOfEntries" type="size_t" overloaded="no">

-        <autodoc>GetNumberOfEntries(bool bRecursive=False) -&gt; size_t</autodoc>
+        <autodoc>GetNumberOfEntries(bool recursive=False) -&gt; size_t</autodoc>
+        <docstring>Get the number of entries in the current group, with or
+without its subgroups.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bRecursive" type="bool" default="False"/>
+          <param name="recursive" type="bool" default="False"/>

         </paramlist>
       </method>
       <method name="GetNumberOfGroups" type="size_t" overloaded="no">
         </paramlist>
       </method>
       <method name="GetNumberOfGroups" type="size_t" overloaded="no">

-        <autodoc>GetNumberOfGroups(bool bRecursive=False) -&gt; size_t</autodoc>
+        <autodoc>GetNumberOfGroups(bool recursive=False) -&gt; size_t</autodoc>
+        <docstring>Get the number of subgroups in the current group, with or
+without its subgroups.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bRecursive" type="bool" default="False"/>
+          <param name="recursive" type="bool" default="False"/>

         </paramlist>
       </method>
       <method name="HasGroup" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="HasGroup" type="bool" overloaded="no">

-        <autodoc>HasGroup(String strName) -&gt; bool</autodoc>
+        <autodoc>HasGroup(String name) -&gt; bool</autodoc>
+        <docstring>Returns True if the group by this name exists</docstring>

         <paramlist>
         <paramlist>

-          <param name="strName" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
       <method name="HasEntry" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="HasEntry" type="bool" overloaded="no">

-        <autodoc>HasEntry(String strName) -&gt; bool</autodoc>
+        <autodoc>HasEntry(String name) -&gt; bool</autodoc>
+        <docstring>Returns True if the entry by this name exists</docstring>

         <paramlist>
         <paramlist>

-          <param name="strName" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
       <method name="Exists" type="bool" overloaded="no">
         </paramlist>
       </method>
       <method name="Exists" type="bool" overloaded="no">

-        <autodoc>Exists(String strName) -&gt; bool</autodoc>
+        <autodoc>Exists(String name) -&gt; bool</autodoc>
+        <docstring>Returns True if either a group or an entry with a given name exists</docstring>

         <paramlist>
         <paramlist>

-          <param name="strName" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
       <method name="GetEntryType" type="wxConfigBase::EntryType" overloaded="no">
         <autodoc>GetEntryType(String name) -&gt; int</autodoc>
         </paramlist>
       </method>
       <method name="GetEntryType" type="wxConfigBase::EntryType" overloaded="no">
         <autodoc>GetEntryType(String name) -&gt; int</autodoc>

+        <docstring>Get the type of the entry.  Returns one of the wx.Config.Type_XXX values.</docstring>

         <paramlist>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>Read(String key, String defaultVal=EmptyString) -&gt; String</autodoc>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="ReadInt" type="long" overloaded="no">
         <autodoc>ReadInt(String key, long defaultVal=0) -&gt; long</autodoc>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
         <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>
           <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>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
         <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>
           <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>

+        <docstring>Returns the value of key if it exists, defaultVal otherwise.</docstring>

         <paramlist>
         <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>
           <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>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
         <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>
       </method>
       <method name="WriteInt" type="bool" overloaded="no">
         <autodoc>WriteInt(String key, long value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
         <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>
           <param name="value" type="long" default=""/>
         </paramlist>
       </method>
       <method name="WriteFloat" type="bool" overloaded="no">
         <autodoc>WriteFloat(String key, double value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
         <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>
           <param name="value" type="double" default=""/>
         </paramlist>
       </method>
       <method name="WriteBool" type="bool" overloaded="no">
         <autodoc>WriteBool(String key, bool value) -&gt; bool</autodoc>

+        <docstring>write the value (return True on success)</docstring>

         <paramlist>
         <paramlist>

-          <param name="key" type="r.q(const).wxString" default=""/>
+          <param name="key" type="String" default=""/>

           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Flush" type="bool" overloaded="no">
           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
       <method name="Flush" type="bool" overloaded="no">

-        <autodoc>Flush(bool bCurrentOnly=False) -&gt; bool</autodoc>
+        <autodoc>Flush(bool currentOnly=False) -&gt; bool</autodoc>
+        <docstring>permanently writes all changes</docstring>

         <paramlist>
         <paramlist>

-          <param name="bCurrentOnly" type="bool" default="False"/>
+          <param name="currentOnly" type="bool" default="False"/>

         </paramlist>
       </method>
       <method name="RenameEntry" type="bool" overloaded="no">
         <autodoc>RenameEntry(String oldName, String newName) -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="RenameEntry" type="bool" overloaded="no">
         <autodoc>RenameEntry(String oldName, String newName) -&gt; bool</autodoc>

+        <docstring>Rename an entry.  Returns False on failure (probably because the new
+name is already taken by an existing entry)</docstring>

         <paramlist>
         <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>
       </method>
       <method name="RenameGroup" type="bool" overloaded="no">
         <autodoc>RenameGroup(String oldName, String newName) -&gt; bool</autodoc>

+        <docstring>Rename aa group.  Returns False on failure (probably because the new
+name is already taken by an existing entry)</docstring>

         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="DeleteEntry" type="bool" overloaded="no">

-        <autodoc>DeleteEntry(String key, bool bDeleteGroupIfEmpty=True) -&gt; bool</autodoc>
+        <autodoc>DeleteEntry(String key, bool deleteGroupIfEmpty=True) -&gt; bool</autodoc>
+        <docstring>Deletes the specified entry and the group it belongs to if
+it was the last key in it and the second parameter is True</docstring>

         <paramlist>
         <paramlist>

-          <param name="key" type="r.q(const).wxString" default=""/>
-          <param name="bDeleteGroupIfEmpty" type="bool" default="True"/>
+          <param name="key" type="String" default=""/>
+          <param name="deleteGroupIfEmpty" type="bool" default="True"/>

         </paramlist>
       </method>
       <method name="DeleteGroup" type="bool" overloaded="no">
         <autodoc>DeleteGroup(String key) -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="DeleteGroup" type="bool" overloaded="no">
         <autodoc>DeleteGroup(String key) -&gt; bool</autodoc>

+        <docstring>Delete the group (with all subgroups)</docstring>

         <paramlist>
         <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">
         <autodoc>DeleteAll() -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="DeleteAll" type="bool" overloaded="no">
         <autodoc>DeleteAll() -&gt; bool</autodoc>

+        <docstring>Delete the whole underlying object (disk file, registry key, ...)
+primarly intended for use by desinstallation routine.</docstring>

       </method>
       </method>

-      <method name="IsExpandingEnvVars" type="bool" overloaded="no">
-        <autodoc>IsExpandingEnvVars() -&gt; bool</autodoc>
-      </method>
-      <method name="SetExpandEnvVars" type="void" overloaded="no">
-        <autodoc>SetExpandEnvVars(bool bDoIt=True)</autodoc>
+      <method name="SetExpandEnvVars" type="" overloaded="no">
+        <autodoc>SetExpandEnvVars(bool doIt=True)</autodoc>
+        <docstring>We can automatically expand environment variables in the config entries
+(this option is on by default, you can turn it on/off at any time)</docstring>

         <paramlist>
         <paramlist>

-          <param name="bDoIt" type="bool" default="True"/>
+          <param name="doIt" type="bool" default="True"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetRecordDefaults" type="void" overloaded="no">
-        <autodoc>SetRecordDefaults(bool bDoIt=True)</autodoc>
+      <method name="IsExpandingEnvVars" type="bool" overloaded="no">
+        <autodoc>IsExpandingEnvVars() -&gt; bool</autodoc>
+        <docstring>Are we currently expanding environment variables?</docstring>
+      </method>
+      <method name="SetRecordDefaults" type="" overloaded="no">
+        <autodoc>SetRecordDefaults(bool doIt=True)</autodoc>
+        <docstring>Set whether the config objec should record default values.</docstring>

         <paramlist>
         <paramlist>

-          <param name="bDoIt" type="bool" default="True"/>
+          <param name="doIt" type="bool" default="True"/>

         </paramlist>
       </method>
       <method name="IsRecordingDefaults" type="bool" overloaded="no">
         <autodoc>IsRecordingDefaults() -&gt; bool</autodoc>
         </paramlist>
       </method>
       <method name="IsRecordingDefaults" type="bool" overloaded="no">
         <autodoc>IsRecordingDefaults() -&gt; bool</autodoc>

+        <docstring>Are we currently recording default values?</docstring>

       </method>
       </method>

-      <method name="ExpandEnvVars" type="wxString" overloaded="no">
+      <method name="ExpandEnvVars" type="String" overloaded="no">

         <autodoc>ExpandEnvVars(String str) -&gt; String</autodoc>
         <autodoc>ExpandEnvVars(String str) -&gt; String</autodoc>

+        <docstring>Expand any environment variables in str and return the result</docstring>

         <paramlist>
         <paramlist>

-          <param name="str" type="r.q(const).wxString" default=""/>
+          <param name="str" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetAppName" type="wxString" overloaded="no">
+      <method name="GetAppName" type="String" overloaded="no">

         <autodoc>GetAppName() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetAppName(String appName)</autodoc>
         <paramlist>

-          <param name="appName" type="r.q(const).wxString" default=""/>
+          <param name="appName" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetVendorName" type="void" overloaded="no">
+      <method name="SetVendorName" type="" overloaded="no">

         <autodoc>SetVendorName(String vendorName)</autodoc>
         <paramlist>
         <autodoc>SetVendorName(String vendorName)</autodoc>
         <paramlist>

-          <param name="vendorName" type="r.q(const).wxString" default=""/>
+          <param name="vendorName" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetStyle(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>


@@ -19773,32 +22000,19 @@ wx.NullIcon if no provider provides it.</docstring>
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
     </class>
         <autodoc>GetStyle() -&gt; long</autodoc>
       </method>
     </class>

-    <class name="ConfigPathChanger" oldname="wxConfigPathChanger" module="misc">
-      <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=""/>
-        </paramlist>
-      </constructor>
-      <destructor name="~wxConfigPathChanger" overloaded="no">
-        <autodoc>__del__()</autodoc>
-      </destructor>
-      <method name="Name" type="q(const).wxString" overloaded="no">
-        <autodoc>Name() -&gt; String</autodoc>
-      </method>
-    </class>

     <class name="Config" oldname="wxConfig" module="misc">
     <class name="Config" oldname="wxConfig" module="misc">

-      <baseclass name="wxConfigBase"/>
+      <docstring>This ConfigBase-derived class will use the registry on Windows,
+and will be a wx.FileConfig on other platforms.</docstring>
+      <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>
       <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>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>


@@ -19807,16 +22021,17 @@ wx.NullIcon if no provider provides it.</docstring>
       </destructor>
     </class>
     <class name="FileConfig" oldname="wxFileConfig" module="misc">
       </destructor>
     </class>
     <class name="FileConfig" oldname="wxFileConfig" module="misc">

-      <baseclass name="wxConfigBase"/>
+      <docstring>This config class will use a file for storage on all platforms.</docstring>
+      <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>
       <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>
           <param name="style" type="long" default="0"/>
         </paramlist>
       </constructor>


@@ -19824,10 +22039,34 @@ wx.NullIcon if no provider provides it.</docstring>
         <autodoc>__del__()</autodoc>
       </destructor>
     </class>
         <autodoc>__del__()</autodoc>
       </destructor>
     </class>

-    <method name="ExpandEnvVars" oldname="wxExpandEnvVars" type="wxString" overloaded="no">
+    <class name="ConfigPathChanger" oldname="wxConfigPathChanger" module="misc">
+      <docstring>A handy little class which changes current path to the path of
+given entry and restores it in the destructoir: so if you declare
+a local variable of this type, you work in the entry directory
+and the path is automatically restored when the function returns.</docstring>
+      <constructor name="ConfigPathChanger" overloaded="no">
+        <autodoc>__init__(ConfigBase config, String entry) -&gt; ConfigPathChanger</autodoc>
+        <paramlist>
+          <param name="config" type="ConfigBase" default=""/>
+          <param name="entry" type="String" default=""/>
+        </paramlist>
+      </constructor>
+      <destructor name="~wxConfigPathChanger" overloaded="no">
+        <autodoc>__del__()</autodoc>
+      </destructor>
+      <method name="Name" type="String" overloaded="no">
+        <autodoc>Name() -&gt; String</autodoc>
+        <docstring>Get the key name</docstring>
+      </method>
+    </class>
+    <method name="ExpandEnvVars" oldname="wxExpandEnvVars" type="String" overloaded="no">

       <autodoc>ExpandEnvVars(String sz) -&gt; String</autodoc>
       <autodoc>ExpandEnvVars(String sz) -&gt; String</autodoc>

+      <docstring>Replace environment variables ($SOMETHING) with their values. The
+format is $VARNAME or ${VARNAME} where VARNAME contains
+alphanumeric characters and '_' only. '$' must be escaped ('\\$')
+in order to be taken literally.</docstring>

       <paramlist>
       <paramlist>

-        <param name="sz" type="r.q(const).wxString" default=""/>
+        <param name="sz" type="String" default=""/>

       </paramlist>
     </method>
     <pythoncode>
       </paramlist>
     </method>
     <pythoncode>


@@ -19874,135 +22113,135 @@ wx.NullIcon if no provider provides it.</docstring>
       <destructor name="~wxDateTime" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <destructor name="~wxDateTime" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>

-      <staticmethod name="SetCountry" type="void" overloaded="no">
-        <autodoc>DateTime.SetCountry(int country)</autodoc>
+      <staticmethod name="SetCountry" type="" overloaded="no">
+        <autodoc>SetCountry(int country)</autodoc>

         <paramlist>
           <param name="country" type="wxDateTime::Country" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCountry" type="wxDateTime::Country" overloaded="no">
         <paramlist>
           <param name="country" type="wxDateTime::Country" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCountry" type="wxDateTime::Country" overloaded="no">

-        <autodoc>DateTime.GetCountry() -&gt; int</autodoc>
+        <autodoc>GetCountry() -&gt; int</autodoc>

       </staticmethod>
       <staticmethod name="IsWestEuropeanCountry" type="bool" overloaded="no">
       </staticmethod>
       <staticmethod name="IsWestEuropeanCountry" type="bool" overloaded="no">

-        <autodoc>DateTime.IsWestEuropeanCountry(int country=Country_Default) -&gt; bool</autodoc>
+        <autodoc>IsWestEuropeanCountry(int country=Country_Default) -&gt; bool</autodoc>

         <paramlist>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentYear" type="int" overloaded="no">
         <paramlist>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentYear" type="int" overloaded="no">

-        <autodoc>DateTime.GetCurrentYear(int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetCurrentYear(int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ConvertYearToBC" type="int" overloaded="no">
         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="ConvertYearToBC" type="int" overloaded="no">

-        <autodoc>DateTime.ConvertYearToBC(int year) -&gt; int</autodoc>
+        <autodoc>ConvertYearToBC(int year) -&gt; int</autodoc>

         <paramlist>
           <param name="year" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentMonth" type="wxDateTime::Month" overloaded="no">
         <paramlist>
           <param name="year" type="int" default=""/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCurrentMonth" type="wxDateTime::Month" overloaded="no">

-        <autodoc>DateTime.GetCurrentMonth(int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetCurrentMonth(int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="IsLeapYear" type="bool" overloaded="no">
         <paramlist>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="IsLeapYear" type="bool" overloaded="no">

-        <autodoc>DateTime.IsLeapYear(int year=Inv_Year, int cal=Gregorian) -&gt; bool</autodoc>
+        <autodoc>IsLeapYear(int year=Inv_Year, int cal=Gregorian) -&gt; bool</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCentury" type="int" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetCentury" type="int" overloaded="no">

-        <autodoc>DateTime.GetCentury(int year=Inv_Year) -&gt; int</autodoc>
+        <autodoc>GetCentury(int year=Inv_Year) -&gt; int</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysinYear" type="int" overloaded="no">
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysinYear" type="int" overloaded="no">

-        <autodoc>DateTime.GetNumberOfDaysinYear(int year, int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetNumberOfDaysinYear(int year, int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="year" type="int" default=""/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysInMonth" type="int" overloaded="no">
         <paramlist>
           <param name="year" type="int" default=""/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
       <staticmethod name="GetNumberOfDaysInMonth" type="int" overloaded="no">

-        <autodoc>DateTime.GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -&gt; int</autodoc>
+        <autodoc>GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -&gt; int</autodoc>

         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="month" type="wxDateTime::Month" default=""/>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="cal" type="wxDateTime::Calendar" default="wxDateTime::Gregorian"/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetMonthName" type="wxString" overloaded="no">
-        <autodoc>DateTime.GetMonthName(int month, int flags=Name_Full) -&gt; String</autodoc>
+      <staticmethod name="GetMonthName" type="String" overloaded="no">
+        <autodoc>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>
         <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">
-        <autodoc>DateTime.GetWeekDayName(int weekday, int flags=Name_Full) -&gt; String</autodoc>
+      <staticmethod name="GetWeekDayName" type="String" overloaded="no">
+        <autodoc>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>
         <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>
         <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">
         </paramlist>
       </staticmethod>
       <staticmethod name="IsDSTApplicable" type="bool" overloaded="no">

-        <autodoc>DateTime.IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -&gt; bool</autodoc>
+        <autodoc>IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -&gt; bool</autodoc>

         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
           <param name="country" type="wxDateTime::Country" default="wxDateTime::Country_Default"/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="GetBeginDST" type="wxDateTime" overloaded="no">
-        <autodoc>DateTime.GetBeginDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>
+      <staticmethod name="GetBeginDST" type="DateTime" overloaded="no">
+        <autodoc>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>
         <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">
-        <autodoc>DateTime.GetEndDST(int year=Inv_Year, int country=Country_Default) -&gt; DateTime</autodoc>
+      <staticmethod name="GetEndDST" type="DateTime" overloaded="no">
+        <autodoc>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>
         <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">
-        <autodoc>DateTime.Now() -&gt; DateTime</autodoc>
+      <staticmethod name="Now" type="DateTime" overloaded="no">
+        <autodoc>Now() -&gt; DateTime</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="UNow" type="wxDateTime" overloaded="no">
-        <autodoc>DateTime.UNow() -&gt; DateTime</autodoc>
+      <staticmethod name="UNow" type="DateTime" overloaded="no">
+        <autodoc>UNow() -&gt; DateTime</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Today" type="wxDateTime" overloaded="no">
-        <autodoc>DateTime.Today() -&gt; DateTime</autodoc>
+      <staticmethod name="Today" type="DateTime" overloaded="no">
+        <autodoc>Today() -&gt; DateTime</autodoc>

       </staticmethod>
       </staticmethod>

-      <method name="SetToCurrent" type="wxDateTime" overloaded="no">
+      <method name="SetToCurrent" type="DateTime" overloaded="no">

         <autodoc>SetToCurrent() -&gt; DateTime</autodoc>
       </method>
         <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>
         <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>
         <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=""/>
         <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 +22250,7 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="millisec" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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 +22263,84 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="millisec" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>GetPrevWeekDay(int weekday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="weekday" type="wxDateTime::WeekDay" default=""/>


@@ -20124,7 +22363,7 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="year" type="int" default="wxDateTime::Inv_Year"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +22379,7 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>GetWeek(int numWeek, int weekday=Mon, int flags=Monday_First) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="numWeek" type="int" default=""/>


@@ -20148,27 +22387,27 @@ wx.NullIcon if no provider provides it.</docstring>
           <param name="flags" type="wxDateTime::WeekFlags" default="wxDateTime::Monday_First"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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=""/>
         <autodoc>GetYearDay(int yday) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="yday" type="int" default=""/>


@@ -20189,27 +22428,27 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="GetRataDie" type="double" overloaded="no">
         <autodoc>GetRataDie() -&gt; double</autodoc>
       </method>
       <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>
         <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>
           <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>
         <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>
           <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>
         <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"/>
         <autodoc>MakeGMT(bool noDST=False) -&gt; DateTime</autodoc>
         <paramlist>
           <param name="noDST" type="bool" default="False"/>


@@ -20230,69 +22469,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>
       <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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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"/>
         </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"/>
         </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">
         </paramlist>
       </method>
       <method name="IsWorkDay" type="bool" overloaded="no">


@@ -20304,223 +22543,223 @@ wx.NullIcon if no provider provides it.</docstring>
       <method name="IsEqualTo" type="bool" overloaded="no">
         <autodoc>IsEqualTo(DateTime datetime) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </paramlist>
       </method>

-      <method name="AddTS" type="wxDateTime" overloaded="no">
+      <method name="AddTS" type="DateTime" overloaded="no">

         <autodoc>AddTS(TimeSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddDS" type="wxDateTime" overloaded="no">
+      <method name="AddDS" type="DateTime" overloaded="no">

         <autodoc>AddDS(DateSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SubtractTS" type="wxDateTime" overloaded="no">
+      <method name="SubtractTS" type="DateTime" overloaded="no">

         <autodoc>SubtractTS(TimeSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SubtractDS" type="wxDateTime" overloaded="no">
+      <method name="SubtractDS" type="DateTime" overloaded="no">

         <autodoc>SubtractDS(DateSpan diff) -&gt; DateTime</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="__iadd__" type="wxDateTime" overloaded="yes">
+      <method name="__iadd__" type="DateTime" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="wxTimeSpan" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="__isub__" type="wxDateTime" overloaded="yes">
+      <method name="__isub__" type="DateTime" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="diff" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="diff" type="wxTimeSpan" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="__add__" type="wxDateTime" overloaded="yes">
+      <method name="__add__" type="DateTime" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="wxTimeSpan" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="__sub__" type="wxDateTime" overloaded="yes">
+      <method name="__sub__" type="DateTime" overloaded="yes">

         <paramlist>
         <paramlist>

-          <param name="other" type="r.q(const).wxTimeSpan" default=""/>
+          <param name="other" type="wxTimeSpan" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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">
         </paramlist>
       </method>
       <method name="ParseFormat" type="int" overloaded="no">

-        <autodoc>ParseFormat(String date, String format=DateFormatStr, DateTime dateDef=wxDefaultDateTime) -&gt; int</autodoc>
+        <autodoc>ParseFormat(String date, String format=DateFormatStr, DateTime dateDef=DefaultDateTime) -&gt; int</autodoc>

         <paramlist>
         <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>
         </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>
         </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>
         </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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="FormatDate" type="wxString" overloaded="no">
+      <method name="FormatDate" type="String" overloaded="no">

         <autodoc>FormatDate() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>FormatISOTime() -&gt; String</autodoc>
       </method>
     </class>


@@ -20537,115 +22776,115 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <destructor name="~wxTimeSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <destructor name="~wxTimeSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>

-      <staticmethod name="Seconds" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Seconds(long sec) -&gt; TimeSpan</autodoc>
+      <staticmethod name="Seconds" type="TimeSpan" overloaded="no">
+        <autodoc>Seconds(long sec) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="sec" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="sec" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Second" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Second() -&gt; TimeSpan</autodoc>
+      <staticmethod name="Second" type="TimeSpan" overloaded="no">
+        <autodoc>Second() -&gt; TimeSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Minutes" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Minutes(long min) -&gt; TimeSpan</autodoc>
+      <staticmethod name="Minutes" type="TimeSpan" overloaded="no">
+        <autodoc>Minutes(long min) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="min" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="min" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Minute" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Minute() -&gt; TimeSpan</autodoc>
+      <staticmethod name="Minute" type="TimeSpan" overloaded="no">
+        <autodoc>Minute() -&gt; TimeSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Hours" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Hours(long hours) -&gt; TimeSpan</autodoc>
+      <staticmethod name="Hours" type="TimeSpan" overloaded="no">
+        <autodoc>Hours(long hours) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="hours" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="hours" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Hour" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Hour() -&gt; TimeSpan</autodoc>
+      <staticmethod name="Hour" type="TimeSpan" overloaded="no">
+        <autodoc>Hour() -&gt; TimeSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Days" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Days(long days) -&gt; TimeSpan</autodoc>
+      <staticmethod name="Days" type="TimeSpan" overloaded="no">
+        <autodoc>Days(long days) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Day" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Day() -&gt; TimeSpan</autodoc>
+      <staticmethod name="Day" type="TimeSpan" overloaded="no">
+        <autodoc>Day() -&gt; TimeSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Weeks" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Weeks(long days) -&gt; TimeSpan</autodoc>
+      <staticmethod name="Weeks" type="TimeSpan" overloaded="no">
+        <autodoc>Weeks(long days) -&gt; TimeSpan</autodoc>

         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="days" type="long" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Week" type="wxTimeSpan" overloaded="no">
-        <autodoc>TimeSpan.Week() -&gt; TimeSpan</autodoc>
+      <staticmethod name="Week" type="TimeSpan" overloaded="no">
+        <autodoc>Week() -&gt; TimeSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <method name="Add" type="wxTimeSpan" overloaded="no">
+      <method name="Add" type="TimeSpan" overloaded="no">

         <autodoc>Add(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="Subtract" type="wxTimeSpan" overloaded="no">
+      <method name="Subtract" type="TimeSpan" overloaded="no">

         <autodoc>Subtract(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="__isub__" type="wxTimeSpan" overloaded="no">
+      <method name="__isub__" type="TimeSpan" overloaded="no">

         <autodoc>__isub__(TimeSpan diff) -&gt; TimeSpan</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="__sub__" type="wxTimeSpan" overloaded="no">
+      <method name="__sub__" type="TimeSpan" overloaded="no">

         <autodoc>__sub__(TimeSpan other) -&gt; TimeSpan</autodoc>
         <paramlist>
         <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>
         </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>
         <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=""/>
         <autodoc>__rmul__(int n) -&gt; TimeSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -20654,37 +22893,37 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="__lt__" type="bool" overloaded="no">
         <autodoc>__lt__(TimeSpan other) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         </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>
         </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>
         </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>
         </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">
         </paramlist>
       </method>
       <method name="IsNull" type="bool" overloaded="no">


@@ -20699,19 +22938,19 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="IsEqualTo" type="bool" overloaded="no">
         <autodoc>IsEqualTo(TimeSpan ts) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         </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">
         </paramlist>
       </method>
       <method name="GetWeeks" type="int" overloaded="no">


@@ -20732,10 +22971,10 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="GetMilliseconds" type="wxLongLong" overloaded="no">
         <autodoc>GetMilliseconds() -&gt; wxLongLong</autodoc>
       </method>
       <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -20752,61 +22991,61 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <destructor name="~wxDateSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <destructor name="~wxDateSpan" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>

-      <staticmethod name="Days" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Days(int days) -&gt; DateSpan</autodoc>
+      <staticmethod name="Days" type="DateSpan" overloaded="no">
+        <autodoc>Days(int days) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="days" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="days" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Day" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Day() -&gt; DateSpan</autodoc>
+      <staticmethod name="Day" type="DateSpan" overloaded="no">
+        <autodoc>Day() -&gt; DateSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Weeks" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Weeks(int weeks) -&gt; DateSpan</autodoc>
+      <staticmethod name="Weeks" type="DateSpan" overloaded="no">
+        <autodoc>Weeks(int weeks) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="weeks" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="weeks" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Week" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Week() -&gt; DateSpan</autodoc>
+      <staticmethod name="Week" type="DateSpan" overloaded="no">
+        <autodoc>Week() -&gt; DateSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Months" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Months(int mon) -&gt; DateSpan</autodoc>
+      <staticmethod name="Months" type="DateSpan" overloaded="no">
+        <autodoc>Months(int mon) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="mon" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="mon" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Month" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Month() -&gt; DateSpan</autodoc>
+      <staticmethod name="Month" type="DateSpan" overloaded="no">
+        <autodoc>Month() -&gt; DateSpan</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Years" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Years(int years) -&gt; DateSpan</autodoc>
+      <staticmethod name="Years" type="DateSpan" overloaded="no">
+        <autodoc>Years(int years) -&gt; DateSpan</autodoc>

         <paramlist>
           <param name="years" type="int" default=""/>
         </paramlist>
       </staticmethod>
         <paramlist>
           <param name="years" type="int" default=""/>
         </paramlist>
       </staticmethod>

-      <staticmethod name="Year" type="wxDateSpan" overloaded="no">
-        <autodoc>DateSpan.Year() -&gt; DateSpan</autodoc>
+      <staticmethod name="Year" type="DateSpan" overloaded="no">
+        <autodoc>Year() -&gt; DateSpan</autodoc>

       </staticmethod>
       </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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetDays(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -20827,67 +23066,67 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="GetTotalDays" type="int" overloaded="no">
         <autodoc>GetTotalDays() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="Subtract" type="wxDateSpan" overloaded="no">
+      <method name="Subtract" type="DateSpan" overloaded="no">

         <autodoc>Subtract(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="Neg" type="wxDateSpan" overloaded="no">
+      <method name="Neg" type="DateSpan" overloaded="no">

         <autodoc>Neg() -&gt; DateSpan</autodoc>
       </method>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="__isub__" type="wxDateSpan" overloaded="no">
+      <method name="__isub__" type="DateSpan" overloaded="no">

         <autodoc>__isub__(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="__neg__" type="wxDateSpan" overloaded="no">
+      <method name="__neg__" type="DateSpan" overloaded="no">

         <autodoc>__neg__() -&gt; DateSpan</autodoc>
       </method>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="__sub__" type="wxDateSpan" overloaded="no">
+      <method name="__sub__" type="DateSpan" overloaded="no">

         <autodoc>__sub__(DateSpan other) -&gt; DateSpan</autodoc>
         <paramlist>
         <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>
         </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>
         <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=""/>
         <autodoc>__rmul__(int n) -&gt; DateSpan</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -20896,13 +23135,13 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
       <method name="__eq__" type="bool" overloaded="no">
         <autodoc>__eq__(DateSpan other) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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>
         </paramlist>
       </method>
     </class>


@@ -20922,16 +23161,29 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DataFormat" oldname="wxDataFormat" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="DataFormat" oldname="wxDataFormat" module="misc">

+      <docstring>A wx.DataFormat is an encapsulation of a platform-specific format
+handle which is used by the system for the clipboard and drag and
+drop operations. The applications are usually only interested in,
+for example, pasting data from the clipboard only if the data is
+in a format the program understands.  A data format is is used to
+uniquely identify this format.
+
+On the system level, a data format is usually just a number
+(CLIPFORMAT under Windows or Atom under X11, for example).</docstring>

       <constructor name="DataFormat" overloaded="no">
         <autodoc>__init__(int type) -&gt; DataFormat</autodoc>
       <constructor name="DataFormat" overloaded="no">
         <autodoc>__init__(int type) -&gt; DataFormat</autodoc>

+        <docstring>Constructs a data format object for one of the standard data
+formats or an empty data object (use SetType or SetId later in
+this case)</docstring>

         <paramlist>
           <param name="type" type="wxDataFormatId" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CustomDataFormat" overloaded="no">
         <autodoc>CustomDataFormat(String format) -&gt; DataFormat</autodoc>
         <paramlist>
           <param name="type" type="wxDataFormatId" default=""/>
         </paramlist>
       </constructor>
       <constructor name="CustomDataFormat" overloaded="no">
         <autodoc>CustomDataFormat(String format) -&gt; DataFormat</autodoc>

+        <docstring>Constructs a data format object for a custom format identified by its name.</docstring>

         <paramlist>
         <paramlist>

-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>

         </paramlist>
       </constructor>
       <destructor name="~wxDataFormat" overloaded="no">
         </paramlist>
       </constructor>
       <destructor name="~wxDataFormat" overloaded="no">


@@ -20951,32 +23203,36 @@ __sub__(DateSpan other) -&gt; DateTime</autodoc>
         <autodoc>__eq__(int format) -&gt; bool
 __eq__(DataFormat format) -&gt; bool</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="SetType" type="void" overloaded="no">
+      <method name="SetType" type="" overloaded="no">

         <autodoc>SetType(int format)</autodoc>
         <autodoc>SetType(int format)</autodoc>

+        <docstring>Sets the format to the given value, which should be one of wx.DF_XXX constants.</docstring>

         <paramlist>
           <param name="format" type="wxDataFormatId" default=""/>
         </paramlist>
       </method>
       <method name="GetType" type="wxDataFormatId" overloaded="no">
         <autodoc>GetType() -&gt; int</autodoc>
         <paramlist>
           <param name="format" type="wxDataFormatId" default=""/>
         </paramlist>
       </method>
       <method name="GetType" type="wxDataFormatId" overloaded="no">
         <autodoc>GetType() -&gt; int</autodoc>

+        <docstring>Returns the platform-specific number identifying the format.</docstring>

       </method>
       </method>

-      <method name="GetId" type="wxString" overloaded="no">
+      <method name="GetId" type="String" overloaded="no">

         <autodoc>GetId() -&gt; String</autodoc>
         <autodoc>GetId() -&gt; String</autodoc>

+        <docstring>Returns the name of a custom format (this function will fail for a standard format).</docstring>

       </method>
       </method>

-      <method name="SetId" type="void" overloaded="no">
+      <method name="SetId" type="" overloaded="no">

         <autodoc>SetId(String format)</autodoc>
         <autodoc>SetId(String format)</autodoc>

+        <docstring>Sets the format to be the custom format identified by the given name.</docstring>

         <paramlist>
         <paramlist>

-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -20984,7 +23240,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <destructor name="~wxDataObject" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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"/>
         <autodoc>GetPreferredFormat(int dir=Get) -&gt; DataFormat</autodoc>
         <paramlist>
           <param name="dir" type="wxDataObject::Direction" default="wxDataObject::Get"/>


@@ -20999,184 +23255,190 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="IsSupported" type="bool" overloaded="no">
         <autodoc>IsSupported(DataFormat format, int dir=Get) -&gt; bool</autodoc>
         <paramlist>
       <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="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>
         </paramlist>
       </method>

-      <method name="GetAllFormats" type="void" overloaded="no">
+      <method name="GetAllFormats" type="" overloaded="no">

         <autodoc>GetAllFormats(DataFormat formats, int dir=Get)</autodoc>
         <paramlist>
         <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="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>
         </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="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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetFormat" type="q(const).wxDataFormat" overloaded="no">
+      <method name="GetFormat" type="DataFormat" overloaded="no">

         <autodoc>GetFormat() -&gt; DataFormat</autodoc>
       </method>
         <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>
         <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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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">
         </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>
       <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>
         <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">
           <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>
       <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>
         </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>
         <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>
         <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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">

         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
         <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>
         <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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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">
         </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>
       <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>
         <autodoc>GetFilenames() -&gt; wxArrayString</autodoc>
       </method>

+      <method name="AddFile" type="" overloaded="no">
+        <autodoc>AddFile(String filename)</autodoc>
+        <paramlist>
+          <param name="filename" type="String" default=""/>
+        </paramlist>
+      </method>

     </class>
     <class name="CustomDataObject" oldname="wxCustomDataObject" module="misc">
     </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="TakeData" type="void" overloaded="no">
+      <method name="TakeData" type="" overloaded="no">

         <autodoc>TakeData(PyObject data)</autodoc>
         <paramlist>
         <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>
         </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">
         </paramlist>
       </method>
       <method name="GetSize" type="size_t" overloaded="no">


@@ -21187,22 +23449,22 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="URLDataObject" oldname="wxURLDataObject" module="misc">
       </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>
       <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>
         <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>
         <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">
         </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>
       <constructor name="MetafileDataObject" overloaded="no">
         <autodoc>__init__() -&gt; MetafileDataObject</autodoc>
       </constructor>


@@ -21218,40 +23480,40 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     </method>
     <class name="DropSource" oldname="wxPyDropSource" module="misc">
       <constructor name="wxPyDropSource" overloaded="no">
     </method>
     <class name="DropSource" oldname="wxPyDropSource" module="misc">
       <constructor name="wxPyDropSource" overloaded="no">

-        <autodoc>__init__(Window win=None, Icon copy=wxNullIcon, Icon move=wxNullIcon, 
+        <autodoc>__init__(Window win, Icon copy=wxNullIcon, Icon move=wxNullIcon, 

     Icon none=wxNullIcon) -&gt; DropSource</autodoc>
         <paramlist>
     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=""/>
+          <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>
         </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>
         <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>
           <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>
         <autodoc>SetData(DataObject data)</autodoc>
         <paramlist>

-          <param name="data" type="r.wxDataObject" default=""/>
+          <param name="data" type="DataObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetDataObject" type="wxDataObject" overloaded="no">
+      <method name="GetDataObject" type="DataObject" overloaded="no">

         <autodoc>GetDataObject() -&gt; DataObject</autodoc>
       </method>
         <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=""/>
         <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">
         </paramlist>
       </method>
       <method name="DoDragDrop" type="wxDragResult" overloaded="no">


@@ -21268,29 +23530,29 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="DropTarget" oldname="wxPyDropTarget" module="misc">
       </method>
     </class>
     <class name="DropTarget" oldname="wxPyDropTarget" module="misc">

-      <constructor name="PyDropTarget" overloaded="no">
-        <autodoc>PyDropTarget(DataObject dataObject=None) -&gt; DropTarget</autodoc>
+      <constructor name="DropTarget" overloaded="no">
+        <autodoc>__init__(DataObject dataObject=None) -&gt; DropTarget</autodoc>

         <paramlist>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="GetDataObject" type="wxDataObject" overloaded="no">
+      <method name="GetDataObject" type="DataObject" overloaded="no">

         <autodoc>GetDataObject() -&gt; DataObject</autodoc>
       </method>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="base_OnEnter" type="wxDragResult" overloaded="no">


@@ -21309,7 +23571,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
           <param name="def" type="wxDragResult" default=""/>
         </paramlist>
       </method>
           <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">
         <autodoc>base_OnLeave()</autodoc>
       </method>
       <method name="base_OnDrop" type="bool" overloaded="no">


@@ -21325,15 +23587,15 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     </class>
     <pythoncode> PyDropTarget = DropTarget </pythoncode>
     <class name="TextDropTarget" oldname="wxPyTextDropTarget" module="misc">
     </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>
       <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>
         <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">
         </paramlist>
       </method>
       <method name="base_OnEnter" type="wxDragResult" overloaded="no">


@@ -21352,7 +23614,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
           <param name="def" type="wxDragResult" default=""/>
         </paramlist>
       </method>
           <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">
         <autodoc>base_OnLeave()</autodoc>
       </method>
       <method name="base_OnDrop" type="bool" overloaded="no">


@@ -21372,15 +23634,15 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="FileDropTarget" oldname="wxPyFileDropTarget" module="misc">
       </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>
       <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>
         <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">
         </paramlist>
       </method>
       <method name="base_OnEnter" type="wxDragResult" overloaded="no">


@@ -21399,7 +23661,7 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
           <param name="def" type="wxDragResult" default=""/>
         </paramlist>
       </method>
           <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">
         <autodoc>base_OnLeave()</autodoc>
       </method>
       <method name="base_OnDrop" type="bool" overloaded="no">


@@ -21422,7 +23684,17 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Clipboard" oldname="wxClipboard" module="misc">
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="Clipboard" oldname="wxClipboard" module="misc">

-      <baseclass name="wxObject"/>
+      <docstring>wx.Clipboard represents the system clipboard and provides methods to copy data
+to or paste data from it.  Normally, you should only use wx.TheClipboard which
+is a reference to a global wx.Clipboard instance.
+
+Call wx.TheClipboard.Open to get ownership of the clipboard. If this operation
+returns True, you now own the clipboard. Call wx.TheClipboard.SetData to put
+data on the clipboard, or wx.TheClipboard.GetData to retrieve data from the
+clipboard.  Call wx.TheClipboard.Close to close the clipboard and relinquish
+ownership. You should keep the clipboard open only momentarily.
+</docstring>
+      <baseclass name="Object"/>

       <constructor name="Clipboard" overloaded="no">
         <autodoc>__init__() -&gt; Clipboard</autodoc>
       </constructor>
       <constructor name="Clipboard" overloaded="no">
         <autodoc>__init__() -&gt; Clipboard</autodoc>
       </constructor>


@@ -21431,55 +23703,83 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </destructor>
       <method name="Open" type="bool" overloaded="no">
         <autodoc>Open() -&gt; bool</autodoc>
       </destructor>
       <method name="Open" type="bool" overloaded="no">
         <autodoc>Open() -&gt; bool</autodoc>

+        <docstring>Call this function to open the clipboard before calling SetData
+and GetData.  Call Close when you have finished with the clipboard.
+You should keep the clipboard open for only a very short time.
+Returns true on success. </docstring>

       </method>
       </method>

-      <method name="Close" type="void" overloaded="no">
+      <method name="Close" type="" overloaded="no">

         <autodoc>Close()</autodoc>
         <autodoc>Close()</autodoc>

+        <docstring>Closes the clipboard.</docstring>

       </method>
       <method name="IsOpened" type="bool" overloaded="no">
         <autodoc>IsOpened() -&gt; bool</autodoc>
       </method>
       <method name="IsOpened" type="bool" overloaded="no">
         <autodoc>IsOpened() -&gt; bool</autodoc>

+        <docstring>Query whether the clipboard is opened</docstring>

       </method>
       <method name="AddData" type="bool" overloaded="no">
         <autodoc>AddData(DataObject data) -&gt; bool</autodoc>
       </method>
       <method name="AddData" type="bool" overloaded="no">
         <autodoc>AddData(DataObject data) -&gt; bool</autodoc>

+        <docstring>Call this function to add the data object to the clipboard. You
+may call this function repeatedly after having cleared the clipboard.
+After this function has been called, the clipboard owns the data, so
+do not delete the data explicitly.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="SetData" type="bool" overloaded="no">
         <autodoc>SetData(DataObject data) -&gt; bool</autodoc>

+        <docstring>Set the clipboard data, this is the same as Clear followed by AddData.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="IsSupported" type="bool" overloaded="no">
         <autodoc>IsSupported(DataFormat format) -&gt; bool</autodoc>

+        <docstring>Returns True if the given format is available in the data object(s) on
+the clipboard.</docstring>

         <paramlist>
         <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>
       </method>
       <method name="GetData" type="bool" overloaded="no">
         <autodoc>GetData(DataObject data) -&gt; bool</autodoc>

+        <docstring>Call this function to fill data with data on the clipboard, if available
+in the required format. Returns true on success.</docstring>

         <paramlist>
         <paramlist>

-          <param name="data" type="r.wxDataObject" default=""/>
+          <param name="data" type="DataObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">

         <autodoc>Clear()</autodoc>
         <autodoc>Clear()</autodoc>

+        <docstring>Clears data from the clipboard object and also  the system's clipboard
+if possible.</docstring>

       </method>
       <method name="Flush" type="bool" overloaded="no">
         <autodoc>Flush() -&gt; bool</autodoc>
       </method>
       <method name="Flush" type="bool" overloaded="no">
         <autodoc>Flush() -&gt; bool</autodoc>

+        <docstring>Flushes the clipboard: this means that the data which is currently on
+clipboard will stay available even after the application exits (possibly
+eating memory), otherwise the clipboard will be emptied on exit.
+Returns False if the operation is unsuccesful for any reason.</docstring>

       </method>
       </method>

-      <method name="UsePrimarySelection" type="void" overloaded="no">
-        <autodoc>UsePrimarySelection(bool primary=False)</autodoc>
+      <method name="UsePrimarySelection" type="" overloaded="no">
+        <autodoc>UsePrimarySelection(bool primary=True)</autodoc>
+        <docstring>On platforms supporting it (the X11 based platforms), selects the so
+called PRIMARY SELECTION as the clipboard as opposed to the normal
+clipboard, if primary is True.</docstring>

         <paramlist>
         <paramlist>

-          <param name="primary" type="bool" default="False"/>
+          <param name="primary" type="bool" default="True"/>

         </paramlist>
       </method>
     </class>
     <class name="ClipboardLocker" oldname="wxClipboardLocker" module="misc">
         </paramlist>
       </method>
     </class>
     <class name="ClipboardLocker" oldname="wxClipboardLocker" module="misc">

+      <docstring>A helpful class for opening the clipboard and automatically closing it when
+the locker is destroyed.</docstring>

       <constructor name="ClipboardLocker" overloaded="no">
         <autodoc>__init__(Clipboard clipboard=None) -&gt; ClipboardLocker</autodoc>
       <constructor name="ClipboardLocker" overloaded="no">
         <autodoc>__init__(Clipboard clipboard=None) -&gt; ClipboardLocker</autodoc>

+        <docstring>A helpful class for opening the clipboard and automatically closing it when
+the locker is destroyed.</docstring>

         <paramlist>
         <paramlist>

-          <param name="clipboard" type="p.wxClipboard" default="NULL"/>
+          <param name="clipboard" type="Clipboard" default="NULL"/>

         </paramlist>
       </constructor>
       <destructor name="~wxClipboardLocker" overloaded="no">
         </paramlist>
       </constructor>
       <destructor name="~wxClipboardLocker" overloaded="no">


@@ -21487,6 +23787,8 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </destructor>
       <method name="__nonzero__" type="bool" overloaded="no">
         <autodoc>__nonzero__() -&gt; bool</autodoc>
       </destructor>
       <method name="__nonzero__" type="bool" overloaded="no">
         <autodoc>__nonzero__() -&gt; bool</autodoc>

+        <docstring>A ClipboardLocker instance evaluates to True if the clipboard was
+successfully opened.</docstring>

       </method>
     </class>
   </module>
       </method>
     </class>
   </module>


@@ -21494,56 +23796,52 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
     <import name="misc"/>
     <pythoncode> wx = core </pythoncode>
     <class name="CalendarDateAttr" oldname="wxCalendarDateAttr" module="calendar">
     <import name="misc"/>
     <pythoncode> wx = core </pythoncode>
     <class name="CalendarDateAttr" oldname="wxCalendarDateAttr" module="calendar">

+      <docstring>A set of customization attributes for a calendar date, which can be used to
+control the look of the Calendar object.</docstring>

       <constructor name="CalendarDateAttr" overloaded="no">
       <constructor name="CalendarDateAttr" overloaded="no">

-        <autodoc>__init__(Colour colText, Colour colBack=wxNullColour, Colour colBorder=wxNullColour, 
-    Font font=wxNullFont, 
+        <autodoc>__init__(Colour colText=wxNullColour, Colour colBack=wxNullColour, 
+    Colour colBorder=wxNullColour, Font font=wxNullFont, 

     int border=CAL_BORDER_NONE) -&gt; CalendarDateAttr</autodoc>
     int border=CAL_BORDER_NONE) -&gt; CalendarDateAttr</autodoc>

+        <docstring>Create a CalendarDateAttr.</docstring>

         <paramlist>
         <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="wxNullColour"/>
+          <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>
           <param name="border" type="wxCalendarDateBorder" default="wxCAL_BORDER_NONE"/>
         </paramlist>
       </constructor>

-      <constructor name="CalendarDateAttrBorder" overloaded="no">
-        <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"/>
-        </paramlist>
-      </constructor>
-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">

         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>

-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">

         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>

-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBorderColour" type="void" overloaded="no">
+      <method name="SetBorderColour" type="" overloaded="no">

         <autodoc>SetBorderColour(Colour col)</autodoc>
         <paramlist>
         <autodoc>SetBorderColour(Colour col)</autodoc>
         <paramlist>

-          <param name="col" type="r.q(const).wxColour" default=""/>
+          <param name="col" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">

         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </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>
         <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=""/>
         <autodoc>SetHoliday(bool holiday)</autodoc>
         <paramlist>
           <param name="holiday" type="bool" default=""/>


@@ -21567,16 +23865,16 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       <method name="IsHoliday" type="bool" overloaded="no">
         <autodoc>IsHoliday() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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">
         <autodoc>GetFont() -&gt; Font</autodoc>
       </method>
       <method name="GetBorder" type="wxCalendarDateBorder" overloaded="no">


@@ -21584,27 +23882,27 @@ __ne__(DataFormat format) -&gt; bool</autodoc>
       </method>
     </class>
     <class name="CalendarEvent" oldname="wxCalendarEvent" module="calendar">
       </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>
       <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>
           <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>
         <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>
         <autodoc>SetDate(DateTime date)</autodoc>
         <paramlist>

-          <param name="date" type="r.q(const).wxDateTime" default=""/>
+          <param name="date" type="DateTime" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetWeekDay" type="void" overloaded="no">
+      <method name="SetWeekDay" type="" overloaded="no">

         <autodoc>SetWeekDay(int wd)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetWeekDay" type="wxDateTime::WeekDay" overloaded="no">


@@ -21620,181 +23918,349 @@ 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">
 EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED, 1)
 </pythoncode>
     <class name="CalendarCtrl" oldname="wxCalendarCtrl" module="calendar">

-      <baseclass name="wxControl"/>
+      <docstring>The calendar control allows the user to pick a date interactively.</docstring>
+      <refdoc>The CalendarCtrl displays a window containing several parts: the control to
+pick the month and the year at the top (either or both of them may be
+disabled) and a month area below them which shows all the days in the
+month. The user can move the current selection using the keyboard and select
+the date (generating EVT_CALENDAR event) by pressing &lt;Return&gt; or double
+clicking it.
+
+It has advanced possibilities for the customization of its display. All global
+settings (such as colours and fonts used) can, of course, be changed. But
+also, the display style for each day in the month can be set independently
+using CalendarDateAttr class.
+
+An item without custom attributes is drawn with the default colours and font
+and without border, but setting custom attributes with SetAttr allows to
+modify its appearance. Just create a custom attribute object and set it for
+the day you want to be displayed specially A day may be marked as being a
+holiday, (even if it is not recognized as one by wx.DateTime) by using the
+SetHoliday method.
+
+As the attributes are specified for each day, they may change when the month
+is changed, so you will often want to update them in an EVT_CALENDAR_MONTH
+event handler.
+
+ Styles
+    CAL_SUNDAY_FIRST:         Show Sunday as the first day in the week
+    CAL_MONDAY_FIRST:         Show Monday as the first day in the week
+    CAL_SHOW_HOLIDAYS:         Highlight holidays in the calendar
+    CAL_NO_YEAR_CHANGE:         Disable the year changing
+    CAL_NO_MONTH_CHANGE: Disable the month (and, implicitly, the year) changing
+    CAL_SHOW_SURROUNDING_WEEKS: Show the neighbouring weeks in the previous and next months
+    CAL_SEQUENTIAL_MONTH_SELECTION: Use alternative, more compact, style for the month and year selection controls.
+
+The default calendar style is wxCAL_SHOW_HOLIDAYS.
+
+ Events
+    EVT_CALENDAR:        A day was double clicked in the calendar.
+    EVT_CALENDAR_SEL_CHANGED: The selected date changed.
+    EVT_CALENDAR_DAY:     The selected day changed.
+    EVT_CALENDAR_MONTH:  The selected month changed.
+    EVT_CALENDAR_YEAR:    The selected year changed.
+    EVT_CALENDAR_WEEKDAY_CLICKED:  User clicked on the week day header
+
+Note that changing the selected date will result in either of
+EVT_CALENDAR_DAY, MONTH or YEAR events and an EVT_CALENDAR_SEL_CHANGED event.
+    
+</refdoc>
+      <baseclass name="Control"/>

       <constructor name="CalendarCtrl" overloaded="no">
       <constructor name="CalendarCtrl" overloaded="no">

-        <autodoc>__init__(Window parent, int id, DateTime date=wxDefaultDateTime, 
+        <autodoc>__init__(Window parent, int id, DateTime date=DefaultDateTime, 

     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; CalendarCtrl</autodoc>
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; CalendarCtrl</autodoc>

+        <docstring>Create and show a calendar control.</docstring>
+        <refdoc>The CalendarCtrl displays a window containing several parts: the control to
+pick the month and the year at the top (either or both of them may be
+disabled) and a month area below them which shows all the days in the
+month. The user can move the current selection using the keyboard and select
+the date (generating EVT_CALENDAR event) by pressing &lt;Return&gt; or double
+clicking it.
+
+It has advanced possibilities for the customization of its display. All global
+settings (such as colours and fonts used) can, of course, be changed. But
+also, the display style for each day in the month can be set independently
+using CalendarDateAttr class.
+
+An item without custom attributes is drawn with the default colours and font
+and without border, but setting custom attributes with SetAttr allows to
+modify its appearance. Just create a custom attribute object and set it for
+the day you want to be displayed specially A day may be marked as being a
+holiday, (even if it is not recognized as one by wx.DateTime) by using the
+SetHoliday method.
+
+As the attributes are specified for each day, they may change when the month
+is changed, so you will often want to update them in an EVT_CALENDAR_MONTH
+event handler.
+
+ Styles
+    CAL_SUNDAY_FIRST:         Show Sunday as the first day in the week
+    CAL_MONDAY_FIRST:         Show Monday as the first day in the week
+    CAL_SHOW_HOLIDAYS:         Highlight holidays in the calendar
+    CAL_NO_YEAR_CHANGE:         Disable the year changing
+    CAL_NO_MONTH_CHANGE: Disable the month (and, implicitly, the year) changing
+    CAL_SHOW_SURROUNDING_WEEKS: Show the neighbouring weeks in the previous and next months
+    CAL_SEQUENTIAL_MONTH_SELECTION: Use alternative, more compact, style for the month and year selection controls.
+
+The default calendar style is wxCAL_SHOW_HOLIDAYS.
+
+ Events
+    EVT_CALENDAR:        A day was double clicked in the calendar.
+    EVT_CALENDAR_SEL_CHANGED: The selected date changed.
+    EVT_CALENDAR_DAY:     The selected day changed.
+    EVT_CALENDAR_MONTH:  The selected month changed.
+    EVT_CALENDAR_YEAR:    The selected year changed.
+    EVT_CALENDAR_WEEKDAY_CLICKED:  User clicked on the week day header
+
+Note that changing the selected date will result in either of
+EVT_CALENDAR_DAY, MONTH or YEAR events and an EVT_CALENDAR_SEL_CHANGED event.
+    
+</refdoc>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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">
         <autodoc>PreCalendarCtrl() -&gt; CalendarCtrl</autodoc>
         </paramlist>
       </constructor>
       <constructor name="PreCalendarCtrl" overloaded="no">
         <autodoc>PreCalendarCtrl() -&gt; CalendarCtrl</autodoc>

+        <docstring>Precreate a CalendarCtrl for 2-phase creation.</docstring>
+        <refdoc>The CalendarCtrl displays a window containing several parts: the control to
+pick the month and the year at the top (either or both of them may be
+disabled) and a month area below them which shows all the days in the
+month. The user can move the current selection using the keyboard and select
+the date (generating EVT_CALENDAR event) by pressing &lt;Return&gt; or double
+clicking it.
+
+It has advanced possibilities for the customization of its display. All global
+settings (such as colours and fonts used) can, of course, be changed. But
+also, the display style for each day in the month can be set independently
+using CalendarDateAttr class.
+
+An item without custom attributes is drawn with the default colours and font
+and without border, but setting custom attributes with SetAttr allows to
+modify its appearance. Just create a custom attribute object and set it for
+the day you want to be displayed specially A day may be marked as being a
+holiday, (even if it is not recognized as one by wx.DateTime) by using the
+SetHoliday method.
+
+As the attributes are specified for each day, they may change when the month
+is changed, so you will often want to update them in an EVT_CALENDAR_MONTH
+event handler.
+
+ Styles
+    CAL_SUNDAY_FIRST:         Show Sunday as the first day in the week
+    CAL_MONDAY_FIRST:         Show Monday as the first day in the week
+    CAL_SHOW_HOLIDAYS:         Highlight holidays in the calendar
+    CAL_NO_YEAR_CHANGE:         Disable the year changing
+    CAL_NO_MONTH_CHANGE: Disable the month (and, implicitly, the year) changing
+    CAL_SHOW_SURROUNDING_WEEKS: Show the neighbouring weeks in the previous and next months
+    CAL_SEQUENTIAL_MONTH_SELECTION: Use alternative, more compact, style for the month and year selection controls.
+
+The default calendar style is wxCAL_SHOW_HOLIDAYS.
+
+ Events
+    EVT_CALENDAR:        A day was double clicked in the calendar.
+    EVT_CALENDAR_SEL_CHANGED: The selected date changed.
+    EVT_CALENDAR_DAY:     The selected day changed.
+    EVT_CALENDAR_MONTH:  The selected month changed.
+    EVT_CALENDAR_YEAR:    The selected year changed.
+    EVT_CALENDAR_WEEKDAY_CLICKED:  User clicked on the week day header
+
+Note that changing the selected date will result in either of
+EVT_CALENDAR_DAY, MONTH or YEAR events and an EVT_CALENDAR_SEL_CHANGED event.
+    
+</refdoc>

       </constructor>
       <method name="Create" type="bool" overloaded="no">
       </constructor>
       <method name="Create" type="bool" overloaded="no">

-        <autodoc>Create(Window parent, int id, DateTime date=wxDefaultDateTime, 
+        <autodoc>Create(Window parent, int id, DateTime date=DefaultDateTime, 

     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; bool</autodoc>
     Point pos=DefaultPosition, Size size=DefaultSize, 
     long style=wxCAL_SHOW_HOLIDAYS|wxWANTS_CHARS, 
     String name=CalendarNameStr) -&gt; bool</autodoc>

+        <docstring>Acutally create the GUI portion of the CalendarCtrl for 2-phase creation.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" 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="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>
         </paramlist>
       </method>

-      <method name="SetDate" type="void" overloaded="no">
+      <method name="SetDate" type="" overloaded="no">

         <autodoc>SetDate(DateTime date)</autodoc>
         <autodoc>SetDate(DateTime date)</autodoc>

+        <docstring>Sets the current date.</docstring>

         <paramlist>
         <paramlist>

-          <param name="date" type="r.q(const).wxDateTime" default=""/>
+          <param name="date" type="DateTime" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetDate" type="q(const).wxDateTime" overloaded="no">
+      <method name="GetDate" type="DateTime" overloaded="no">

         <autodoc>GetDate() -&gt; DateTime</autodoc>
         <autodoc>GetDate() -&gt; DateTime</autodoc>

+        <docstring>Gets the currently selected date.</docstring>

       </method>
       <method name="SetLowerDateLimit" type="bool" overloaded="no">
       </method>
       <method name="SetLowerDateLimit" type="bool" overloaded="no">

-        <autodoc>SetLowerDateLimit(DateTime date=wxDefaultDateTime) -&gt; bool</autodoc>
+        <autodoc>SetLowerDateLimit(DateTime date=DefaultDateTime) -&gt; bool</autodoc>
+        <docstring>set the range in which selection can occur</docstring>

         <paramlist>
         <paramlist>

-          <param name="date" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
+          <param name="date" type="DateTime" default="wxDefaultDateTime"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetLowerDateLimit" type="q(const).wxDateTime" overloaded="no">
-        <autodoc>GetLowerDateLimit() -&gt; DateTime</autodoc>
-      </method>

       <method name="SetUpperDateLimit" type="bool" overloaded="no">
       <method name="SetUpperDateLimit" type="bool" overloaded="no">

-        <autodoc>SetUpperDateLimit(DateTime date=wxDefaultDateTime) -&gt; bool</autodoc>
+        <autodoc>SetUpperDateLimit(DateTime date=DefaultDateTime) -&gt; bool</autodoc>
+        <docstring>set the range in which selection can occur</docstring>

         <paramlist>
         <paramlist>

-          <param name="date" type="r.q(const).wxDateTime" default="wxDefaultDateTime"/>
+          <param name="date" type="DateTime" default="wxDefaultDateTime"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetUpperDateLimit" type="q(const).wxDateTime" overloaded="no">
+      <method name="GetLowerDateLimit" type="DateTime" overloaded="no">
+        <autodoc>GetLowerDateLimit() -&gt; DateTime</autodoc>
+        <docstring>get the range in which selection can occur</docstring>
+      </method>
+      <method name="GetUpperDateLimit" type="DateTime" overloaded="no">

         <autodoc>GetUpperDateLimit() -&gt; DateTime</autodoc>
         <autodoc>GetUpperDateLimit() -&gt; DateTime</autodoc>

+        <docstring>get the range in which selection can occur</docstring>

       </method>
       <method name="SetDateRange" type="bool" overloaded="no">
       </method>
       <method name="SetDateRange" type="bool" overloaded="no">

-        <autodoc>SetDateRange(DateTime lowerdate=wxDefaultDateTime, DateTime upperdate=wxDefaultDateTime) -&gt; bool</autodoc>
+        <autodoc>SetDateRange(DateTime lowerdate=DefaultDateTime, DateTime upperdate=DefaultDateTime) -&gt; bool</autodoc>
+        <docstring>set the range in which selection can occur</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="EnableYearChange" type="void" overloaded="no">
+      <method name="EnableYearChange" type="" overloaded="no">

         <autodoc>EnableYearChange(bool enable=True)</autodoc>
         <autodoc>EnableYearChange(bool enable=True)</autodoc>

+        <docstring>This function should be used instead of changing CAL_NO_YEAR_CHANGE
+style bit directly. It allows or disallows the user to change the year
+interactively.</docstring>

         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
         <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>
         <autodoc>EnableMonthChange(bool enable=True)</autodoc>

+        <docstring>This function should be used instead of changing CAL_NO_MONTH_CHANGE style
+bit. It allows or disallows the user to change the month interactively. Note
+that if the month can not be changed, the year can not be changed either.</docstring>

         <paramlist>
           <param name="enable" type="bool" default="True"/>
         </paramlist>
       </method>
         <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>
         <autodoc>EnableHolidayDisplay(bool display=True)</autodoc>

+        <docstring>This function should be used instead of changing CAL_SHOW_HOLIDAYS style
+bit directly. It enables or disables the special highlighting of the holidays.</docstring>

         <paramlist>
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetHeaderColours(Colour colFg, Colour colBg)</autodoc>

+        <docstring>header colours are used for painting the weekdays at the top</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetHeaderColourFg" type="wxColour" overloaded="no">
+      <method name="GetHeaderColourFg" type="Colour" overloaded="no">

         <autodoc>GetHeaderColourFg() -&gt; Colour</autodoc>
         <autodoc>GetHeaderColourFg() -&gt; Colour</autodoc>

+        <docstring>header colours are used for painting the weekdays at the top</docstring>

       </method>
       </method>

-      <method name="GetHeaderColourBg" type="wxColour" overloaded="no">
+      <method name="GetHeaderColourBg" type="Colour" overloaded="no">

         <autodoc>GetHeaderColourBg() -&gt; Colour</autodoc>
         <autodoc>GetHeaderColourBg() -&gt; Colour</autodoc>

+        <docstring>header colours are used for painting the weekdays at the top</docstring>

       </method>
       </method>

-      <method name="SetHighlightColours" type="void" overloaded="no">
+      <method name="SetHighlightColours" type="" overloaded="no">

         <autodoc>SetHighlightColours(Colour colFg, Colour colBg)</autodoc>
         <autodoc>SetHighlightColours(Colour colFg, Colour colBg)</autodoc>

+        <docstring>highlight colour is used for the currently selected date</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetHighlightColourFg" type="wxColour" overloaded="no">
+      <method name="GetHighlightColourFg" type="Colour" overloaded="no">

         <autodoc>GetHighlightColourFg() -&gt; Colour</autodoc>
         <autodoc>GetHighlightColourFg() -&gt; Colour</autodoc>

+        <docstring>highlight colour is used for the currently selected date</docstring>

       </method>
       </method>

-      <method name="GetHighlightColourBg" type="wxColour" overloaded="no">
+      <method name="GetHighlightColourBg" type="Colour" overloaded="no">

         <autodoc>GetHighlightColourBg() -&gt; Colour</autodoc>
         <autodoc>GetHighlightColourBg() -&gt; Colour</autodoc>

+        <docstring>highlight colour is used for the currently selected date</docstring>

       </method>
       </method>

-      <method name="SetHolidayColours" type="void" overloaded="no">
+      <method name="SetHolidayColours" type="" overloaded="no">

         <autodoc>SetHolidayColours(Colour colFg, Colour colBg)</autodoc>
         <autodoc>SetHolidayColours(Colour colFg, Colour colBg)</autodoc>

+        <docstring>holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)</docstring>

         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetHolidayColourFg" type="wxColour" overloaded="no">
+      <method name="GetHolidayColourFg" type="Colour" overloaded="no">

         <autodoc>GetHolidayColourFg() -&gt; Colour</autodoc>
         <autodoc>GetHolidayColourFg() -&gt; Colour</autodoc>

+        <docstring>holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)</docstring>

       </method>
       </method>

-      <method name="GetHolidayColourBg" type="wxColour" overloaded="no">
+      <method name="GetHolidayColourBg" type="Colour" overloaded="no">

         <autodoc>GetHolidayColourBg() -&gt; Colour</autodoc>
         <autodoc>GetHolidayColourBg() -&gt; Colour</autodoc>

+        <docstring>holiday colour is used for the holidays (if CAL_SHOW_HOLIDAYS style is used)</docstring>

       </method>
       </method>

-      <method name="GetAttr" type="wxCalendarDateAttr" overloaded="no">
+      <method name="GetAttr" type="CalendarDateAttr" overloaded="no">

         <autodoc>GetAttr(size_t day) -&gt; CalendarDateAttr</autodoc>
         <autodoc>GetAttr(size_t day) -&gt; CalendarDateAttr</autodoc>

+        <docstring>Returns the attribute for the given date (should be in the range 1...31).
+The returned value may be None</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>SetAttr(size_t day, CalendarDateAttr attr)</autodoc>

+        <docstring>Associates the attribute with the specified date (in the range 1...31).
+If the attribute passed is None, the items attribute is cleared.</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         <paramlist>
           <param name="day" type="size_t" default=""/>

-          <param name="attr" type="p.wxCalendarDateAttr" default=""/>
+          <param name="attr" type="CalendarDateAttr" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetHoliday" type="void" overloaded="no">
+      <method name="SetHoliday" type="" overloaded="no">

         <autodoc>SetHoliday(size_t day)</autodoc>
         <autodoc>SetHoliday(size_t day)</autodoc>

+        <docstring>Marks the specified day as being a holiday in the current month.</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
         <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>
         <autodoc>ResetAttr(size_t day)</autodoc>

+        <docstring>Clears any attributes associated with the given day (in the range 1...31).</docstring>

         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>
         <paramlist>
           <param name="day" type="size_t" default=""/>
         </paramlist>
       </method>

-      <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"/>
-        </paramlist>
-      </method>
-      <method name="Enable" type="bool" overloaded="no">
-        <autodoc>Enable(bool enable=True) -&gt; bool</autodoc>
-        <paramlist>
-          <param name="enable" type="bool" default="True"/>
-        </paramlist>
-      </method>
-      <method name="Show" type="bool" overloaded="no">
-        <autodoc>Show(bool show=True) -&gt; bool</autodoc>
+      <method name="HitTest" type="PyObject" overloaded="no">
+        <autodoc>HitTest(Point pos) -&gt; (result, date, weekday)</autodoc>
+        <docstring>Returns 3-tuple with information about the given position on the calendar
+control.  The first value of the tuple is a result code and determines the
+validity of the remaining two values.  The result codes are:
+
+    CAL_HITTEST_NOWHERE:    hit outside of anything
+    CAL_HITTEST_HEADER:     hit on the header, weekday is valid
+    CAL_HITTEST_DAY:        hit on a day in the calendar, date is set.
+</docstring>

         <paramlist>
         <paramlist>

-          <param name="show" type="bool" default="True"/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetMonthControl" type="wxControl" overloaded="no">
+      <method name="GetMonthControl" type="Control" overloaded="no">

         <autodoc>GetMonthControl() -&gt; Control</autodoc>
         <autodoc>GetMonthControl() -&gt; Control</autodoc>

+        <docstring>get the currently shown control for month</docstring>

       </method>
       </method>

-      <method name="GetYearControl" type="wxControl" overloaded="no">
+      <method name="GetYearControl" type="Control" overloaded="no">

         <autodoc>GetYearControl() -&gt; Control</autodoc>
         <autodoc>GetYearControl() -&gt; Control</autodoc>

+        <docstring>get the currently shown control for year</docstring>

       </method>
     </class>
   </module>
       </method>
     </class>
   </module>


@@ -21802,84 +24268,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">
     <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>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetParameters" type="void" overloaded="no">
+      <method name="SetParameters" type="" overloaded="no">

         <autodoc>SetParameters(String params)</autodoc>
         <paramlist>
         <autodoc>SetParameters(String params)</autodoc>
         <paramlist>

-          <param name="params" type="r.q(const).wxString" default=""/>
+          <param name="params" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="IncRef" type="void" overloaded="no">
+      <method name="IncRef" type="" overloaded="no">

         <autodoc>IncRef()</autodoc>
       </method>
         <autodoc>IncRef()</autodoc>
       </method>

-      <method name="DecRef" type="void" overloaded="no">
+      <method name="DecRef" type="" overloaded="no">

         <autodoc>DecRef()</autodoc>
       </method>
         <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>
         <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>
           <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>
         <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>
           <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">
         <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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="base_SetParameters" type="void" overloaded="no">
+      <method name="base_SetParameters" type="" overloaded="no">

         <autodoc>base_SetParameters(String params)</autodoc>
         <paramlist>
         <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">
         </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">
       <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">
       <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>
       <constructor name="GridCellFloatRenderer" overloaded="no">
         <autodoc>__init__(int width=-1, int precision=-1) -&gt; GridCellFloatRenderer</autodoc>
         <paramlist>


@@ -21890,7 +24356,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="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=""/>
         <autodoc>SetWidth(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>


@@ -21899,7 +24365,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="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=""/>
         <autodoc>SetPrecision(int precision)</autodoc>
         <paramlist>
           <param name="precision" type="int" default=""/>


@@ -21907,90 +24373,90 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridCellBoolRenderer" oldname="wxGridCellBoolRenderer" module="grid">
       </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">
       <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>
       <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">
         </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>
       <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">
         </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">
       <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>
         <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>
         </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>
         <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>
         <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>
         </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>
         <autodoc>SetCellAttr(GridCellAttr attr)</autodoc>
         <paramlist>

-          <param name="attr" type="p.wxGridCellAttr" default=""/>
+          <param name="attr" type="wxGridCellAttr" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetParameters" type="void" overloaded="no">
+      <method name="SetParameters" type="" overloaded="no">

         <autodoc>SetParameters(String params)</autodoc>
         <paramlist>
         <autodoc>SetParameters(String params)</autodoc>
         <paramlist>

-          <param name="params" type="r.q(const).wxString" default=""/>
+          <param name="params" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="IncRef" type="void" overloaded="no">
+      <method name="IncRef" type="" overloaded="no">

         <autodoc>IncRef()</autodoc>
       </method>
         <autodoc>IncRef()</autodoc>
       </method>

-      <method name="DecRef" type="void" overloaded="no">
+      <method name="DecRef" type="" overloaded="no">

         <autodoc>DecRef()</autodoc>
       </method>
         <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>
         <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="id" type="int" default=""/>

-          <param name="evtHandler" type="p.wxEvtHandler" default=""/>
+          <param name="evtHandler" type="EvtHandler" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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">
         </paramlist>
       </method>
       <method name="EndEdit" type="bool" overloaded="no">


@@ -21998,134 +24464,134 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         <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>
         </paramlist>
       </method>

-      <method name="Reset" type="void" overloaded="no">
+      <method name="Reset" type="" overloaded="no">

         <autodoc>Reset()</autodoc>
       </method>
         <autodoc>Reset()</autodoc>
       </method>

-      <method name="Clone" type="wxGridCellEditor" overloaded="no">
+      <method name="Clone" type="GridCellEditor" overloaded="no">

         <autodoc>Clone() -&gt; GridCellEditor</autodoc>
       </method>
         <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>
         <autodoc>SetSize(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="PaintBackground" type="void" overloaded="no">
+      <method name="PaintBackground" type="" overloaded="no">

         <autodoc>PaintBackground(Rect rectCell, GridCellAttr attr)</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="StartingKey" type="void" overloaded="no">
+      <method name="StartingKey" type="" overloaded="no">

         <autodoc>StartingKey(KeyEvent event)</autodoc>
         <paramlist>
         <autodoc>StartingKey(KeyEvent event)</autodoc>
         <paramlist>

-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="StartingClick" type="void" overloaded="no">
+      <method name="StartingClick" type="" overloaded="no">

         <autodoc>StartingClick()</autodoc>
       </method>
         <autodoc>StartingClick()</autodoc>
       </method>

-      <method name="HandleReturn" type="void" overloaded="no">
+      <method name="HandleReturn" type="" overloaded="no">

         <autodoc>HandleReturn(KeyEvent event)</autodoc>
         <paramlist>
         <autodoc>HandleReturn(KeyEvent event)</autodoc>
         <paramlist>

-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>

         </paramlist>
       </method>
         </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">
         <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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="base_SetSize" type="void" overloaded="no">
+      <method name="base_SetSize" type="" overloaded="no">

         <autodoc>base_SetSize(Rect rect)</autodoc>
         <paramlist>
         <autodoc>base_SetSize(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </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>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="base_StartingKey" type="void" overloaded="no">
+      <method name="base_StartingKey" type="" overloaded="no">

         <autodoc>base_StartingKey(KeyEvent event)</autodoc>
         <paramlist>
         <autodoc>base_StartingKey(KeyEvent event)</autodoc>
         <paramlist>

-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_StartingClick" type="void" overloaded="no">
+      <method name="base_StartingClick" type="" overloaded="no">

         <autodoc>base_StartingClick()</autodoc>
       </method>
         <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>
         <autodoc>base_HandleReturn(KeyEvent event)</autodoc>
         <paramlist>

-          <param name="event" type="r.wxKeyEvent" default=""/>
+          <param name="event" type="KeyEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_Destroy" type="void" overloaded="no">
+      <method name="base_Destroy" type="" overloaded="no">

         <autodoc>base_Destroy()</autodoc>
       </method>
         <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>
         <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">
         </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>
       <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">
         <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>
       <constructor name="GridCellNumberEditor" overloaded="no">
         <autodoc>__init__(int min=-1, int max=-1) -&gt; GridCellNumberEditor</autodoc>
         <paramlist>


@@ -22133,60 +24599,60 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="max" type="int" default="-1"/>
         </paramlist>
       </constructor>
           <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">
         <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>
       <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">
         <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>
       <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">
         <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"/>
       <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>
           <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">
         <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>
       <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>
         </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">
         <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>
       <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>
         <autodoc>GetValue() -&gt; String</autodoc>
       </method>
     </class>


@@ -22194,87 +24660,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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">

         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Clone" type="wxGridCellAttr" overloaded="no">
+      <method name="Clone" type="GridCellAttr" overloaded="no">

         <autodoc>Clone() -&gt; GridCellAttr</autodoc>
       </method>
         <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>
         <autodoc>MergeWith(GridCellAttr mergefrom)</autodoc>
         <paramlist>

-          <param name="mergefrom" type="p.wxGridCellAttr" default=""/>
+          <param name="mergefrom" type="GridCellAttr" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="IncRef" type="void" overloaded="no">
+      <method name="IncRef" type="" overloaded="no">

         <autodoc>IncRef()</autodoc>
       </method>
         <autodoc>IncRef()</autodoc>
       </method>

-      <method name="DecRef" type="void" overloaded="no">
+      <method name="DecRef" type="" overloaded="no">

         <autodoc>DecRef()</autodoc>
       </method>
         <autodoc>DecRef()</autodoc>
       </method>

-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">

         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>
         <autodoc>SetTextColour(Colour colText)</autodoc>
         <paramlist>

-          <param name="colText" type="r.q(const).wxColour" default=""/>
+          <param name="colText" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">

         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>
         <autodoc>SetBackgroundColour(Colour colBack)</autodoc>
         <paramlist>

-          <param name="colBack" type="r.q(const).wxColour" default=""/>
+          <param name="colBack" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">

         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>

-          <param name="font" type="r.q(const).wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetRenderer(GridCellRenderer renderer)</autodoc>
         <paramlist>

-          <param name="renderer" type="p.wxGridCellRenderer" default=""/>
+          <param name="renderer" type="GridCellRenderer" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetEditor" type="void" overloaded="no">
+      <method name="SetEditor" type="" overloaded="no">

         <autodoc>SetEditor(GridCellEditor editor)</autodoc>
         <paramlist>
         <autodoc>SetEditor(GridCellEditor editor)</autodoc>
         <paramlist>

-          <param name="editor" type="p.wxGridCellEditor" default=""/>
+          <param name="editor" type="GridCellEditor" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetKind(int kind)</autodoc>
         <paramlist>
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>


@@ -22304,44 +24770,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="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>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetSize" type="void" overloaded="no">
+      <method name="GetSize" type="" overloaded="no">

         <autodoc>GetSize() -&gt; (num_rows, num_cols)</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
           <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>
         <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>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         </paramlist>


@@ -22349,10 +24815,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="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>
         <autodoc>SetDefAttr(GridCellAttr defAttr)</autodoc>
         <paramlist>

-          <param name="defAttr" type="p.wxGridCellAttr" default=""/>
+          <param name="defAttr" type="GridCellAttr" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -22360,13 +24826,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <constructor name="GridCellAttrProvider" overloaded="no">
         <autodoc>__init__() -&gt; GridCellAttrProvider</autodoc>
       </constructor>
       <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>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22374,36 +24840,36 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>UpdateAttrCols(size_t pos, int numCols)</autodoc>
         <paramlist>
           <param name="pos" type="size_t" default=""/>


@@ -22412,18 +24878,18 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="PyGridCellAttrProvider" oldname="wxPyGridCellAttrProvider" module="grid">
       </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>
       <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>
         <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>
         </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=""/>
         <autodoc>base_GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22431,50 +24897,50 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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">
           <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>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetAttrProvider" type="void" overloaded="no">
+      <method name="SetAttrProvider" type="" overloaded="no">

         <autodoc>SetAttrProvider(GridCellAttrProvider attrProvider)</autodoc>
         <paramlist>
         <autodoc>SetAttrProvider(GridCellAttrProvider attrProvider)</autodoc>
         <paramlist>

-          <param name="attrProvider" type="p.wxGridCellAttrProvider" default=""/>
+          <param name="attrProvider" type="GridCellAttrProvider" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetAttrProvider" type="wxGridCellAttrProvider" overloaded="no">
+      <method name="GetAttrProvider" type="GridCellAttrProvider" overloaded="no">

         <autodoc>GetAttrProvider() -&gt; GridCellAttrProvider</autodoc>
       </method>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="GetView" type="wxGrid" overloaded="no">


@@ -22493,22 +24959,22 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <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>
         </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=""/>
         <autodoc>GetTypeName(int row, int col) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22520,7 +24986,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         <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">
         </paramlist>
       </method>
       <method name="CanSetValueAs" type="bool" overloaded="no">


@@ -22528,7 +24994,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetValueAsLong" type="long" overloaded="no">


@@ -22552,7 +25018,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetValueAsLong(int row, int col, long value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22560,7 +25026,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="value" type="long" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetValueAsDouble(int row, int col, double value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22568,7 +25034,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="value" type="double" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetValueAsBool(int row, int col, bool value)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22576,7 +25042,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="value" type="bool" default=""/>
         </paramlist>
       </method>
           <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">
         <autodoc>Clear()</autodoc>
       </method>
       <method name="InsertRows" type="bool" overloaded="no">


@@ -22619,36 +25085,36 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="numCols" type="size_t" default="1"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <autodoc>GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22656,46 +25122,46 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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">
           <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>
       <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>
         <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>
         </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>
         <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=""/>
         <autodoc>base_GetTypeName(int row, int col) -&gt; String</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22707,7 +25173,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         <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">
         </paramlist>
       </method>
       <method name="base_CanSetValueAs" type="bool" overloaded="no">


@@ -22715,10 +25181,10 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="row" type="int" default=""/>
           <param name="col" type="int" default=""/>
         <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>
         </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">
         <autodoc>base_Clear()</autodoc>
       </method>
       <method name="base_InsertRows" type="bool" overloaded="no">


@@ -22761,36 +25227,36 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="numCols" type="size_t" default="1"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <autodoc>base_GetAttr(int row, int col, int kind) -&gt; GridCellAttr</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22798,31 +25264,31 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="kind" type="wxGridCellAttr::wxAttrKind" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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">
           <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>
       <constructor name="GridStringTable" overloaded="no">
         <autodoc>__init__(int numRows=0, int numCols=0) -&gt; GridStringTable</autodoc>
         <paramlist>


@@ -22835,7 +25301,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>
       <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"/>
           <param name="id" type="int" default=""/>
           <param name="comInt1" type="int" default="-1"/>
           <param name="comInt2" type="int" default="-1"/>


@@ -22844,16 +25310,16 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       <destructor name="~wxGridTableMessage" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <autodoc>SetTableObject(GridTableBase table)</autodoc>
         <paramlist>

-          <param name="table" type="p.wxGridTableBase" default=""/>
+          <param name="table" type="GridTableBase" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTableObject" type="wxGridTableBase" overloaded="no">
+      <method name="GetTableObject" type="GridTableBase" overloaded="no">

         <autodoc>GetTableObject() -&gt; GridTableBase</autodoc>
       </method>
         <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=""/>
         <autodoc>SetId(int id)</autodoc>
         <paramlist>
           <param name="id" type="int" default=""/>


@@ -22862,7 +25328,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="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=""/>
         <autodoc>SetCommandInt(int comInt1)</autodoc>
         <paramlist>
           <param name="comInt1" type="int" default=""/>


@@ -22871,7 +25337,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="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=""/>
         <autodoc>SetCommandInt2(int comInt2)</autodoc>
         <paramlist>
           <param name="comInt2" type="int" default=""/>


@@ -22895,7 +25361,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="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=""/>
         <autodoc>SetRow(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -22904,13 +25370,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="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>
         <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=""/>
         <autodoc>Set(int row, int col)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -22920,13 +25386,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>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="asTuple" type="PyObject" overloaded="no">


@@ -22934,18 +25400,18 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="Grid" oldname="wxGrid" module="grid">
       </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <method name="CreateGrid" type="bool" overloaded="no">


@@ -22956,7 +25422,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="selmode" type="WXGRIDSELECTIONMODES" default="wxGrid::wxGridSelectCells"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetSelectionMode(WXGRIDSELECTIONMODES selmode)</autodoc>
         <paramlist>
           <param name="selmode" type="WXGRIDSELECTIONMODES" default=""/>


@@ -22974,21 +25440,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>
       <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>
         </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>
         <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>
           <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">
         <autodoc>ClearGrid()</autodoc>
       </method>
       <method name="InsertRows" type="bool" overloaded="no">


@@ -23037,69 +25503,72 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="updateLabels" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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>
         </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>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="BeginBatch" type="void" overloaded="no">
+      <method name="BeginBatch" type="" overloaded="no">

         <autodoc>BeginBatch()</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>Refresh(bool eraseb=True, Rect rect=None)</autodoc>

+        <docstring>Mark the specified rectangle (or the whole window) as "dirty" so it
+will be repainted.  Causes an EVT_PAINT event to be generated and sent
+to the window.</docstring>

         <paramlist>
           <param name="eraseb" type="bool" default="True"/>
         <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>
         </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>
         <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>
         <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">
         <autodoc>DisableCellEditControl()</autodoc>
       </method>
       <method name="CanEnableCellControl" type="bool" overloaded="no">


@@ -23114,16 +25583,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="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>
         <autodoc>ShowCellEditControl()</autodoc>
       </method>

-      <method name="HideCellEditControl" type="void" overloaded="no">
+      <method name="HideCellEditControl" type="" overloaded="no">

         <autodoc>HideCellEditControl()</autodoc>
       </method>
         <autodoc>HideCellEditControl()</autodoc>
       </method>

-      <method name="SaveEditControlValue" type="void" overloaded="no">
+      <method name="SaveEditControlValue" type="" overloaded="no">

         <autodoc>SaveEditControlValue()</autodoc>
       </method>
         <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=""/>
         <autodoc>XYToCell(int x, int y) -&gt; GridCellCoords</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -23154,7 +25623,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="x" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>CellToRect(int row, int col) -&gt; Rect</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -23175,14 +25644,14 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="wholeCellVisible" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>SetGridCursor(int row, int col)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -23255,48 +25724,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="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>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetColLabelAlignment" type="void" overloaded="no">
+      <method name="GetColLabelAlignment" type="" overloaded="no">

         <autodoc>GetColLabelAlignment() -&gt; (horiz, vert)</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         <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">
         <autodoc>GetCellHighlightColour() -&gt; Colour</autodoc>
       </method>
       <method name="GetCellHighlightPenWidth" type="int" overloaded="no">


@@ -23305,165 +25774,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="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>
         <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>
         <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>
         <autodoc>SetLabelBackgroundColour(Colour ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLabelTextColour" type="void" overloaded="no">
+      <method name="SetLabelTextColour" type="" overloaded="no">

         <autodoc>SetLabelTextColour(Colour ??)</autodoc>
         <paramlist>
         <autodoc>SetLabelTextColour(Colour ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLabelFont" type="void" overloaded="no">
+      <method name="SetLabelFont" type="" overloaded="no">

         <autodoc>SetLabelFont(Font ??)</autodoc>
         <paramlist>
         <autodoc>SetLabelFont(Font ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxFont" default=""/>
+          <param name="" type="Font" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetGridLineColour" type="void" overloaded="no">
+      <method name="SetGridLineColour" type="" overloaded="no">

         <autodoc>SetGridLineColour(Colour ??)</autodoc>
         <paramlist>
         <autodoc>SetGridLineColour(Colour ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetCellHighlightColour" type="void" overloaded="no">
+      <method name="SetCellHighlightColour" type="" overloaded="no">

         <autodoc>SetCellHighlightColour(Colour ??)</autodoc>
         <paramlist>
         <autodoc>SetCellHighlightColour(Colour ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <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>
         </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>
         <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>
         <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=""/>
         <autodoc>SetColFormatFloat(int col, int width=-1, int precision=-1)</autodoc>
         <paramlist>
           <param name="col" type="int" default=""/>


@@ -23471,14 +25940,14 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="precision" type="int" default="-1"/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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"/>
         <autodoc>EnableGridLines(bool enable=True)</autodoc>
         <paramlist>
           <param name="enable" type="bool" default="True"/>


@@ -23505,50 +25974,50 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         </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=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetDefaultCellOverflow" type="bool" overloaded="no">


@@ -23561,105 +26030,105 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetRowMinimalAcceptableHeight(int width)</autodoc>
         <paramlist>
           <param name="width" type="int" default=""/>


@@ -23671,56 +26140,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="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>
         <autodoc>SetDefaultCellBackgroundColour(Colour ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetDefaultCellTextColour" type="void" overloaded="no">
+      <method name="SetDefaultCellTextColour" type="" overloaded="no">

         <autodoc>SetDefaultCellTextColour(Colour ??)</autodoc>
         <paramlist>
         <autodoc>SetDefaultCellTextColour(Colour ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxColour" default=""/>
+          <param name="" type="Colour" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetDefaultCellFont" type="void" overloaded="no">
+      <method name="SetDefaultCellFont" type="" overloaded="no">

         <autodoc>SetDefaultCellFont(Font ??)</autodoc>
         <paramlist>
         <autodoc>SetDefaultCellFont(Font ??)</autodoc>
         <paramlist>

-          <param name="" type="r.q(const).wxFont" default=""/>
+          <param name="" type="Font" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </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>
         <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=""/>
         <autodoc>SetCellAlignment(int row, int col, int horiz, int vert)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -23729,13 +26198,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="vert" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>SetCellOverflow(int row, int col, bool allow)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -23743,7 +26212,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="allow" type="bool" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetCellSize(int row, int col, int num_rows, int num_cols)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -23752,67 +26221,67 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="num_cols" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetDefaultRenderer(GridCellRenderer renderer)</autodoc>
         <paramlist>

-          <param name="renderer" type="p.wxGridCellRenderer" default=""/>
+          <param name="renderer" type="GridCellRenderer" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="GetDefaultRenderer" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetDefaultRenderer" type="GridCellRenderer" overloaded="no">

         <autodoc>GetDefaultRenderer() -&gt; GridCellRenderer</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetDefaultEditor(GridCellEditor editor)</autodoc>
         <paramlist>

-          <param name="editor" type="p.wxGridCellEditor" default=""/>
+          <param name="editor" type="GridCellEditor" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="GetDefaultEditor" type="wxGridCellEditor" overloaded="no">
+      <method name="GetDefaultEditor" type="GridCellEditor" overloaded="no">

         <autodoc>GetDefaultEditor() -&gt; GridCellEditor</autodoc>
       </method>
         <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>
         <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>
         <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=""/>
         <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">
         </paramlist>
       </method>
       <method name="IsReadOnly" type="bool" overloaded="no">


@@ -23822,7 +26291,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetReadOnly(int row, int col, bool isReadOnly=True)</autodoc>
         <paramlist>
           <param name="row" type="int" default=""/>


@@ -23830,21 +26299,21 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="isReadOnly" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <autodoc>SelectBlock(int topRow, int leftCol, int bottomRow, int rightCol, 
     bool addToSelected=False)</autodoc>
         <paramlist>


@@ -23855,13 +26324,13 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="addToSelected" type="bool" default="False"/>
         </paramlist>
       </method>
           <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>
         <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">
         <autodoc>ClearSelection()</autodoc>
       </method>
       <method name="IsInSelection" type="bool" overloaded="no">


@@ -23871,121 +26340,121 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="col" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetSelectionBackground" type="wxColour" overloaded="no">
+      <method name="GetSelectionBackground" type="Colour" overloaded="no">

         <autodoc>GetSelectionBackground() -&gt; Colour</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetSelectionBackground(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetSelectionForeground" type="void" overloaded="no">
+      <method name="SetSelectionForeground" type="" overloaded="no">

         <autodoc>SetSelectionForeground(Colour c)</autodoc>
         <paramlist>
         <autodoc>SetSelectionForeground(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetDefaultRendererForType" type="wxGridCellRenderer" overloaded="no">
+      <method name="GetDefaultRendererForType" type="GridCellRenderer" overloaded="no">

         <autodoc>GetDefaultRendererForType(String typeName) -&gt; GridCellRenderer</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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">
         <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, 
       <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 +26463,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
         <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"/>
           <param name="row" type="int" default="-1"/>
           <param name="col" type="int" default="-1"/>
           <param name="x" type="int" default="-1"/>


@@ -24012,7 +26481,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="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">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="Selecting" type="bool" overloaded="no">


@@ -24032,7 +26501,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridSizeEvent" oldname="wxGridSizeEvent" module="grid">
       </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, 
       <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 +26509,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
         <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"/>
           <param name="rowOrCol" type="int" default="-1"/>
           <param name="x" type="int" default="-1"/>
           <param name="y" type="int" default="-1"/>


@@ -24053,7 +26522,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="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">
         <autodoc>GetPosition() -&gt; Point</autodoc>
       </method>
       <method name="ControlDown" type="bool" overloaded="no">


@@ -24070,7 +26539,7 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridRangeSelectEvent" oldname="wxGridRangeSelectEvent" module="grid">
       </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, 
       <constructor name="GridRangeSelectEvent" overloaded="no">
         <autodoc>__init__(int id, wxEventType type, Grid obj, GridCellCoords topLeft, 
     GridCellCoords bottomRight, bool sel=True, 


@@ -24079,9 +26548,9 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
         <paramlist>
           <param name="id" type="int" default=""/>
           <param name="type" type="wxEventType" default=""/>
         <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"/>
           <param name="sel" type="bool" default="True"/>
           <param name="control" type="bool" default="False"/>
           <param name="shift" type="bool" default="False"/>


@@ -24089,10 +26558,10 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
           <param name="meta" type="bool" default="False"/>
         </paramlist>
       </constructor>
           <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>
         <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">
         <autodoc>GetBottomRightCoords() -&gt; GridCellCoords</autodoc>
       </method>
       <method name="GetTopRow" type="int" overloaded="no">


@@ -24124,17 +26593,17 @@ EVT_CALENDAR_WEEKDAY_CLICKED = wx.PyEventBinder( wxEVT_CALENDAR_WEEKDAY_CLICKED,
       </method>
     </class>
     <class name="GridEditorCreatedEvent" oldname="wxGridEditorCreatedEvent" module="grid">
       </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=""/>
       <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="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">
         </paramlist>
       </constructor>
       <method name="GetRow" type="int" overloaded="no">


@@ -24143,25 +26612,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="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>
         <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>
         <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>
         <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>
         <autodoc>SetControl(Control ctrl)</autodoc>
         <paramlist>

-          <param name="ctrl" type="p.wxControl" default=""/>
+          <param name="ctrl" type="Control" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -24191,58 +26660,58 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlLinkInfo" oldname="wxHtmlLinkInfo" module="html">
 #---------------------------------------------------------------------------
 </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetHref" type="wxString" overloaded="no">
+      <method name="GetHref" type="String" overloaded="no">

         <autodoc>GetHref() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>SetEvent(MouseEvent e)</autodoc>
         <paramlist>

-          <param name="e" type="p.q(const).wxMouseEvent" default=""/>
+          <param name="e" type="MouseEvent" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetHtmlCell" type="void" overloaded="no">
+      <method name="SetHtmlCell" type="" overloaded="no">

         <autodoc>SetHtmlCell(HtmlCell e)</autodoc>
         <paramlist>
         <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">
         </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>
         <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>
         </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>
         <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>
           <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">
         <autodoc>GetAllParams() -&gt; String</autodoc>
       </method>
       <method name="HasEnding" type="bool" overloaded="no">


@@ -24259,76 +26728,76 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       </method>
     </class>
     <class name="HtmlParser" oldname="wxHtmlParser" module="html">
       </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>
         <autodoc>SetFS(FileSystem fs)</autodoc>
         <paramlist>

-          <param name="fs" type="p.wxFileSystem" default=""/>
+          <param name="fs" type="FileSystem" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFS" type="wxFileSystem" overloaded="no">
+      <method name="GetFS" type="FileSystem" overloaded="no">

         <autodoc>GetFS() -&gt; FileSystem</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="InitParser" type="void" overloaded="no">
+      <method name="InitParser" type="" overloaded="no">

         <autodoc>InitParser(String source)</autodoc>
         <paramlist>
         <autodoc>InitParser(String source)</autodoc>
         <paramlist>

-          <param name="source" type="r.q(const).wxString" default=""/>
+          <param name="source" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DoneParser" type="void" overloaded="no">
+      <method name="DoneParser" type="" overloaded="no">

         <autodoc>DoneParser()</autodoc>
       </method>
         <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>
         <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>
         <autodoc>StopParsing()</autodoc>
       </method>

-      <method name="AddTagHandler" type="void" overloaded="no">
+      <method name="AddTagHandler" type="" overloaded="no">

         <autodoc>AddTagHandler(HtmlTagHandler handler)</autodoc>
         <paramlist>
         <autodoc>AddTagHandler(HtmlTagHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxHtmlTagHandler" default=""/>
+          <param name="handler" type="wxHtmlTagHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSource" type="wxString" overloaded="no">
+      <method name="GetSource" type="String" overloaded="no">

         <autodoc>GetSource() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         </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">
         <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>
       <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>
         </paramlist>
       </constructor>

-      <method name="SetDC" type="void" overloaded="no">
+      <method name="SetDC" type="" overloaded="no">

         <autodoc>SetDC(DC dc)</autodoc>
         <paramlist>
         <autodoc>SetDC(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="p.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetDC() -&gt; DC</autodoc>
       </method>
       <method name="GetCharHeight" type="int" overloaded="no">


@@ -24340,12 +26809,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="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>
         <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">
         </paramlist>
       </method>
       <method name="GetContainer" type="wxHtmlContainerCell" overloaded="no">


@@ -24357,7 +26826,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>
       <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">
         </paramlist>
       </method>
       <method name="CloseContainer" type="wxHtmlContainerCell" overloaded="no">


@@ -24366,7 +26835,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="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=""/>
         <autodoc>SetFontSize(int s)</autodoc>
         <paramlist>
           <param name="s" type="int" default=""/>


@@ -24375,7 +26844,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="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=""/>
         <autodoc>SetFontBold(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -24384,7 +26853,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="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=""/>
         <autodoc>SetFontItalic(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -24393,7 +26862,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="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=""/>
         <autodoc>SetFontUnderlined(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -24402,7 +26871,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="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=""/>
         <autodoc>SetFontFixed(int x)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -24411,103 +26880,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="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>
         <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>
         <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>
         <autodoc>SetLinkColor(Colour clr)</autodoc>
         <paramlist>

-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetActualColor" type="wxColour" overloaded="no">
+      <method name="GetActualColor" type="Colour" overloaded="no">

         <autodoc>GetActualColor() -&gt; Colour</autodoc>
       </method>
         <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>
         <autodoc>SetActualColor(Colour clr)</autodoc>
         <paramlist>

-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLink" type="void" overloaded="no">
+      <method name="SetLink" type="" overloaded="no">

         <autodoc>SetLink(String link)</autodoc>
         <paramlist>
         <autodoc>SetLink(String link)</autodoc>
         <paramlist>

-          <param name="link" type="r.q(const).wxString" default=""/>
+          <param name="link" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CreateCurrentFont" type="wxFont" overloaded="no">
+      <method name="CreateCurrentFont" type="Font" overloaded="no">

         <autodoc>CreateCurrentFont() -&gt; Font</autodoc>
       </method>
         <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">
         <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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetParser" type="void" overloaded="no">
+      <method name="SetParser" type="" overloaded="no">

         <autodoc>SetParser(HtmlParser parser)</autodoc>
         <paramlist>
         <autodoc>SetParser(HtmlParser parser)</autodoc>
         <paramlist>

-          <param name="parser" type="p.wxHtmlParser" default=""/>
+          <param name="parser" type="HtmlParser" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetParser" type="wxHtmlParser" overloaded="no">
+      <method name="GetParser" type="HtmlParser" overloaded="no">

         <autodoc>GetParser() -&gt; HtmlParser</autodoc>
       </method>
         <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>
         <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">
         </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetParser" type="void" overloaded="no">
+      <method name="SetParser" type="" overloaded="no">

         <autodoc>SetParser(HtmlParser parser)</autodoc>
         <paramlist>
         <autodoc>SetParser(HtmlParser parser)</autodoc>
         <paramlist>

-          <param name="parser" type="p.wxHtmlParser" default=""/>
+          <param name="parser" type="HtmlParser" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetParser" type="wxHtmlWinParser" overloaded="no">
+      <method name="GetParser" type="HtmlWinParser" overloaded="no">

         <autodoc>GetParser() -&gt; HtmlWinParser</autodoc>
       </method>
         <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>
         <autodoc>ParseInner(HtmlTag tag)</autodoc>
         <paramlist>

-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>

         </paramlist>
       </method>
     </class>
         </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>
       <autodoc>HtmlWinParser_AddTagHandler(PyObject tagHandlerClass)</autodoc>
       <paramlist>

-        <param name="tagHandlerClass" type="p.PyObject" default=""/>
+        <param name="tagHandlerClass" type="PyObject" default=""/>

       </paramlist>
     </method>
     <pythoncode>
       </paramlist>
     </method>
     <pythoncode>


@@ -24520,56 +26989,56 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlSelection" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetCells" type="void" overloaded="no">
+      <method name="SetCells" type="" overloaded="no">

         <autodoc>SetCells(HtmlCell fromCell, HtmlCell toCell)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetFromCell" type="q(const).wxHtmlCell" overloaded="no">
+      <method name="GetFromCell" type="wxHtmlCell" overloaded="no">

         <autodoc>GetFromCell() -&gt; HtmlCell</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetFromPrivPos(Point pos)</autodoc>
         <paramlist>

-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetToPrivPos" type="void" overloaded="no">
+      <method name="SetToPrivPos" type="" overloaded="no">

         <autodoc>SetToPrivPos(Point pos)</autodoc>
         <paramlist>
         <autodoc>SetToPrivPos(Point pos)</autodoc>
         <paramlist>

-          <param name="pos" type="r.q(const).wxPoint" default=""/>
+          <param name="pos" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ClearPrivPos" type="void" overloaded="no">
+      <method name="ClearPrivPos" type="" overloaded="no">

         <autodoc>ClearPrivPos()</autodoc>
       </method>
         <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>
         <autodoc>IsEmpty() -&gt; bool</autodoc>
       </method>
     </class>


@@ -24580,7 +27049,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlRenderingState" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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=""/>
         <autodoc>SetSelectionState(int s)</autodoc>
         <paramlist>
           <param name="s" type="wxHtmlSelectionState" default=""/>


@@ -24589,51 +27058,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="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>
         <autodoc>SetFgColour(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFgColour" type="q(const).wxColour" overloaded="no">
+      <method name="GetFgColour" type="Colour" overloaded="no">

         <autodoc>GetFgColour() -&gt; Colour</autodoc>
       </method>
         <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>
         <autodoc>SetBgColour(Colour c)</autodoc>
         <paramlist>

-          <param name="c" type="r.q(const).wxColour" default=""/>
+          <param name="c" type="Colour" default=""/>

         </paramlist>
       </method>
         </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">
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetSelectedTextBgColour" type="wxColour" overloaded="no">
+      <method name="GetSelectedTextBgColour" type="Colour" overloaded="no">

         <autodoc>GetSelectedTextBgColour(Colour clr) -&gt; Colour</autodoc>
         <paramlist>
         <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">
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="GetSelectedTextBgColour" type="wxColour" overloaded="no">
+      <method name="GetSelectedTextBgColour" type="Colour" overloaded="no">

         <autodoc>GetSelectedTextBgColour(Colour clr) -&gt; Colour</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>
     </class>


@@ -24644,25 +27113,25 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlRenderingInfo" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <autodoc>SetSelection(HtmlSelection s)</autodoc>
         <paramlist>

-          <param name="s" type="p.wxHtmlSelection" default=""/>
+          <param name="s" type="HtmlSelection" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetSelection" type="wxHtmlSelection" overloaded="no">
+      <method name="GetSelection" type="HtmlSelection" overloaded="no">

         <autodoc>GetSelection() -&gt; HtmlSelection</autodoc>
       </method>
         <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>
         <autodoc>SetStyle(HtmlRenderingStyle style)</autodoc>
         <paramlist>

-          <param name="style" type="p.wxHtmlRenderingStyle" default=""/>
+          <param name="style" type="HtmlRenderingStyle" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetStyle" type="wxHtmlRenderingStyle" overloaded="no">
+      <method name="GetStyle" type="HtmlRenderingStyle" overloaded="no">

         <autodoc>GetStyle() -&gt; HtmlRenderingStyle</autodoc>
       </method>
         <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>
         <autodoc>GetState() -&gt; HtmlRenderingState</autodoc>
       </method>
     </class>


@@ -24670,7 +27139,7 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlCell" oldname="wxHtmlCell" module="html">
 #---------------------------------------------------------------------------
 </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>
       <constructor name="HtmlCell" overloaded="no">
         <autodoc>__init__() -&gt; HtmlCell</autodoc>
       </constructor>


@@ -24689,102 +27158,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="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>
         <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>
         <autodoc>SetId(String id)</autodoc>
         <paramlist>

-          <param name="id" type="r.q(const).wxString" default=""/>
+          <param name="id" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetLink(HtmlLinkInfo link)</autodoc>
         <paramlist>

-          <param name="link" type="r.q(const).wxHtmlLinkInfo" default=""/>
+          <param name="link" type="HtmlLinkInfo" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">

         <autodoc>SetNext(HtmlCell cell)</autodoc>
         <paramlist>
         <autodoc>SetNext(HtmlCell cell)</autodoc>
         <paramlist>

-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetParent" type="void" overloaded="no">
+      <method name="SetParent" type="" overloaded="no">

         <autodoc>SetParent(HtmlContainerCell p)</autodoc>
         <paramlist>
         <autodoc>SetParent(HtmlContainerCell p)</autodoc>
         <paramlist>

-          <param name="p" type="p.wxHtmlContainerCell" default=""/>
+          <param name="p" type="wxHtmlContainerCell" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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="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>
         </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>
         <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="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>
         </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=""/>
         <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>
         </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>
         </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=""/>
         <autodoc>SetCanLiveOnPagebreak(bool can)</autodoc>
         <paramlist>
           <param name="can" type="bool" default=""/>


@@ -24796,7 +27265,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="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=""/>
         <autodoc>FindCellByPos(int x, int y, unsigned int flags=HTML_FIND_EXACT) -&gt; HtmlCell</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -24804,13 +27273,13 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="flags" type="unsigned int" default="wxHTML_FIND_EXACT"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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">
         <autodoc>GetLastTerminal() -&gt; HtmlCell</autodoc>
       </method>
       <method name="GetDepth" type="unsigned int" overloaded="no">


@@ -24819,41 +27288,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>
       <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>
         </paramlist>
       </method>

-      <method name="ConvertToText" type="wxString" overloaded="no">
+      <method name="ConvertToText" type="String" overloaded="no">

         <autodoc>ConvertToText(HtmlSelection sel) -&gt; String</autodoc>
         <paramlist>
         <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">
         </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>
       <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">
         </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="InsertCell" type="void" overloaded="no">
+      <method name="InsertCell" type="" overloaded="no">

         <autodoc>InsertCell(HtmlCell cell)</autodoc>
         <paramlist>
         <autodoc>InsertCell(HtmlCell cell)</autodoc>
         <paramlist>

-          <param name="cell" type="p.wxHtmlCell" default=""/>
+          <param name="cell" type="HtmlCell" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetAlignHor(int al)</autodoc>
         <paramlist>
           <param name="al" type="int" default=""/>


@@ -24862,7 +27331,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="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=""/>
         <autodoc>SetAlignVer(int al)</autodoc>
         <paramlist>
           <param name="al" type="int" default=""/>


@@ -24871,7 +27340,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="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=""/>
         <autodoc>SetIndent(int i, int what, int units=HTML_UNITS_PIXELS)</autodoc>
         <paramlist>
           <param name="i" type="int" default=""/>


@@ -24891,77 +27360,77 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="ind" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetAlign(HtmlTag tag)</autodoc>
         <paramlist>

-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetWidthFloatFromTag(HtmlTag tag)</autodoc>
         <paramlist>

-          <param name="tag" type="r.q(const).wxHtmlTag" default=""/>
+          <param name="tag" type="HtmlTag" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetBackgroundColour(Colour clr)</autodoc>
         <paramlist>

-          <param name="clr" type="r.q(const).wxColour" default=""/>
+          <param name="clr" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetBackgroundColour" type="Colour" overloaded="no">

         <autodoc>GetBackgroundColour() -&gt; Colour</autodoc>
       </method>
         <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>
         <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>
         </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">
         <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>
       <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">
           <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>
       <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">
         </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>
       <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>
           <param name="w" type="int" default="0"/>
         </paramlist>
       </constructor>


@@ -24970,15 +27439,15 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlFilter" oldname="wxPyHtmlFilter" module="html">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -24986,18 +27455,18 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlWindow" oldname="wxPyHtmlWindow" module="html">
 #---------------------------------------------------------------------------
 </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreHtmlWindow" overloaded="no">


@@ -25008,102 +27477,103 @@ 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>
     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="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="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>
         </paramlist>
       </method>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </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>
         </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>
         </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>
         </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>
         </paramlist>
       </method>

-      <method name="GetOpenedPage" type="wxString" overloaded="no">
+      <method name="GetOpenedPage" type="String" overloaded="no">

         <autodoc>GetOpenedPage() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetRelatedFrame" type="wxFrame" overloaded="no">
+      <method name="GetRelatedFrame" type="Frame" overloaded="no">

         <autodoc>GetRelatedFrame() -&gt; Frame</autodoc>
       </method>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetTitle" type="void" overloaded="no">
+      <method name="SetTitle" type="" overloaded="no">

         <autodoc>SetTitle(String title)</autodoc>
         <autodoc>SetTitle(String title)</autodoc>

+        <docstring>Sets the window's title. Applicable only to frames and dialogs.</docstring>

         <paramlist>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="WriteCustomization" type="void" overloaded="no">
+      <method name="WriteCustomization" type="" overloaded="no">

         <autodoc>WriteCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="HistoryBack" type="bool" overloaded="no">


@@ -25118,60 +27588,75 @@ 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="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>
         <autodoc>HistoryClear()</autodoc>
       </method>

-      <method name="GetInternalRepresentation" type="wxHtmlContainerCell" overloaded="no">
+      <method name="GetInternalRepresentation" type="HtmlContainerCell" overloaded="no">

         <autodoc>GetInternalRepresentation() -&gt; HtmlContainerCell</autodoc>
       </method>
         <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>
         <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>
         </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>
         </paramlist>
       </method>

-      <staticmethod name="AddFilter" type="void" overloaded="no">
-        <autodoc>HtmlWindow.AddFilter(HtmlFilter filter)</autodoc>
+      <staticmethod name="AddFilter" type="" overloaded="no">
+        <autodoc>AddFilter(HtmlFilter filter)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="filter" type="p.wxPyHtmlFilter" default=""/>
+          <param name="filter" type="HtmlFilter" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <method name="base_OnLinkClicked" type="void" overloaded="no">
+      <method name="SelectWord" type="" overloaded="no">
+        <autodoc>SelectWord(Point pos)</autodoc>
+        <paramlist>
+          <param name="pos" type="Point" default=""/>
+        </paramlist>
+      </method>
+      <method name="SelectLine" type="" overloaded="no">
+        <autodoc>SelectLine(Point pos)</autodoc>
+        <paramlist>
+          <param name="pos" type="Point" default=""/>
+        </paramlist>
+      </method>
+      <method name="SelectAll" type="" overloaded="no">
+        <autodoc>SelectAll()</autodoc>
+      </method>
+      <method name="base_OnLinkClicked" type="" overloaded="no">

         <autodoc>base_OnLinkClicked(HtmlLinkInfo link)</autodoc>
         <paramlist>
         <autodoc>base_OnLinkClicked(HtmlLinkInfo link)</autodoc>
         <paramlist>

-          <param name="link" type="r.q(const).wxHtmlLinkInfo" default=""/>
+          <param name="link" type="HtmlLinkInfo" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnSetTitle" type="void" overloaded="no">
+      <method name="base_OnSetTitle" type="" overloaded="no">

         <autodoc>base_OnSetTitle(String title)</autodoc>
         <paramlist>
         <autodoc>base_OnSetTitle(String title)</autodoc>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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="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>
         </paramlist>
       </method>
     </class>


@@ -25179,41 +27664,41 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="HtmlDCRenderer" oldname="wxHtmlDCRenderer" module="html">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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>
           <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>
         <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>
         <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>
           <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>
         <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">
         </paramlist>
       </method>
       <method name="Render" type="int" overloaded="no">


@@ -25225,7 +27710,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="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>
           <param name="LCOUNT" type="int" default="0"/>
         </paramlist>
       </method>


@@ -25234,50 +27719,50 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       </method>
     </class>
     <class name="HtmlPrintout" oldname="wxHtmlPrintout" module="html">
       </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>
       <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>
         </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>
         <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>
           <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>
         <autodoc>SetHtmlFile(String htmlfile)</autodoc>
         <paramlist>

-          <param name="htmlfile" type="r.q(const).wxString" default=""/>
+          <param name="htmlfile" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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>
           <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>
         <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>
         </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>
         <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 +27773,86 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
           <param name="spaces" type="float" default="5"/>
         </paramlist>
       </method>
           <param name="spaces" type="float" default="5"/>
         </paramlist>
       </method>

-      <staticmethod name="AddFilter" type="void" overloaded="no">
-        <autodoc>HtmlPrintout.AddFilter(wxHtmlFilter filter)</autodoc>
+      <staticmethod name="AddFilter" type="" overloaded="no">
+        <autodoc>AddFilter(wxHtmlFilter filter)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="filter" type="p.wxHtmlFilter" default=""/>
+          <param name="filter" type="wxHtmlFilter" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <staticmethod name="CleanUpStatics" type="void" overloaded="no">
-        <autodoc>HtmlPrintout.CleanUpStatics()</autodoc>
+      <staticmethod name="CleanUpStatics" type="" overloaded="no">
+        <autodoc>CleanUpStatics()</autodoc>

       </staticmethod>
     </class>
     <class name="HtmlEasyPrinting" oldname="wxHtmlEasyPrinting" module="html">
       </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>
       <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>
         </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>
         <autodoc>PreviewFile(String htmlfile)</autodoc>
         <paramlist>

-          <param name="htmlfile" type="r.q(const).wxString" default=""/>
+          <param name="htmlfile" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="PreviewText" type="void" overloaded="no">
+      <method name="PreviewText" type="" overloaded="no">

         <autodoc>PreviewText(String htmltext, String basepath=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="PrintFile" type="void" overloaded="no">
+      <method name="PrintFile" type="" overloaded="no">

         <autodoc>PrintFile(String htmlfile)</autodoc>
         <paramlist>
         <autodoc>PrintFile(String htmlfile)</autodoc>
         <paramlist>

-          <param name="htmlfile" type="r.q(const).wxString" default=""/>
+          <param name="htmlfile" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="PrintText" type="void" overloaded="no">
+      <method name="PrintText" type="" overloaded="no">

         <autodoc>PrintText(String htmltext, String basepath=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="PrinterSetup" type="void" overloaded="no">
+      <method name="PrinterSetup" type="" overloaded="no">

         <autodoc>PrinterSetup()</autodoc>
       </method>
         <autodoc>PrinterSetup()</autodoc>
       </method>

-      <method name="PageSetup" type="void" overloaded="no">
+      <method name="PageSetup" type="" overloaded="no">

         <autodoc>PageSetup()</autodoc>
       </method>
         <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>
         <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>
           <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>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetPrintData" type="wxPrintData" overloaded="no">
+      <method name="GetPrintData" type="PrintData" overloaded="no">

         <autodoc>GetPrintData() -&gt; PrintData</autodoc>
       </method>
         <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>
         <autodoc>GetPageSetupData() -&gt; PageSetupDialogData</autodoc>
       </method>
     </class>


@@ -25378,25 +27863,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>
       <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>
         </paramlist>
       </constructor>

-      <method name="GetBookFile" type="wxString" overloaded="no">
+      <method name="GetBookFile" type="String" overloaded="no">

         <autodoc>GetBookFile() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetContentsRange(int start, int end)</autodoc>
         <paramlist>
           <param name="start" type="int" default=""/>


@@ -25409,28 +27894,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="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>
         <autodoc>SetTitle(String title)</autodoc>
         <paramlist>

-          <param name="title" type="r.q(const).wxString" default=""/>
+          <param name="title" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBasePath" type="void" overloaded="no">
+      <method name="SetBasePath" type="" overloaded="no">

         <autodoc>SetBasePath(String path)</autodoc>
         <paramlist>
         <autodoc>SetBasePath(String path)</autodoc>
         <paramlist>

-          <param name="path" type="r.q(const).wxString" default=""/>
+          <param name="path" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetStart" type="void" overloaded="no">
+      <method name="SetStart" type="" overloaded="no">

         <autodoc>SetStart(String start)</autodoc>
         <paramlist>
         <autodoc>SetStart(String start)</autodoc>
         <paramlist>

-          <param name="start" type="r.q(const).wxString" default=""/>
+          <param name="start" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFullPath" type="wxString" overloaded="no">
+      <method name="GetFullPath" type="String" overloaded="no">

         <autodoc>GetFullPath(String page) -&gt; String</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>
     </class>


@@ -25441,13 +27926,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="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>
         <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>
         <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>
         <autodoc>GetBook() -&gt; HtmlBookRecord</autodoc>
       </method>
     </class>


@@ -25464,10 +27949,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="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>
         <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>
         <autodoc>GetContentsItem() -&gt; HtmlContentsItem</autodoc>
       </method>
     </class>


@@ -25478,40 +27963,40 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlHelpData" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="FindPageByName" type="wxString" overloaded="no">
+      <method name="FindPageByName" type="String" overloaded="no">

         <autodoc>FindPageByName(String page) -&gt; String</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         <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">
         <autodoc>GetIndex() -&gt; HtmlContentsItem</autodoc>
       </method>
       <method name="GetIndexCnt" type="int" overloaded="no">


@@ -25519,75 +28004,75 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       </method>
     </class>
     <class name="HtmlHelpFrame" oldname="wxHtmlHelpFrame" module="html">
       </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>
       <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="" 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="style" type="int" default="wxHF_DEFAULTSTYLE"/>

-          <param name="data" type="p.wxHtmlHelpData" default="NULL"/>
+          <param name="data" type="HtmlHelpData" default="NULL"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="GetData" type="wxHtmlHelpData" overloaded="no">
+      <method name="GetData" type="HtmlHelpData" overloaded="no">

         <autodoc>GetData() -&gt; HtmlHelpData</autodoc>
       </method>
         <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>
         <autodoc>SetTitleFormat(String format)</autodoc>
         <paramlist>

-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Display" type="void" overloaded="no">
+      <method name="Display" type="" overloaded="no">

         <autodoc>Display(String x)</autodoc>
         <paramlist>
         <autodoc>Display(String x)</autodoc>
         <paramlist>

-          <param name="x" type="r.q(const).wxString" default=""/>
+          <param name="x" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="UseConfig" type="void" overloaded="no">
+      <method name="UseConfig" type="" overloaded="no">

         <autodoc>UseConfig(ConfigBase config, String rootpath=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="ReadCustomization" type="void" overloaded="no">
+      <method name="ReadCustomization" type="" overloaded="no">

         <autodoc>ReadCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="WriteCustomization" type="void" overloaded="no">
+      <method name="WriteCustomization" type="" overloaded="no">

         <autodoc>WriteCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
         <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">
         </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>
       <constructor name="HtmlHelpController" overloaded="no">
         <autodoc>__init__(int style=HF_DEFAULTSTYLE) -&gt; HtmlHelpController</autodoc>
         <paramlist>


@@ -25597,71 +28082,71 @@ EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
       <destructor name="~wxHtmlHelpController" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <autodoc>SetTitleFormat(String format)</autodoc>
         <paramlist>

-          <param name="format" type="r.q(const).wxString" default=""/>
+          <param name="format" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTempDir" type="void" overloaded="no">
+      <method name="SetTempDir" type="" overloaded="no">

         <autodoc>SetTempDir(String path)</autodoc>
         <paramlist>
         <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>
         </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>
           <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>
         <autodoc>Display(String x)</autodoc>
         <paramlist>

-          <param name="x" type="r.q(const).wxString" default=""/>
+          <param name="x" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="UseConfig" type="void" overloaded="no">
+      <method name="UseConfig" type="" overloaded="no">

         <autodoc>UseConfig(ConfigBase config, String rootpath=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="ReadCustomization" type="void" overloaded="no">
+      <method name="ReadCustomization" type="" overloaded="no">

         <autodoc>ReadCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="WriteCustomization" type="void" overloaded="no">
+      <method name="WriteCustomization" type="" overloaded="no">

         <autodoc>WriteCustomization(ConfigBase cfg, String path=EmptyString)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetFrame" type="wxHtmlHelpFrame" overloaded="no">
+      <method name="GetFrame" type="HtmlHelpFrame" overloaded="no">

         <autodoc>GetFrame() -&gt; HtmlHelpFrame</autodoc>
       </method>
     </class>
         <autodoc>GetFrame() -&gt; HtmlHelpFrame</autodoc>
       </method>
     </class>


@@ -25677,7 +28162,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">
 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>
       <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 +28170,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="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">
         </paramlist>
       </constructor>
       <method name="GetDirection" type="bool" overloaded="no">


@@ -25696,33 +28181,33 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="WizardPage" oldname="wxWizardPage" module="wizard">
       </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>
       <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>
         </paramlist>
       </method>

-      <method name="GetPrev" type="wxWizardPage" overloaded="no">
+      <method name="GetPrev" type="WizardPage" overloaded="no">

         <autodoc>GetPrev() -&gt; WizardPage</autodoc>
       </method>
         <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>
         <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">
         <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>
       <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">
         </paramlist>
       </constructor>
       <constructor name="PrePyWizardPage" overloaded="no">


@@ -25731,19 +28216,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>
       <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>
         </paramlist>
       </method>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <autodoc>base_DoMoveWindow(int x, int y, int width, int height)</autodoc>
         <paramlist>
           <param name="x" type="int" default=""/>


@@ -25752,7 +28237,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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 +28247,48 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="sizeFlags" type="int" default="wxSIZE_AUTO"/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         <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">
         <autodoc>base_InitDialog()</autodoc>
       </method>
       <method name="base_TransferDataToWindow" type="bool" overloaded="no">


@@ -25821,33 +28306,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_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>
         <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>
         <autodoc>base_AddChild(Window child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxWindow" default=""/>
+          <param name="child" type="Window" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_RemoveChild" type="void" overloaded="no">
+      <method name="base_RemoveChild" type="" overloaded="no">

         <autodoc>base_RemoveChild(Window child)</autodoc>
         <paramlist>
         <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">
         </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>
       <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">
         </paramlist>
       </constructor>
       <constructor name="PreWizardPageSimple" overloaded="no">


@@ -25857,45 +28342,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>
         <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>
         </paramlist>
       </method>

-      <method name="SetPrev" type="void" overloaded="no">
+      <method name="SetPrev" type="" overloaded="no">

         <autodoc>SetPrev(WizardPage prev)</autodoc>
         <paramlist>
         <autodoc>SetPrev(WizardPage prev)</autodoc>
         <paramlist>

-          <param name="prev" type="p.wxWizardPage" default=""/>
+          <param name="prev" type="WizardPage" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">

         <autodoc>SetNext(WizardPage next)</autodoc>
         <paramlist>
         <autodoc>SetNext(WizardPage next)</autodoc>
         <paramlist>

-          <param name="next" type="p.wxWizardPage" default=""/>
+          <param name="next" type="WizardPage" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <staticmethod name="Chain" type="void" overloaded="no">
-        <autodoc>WizardPageSimple.Chain(WizardPageSimple first, WizardPageSimple second)</autodoc>
+      <staticmethod name="Chain" type="" overloaded="no">
+        <autodoc>Chain(WizardPageSimple first, WizardPageSimple second)</autodoc>

         <paramlist>
         <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">
         </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>
       <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="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>
           <param name="style" type="long" default="wxDEFAULT_DIALOG_STYLE"/>
         </paramlist>
       </constructor>


@@ -25906,44 +28391,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>
         <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="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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="GetCurrentPage" type="wxWizardPage" overloaded="no">
+      <method name="GetCurrentPage" type="WizardPage" overloaded="no">

         <autodoc>GetCurrentPage() -&gt; WizardPage</autodoc>
       </method>
         <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>
         <autodoc>SetPageSize(Size size)</autodoc>
         <paramlist>

-          <param name="size" type="r.q(const).wxSize" default=""/>
+          <param name="size" type="Size" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPageSize" type="wxSize" overloaded="no">
+      <method name="GetPageSize" type="Size" overloaded="no">

         <autodoc>GetPageSize() -&gt; Size</autodoc>
       </method>
         <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>
         <autodoc>FitToPage(WizardPage firstPage)</autodoc>
         <paramlist>

-          <param name="firstPage" type="p.q(const).wxWizardPage" default=""/>
+          <param name="firstPage" type="WizardPage" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPageAreaSizer" type="wxSizer" overloaded="no">
+      <method name="GetPageAreaSizer" type="Sizer" overloaded="no">

         <autodoc>GetPageAreaSizer() -&gt; Sizer</autodoc>
       </method>
         <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=""/>
         <autodoc>SetBorder(int border)</autodoc>
         <paramlist>
           <param name="border" type="int" default=""/>


@@ -25955,20 +28440,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>
       <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="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>
         </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>
         </paramlist>
       </method>
     </class>


@@ -25977,98 +28462,98 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     <import name="core"/>
     <pythoncode> wx = core </pythoncode>
     <class name="GLContext" oldname="wxGLContext" module="glcanvas">
     <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=""/>
       <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>
         </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>
         <autodoc>SetCurrent()</autodoc>
       </method>

-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">

         <autodoc>SetColour(String colour)</autodoc>
         <paramlist>
         <autodoc>SetColour(String colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SwapBuffers" type="void" overloaded="no">
+      <method name="SwapBuffers" type="" overloaded="no">

         <autodoc>SwapBuffers()</autodoc>
       </method>
         <autodoc>SwapBuffers()</autodoc>
       </method>

-      <method name="SetupPixelFormat" type="void" overloaded="no">
+      <method name="SetupPixelFormat" type="" overloaded="no">

         <autodoc>SetupPixelFormat()</autodoc>
       </method>
         <autodoc>SetupPixelFormat()</autodoc>
       </method>

-      <method name="SetupPalette" type="void" overloaded="no">
+      <method name="SetupPalette" type="" overloaded="no">

         <autodoc>SetupPalette(wxPalette palette)</autodoc>
         <paramlist>
         <autodoc>SetupPalette(wxPalette palette)</autodoc>
         <paramlist>

-          <param name="palette" type="r.q(const).wxPalette" default=""/>
+          <param name="palette" type="Palette" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CreateDefaultPalette" type="wxPalette" overloaded="no">
+      <method name="CreateDefaultPalette" type="Palette" overloaded="no">

         <autodoc>CreateDefaultPalette() -&gt; wxPalette</autodoc>
       </method>
         <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>
         <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">
         <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>
       <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="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="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>
         </paramlist>
       </constructor>

-      <constructor name="wxGLCanvasWithContext" overloaded="no">
-        <autodoc>wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
+      <constructor name="GLCanvasWithContext" overloaded="no">
+        <autodoc>GLCanvasWithContext(Window parent, GLContext shared=None, 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>
     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="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="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="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>
         </paramlist>
       </constructor>

-      <method name="SetCurrent" type="void" overloaded="no">
+      <method name="SetCurrent" type="" overloaded="no">

         <autodoc>SetCurrent()</autodoc>
       </method>
         <autodoc>SetCurrent()</autodoc>
       </method>

-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">

         <autodoc>SetColour(String colour)</autodoc>
         <paramlist>
         <autodoc>SetColour(String colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SwapBuffers" type="void" overloaded="no">
+      <method name="SwapBuffers" type="" overloaded="no">

         <autodoc>SwapBuffers()</autodoc>
       </method>
         <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>
         <autodoc>GetContext() -&gt; GLContext</autodoc>
       </method>
     </class>


@@ -26080,136 +28565,136 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="ShapeRegion" oldname="wxShapeRegion" module="ogl">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <autodoc>SetText(String s)</autodoc>
         <paramlist>

-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFont" type="void" overloaded="no">
+      <method name="SetFont" type="" overloaded="no">

         <autodoc>SetFont(Font f)</autodoc>
         <paramlist>
         <autodoc>SetFont(Font f)</autodoc>
         <paramlist>

-          <param name="f" type="p.wxFont" default=""/>
+          <param name="f" type="Font" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetName(String s)</autodoc>
         <paramlist>

-          <param name="s" type="r.q(const).wxString" default=""/>
+          <param name="s" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetColour" type="void" overloaded="no">
+      <method name="SetColour" type="" overloaded="no">

         <autodoc>SetColour(String col)</autodoc>
         <paramlist>
         <autodoc>SetColour(String col)</autodoc>
         <paramlist>

-          <param name="col" type="r.q(const).wxString" default=""/>
+          <param name="col" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetText" type="wxString" overloaded="no">
+      <method name="GetText" type="String" overloaded="no">

         <autodoc>GetText() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetProportion" type="void" overloaded="no">
+      <method name="GetProportion" type="" overloaded="no">

         <autodoc>GetProportion(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetSize" type="void" overloaded="no">
+      <method name="GetSize" type="" overloaded="no">

         <autodoc>GetSize(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetPosition" type="void" overloaded="no">
+      <method name="GetPosition" type="" overloaded="no">

         <autodoc>GetPosition(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetPenColour(String col)</autodoc>
         <paramlist>

-          <param name="col" type="r.q(const).wxString" default=""/>
+          <param name="col" type="String" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>GetActualPen() -&gt; wxPen</autodoc>
       </method>
       <method name="GetWidth" type="double" overloaded="no">


@@ -26218,100 +28703,114 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetHeight" type="double" overloaded="no">
         <autodoc>GetHeight() -&gt; double</autodoc>
       </method>
       <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>
         <autodoc>ClearText()</autodoc>
       </method>
     </class>

+    <class name="AttachmentPoint" oldname="wxAttachmentPoint" module="ogl">
+      <baseclass name="Object"/>
+      <constructor name="AttachmentPoint" overloaded="no">
+        <autodoc>__init__(int id=0, double x=0.0, double y=0.0) -&gt; AttachmentPoint</autodoc>
+        <paramlist>
+          <param name="id" type="int" default="0"/>
+          <param name="x" type="double" default="0.0"/>
+          <param name="y" type="double" default="0.0"/>
+        </paramlist>
+      </constructor>
+      <property name="m_id" type="int" readonly="no"/>
+      <property name="m_x" type="double" readonly="no"/>
+      <property name="m_y" type="double" readonly="no"/>
+    </class>

     <class name="PyShapeEvtHandler" oldname="wxPyShapeEvtHandler" module="ogl">
     <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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="_setOORInfo" type="void" overloaded="no">
+      <method name="_setOORInfo" type="" overloaded="no">

         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>
         <autodoc>_setOORInfo(PyObject _self)</autodoc>
         <paramlist>

-          <param name="_self" type="p.PyObject" default=""/>
+          <param name="_self" type="PyObject" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetShape" type="void" overloaded="no">
+      <method name="SetShape" type="" overloaded="no">

         <autodoc>SetShape(PyShape sh)</autodoc>
         <paramlist>
         <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>
         </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>
         <autodoc>SetPreviousHandler(PyShapeEvtHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxPyShapeEvtHandler" default=""/>
+          <param name="handler" type="PyShapeEvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPreviousHandler" type="wxPyShapeEvtHandler" overloaded="no">
+      <method name="GetPreviousHandler" type="PyShapeEvtHandler" overloaded="no">

         <autodoc>GetPreviousHandler() -&gt; PyShapeEvtHandler</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26320,7 +28819,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26329,7 +28828,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26338,7 +28837,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26349,7 +28848,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -26357,11 +28856,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -26369,7 +28868,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +28878,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26388,7 +28887,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26397,7 +28896,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +28906,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26416,7 +28915,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26425,40 +28924,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -26466,36 +28965,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -26504,32 +29003,32 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyShape" oldname="wxPyShape" module="ogl">
       </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>
       <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>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetBoundingBoxMax" type="void" overloaded="no">
+      <method name="GetBoundingBoxMax" type="" overloaded="no">

         <autodoc>GetBoundingBoxMax(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetBoundingBoxMin" type="void" overloaded="no">
+      <method name="GetBoundingBoxMin" type="" overloaded="no">

         <autodoc>GetBoundingBoxMin(double OUTPUT, double OUTPUT)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetPerimeterPoint" type="bool" overloaded="no">


@@ -26540,36 +29039,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="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>
         </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>
         <autodoc>SetCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>

-          <param name="the_canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="InsertInCanvas" type="void" overloaded="no">
+      <method name="InsertInCanvas" type="" overloaded="no">

         <autodoc>InsertInCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>
         <autodoc>InsertInCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>

-          <param name="the_canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="the_canvas" type="wxPyShapeCanvas" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RemoveFromCanvas" type="void" overloaded="no">
+      <method name="RemoveFromCanvas" type="" overloaded="no">

         <autodoc>RemoveFromCanvas(PyShapeCanvas the_canvas)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetX" type="double" overloaded="no">


@@ -26578,37 +29077,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="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>
         <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>
         <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>
         <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>
         <autodoc>SetParent(PyShape p)</autodoc>
         <paramlist>

-          <param name="p" type="p.wxPyShape" default=""/>
+          <param name="p" type="PyShape" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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=""/>
         <autodoc>SetDrawHandles(bool drawH)</autodoc>
         <paramlist>
           <param name="drawH" type="bool" default=""/>


@@ -26617,47 +29116,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="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>
         <autodoc>MakeControlPoints()</autodoc>
       </method>

-      <method name="DeleteControlPoints" type="void" overloaded="no">
+      <method name="DeleteControlPoints" type="" overloaded="no">

         <autodoc>DeleteControlPoints(DC dc=None)</autodoc>
         <paramlist>
         <autodoc>DeleteControlPoints(DC dc=None)</autodoc>
         <paramlist>

-          <param name="dc" type="p.wxDC" default="NULL"/>
+          <param name="dc" type="DC" default="NULL"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ResetControlPoints" type="void" overloaded="no">
+      <method name="ResetControlPoints" type="" overloaded="no">

         <autodoc>ResetControlPoints()</autodoc>
       </method>
         <autodoc>ResetControlPoints()</autodoc>
       </method>

-      <method name="GetEventHandler" type="wxPyShapeEvtHandler" overloaded="no">
+      <method name="GetEventHandler" type="PyShapeEvtHandler" overloaded="no">

         <autodoc>GetEventHandler() -&gt; PyShapeEvtHandler</autodoc>
       </method>
         <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>
         <autodoc>SetEventHandler(PyShapeEvtHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxPyShapeEvtHandler" default=""/>
+          <param name="handler" type="PyShapeEvtHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="MakeMandatoryControlPoints" type="void" overloaded="no">
+      <method name="MakeMandatoryControlPoints" type="" overloaded="no">

         <autodoc>MakeMandatoryControlPoints()</autodoc>
       </method>
         <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>
         <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>
         <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"/>
         <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>
         </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"/>
         <autodoc>SetHighlight(bool hi=True, bool recurse=False)</autodoc>
         <paramlist>
           <param name="hi" type="bool" default="True"/>


@@ -26673,7 +29172,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="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"/>
         <autodoc>SetSensitivityFilter(int sens=OP_ALL, bool recursive=False)</autodoc>
         <paramlist>
           <param name="sens" type="int" default="OP_ALL"/>


@@ -26683,25 +29182,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="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>
         <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>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="GetFixedWidth" type="bool" overloaded="no">


@@ -26710,7 +29209,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="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=""/>
         <autodoc>SetSpaceAttachments(bool sp)</autodoc>
         <paramlist>
           <param name="sp" type="bool" default=""/>


@@ -26719,7 +29218,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="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=""/>
         <autodoc>SetShadowMode(int mode, bool redraw=False)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -26734,11 +29233,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <paramlist>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
         <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>
         </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=""/>
         <autodoc>SetCentreResize(bool cr)</autodoc>
         <paramlist>
           <param name="cr" type="bool" default=""/>


@@ -26747,7 +29246,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="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=""/>
         <autodoc>SetMaintainAspectRatio(bool ar)</autodoc>
         <paramlist>
           <param name="ar" type="bool" default=""/>


@@ -26759,7 +29258,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="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=""/>
         <autodoc>SetDisableLabel(bool flag)</autodoc>
         <paramlist>
           <param name="flag" type="bool" default=""/>


@@ -26768,7 +29267,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="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=""/>
         <autodoc>SetAttachmentMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -26777,7 +29276,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="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=""/>
         <autodoc>SetId(long i)</autodoc>
         <paramlist>
           <param name="i" type="long" default=""/>


@@ -26786,19 +29285,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="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>
         <autodoc>SetPen(wxPen pen)</autodoc>
         <paramlist>

-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBrush" type="void" overloaded="no">
+      <method name="SetBrush" type="" overloaded="no">

         <autodoc>SetBrush(wxBrush brush)</autodoc>
         <paramlist>
         <autodoc>SetBrush(wxBrush brush)</autodoc>
         <paramlist>

-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>Show(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -26807,49 +29306,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="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>
         <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>
           <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>
         <autodoc>Erase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="EraseContents" type="void" overloaded="no">
+      <method name="EraseContents" type="" overloaded="no">

         <autodoc>EraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>EraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Draw" type="void" overloaded="no">
+      <method name="Draw" type="" overloaded="no">

         <autodoc>Draw(DC dc)</autodoc>
         <paramlist>
         <autodoc>Draw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Flash" type="void" overloaded="no">
+      <method name="Flash" type="" overloaded="no">

         <autodoc>Flash()</autodoc>
       </method>
         <autodoc>Flash()</autodoc>
       </method>

-      <method name="MoveLinks" type="void" overloaded="no">
+      <method name="MoveLinks" type="" overloaded="no">

         <autodoc>MoveLinks(DC dc)</autodoc>
         <paramlist>
         <autodoc>MoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DrawContents" type="void" overloaded="no">
+      <method name="DrawContents" type="" overloaded="no">

         <autodoc>DrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>DrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetSize(double x, double y, bool recursive=True)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -26857,31 +29356,31 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="recursive" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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>
         <autodoc>Attach(PyShapeCanvas can)</autodoc>
         <paramlist>

-          <param name="can" type="p.wxPyShapeCanvas" default=""/>
+          <param name="can" type="wxPyShapeCanvas" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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"/>
           <param name="attachFrom" type="int" default="0"/>
           <param name="attachTo" type="int" default="0"/>
           <param name="positionFrom" type="int" default="-1"/>


@@ -26891,33 +29390,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>
       <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>
         </paramlist>
       </method>

-      <method name="AddText" type="void" overloaded="no">
+      <method name="AddText" type="" overloaded="no">

         <autodoc>AddText(String string)</autodoc>
         <paramlist>
         <autodoc>AddText(String string)</autodoc>
         <paramlist>

-          <param name="string" type="r.q(const).wxString" default=""/>
+          <param name="string" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetPen" type="wxPen" overloaded="no">
+      <method name="GetPen" type="Pen" overloaded="no">

         <autodoc>GetPen() -&gt; wxPen</autodoc>
       </method>
         <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>
         <autodoc>GetBrush() -&gt; wxBrush</autodoc>
       </method>

-      <method name="SetDefaultRegionSize" type="void" overloaded="no">
+      <method name="SetDefaultRegionSize" type="" overloaded="no">

         <autodoc>SetDefaultRegionSize()</autodoc>
       </method>
         <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>
         <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>
           <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=""/>
         <autodoc>SetFormatMode(int mode, int regionId=0)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -26930,27 +29429,27 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="regionId" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
         <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>
           <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"/>
         <autodoc>GetTextColour(int regionId=0) -&gt; String</autodoc>
         <paramlist>
           <param name="regionId" type="int" default="0"/>


@@ -26959,14 +29458,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="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>
         <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>
           <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=""/>
         <autodoc>GetRegionName(int regionId) -&gt; String</autodoc>
         <paramlist>
           <param name="regionId" type="int" default=""/>


@@ -26975,53 +29474,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>
       <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>
         </paramlist>
       </method>

-      <method name="NameRegions" type="void" overloaded="no">
+      <method name="NameRegions" type="" overloaded="no">

         <autodoc>NameRegions(String parentName=EmptyString)</autodoc>
         <paramlist>
         <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>
         </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>
         <autodoc>AddRegion(ShapeRegion region)</autodoc>
         <paramlist>

-          <param name="region" type="p.wxShapeRegion" default=""/>
+          <param name="region" type="ShapeRegion" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ClearRegions" type="void" overloaded="no">
+      <method name="ClearRegions" type="" overloaded="no">

         <autodoc>ClearRegions()</autodoc>
       </method>
         <autodoc>ClearRegions()</autodoc>
       </method>

-      <method name="AssignNewIds" type="void" overloaded="no">
+      <method name="AssignNewIds" type="" overloaded="no">

         <autodoc>AssignNewIds()</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="FindRegionNames" type="void" overloaded="no">
+      <method name="FindRegionNames" type="" overloaded="no">

         <autodoc>FindRegionNames(wxStringList list)</autodoc>
         <paramlist>
         <autodoc>FindRegionNames(wxStringList list)</autodoc>
         <paramlist>

-          <param name="list" type="r.wxStringList" default=""/>
+          <param name="list" type="wxStringList" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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">
         </paramlist>
       </method>
       <method name="GetAttachmentPosition" type="bool" overloaded="no">


@@ -27029,11 +29528,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=""/>
     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="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">
         </paramlist>
       </method>
       <method name="GetNumberOfAttachments" type="int" overloaded="no">


@@ -27045,49 +29544,52 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default=""/>
         </paramlist>
       </method>
           <param name="attachment" type="int" default=""/>
         </paramlist>
       </method>

+      <method name="GetAttachments" type="PyObject" overloaded="no">
+        <autodoc>GetAttachments() -&gt; PyObject</autodoc>
+      </method>

       <method name="GetAttachmentPositionEdge" type="bool" overloaded="no">
         <autodoc>GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
     int no_arcs=1, PyLineShape line=None) -&gt; bool</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>
       <method name="GetAttachmentPositionEdge" type="bool" overloaded="no">
         <autodoc>GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
     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="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>
         </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>
         <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="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=""/>
         </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>
         </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>
         <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>
           <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>
         <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>
           <param name="attachment" type="int" default="-1"/>
           <param name="recurse" type="bool" default="False"/>
         </paramlist>


@@ -27095,19 +29597,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>
       <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>
           <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>
         <autodoc>ApplyAttachmentOrdering(PyObject linesToSort)</autodoc>
         <paramlist>

-          <param name="linesToSort" type="p.PyObject" default=""/>
+          <param name="linesToSort" type="PyObject" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>GetBranchingAttachmentRoot(int attachment) -&gt; RealPoint</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>


@@ -27118,10 +29620,10 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
     RealPoint shoulder2) -&gt; bool</autodoc>
         <paramlist>
           <param name="attachment" type="int" default=""/>
     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">
         </paramlist>
       </method>
       <method name="GetBranchingAttachmentPoint" type="bool" overloaded="no">


@@ -27129,8 +29631,8 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
         <paramlist>
           <param name="attachment" type="int" default=""/>
           <param name="n" type="int" default=""/>
         <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">
         </paramlist>
       </method>
       <method name="GetAttachmentLineCount" type="int" overloaded="no">


@@ -27139,7 +29641,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetBranchNeckLength(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>


@@ -27148,7 +29650,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="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=""/>
         <autodoc>SetBranchStemLength(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>


@@ -27157,7 +29659,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="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=""/>
         <autodoc>SetBranchSpacing(int len)</autodoc>
         <paramlist>
           <param name="len" type="int" default=""/>


@@ -27166,7 +29668,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="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=""/>
         <autodoc>SetBranchStyle(long style)</autodoc>
         <paramlist>
           <param name="style" type="long" default=""/>


@@ -27193,29 +29695,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>
       <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>
         </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>
         <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>
         <autodoc>Copy(PyShape copy)</autodoc>
         <paramlist>

-          <param name="copy" type="r.wxPyShape" default=""/>
+          <param name="copy" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CopyWithHandler" type="void" overloaded="no">
+      <method name="CopyWithHandler" type="" overloaded="no">

         <autodoc>CopyWithHandler(PyShape copy)</autodoc>
         <paramlist>
         <autodoc>CopyWithHandler(PyShape copy)</autodoc>
         <paramlist>

-          <param name="copy" type="r.wxPyShape" default=""/>
+          <param name="copy" type="PyShape" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>Rotate(double x, double y, double theta)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27226,74 +29728,80 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetRotation" type="double" overloaded="no">
         <autodoc>GetRotation() -&gt; double</autodoc>
       </method>
       <method name="GetRotation" type="double" overloaded="no">
         <autodoc>GetRotation() -&gt; double</autodoc>
       </method>

-      <method name="ClearAttachments" type="void" overloaded="no">
+      <method name="SetRotation" type="" overloaded="no">
+        <autodoc>SetRotation(double rotation)</autodoc>
+        <paramlist>
+          <param name="rotation" type="double" default=""/>
+        </paramlist>
+      </method>
+      <method name="ClearAttachments" type="" overloaded="no">

         <autodoc>ClearAttachments()</autodoc>
       </method>
         <autodoc>ClearAttachments()</autodoc>
       </method>

-      <method name="Recentre" type="void" overloaded="no">
+      <method name="Recentre" type="" overloaded="no">

         <autodoc>Recentre(DC dc)</autodoc>
         <paramlist>
         <autodoc>Recentre(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ClearPointList" type="void" overloaded="no">
+      <method name="ClearPointList" type="" overloaded="no">

         <autodoc>ClearPointList(wxList list)</autodoc>
         <paramlist>
         <autodoc>ClearPointList(wxList list)</autodoc>
         <paramlist>

-          <param name="list" type="r.wxList" default=""/>
+          <param name="list" type="wxList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetBackgroundPen" type="wxPen" overloaded="no">
+      <method name="GetBackgroundPen" type="Pen" overloaded="no">

         <autodoc>GetBackgroundPen() -&gt; wxPen</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27302,7 +29810,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27311,7 +29819,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27320,7 +29828,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27331,7 +29839,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -27339,11 +29847,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -27351,7 +29859,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +29869,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27370,7 +29878,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27379,7 +29887,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +29897,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27398,7 +29906,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27407,40 +29915,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -27448,36 +29956,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -27486,52 +29994,52 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PseudoMetaFile" oldname="wxPseudoMetaFile" module="ogl">
       </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>
       <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>
         <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>
           <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>
         <autodoc>Clear()</autodoc>
       </method>

-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">

         <autodoc>Copy(PseudoMetaFile copy)</autodoc>
         <paramlist>
         <autodoc>Copy(PseudoMetaFile copy)</autodoc>
         <paramlist>

-          <param name="copy" type="r.wxPseudoMetaFile" default=""/>
+          <param name="copy" type="PseudoMetaFile" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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=""/>
         <autodoc>Rotate(double x, double y, double theta)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27542,27 +30050,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>
       <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="CalculateSize" type="void" overloaded="no">
+      <method name="CalculateSize" type="" overloaded="no">

         <autodoc>CalculateSize(PyDrawnShape shape)</autodoc>
         <paramlist>
         <autodoc>CalculateSize(PyDrawnShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyDrawnShape" default=""/>
+          <param name="shape" type="wxPyDrawnShape" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetRotateable(bool rot)</autodoc>
         <paramlist>
           <param name="rot" type="bool" default=""/>


@@ -27571,32 +30079,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="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>
         <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>
         <autodoc>SetFillBrush(wxBrush brush)</autodoc>
         <paramlist>

-          <param name="brush" type="p.wxBrush" default=""/>
+          <param name="brush" type="Brush" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetFillBrush" type="wxBrush" overloaded="no">
+      <method name="GetFillBrush" type="Brush" overloaded="no">

         <autodoc>GetFillBrush() -&gt; wxBrush</autodoc>
       </method>
         <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>
         <autodoc>SetOutlinePen(wxPen pen)</autodoc>
         <paramlist>

-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetOutlinePen" type="wxPen" overloaded="no">
+      <method name="GetOutlinePen" type="Pen" overloaded="no">

         <autodoc>GetOutlinePen() -&gt; wxPen</autodoc>
       </method>
         <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=""/>
         <autodoc>SetOutlineOp(int op)</autodoc>
         <paramlist>
           <param name="op" type="int" default=""/>


@@ -27608,125 +30116,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="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>
         <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>
         </paramlist>
       </method>

-      <method name="DrawRectangle" type="void" overloaded="no">
+      <method name="DrawRectangle" type="" overloaded="no">

         <autodoc>DrawRectangle(Rect rect)</autodoc>
         <paramlist>
         <autodoc>DrawRectangle(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DrawRoundedRectangle" type="void" overloaded="no">
+      <method name="DrawRoundedRectangle" type="" overloaded="no">

         <autodoc>DrawRoundedRectangle(Rect rect, double radius)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
         </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>
         <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>
           <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>
         <autodoc>DrawEllipse(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DrawPoint" type="void" overloaded="no">
+      <method name="DrawPoint" type="" overloaded="no">

         <autodoc>DrawPoint(Point pt)</autodoc>
         <paramlist>
         <autodoc>DrawPoint(Point pt)</autodoc>
         <paramlist>

-          <param name="pt" type="r.q(const).wxPoint" default=""/>
+          <param name="pt" type="Point" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DrawText" type="void" overloaded="no">
+      <method name="DrawText" type="" overloaded="no">

         <autodoc>DrawText(String text, Point pt)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <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>
           <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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetClippingRect" type="void" overloaded="no">
+      <method name="SetClippingRect" type="" overloaded="no">

         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>
         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DestroyClippingRect" type="void" overloaded="no">
+      <method name="DestroyClippingRect" type="" overloaded="no">

         <autodoc>DestroyClippingRect()</autodoc>
       </method>
         <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>
         <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>
           <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>
         <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>
           <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>
         <autodoc>SetFont(Font font)</autodoc>
         <paramlist>

-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTextColour" type="void" overloaded="no">
+      <method name="SetTextColour" type="" overloaded="no">

         <autodoc>SetTextColour(Colour colour)</autodoc>
         <paramlist>
         <autodoc>SetTextColour(Colour colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetBackgroundColour" type="void" overloaded="no">
+      <method name="SetBackgroundColour" type="" overloaded="no">

         <autodoc>SetBackgroundColour(Colour colour)</autodoc>
         <paramlist>
         <autodoc>SetBackgroundColour(Colour colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetBackgroundMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -27734,7 +30242,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyRectangleShape" oldname="wxPyRectangleShape" module="ogl">
       </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>
       <constructor name="PyRectangleShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyRectangleShape</autodoc>
         <paramlist>


@@ -27742,66 +30250,69 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
           <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>
         <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>
         </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>
         <autodoc>SetCornerRadius(double radius)</autodoc>
         <paramlist>
           <param name="radius" type="double" default=""/>
         </paramlist>
       </method>

-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="GetCornerRadius" type="double" overloaded="no">
+        <autodoc>GetCornerRadius() -&gt; double</autodoc>
+      </method>
+      <method name="base_OnDelete" type="" overloaded="no">

         <autodoc>base_OnDelete()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27810,7 +30321,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27819,7 +30330,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27828,7 +30339,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27839,7 +30350,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -27847,11 +30358,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -27859,7 +30370,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +30380,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27878,7 +30389,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27887,7 +30398,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +30408,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27906,7 +30417,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -27915,40 +30426,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -27956,36 +30467,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -27994,80 +30505,80 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyControlPoint" oldname="wxPyControlPoint" module="ogl">
       </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>
       <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>
           <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>
         <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>
         </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>
         <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>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28076,7 +30587,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28085,7 +30596,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28094,7 +30605,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28105,7 +30616,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -28113,11 +30624,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -28125,7 +30636,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +30646,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28144,7 +30655,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28153,7 +30664,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +30674,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28172,7 +30683,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28181,40 +30692,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -28222,36 +30733,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -28260,82 +30771,82 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyBitmapShape" oldname="wxPyBitmapShape" module="ogl">
       </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetBitmap" type="wxBitmap" overloaded="no">
+      <method name="GetBitmap" type="Bitmap" overloaded="no">

         <autodoc>GetBitmap() -&gt; Bitmap</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetBitmap(Bitmap bitmap)</autodoc>
         <paramlist>

-          <param name="bitmap" type="r.q(const).wxBitmap" default=""/>
+          <param name="bitmap" type="Bitmap" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFilename" type="void" overloaded="no">
+      <method name="SetFilename" type="" overloaded="no">

         <autodoc>SetFilename(String filename)</autodoc>
         <paramlist>
         <autodoc>SetFilename(String filename)</autodoc>
         <paramlist>

-          <param name="filename" type="r.q(const).wxString" default=""/>
+          <param name="filename" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">

         <autodoc>base_OnDelete()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28344,7 +30855,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28353,7 +30864,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28362,7 +30873,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28373,7 +30884,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -28381,11 +30892,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -28393,7 +30904,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +30914,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28412,7 +30923,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28421,7 +30932,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +30942,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28440,7 +30951,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28449,40 +30960,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -28490,36 +31001,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -28528,104 +31039,104 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyDrawnShape" oldname="wxPyDrawnShape" module="ogl">
       </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="CalculateSize" type="void" overloaded="no">
+      <method name="CalculateSize" type="" overloaded="no">

         <autodoc>CalculateSize()</autodoc>
       </method>
         <autodoc>CalculateSize()</autodoc>
       </method>

-      <method name="DestroyClippingRect" type="void" overloaded="no">
+      <method name="DestroyClippingRect" type="" overloaded="no">

         <autodoc>DestroyClippingRect()</autodoc>
       </method>
         <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>
         <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>
         </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>
         <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>
         <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>
           <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>
         <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>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="DrawPoint" type="void" overloaded="no">
+      <method name="DrawPoint" type="" overloaded="no">

         <autodoc>DrawPoint(Point point)</autodoc>
         <paramlist>
         <autodoc>DrawPoint(Point point)</autodoc>
         <paramlist>

-          <param name="point" type="r.q(const).wxPoint" default=""/>
+          <param name="point" type="Point" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
           <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>
         <autodoc>DrawRectangle(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DrawRoundedRectangle" type="void" overloaded="no">
+      <method name="DrawRoundedRectangle" type="" overloaded="no">

         <autodoc>DrawRoundedRectangle(Rect rect, double radius)</autodoc>
         <paramlist>
         <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>
           <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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="DrawText" type="void" overloaded="no">
+      <method name="DrawText" type="" overloaded="no">

         <autodoc>DrawText(String text, Point point)</autodoc>
         <paramlist>
         <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>
         </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">
         <autodoc>GetMetaFile() -&gt; PseudoMetaFile</autodoc>
       </method>
       <method name="GetRotation" type="double" overloaded="no">


@@ -28634,10 +31145,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>
       <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>
         </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=""/>
         <autodoc>Rotate(double x, double y, double theta)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28645,117 +31156,117 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="theta" type="double" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetClippingRect(Rect rect)</autodoc>
         <paramlist>

-          <param name="rect" type="r.q(const).wxRect" default=""/>
+          <param name="rect" type="Rect" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDrawnBackgroundColour" type="void" overloaded="no">
+      <method name="SetDrawnBackgroundColour" type="" overloaded="no">

         <autodoc>SetDrawnBackgroundColour(Colour colour)</autodoc>
         <paramlist>
         <autodoc>SetDrawnBackgroundColour(Colour colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
           <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>
         <autodoc>SetDrawnFont(Font font)</autodoc>
         <paramlist>

-          <param name="font" type="p.wxFont" default=""/>
+          <param name="font" type="Font" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDrawnPen" type="void" overloaded="no">
+      <method name="SetDrawnPen" type="" overloaded="no">

         <autodoc>SetDrawnPen(wxPen pen, bool isOutline=FALSE)</autodoc>
         <paramlist>
         <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>
           <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>
         <autodoc>SetDrawnTextColour(Colour colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxColour" default=""/>
+          <param name="colour" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28764,7 +31275,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28773,7 +31284,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28782,7 +31293,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28793,7 +31304,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -28801,11 +31312,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -28813,7 +31324,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +31334,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28832,7 +31343,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28841,7 +31352,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +31362,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28860,7 +31371,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28869,40 +31380,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -28910,36 +31421,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -28948,19 +31459,19 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="OGLConstraint" oldname="wxOGLConstraint" module="ogl">
       </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=""/>
       <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>
         </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=""/>
         <autodoc>SetSpacing(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -28976,68 +31487,68 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyCompositeShape" oldname="wxPyCompositeShape" module="ogl">
       </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="AddChild" type="void" overloaded="no">
+      <method name="AddChild" type="" overloaded="no">

         <autodoc>AddChild(PyShape child, PyShape addAfter=None)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddConstraint" type="wxOGLConstraint" overloaded="no">
+      <method name="AddConstraint" type="OGLConstraint" overloaded="no">

         <autodoc>AddConstraint(OGLConstraint constraint) -&gt; OGLConstraint</autodoc>
         <paramlist>
         <autodoc>AddConstraint(OGLConstraint constraint) -&gt; OGLConstraint</autodoc>
         <paramlist>

-          <param name="constraint" type="p.wxOGLConstraint" default=""/>
+          <param name="constraint" type="OGLConstraint" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </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=""/>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="DeleteConstraint" type="void" overloaded="no">
+      <method name="DeleteConstraint" type="" overloaded="no">

         <autodoc>DeleteConstraint(OGLConstraint constraint)</autodoc>
         <paramlist>
         <autodoc>DeleteConstraint(OGLConstraint constraint)</autodoc>
         <paramlist>

-          <param name="constraint" type="p.wxOGLConstraint" default=""/>
+          <param name="constraint" type="OGLConstraint" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DeleteConstraintsInvolvingChild" type="void" overloaded="no">
+      <method name="DeleteConstraintsInvolvingChild" type="" overloaded="no">

         <autodoc>DeleteConstraintsInvolvingChild(PyShape child)</autodoc>
         <paramlist>
         <autodoc>DeleteConstraintsInvolvingChild(PyShape child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxPyShape" default=""/>
+          <param name="child" type="PyShape" default=""/>

         </paramlist>
       </method>
         </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">
         <autodoc>FindContainerImage() -&gt; PyShape</autodoc>
       </method>
       <method name="GetConstraints" type="PyObject" overloaded="no">


@@ -29046,65 +31557,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="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>
         <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>
         <autodoc>RemoveChild(PyShape child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxPyShape" default=""/>
+          <param name="child" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">

         <autodoc>base_OnDelete()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29113,7 +31624,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29122,7 +31633,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29131,7 +31642,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29142,7 +31653,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -29150,11 +31661,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -29162,7 +31673,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +31683,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29181,7 +31692,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29190,7 +31701,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +31711,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29209,7 +31720,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29218,40 +31729,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -29259,36 +31770,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -29297,7 +31808,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyDividedShape" oldname="wxPyDividedShape" module="ogl">
       </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>
       <constructor name="PyDividedShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyDividedShape</autodoc>
         <paramlist>


@@ -29305,66 +31816,66 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="EditRegions" type="void" overloaded="no">
+      <method name="EditRegions" type="" overloaded="no">

         <autodoc>EditRegions()</autodoc>
       </method>
         <autodoc>EditRegions()</autodoc>
       </method>

-      <method name="SetRegionSizes" type="void" overloaded="no">
+      <method name="SetRegionSizes" type="" overloaded="no">

         <autodoc>SetRegionSizes()</autodoc>
       </method>
         <autodoc>SetRegionSizes()</autodoc>
       </method>

-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">

         <autodoc>base_OnDelete()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29373,7 +31884,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29382,7 +31893,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29391,7 +31902,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29402,7 +31913,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -29410,11 +31921,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -29422,7 +31933,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +31943,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29441,7 +31952,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29450,7 +31961,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +31971,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29469,7 +31980,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29478,40 +31989,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -29519,36 +32030,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -29557,82 +32068,82 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyDivisionShape" oldname="wxPyDivisionShape" module="ogl">
       </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>
       <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>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>ResizeAdjoining(int side, double newPos, bool test)</autodoc>
         <paramlist>
           <param name="side" type="int" default=""/>


@@ -29640,114 +32151,114 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="test" type="bool" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <autodoc>SetBottomSide(PyDivisionShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <autodoc>SetLeftSide(PyDivisionShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLeftSideColour" type="void" overloaded="no">
+      <method name="SetLeftSideColour" type="" overloaded="no">

         <autodoc>SetLeftSideColour(String colour)</autodoc>
         <paramlist>
         <autodoc>SetLeftSideColour(String colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetLeftSidePen" type="void" overloaded="no">
+      <method name="SetLeftSidePen" type="" overloaded="no">

         <autodoc>SetLeftSidePen(wxPen pen)</autodoc>
         <paramlist>
         <autodoc>SetLeftSidePen(wxPen pen)</autodoc>
         <paramlist>

-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetRightSide" type="void" overloaded="no">
+      <method name="SetRightSide" type="" overloaded="no">

         <autodoc>SetRightSide(PyDivisionShape shape)</autodoc>
         <paramlist>
         <autodoc>SetRightSide(PyDivisionShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTopSide" type="void" overloaded="no">
+      <method name="SetTopSide" type="" overloaded="no">

         <autodoc>SetTopSide(PyDivisionShape shape)</autodoc>
         <paramlist>
         <autodoc>SetTopSide(PyDivisionShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyDivisionShape" default=""/>
+          <param name="shape" type="PyDivisionShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTopSideColour" type="void" overloaded="no">
+      <method name="SetTopSideColour" type="" overloaded="no">

         <autodoc>SetTopSideColour(String colour)</autodoc>
         <paramlist>
         <autodoc>SetTopSideColour(String colour)</autodoc>
         <paramlist>

-          <param name="colour" type="r.q(const).wxString" default=""/>
+          <param name="colour" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetTopSidePen" type="void" overloaded="no">
+      <method name="SetTopSidePen" type="" overloaded="no">

         <autodoc>SetTopSidePen(wxPen pen)</autodoc>
         <paramlist>
         <autodoc>SetTopSidePen(wxPen pen)</autodoc>
         <paramlist>

-          <param name="pen" type="p.wxPen" default=""/>
+          <param name="pen" type="Pen" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">

         <autodoc>base_OnDelete()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29756,7 +32267,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29765,7 +32276,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29774,7 +32285,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29785,7 +32296,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -29793,11 +32304,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -29805,7 +32316,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +32326,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29824,7 +32335,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29833,7 +32344,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +32354,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29852,7 +32363,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -29861,40 +32372,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -29902,36 +32413,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -29940,7 +32451,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyEllipseShape" oldname="wxPyEllipseShape" module="ogl">
       </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>
       <constructor name="PyEllipseShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyEllipseShape</autodoc>
         <paramlist>


@@ -29948,57 +32459,57 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">

         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30007,7 +32518,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30016,7 +32527,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30025,7 +32536,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30036,7 +32547,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -30044,11 +32555,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -30056,7 +32567,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +32577,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30075,7 +32586,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30084,7 +32595,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +32605,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30103,7 +32614,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30112,40 +32623,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -30153,36 +32664,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -30191,64 +32702,64 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyCircleShape" oldname="wxPyCircleShape" module="ogl">
       </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="base_OnDraw" type="" overloaded="no">

         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30257,7 +32768,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30266,7 +32777,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30275,7 +32786,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30286,7 +32797,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -30294,11 +32805,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -30306,7 +32817,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +32827,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30325,7 +32836,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30334,7 +32845,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +32855,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30353,7 +32864,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30362,40 +32873,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -30403,36 +32914,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -30441,7 +32952,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="ArrowHead" oldname="wxArrowHead" module="ogl">
       </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, 
       <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 +32962,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="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>
           <param name="arrowId" type="long" default="-1"/>
         </paramlist>
       </constructor>


@@ -30465,7 +32976,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="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=""/>
         <autodoc>SetPosition(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -30483,22 +32994,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="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>
         <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>
         <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>
         <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">
         <autodoc>GetMetaFile() -&gt; PseudoMetaFile</autodoc>
       </method>
       <method name="GetId" type="long" overloaded="no">


@@ -30510,13 +33021,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="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>
         <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=""/>
         <autodoc>SetSpacing(double sp)</autodoc>
         <paramlist>
           <param name="sp" type="double" default=""/>


@@ -30524,18 +33035,18 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyLineShape" oldname="wxPyLineShape" module="ogl">
       </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>
       <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>
         <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>
         </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>
         <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 +33055,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="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>
           <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>
         <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="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>
         </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>
         <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>
         <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>
           <param name="xOffset" type="double" default=""/>
           <param name="proportionalOffset" type="bool" default=""/>
         </paramlist>


@@ -30588,56 +33099,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=""/>
         <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>
         </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>
         <autodoc>DrawArrows(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <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>
         </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>
         <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">
         </paramlist>
       </method>
       <method name="FindLinePosition" type="int" overloaded="no">


@@ -30650,12 +33161,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="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>
         <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>
           <param name="incoming" type="bool" default=""/>
         </paramlist>
       </method>


@@ -30665,54 +33176,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="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>
         <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>
         </paramlist>
       </method>

-      <method name="GetFrom" type="wxPyShape" overloaded="no">
+      <method name="GetFrom" type="PyShape" overloaded="no">

         <autodoc>GetFrom() -&gt; PyShape</autodoc>
       </method>
         <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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="GetNextControlPoint" type="wxRealPoint" overloaded="no">
+      <method name="GetNextControlPoint" type="RealPoint" overloaded="no">

         <autodoc>GetNextControlPoint(PyShape shape) -&gt; RealPoint</autodoc>
         <paramlist>
         <autodoc>GetNextControlPoint(PyShape shape) -&gt; RealPoint</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetTo" type="wxPyShape" overloaded="no">
+      <method name="GetTo" type="PyShape" overloaded="no">

         <autodoc>GetTo() -&gt; PyShape</autodoc>
       </method>
         <autodoc>GetTo() -&gt; PyShape</autodoc>
       </method>

-      <method name="Initialise" type="void" overloaded="no">
+      <method name="Initialise" type="" overloaded="no">

         <autodoc>Initialise()</autodoc>
       </method>
         <autodoc>Initialise()</autodoc>
       </method>

-      <method name="InsertLineControlPoint" type="void" overloaded="no">
+      <method name="InsertLineControlPoint" type="" overloaded="no">

         <autodoc>InsertLineControlPoint(DC dc)</autodoc>
         <paramlist>
         <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>
         </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>
         </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=""/>
         <autodoc>MakeLineControlPoints(int n)</autodoc>
         <paramlist>
           <param name="n" type="int" default=""/>


@@ -30721,26 +33232,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="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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetEnds(double x1, double y1, double x2, double y2)</autodoc>
         <paramlist>
           <param name="x1" type="double" default=""/>


@@ -30749,83 +33260,115 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="y2" type="double" default=""/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetFrom(PyShape object)</autodoc>
         <paramlist>

-          <param name="object" type="p.wxPyShape" default=""/>
+          <param name="object" type="PyShape" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <autodoc>SetTo(PyShape object)</autodoc>
         <paramlist>

-          <param name="object" type="p.wxPyShape" default=""/>
+          <param name="object" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Straighten" type="void" overloaded="no">
+      <method name="Straighten" type="" overloaded="no">

         <autodoc>Straighten(DC dc=None)</autodoc>
         <paramlist>
         <autodoc>Straighten(DC dc=None)</autodoc>
         <paramlist>

-          <param name="dc" type="p.wxDC" default="NULL"/>
+          <param name="dc" type="DC" default="NULL"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Unlink" type="void" overloaded="no">
+      <method name="Unlink" type="" overloaded="no">

         <autodoc>Unlink()</autodoc>
       </method>
         <autodoc>Unlink()</autodoc>
       </method>

-      <method name="base_OnDraw" type="void" overloaded="no">
+      <method name="SetAlignmentOrientation" type="" overloaded="no">
+        <autodoc>SetAlignmentOrientation(bool isEnd, bool isHoriz)</autodoc>
+        <paramlist>
+          <param name="isEnd" type="bool" default=""/>
+          <param name="isHoriz" type="bool" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetAlignmentType" type="" overloaded="no">
+        <autodoc>SetAlignmentType(bool isEnd, int alignType)</autodoc>
+        <paramlist>
+          <param name="isEnd" type="bool" default=""/>
+          <param name="alignType" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetAlignmentOrientation" type="bool" overloaded="no">
+        <autodoc>GetAlignmentOrientation(bool isEnd) -&gt; bool</autodoc>
+        <paramlist>
+          <param name="isEnd" type="bool" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetAlignmentType" type="int" overloaded="no">
+        <autodoc>GetAlignmentType(bool isEnd) -&gt; int</autodoc>
+        <paramlist>
+          <param name="isEnd" type="bool" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetAlignmentStart" type="int" overloaded="no">
+        <autodoc>GetAlignmentStart() -&gt; int</autodoc>
+      </method>
+      <method name="GetAlignmentEnd" type="int" overloaded="no">
+        <autodoc>GetAlignmentEnd() -&gt; int</autodoc>
+      </method>
+      <method name="base_OnDraw" type="" overloaded="no">

         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30834,7 +33377,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30843,7 +33386,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30852,7 +33395,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30863,7 +33406,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -30871,11 +33414,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -30883,7 +33426,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +33436,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30902,7 +33445,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30911,7 +33454,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +33464,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30930,7 +33473,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -30939,40 +33482,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -30980,36 +33523,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -31018,33 +33561,33 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyPolygonShape" oldname="wxPyPolygonShape" module="ogl">
       </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>
       <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>
         <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>
         </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>
         </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>
         <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>
         <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"/>
         <autodoc>DeletePolygonPoint(int pos=0)</autodoc>
         <paramlist>
           <param name="pos" type="int" default="0"/>


@@ -31053,53 +33596,74 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       <method name="GetPoints" type="PyObject" overloaded="no">
         <autodoc>GetPoints() -&gt; PyObject</autodoc>
       </method>
       <method name="GetPoints" type="PyObject" overloaded="no">
         <autodoc>GetPoints() -&gt; PyObject</autodoc>
       </method>

-      <method name="UpdateOriginalPoints" type="void" overloaded="no">
+      <method name="GetOriginalPoints" type="PyObject" overloaded="no">
+        <autodoc>GetOriginalPoints() -&gt; PyObject</autodoc>
+      </method>
+      <method name="GetOriginalWidth" type="double" overloaded="no">
+        <autodoc>GetOriginalWidth() -&gt; double</autodoc>
+      </method>
+      <method name="GetOriginalHeight" type="double" overloaded="no">
+        <autodoc>GetOriginalHeight() -&gt; double</autodoc>
+      </method>
+      <method name="SetOriginalWidth" type="" overloaded="no">
+        <autodoc>SetOriginalWidth(double w)</autodoc>
+        <paramlist>
+          <param name="w" type="double" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetOriginalHeight" type="" overloaded="no">
+        <autodoc>SetOriginalHeight(double h)</autodoc>
+        <paramlist>
+          <param name="h" type="double" default=""/>
+        </paramlist>
+      </method>
+      <method name="UpdateOriginalPoints" type="" overloaded="no">

         <autodoc>UpdateOriginalPoints()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31108,7 +33672,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31117,7 +33681,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31126,7 +33690,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31137,7 +33701,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -31145,11 +33709,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -31157,7 +33721,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +33731,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31176,7 +33740,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31185,7 +33749,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +33759,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31204,7 +33768,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31213,40 +33777,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -31254,36 +33818,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -31292,7 +33856,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="PyTextShape" oldname="wxPyTextShape" module="ogl">
       </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>
       <constructor name="PyTextShape" overloaded="no">
         <autodoc>__init__(double width=0.0, double height=0.0) -&gt; PyTextShape</autodoc>
         <paramlist>


@@ -31300,60 +33864,60 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="height" type="double" default="0.0"/>
         </paramlist>
       </constructor>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="base_OnDelete" type="void" overloaded="no">
+      <method name="base_OnDelete" type="" overloaded="no">

         <autodoc>base_OnDelete()</autodoc>
       </method>
         <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>
         <autodoc>base_OnDraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnDrawContents" type="void" overloaded="no">
+      <method name="base_OnDrawContents" type="" overloaded="no">

         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnDrawContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <autodoc>base_OnMoveLinks(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnErase" type="void" overloaded="no">
+      <method name="base_OnErase" type="" overloaded="no">

         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnErase(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseContents" type="void" overloaded="no">
+      <method name="base_OnEraseContents" type="" overloaded="no">

         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseContents(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnHighlight" type="void" overloaded="no">
+      <method name="base_OnHighlight" type="" overloaded="no">

         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnHighlight(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31362,7 +33926,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31371,7 +33935,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31380,7 +33944,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnSize(double x, double y)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31391,7 +33955,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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -31399,11 +33963,11 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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>
         <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=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>
           <param name="old_x" type="double" default=""/>


@@ -31411,7 +33975,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="display" type="bool" default="True"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +33985,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31430,7 +33994,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31439,7 +34003,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <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 +34013,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31458,7 +34022,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31467,40 +34031,40 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <autodoc>base_OnDrawControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="base_OnEraseControlPoints" type="void" overloaded="no">
+      <method name="base_OnEraseControlPoints" type="" overloaded="no">

         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>
         <autodoc>base_OnEraseControlPoints(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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=""/>
           <param name="draw" type="bool" default=""/>
           <param name="x" type="double" default=""/>
           <param name="y" type="double" default=""/>


@@ -31508,36 +34072,36 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="attachment" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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=""/>
         <autodoc>base_OnEndSize(double w, double h)</autodoc>
         <paramlist>
           <param name="w" type="double" default=""/>


@@ -31546,37 +34110,37 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
       </method>
     </class>
     <class name="Diagram" oldname="wxDiagram" module="ogl">
       </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>
       <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>
         <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>
         </paramlist>
       </method>

-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">

         <autodoc>Clear(DC dc)</autodoc>
         <paramlist>
         <autodoc>Clear(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DeleteAllShapes" type="void" overloaded="no">
+      <method name="DeleteAllShapes" type="" overloaded="no">

         <autodoc>DeleteAllShapes()</autodoc>
       </method>
         <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>
         <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>
           <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=""/>
         <autodoc>FindShape(long id) -&gt; PyShape</autodoc>
         <paramlist>
           <param name="id" type="long" default=""/>


@@ -31603,139 +34167,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="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>
         <autodoc>InsertShape(PyShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RecentreAll" type="void" overloaded="no">
+      <method name="RecentreAll" type="" overloaded="no">

         <autodoc>RecentreAll(DC dc)</autodoc>
         <paramlist>
         <autodoc>RecentreAll(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Redraw" type="void" overloaded="no">
+      <method name="Redraw" type="" overloaded="no">

         <autodoc>Redraw(DC dc)</autodoc>
         <paramlist>
         <autodoc>Redraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RemoveAllShapes" type="void" overloaded="no">
+      <method name="RemoveAllShapes" type="" overloaded="no">

         <autodoc>RemoveAllShapes()</autodoc>
       </method>
         <autodoc>RemoveAllShapes()</autodoc>
       </method>

-      <method name="RemoveShape" type="void" overloaded="no">
+      <method name="RemoveShape" type="" overloaded="no">

         <autodoc>RemoveShape(PyShape shape)</autodoc>
         <paramlist>
         <autodoc>RemoveShape(PyShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetCanvas" type="void" overloaded="no">
+      <method name="SetCanvas" type="" overloaded="no">

         <autodoc>SetCanvas(PyShapeCanvas canvas)</autodoc>
         <paramlist>
         <autodoc>SetCanvas(PyShapeCanvas canvas)</autodoc>
         <paramlist>

-          <param name="canvas" type="p.wxPyShapeCanvas" default=""/>
+          <param name="canvas" type="wxPyShapeCanvas" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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">
         </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>
       <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="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="style" type="long" default="wxBORDER"/>

-          <param name="name" type="r.q(const).wxString" default="wxPyShapeCanvasNameStr"/>
+          <param name="name" type="String" default="wxPyShapeCanvasNameStr"/>

         </paramlist>
       </constructor>
         </paramlist>
       </constructor>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddShape" type="void" overloaded="no">
+      <method name="AddShape" type="" overloaded="no">

         <autodoc>AddShape(PyShape shape, PyShape addAfter=None)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <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>
           <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>
         <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>
         <autodoc>InsertShape(PyShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>base_OnBeginDragLeft(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31743,7 +34307,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnBeginDragRight(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31751,7 +34315,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragLeft(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31759,7 +34323,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnEndDragRight(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31767,7 +34331,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnDragLeft(bool draw, double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>


@@ -31776,7 +34340,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnDragRight(bool draw, double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="draw" type="bool" default=""/>


@@ -31785,7 +34349,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnLeftClick(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31793,7 +34357,7 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>base_OnRightClick(double x, double y, int keys=0)</autodoc>
         <paramlist>
           <param name="x" type="double" default=""/>


@@ -31801,29 +34365,29 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
           <param name="keys" type="int" default="0"/>
         </paramlist>
       </method>
           <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>
         <autodoc>Redraw(DC dc)</autodoc>
         <paramlist>

-          <param name="dc" type="r.wxDC" default=""/>
+          <param name="dc" type="DC" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="RemoveShape" type="void" overloaded="no">
+      <method name="RemoveShape" type="" overloaded="no">

         <autodoc>RemoveShape(PyShape shape)</autodoc>
         <paramlist>
         <autodoc>RemoveShape(PyShape shape)</autodoc>
         <paramlist>

-          <param name="shape" type="p.wxPyShape" default=""/>
+          <param name="shape" type="PyShape" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetDiagram" type="void" overloaded="no">
+      <method name="SetDiagram" type="" overloaded="no">

         <autodoc>SetDiagram(Diagram diagram)</autodoc>
         <paramlist>
         <autodoc>SetDiagram(Diagram diagram)</autodoc>
         <paramlist>

-          <param name="diagram" type="p.wxDiagram" default=""/>
+          <param name="diagram" type="Diagram" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Snap" type="void" overloaded="no">
+      <method name="Snap" type="" overloaded="no">

         <autodoc>Snap(double INOUT, double INOUT)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>
     </class>


@@ -31845,68 +34409,69 @@ PolygonShape =      PyPolygonShape
 TextShape =         PyTextShape
 ControlPoint =      PyControlPoint
 </pythoncode>
 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>
       <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>
   <module name="stc">
     <import name="core"/>
       <autodoc>OGLCleanUp()</autodoc>
     </method>
   </module>
   <module name="stc">
     <import name="core"/>

+    <import name="misc"/>

     <pythoncode> wx = core </pythoncode>
     <class name="StyledTextCtrl" oldname="wxStyledTextCtrl" module="stc">
     <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>
       <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="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="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>
         </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>
         <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="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="style" type="long" default="0"/>

-          <param name="name" type="r.q(const).wxString" default="wxSTCNameStr"/>
+          <param name="name" type="String" default="wxSTCNameStr"/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddText" type="void" overloaded="no">
+      <method name="AddText" type="" overloaded="no">

         <autodoc>AddText(String text)</autodoc>
         <paramlist>
         <autodoc>AddText(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddStyledText" type="void" overloaded="no">
+      <method name="AddStyledText" type="" overloaded="no">

         <autodoc>AddStyledText(wxMemoryBuffer data)</autodoc>
         <paramlist>
         <autodoc>AddStyledText(wxMemoryBuffer data)</autodoc>
         <paramlist>

-          <param name="data" type="r.q(const).wxMemoryBuffer" default=""/>
+          <param name="data" type="wxMemoryBuffer" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="ClearAll" type="void" overloaded="no">
+      <method name="ClearAll" type="" overloaded="no">

         <autodoc>ClearAll()</autodoc>
       </method>
         <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">
         <autodoc>ClearDocumentStyle()</autodoc>
       </method>
       <method name="GetLength" type="int" overloaded="no">


@@ -31930,19 +34495,19 @@ ControlPoint =      PyControlPoint
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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">
         <autodoc>SetSavePoint()</autodoc>
       </method>
       <method name="GetStyledText" type="wxMemoryBuffer" overloaded="no">


@@ -31961,7 +34526,7 @@ ControlPoint =      PyControlPoint
           <param name="handle" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>MarkerDeleteHandle(int handle)</autodoc>
         <paramlist>
           <param name="handle" type="int" default=""/>


@@ -31973,7 +34538,7 @@ ControlPoint =      PyControlPoint
       <method name="GetViewWhiteSpace" type="int" overloaded="no">
         <autodoc>GetViewWhiteSpace() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetViewWhiteSpace(int viewWS)</autodoc>
         <paramlist>
           <param name="viewWS" type="int" default=""/>


@@ -31982,7 +34547,7 @@ ControlPoint =      PyControlPoint
       <method name="PositionFromPoint" type="int" overloaded="no">
         <autodoc>PositionFromPoint(Point pt) -&gt; int</autodoc>
         <paramlist>
       <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">
         </paramlist>
       </method>
       <method name="PositionFromPointClose" type="int" overloaded="no">


@@ -31992,34 +34557,34 @@ ControlPoint =      PyControlPoint
           <param name="y" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         <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>
         </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=""/>
         <autodoc>ConvertEOLs(int eolMode)</autodoc>
         <paramlist>
           <param name="eolMode" type="int" default=""/>


@@ -32028,20 +34593,20 @@ ControlPoint =      PyControlPoint
       <method name="GetEOLMode" type="int" overloaded="no">
         <autodoc>GetEOLMode() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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=""/>
         <autodoc>SetStyling(int length, int style)</autodoc>
         <paramlist>
           <param name="length" type="int" default=""/>


@@ -32051,13 +34616,13 @@ ControlPoint =      PyControlPoint
       <method name="GetBufferedDraw" type="bool" overloaded="no">
         <autodoc>GetBufferedDraw() -&gt; bool</autodoc>
       </method>
       <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>
         <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=""/>
         <autodoc>SetTabWidth(int tabWidth)</autodoc>
         <paramlist>
           <param name="tabWidth" type="int" default=""/>


@@ -32066,34 +34631,34 @@ ControlPoint =      PyControlPoint
       <method name="GetTabWidth" type="int" overloaded="no">
         <autodoc>GetTabWidth() -&gt; int</autodoc>
       </method>
       <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <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">
         </paramlist>
       </method>
       <method name="MarkerAdd" type="int" overloaded="no">


@@ -32103,14 +34668,14 @@ ControlPoint =      PyControlPoint
           <param name="markerNumber" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>MarkerDeleteAll(int markerNumber)</autodoc>
         <paramlist>
           <param name="markerNumber" type="int" default=""/>


@@ -32136,14 +34701,14 @@ ControlPoint =      PyControlPoint
           <param name="markerMask" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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=""/>
         <autodoc>SetMarginType(int margin, int marginType)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>


@@ -32156,7 +34721,7 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetMarginWidth(int margin, int pixelWidth)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>


@@ -32169,7 +34734,7 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetMarginMask(int margin, int mask)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>


@@ -32182,7 +34747,7 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetMarginSensitive(int margin, bool sensitive)</autodoc>
         <paramlist>
           <param name="margin" type="int" default=""/>


@@ -32195,110 +34760,110 @@ ControlPoint =      PyControlPoint
           <param name="margin" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </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>
         <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>
         <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>
         <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=""/>
         <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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetCaretForeground" type="void" overloaded="no">
+      <method name="SetCaretForeground" type="" overloaded="no">

         <autodoc>SetCaretForeground(Colour fore)</autodoc>
         <paramlist>
         <autodoc>SetCaretForeground(Colour fore)</autodoc>
         <paramlist>

-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>CmdKeyAssign(int key, int modifiers, int cmd)</autodoc>
         <paramlist>
           <param name="key" type="int" default=""/>


@@ -32306,24 +34871,24 @@ ControlPoint =      PyControlPoint
           <param name="cmd" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <autodoc>StyleSetVisible(int style, bool visible)</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>


@@ -32333,25 +34898,25 @@ ControlPoint =      PyControlPoint
       <method name="GetCaretPeriod" type="int" overloaded="no">
         <autodoc>GetCaretPeriod() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <autodoc>SetWordChars(String characters)</autodoc>
         <paramlist>

-          <param name="characters" type="r.q(const).wxString" default=""/>
+          <param name="characters" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="BeginUndoAction" type="void" overloaded="no">
+      <method name="BeginUndoAction" type="" overloaded="no">

         <autodoc>BeginUndoAction()</autodoc>
       </method>
         <autodoc>BeginUndoAction()</autodoc>
       </method>

-      <method name="EndUndoAction" type="void" overloaded="no">
+      <method name="EndUndoAction" type="" overloaded="no">

         <autodoc>EndUndoAction()</autodoc>
       </method>
         <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=""/>
         <autodoc>IndicatorSetStyle(int indic, int style)</autodoc>
         <paramlist>
           <param name="indic" type="int" default=""/>


@@ -32364,34 +34929,34 @@ ControlPoint =      PyControlPoint
           <param name="indic" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <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>
         </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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <autodoc>SetStyleBits(int bits)</autodoc>
         <paramlist>
           <param name="bits" type="int" default=""/>


@@ -32400,7 +34965,7 @@ ControlPoint =      PyControlPoint
       <method name="GetStyleBits" type="int" overloaded="no">
         <autodoc>GetStyleBits() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetLineState(int line, int state)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>


@@ -32419,36 +34984,36 @@ ControlPoint =      PyControlPoint
       <method name="GetCaretLineVisible" type="bool" overloaded="no">
         <autodoc>GetCaretLineVisible() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <autodoc>SetCaretLineBack(Colour back)</autodoc>
         <paramlist>

-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>

         </paramlist>
       </method>
         </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>
         <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=""/>
         <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>
         </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">
         <autodoc>AutoCompCancel()</autodoc>
       </method>
       <method name="AutoCompActive" type="bool" overloaded="no">


@@ -32457,16 +35022,16 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompPosStart" type="int" overloaded="no">
         <autodoc>AutoCompPosStart() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>AutoCompComplete()</autodoc>
       </method>

-      <method name="AutoCompStops" type="void" overloaded="no">
+      <method name="AutoCompStops" type="" overloaded="no">

         <autodoc>AutoCompStops(String characterSet)</autodoc>
         <paramlist>
         <autodoc>AutoCompStops(String characterSet)</autodoc>
         <paramlist>

-          <param name="characterSet" type="r.q(const).wxString" default=""/>
+          <param name="characterSet" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>AutoCompSetSeparator(int separatorCharacter)</autodoc>
         <paramlist>
           <param name="separatorCharacter" type="int" default=""/>


@@ -32475,13 +35040,13 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetSeparator" type="int" overloaded="no">
         <autodoc>AutoCompGetSeparator() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>AutoCompSelect(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>AutoCompSetCancelAtStart(bool cancel)</autodoc>
         <paramlist>
           <param name="cancel" type="bool" default=""/>


@@ -32490,13 +35055,13 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetCancelAtStart" type="bool" overloaded="no">
         <autodoc>AutoCompGetCancelAtStart() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>AutoCompSetFillUps(String characterSet)</autodoc>
         <paramlist>

-          <param name="characterSet" type="r.q(const).wxString" default=""/>
+          <param name="characterSet" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>AutoCompSetChooseSingle(bool chooseSingle)</autodoc>
         <paramlist>
           <param name="chooseSingle" type="bool" default=""/>


@@ -32505,7 +35070,7 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetChooseSingle" type="bool" overloaded="no">
         <autodoc>AutoCompGetChooseSingle() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>AutoCompSetIgnoreCase(bool ignoreCase)</autodoc>
         <paramlist>
           <param name="ignoreCase" type="bool" default=""/>


@@ -32514,14 +35079,14 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetIgnoreCase" type="bool" overloaded="no">
         <autodoc>AutoCompGetIgnoreCase() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <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>
         </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=""/>
         <autodoc>AutoCompSetAutoHide(bool autoHide)</autodoc>
         <paramlist>
           <param name="autoHide" type="bool" default=""/>


@@ -32530,7 +35095,7 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetAutoHide" type="bool" overloaded="no">
         <autodoc>AutoCompGetAutoHide() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>AutoCompSetDropRestOfWord(bool dropRestOfWord)</autodoc>
         <paramlist>
           <param name="dropRestOfWord" type="bool" default=""/>


@@ -32539,26 +35104,26 @@ ControlPoint =      PyControlPoint
       <method name="AutoCompGetDropRestOfWord" type="bool" overloaded="no">
         <autodoc>AutoCompGetDropRestOfWord() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <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>
         </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>
         <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>
         <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=""/>
         <autodoc>SetIndent(int indentSize)</autodoc>
         <paramlist>
           <param name="indentSize" type="int" default=""/>


@@ -32567,7 +35132,7 @@ ControlPoint =      PyControlPoint
       <method name="GetIndent" type="int" overloaded="no">
         <autodoc>GetIndent() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetUseTabs(bool useTabs)</autodoc>
         <paramlist>
           <param name="useTabs" type="bool" default=""/>


@@ -32576,7 +35141,7 @@ ControlPoint =      PyControlPoint
       <method name="GetUseTabs" type="bool" overloaded="no">
         <autodoc>GetUseTabs() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetLineIndentation(int line, int indentSize)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>


@@ -32601,7 +35166,7 @@ ControlPoint =      PyControlPoint
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetUseHorizontalScrollBar(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -32610,7 +35175,7 @@ ControlPoint =      PyControlPoint
       <method name="GetUseHorizontalScrollBar" type="bool" overloaded="no">
         <autodoc>GetUseHorizontalScrollBar() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetIndentationGuides(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -32619,7 +35184,7 @@ ControlPoint =      PyControlPoint
       <method name="GetIndentationGuides" type="bool" overloaded="no">
         <autodoc>GetIndentationGuides() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetHighlightGuide(int column)</autodoc>
         <paramlist>
           <param name="column" type="int" default=""/>


@@ -32637,19 +35202,19 @@ ControlPoint =      PyControlPoint
       <method name="GetCodePage" type="int" overloaded="no">
         <autodoc>GetCodePage() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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=""/>
         <autodoc>SetSelectionStart(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -32658,7 +35223,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSelectionStart" type="int" overloaded="no">
         <autodoc>GetSelectionStart() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetSelectionEnd(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -32667,7 +35232,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSelectionEnd" type="int" overloaded="no">
         <autodoc>GetSelectionEnd() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetPrintMagnification(int magnification)</autodoc>
         <paramlist>
           <param name="magnification" type="int" default=""/>


@@ -32676,7 +35241,7 @@ ControlPoint =      PyControlPoint
       <method name="GetPrintMagnification" type="int" overloaded="no">
         <autodoc>GetPrintMagnification() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetPrintColourMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -32690,7 +35255,7 @@ ControlPoint =      PyControlPoint
         <paramlist>
           <param name="minPos" type="int" default=""/>
           <param name="maxPos" type="int" default=""/>
         <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>
           <param name="flags" type="int" default="0"/>
         </paramlist>
       </method>


@@ -32701,16 +35266,16 @@ ControlPoint =      PyControlPoint
           <param name="doDraw" type="bool" default=""/>
           <param name="startPos" type="int" default=""/>
           <param name="endPos" type="int" default=""/>
           <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>
         </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=""/>
         <autodoc>GetLine(int line) -&gt; String</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>


@@ -32719,7 +35284,7 @@ ControlPoint =      PyControlPoint
       <method name="GetLineCount" type="int" overloaded="no">
         <autodoc>GetLineCount() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetMarginLeft(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>


@@ -32728,7 +35293,7 @@ ControlPoint =      PyControlPoint
       <method name="GetMarginLeft" type="int" overloaded="no">
         <autodoc>GetMarginLeft() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetMarginRight(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>


@@ -32740,24 +35305,24 @@ ControlPoint =      PyControlPoint
       <method name="GetModify" type="bool" overloaded="no">
         <autodoc>GetModify() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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=""/>
         <autodoc>HideSelection(bool normal)</autodoc>
         <paramlist>
           <param name="normal" type="bool" default=""/>


@@ -32775,23 +35340,23 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <autodoc>EnsureCaretVisible()</autodoc>
       </method>

-      <method name="ReplaceSelection" type="void" overloaded="no">
+      <method name="ReplaceSelection" type="" overloaded="no">

         <autodoc>ReplaceSelection(String text)</autodoc>
         <paramlist>
         <autodoc>ReplaceSelection(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetReadOnly(bool readOnly)</autodoc>
         <paramlist>
           <param name="readOnly" type="bool" default=""/>


@@ -32803,37 +35368,37 @@ ControlPoint =      PyControlPoint
       <method name="CanUndo" type="bool" overloaded="no">
         <autodoc>CanUndo() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>EmptyUndoBuffer()</autodoc>
       </method>

-      <method name="Undo" type="void" overloaded="no">
+      <method name="Undo" type="" overloaded="no">

         <autodoc>Undo()</autodoc>
       </method>
         <autodoc>Undo()</autodoc>
       </method>

-      <method name="Cut" type="void" overloaded="no">
+      <method name="Cut" type="" overloaded="no">

         <autodoc>Cut()</autodoc>
       </method>
         <autodoc>Cut()</autodoc>
       </method>

-      <method name="Copy" type="void" overloaded="no">
+      <method name="Copy" type="" overloaded="no">

         <autodoc>Copy()</autodoc>
       </method>
         <autodoc>Copy()</autodoc>
       </method>

-      <method name="Paste" type="void" overloaded="no">
+      <method name="Paste" type="" overloaded="no">

         <autodoc>Paste()</autodoc>
       </method>
         <autodoc>Paste()</autodoc>
       </method>

-      <method name="Clear" type="void" overloaded="no">
+      <method name="Clear" type="" overloaded="no">

         <autodoc>Clear()</autodoc>
       </method>
         <autodoc>Clear()</autodoc>
       </method>

-      <method name="SetText" type="void" overloaded="no">
+      <method name="SetText" type="" overloaded="no">

         <autodoc>SetText(String text)</autodoc>
         <paramlist>
         <autodoc>SetText(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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=""/>
         <autodoc>SetOvertype(bool overtype)</autodoc>
         <paramlist>
           <param name="overtype" type="bool" default=""/>


@@ -32842,7 +35407,7 @@ ControlPoint =      PyControlPoint
       <method name="GetOvertype" type="bool" overloaded="no">
         <autodoc>GetOvertype() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetCaretWidth(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>


@@ -32851,7 +35416,7 @@ ControlPoint =      PyControlPoint
       <method name="GetCaretWidth" type="int" overloaded="no">
         <autodoc>GetCaretWidth() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetTargetStart(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -32860,7 +35425,7 @@ ControlPoint =      PyControlPoint
       <method name="GetTargetStart" type="int" overloaded="no">
         <autodoc>GetTargetStart() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetTargetEnd(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -32872,22 +35437,22 @@ ControlPoint =      PyControlPoint
       <method name="ReplaceTarget" type="int" overloaded="no">
         <autodoc>ReplaceTarget(String text) -&gt; int</autodoc>
         <paramlist>
       <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>
         </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>
         </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>
         </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=""/>
         <autodoc>SetSearchFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>


@@ -32896,14 +35461,14 @@ ControlPoint =      PyControlPoint
       <method name="GetSearchFlags" type="int" overloaded="no">
         <autodoc>GetSearchFlags() -&gt; int</autodoc>
       </method>
       <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=""/>
         <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>
         </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">
         <autodoc>CallTipCancel()</autodoc>
       </method>
       <method name="CallTipActive" type="bool" overloaded="no">


@@ -32912,29 +35477,29 @@ ControlPoint =      PyControlPoint
       <method name="CallTipPosAtStart" type="int" overloaded="no">
         <autodoc>CallTipPosAtStart() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <autodoc>CallTipSetBackground(Colour back)</autodoc>
         <paramlist>

-          <param name="back" type="r.q(const).wxColour" default=""/>
+          <param name="back" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CallTipSetForeground" type="void" overloaded="no">
+      <method name="CallTipSetForeground" type="" overloaded="no">

         <autodoc>CallTipSetForeground(Colour fore)</autodoc>
         <paramlist>
         <autodoc>CallTipSetForeground(Colour fore)</autodoc>
         <paramlist>

-          <param name="fore" type="r.q(const).wxColour" default=""/>
+          <param name="fore" type="Colour" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CallTipSetForegroundHighlight" type="void" overloaded="no">
+      <method name="CallTipSetForegroundHighlight" type="" overloaded="no">

         <autodoc>CallTipSetForegroundHighlight(Colour fore)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="VisibleFromDocLine" type="int" overloaded="no">


@@ -32949,7 +35514,7 @@ ControlPoint =      PyControlPoint
           <param name="lineDisplay" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetFoldLevel(int line, int level)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>


@@ -32975,14 +35540,14 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>HideLines(int lineStart, int lineEnd)</autodoc>
         <paramlist>
           <param name="lineStart" type="int" default=""/>


@@ -32995,7 +35560,7 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetFoldExpanded(int line, bool expanded)</autodoc>
         <paramlist>
           <param name="line" type="int" default=""/>


@@ -33008,31 +35573,31 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetTabIndents(bool tabIndents)</autodoc>
         <paramlist>
           <param name="tabIndents" type="bool" default=""/>


@@ -33041,7 +35606,7 @@ ControlPoint =      PyControlPoint
       <method name="GetTabIndents" type="bool" overloaded="no">
         <autodoc>GetTabIndents() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetBackSpaceUnIndents(bool bsUnIndents)</autodoc>
         <paramlist>
           <param name="bsUnIndents" type="bool" default=""/>


@@ -33050,7 +35615,7 @@ ControlPoint =      PyControlPoint
       <method name="GetBackSpaceUnIndents" type="bool" overloaded="no">
         <autodoc>GetBackSpaceUnIndents() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetMouseDwellTime(int periodMilliseconds)</autodoc>
         <paramlist>
           <param name="periodMilliseconds" type="int" default=""/>


@@ -33073,7 +35638,7 @@ ControlPoint =      PyControlPoint
           <param name="onlyWordCharacters" type="bool" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetWrapMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -33082,7 +35647,7 @@ ControlPoint =      PyControlPoint
       <method name="GetWrapMode" type="int" overloaded="no">
         <autodoc>GetWrapMode() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetLayoutCache(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -33091,7 +35656,7 @@ ControlPoint =      PyControlPoint
       <method name="GetLayoutCache" type="int" overloaded="no">
         <autodoc>GetLayoutCache() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetScrollWidth(int pixelWidth)</autodoc>
         <paramlist>
           <param name="pixelWidth" type="int" default=""/>


@@ -33104,10 +35669,10 @@ ControlPoint =      PyControlPoint
         <autodoc>TextWidth(int style, String text) -&gt; int</autodoc>
         <paramlist>
           <param name="style" type="int" default=""/>
         <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>
         </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=""/>
         <autodoc>SetEndAtLastLine(bool endAtLastLine)</autodoc>
         <paramlist>
           <param name="endAtLastLine" type="bool" default=""/>


@@ -33122,7 +35687,7 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetUseVerticalScrollBar(bool show)</autodoc>
         <paramlist>
           <param name="show" type="bool" default=""/>


@@ -33131,67 +35696,67 @@ ControlPoint =      PyControlPoint
       <method name="GetUseVerticalScrollBar" type="bool" overloaded="no">
         <autodoc>GetUseVerticalScrollBar() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <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>
         </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>
         <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>
         <autodoc>TargetFromSelection()</autodoc>
       </method>

-      <method name="LinesJoin" type="void" overloaded="no">
+      <method name="LinesJoin" type="" overloaded="no">

         <autodoc>LinesJoin()</autodoc>
       </method>
         <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>
         <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=""/>
         <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>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="LineDuplicate" type="void" overloaded="no">
+      <method name="LineDuplicate" type="" overloaded="no">

         <autodoc>LineDuplicate()</autodoc>
       </method>
         <autodoc>LineDuplicate()</autodoc>
       </method>

-      <method name="HomeDisplay" type="void" overloaded="no">
+      <method name="HomeDisplay" type="" overloaded="no">

         <autodoc>HomeDisplay()</autodoc>
       </method>
         <autodoc>HomeDisplay()</autodoc>
       </method>

-      <method name="HomeDisplayExtend" type="void" overloaded="no">
+      <method name="HomeDisplayExtend" type="" overloaded="no">

         <autodoc>HomeDisplayExtend()</autodoc>
       </method>
         <autodoc>HomeDisplayExtend()</autodoc>
       </method>

-      <method name="LineEndDisplay" type="void" overloaded="no">
+      <method name="LineEndDisplay" type="" overloaded="no">

         <autodoc>LineEndDisplay()</autodoc>
       </method>
         <autodoc>LineEndDisplay()</autodoc>
       </method>

-      <method name="LineEndDisplayExtend" type="void" overloaded="no">
+      <method name="LineEndDisplayExtend" type="" overloaded="no">

         <autodoc>LineEndDisplayExtend()</autodoc>
       </method>
         <autodoc>LineEndDisplayExtend()</autodoc>
       </method>

-      <method name="LineCopy" type="void" overloaded="no">
+      <method name="LineCopy" type="" overloaded="no">

         <autodoc>LineCopy()</autodoc>
       </method>
         <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">
         <autodoc>MoveCaretInsideView()</autodoc>
       </method>
       <method name="LineLength" type="int" overloaded="no">


@@ -33200,14 +35765,14 @@ ControlPoint =      PyControlPoint
           <param name="line" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <autodoc>BraceBadLight(int pos)</autodoc>
         <paramlist>
           <param name="pos" type="int" default=""/>


@@ -33222,22 +35787,22 @@ ControlPoint =      PyControlPoint
       <method name="GetViewEOL" type="bool" overloaded="no">
         <autodoc>GetViewEOL() -&gt; bool</autodoc>
       </method>
       <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>
         <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>
         <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>
         <autodoc>SetDocPointer(void docPointer)</autodoc>
         <paramlist>

-          <param name="docPointer" type="p.void" default=""/>
+          <param name="docPointer" type="" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <autodoc>SetModEventMask(int mask)</autodoc>
         <paramlist>
           <param name="mask" type="int" default=""/>


@@ -33246,7 +35811,7 @@ ControlPoint =      PyControlPoint
       <method name="GetEdgeColumn" type="int" overloaded="no">
         <autodoc>GetEdgeColumn() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetEdgeColumn(int column)</autodoc>
         <paramlist>
           <param name="column" type="int" default=""/>


@@ -33255,42 +35820,42 @@ ControlPoint =      PyControlPoint
       <method name="GetEdgeMode" type="int" overloaded="no">
         <autodoc>GetEdgeMode() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <autodoc>SetEdgeColour(Colour edgeColour)</autodoc>
         <paramlist>

-          <param name="edgeColour" type="r.q(const).wxColour" default=""/>
+          <param name="edgeColour" type="Colour" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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=""/>
         </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>
         </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=""/>
         <autodoc>UsePopUp(bool allowPopUp)</autodoc>
         <paramlist>
           <param name="allowPopUp" type="bool" default=""/>


@@ -33299,7 +35864,7 @@ ControlPoint =      PyControlPoint
       <method name="SelectionIsRectangle" type="bool" overloaded="no">
         <autodoc>SelectionIsRectangle() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetZoom(int zoom)</autodoc>
         <paramlist>
           <param name="zoom" type="int" default=""/>


@@ -33308,25 +35873,25 @@ ControlPoint =      PyControlPoint
       <method name="GetZoom" type="int" overloaded="no">
         <autodoc>GetZoom() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <autodoc>AddRefDocument(void docPointer)</autodoc>
         <paramlist>

-          <param name="docPointer" type="p.void" default=""/>
+          <param name="docPointer" type="" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ReleaseDocument" type="void" overloaded="no">
+      <method name="ReleaseDocument" type="" overloaded="no">

         <autodoc>ReleaseDocument(void docPointer)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <autodoc>SetSTCFocus(bool focus)</autodoc>
         <paramlist>
           <param name="focus" type="bool" default=""/>


@@ -33335,7 +35900,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSTCFocus" type="bool" overloaded="no">
         <autodoc>GetSTCFocus() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetStatus(int statusCode)</autodoc>
         <paramlist>
           <param name="statusCode" type="int" default=""/>


@@ -33344,7 +35909,7 @@ ControlPoint =      PyControlPoint
       <method name="GetStatus" type="int" overloaded="no">
         <autodoc>GetStatus() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetMouseDownCaptures(bool captures)</autodoc>
         <paramlist>
           <param name="captures" type="bool" default=""/>


@@ -33353,7 +35918,7 @@ ControlPoint =      PyControlPoint
       <method name="GetMouseDownCaptures" type="bool" overloaded="no">
         <autodoc>GetMouseDownCaptures() -&gt; bool</autodoc>
       </method>
       <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=""/>
         <autodoc>SetSTCCursor(int cursorType)</autodoc>
         <paramlist>
           <param name="cursorType" type="int" default=""/>


@@ -33362,7 +35927,7 @@ ControlPoint =      PyControlPoint
       <method name="GetSTCCursor" type="int" overloaded="no">
         <autodoc>GetSTCCursor() -&gt; int</autodoc>
       </method>
       <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=""/>
         <autodoc>SetControlCharSymbol(int symbol)</autodoc>
         <paramlist>
           <param name="symbol" type="int" default=""/>


@@ -33371,32 +35936,32 @@ ControlPoint =      PyControlPoint
       <method name="GetControlCharSymbol" type="int" overloaded="no">
         <autodoc>GetControlCharSymbol() -&gt; int</autodoc>
       </method>
       <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>
         <autodoc>WordPartLeft()</autodoc>
       </method>

-      <method name="WordPartLeftExtend" type="void" overloaded="no">
+      <method name="WordPartLeftExtend" type="" overloaded="no">

         <autodoc>WordPartLeftExtend()</autodoc>
       </method>
         <autodoc>WordPartLeftExtend()</autodoc>
       </method>

-      <method name="WordPartRight" type="void" overloaded="no">
+      <method name="WordPartRight" type="" overloaded="no">

         <autodoc>WordPartRight()</autodoc>
       </method>
         <autodoc>WordPartRight()</autodoc>
       </method>

-      <method name="WordPartRightExtend" type="void" overloaded="no">
+      <method name="WordPartRightExtend" type="" overloaded="no">

         <autodoc>WordPartRightExtend()</autodoc>
       </method>
         <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>
         <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>
         <autodoc>DelLineLeft()</autodoc>
       </method>

-      <method name="DelLineRight" type="void" overloaded="no">
+      <method name="DelLineRight" type="" overloaded="no">

         <autodoc>DelLineRight()</autodoc>
       </method>
         <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=""/>
         <autodoc>SetXOffset(int newOffset)</autodoc>
         <paramlist>
           <param name="newOffset" type="int" default=""/>


@@ -33405,24 +35970,24 @@ ControlPoint =      PyControlPoint
       <method name="GetXOffset" type="int" overloaded="no">
         <autodoc>GetXOffset() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         <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=""/>
         <autodoc>SetPrintWrapMode(int mode)</autodoc>
         <paramlist>
           <param name="mode" type="int" default=""/>


@@ -33431,26 +35996,32 @@ ControlPoint =      PyControlPoint
       <method name="GetPrintWrapMode" type="int" overloaded="no">
         <autodoc>GetPrintWrapMode() -&gt; int</autodoc>
       </method>
       <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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         </paramlist>
       </method>
         <autodoc>SetHotspotActiveUnderline(bool underline)</autodoc>
         <paramlist>
           <param name="underline" type="bool" default=""/>
         </paramlist>
       </method>

+      <method name="SetHotspotSingleLine" type="" overloaded="no">
+        <autodoc>SetHotspotSingleLine(bool singleLine)</autodoc>
+        <paramlist>
+          <param name="singleLine" type="bool" default=""/>
+        </paramlist>
+      </method>

       <method name="PositionBefore" type="int" overloaded="no">
         <autodoc>PositionBefore(int pos) -&gt; int</autodoc>
         <paramlist>
       <method name="PositionBefore" type="int" overloaded="no">
         <autodoc>PositionBefore(int pos) -&gt; int</autodoc>
         <paramlist>


@@ -33463,27 +36034,60 @@ ControlPoint =      PyControlPoint
           <param name="pos" type="int" default=""/>
         </paramlist>
       </method>
           <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>
         <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=""/>
         <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="SetSelectionMode" type="" overloaded="no">
+        <autodoc>SetSelectionMode(int mode)</autodoc>
+        <paramlist>
+          <param name="mode" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetSelectionMode" type="int" overloaded="no">
+        <autodoc>GetSelectionMode() -&gt; int</autodoc>
+      </method>
+      <method name="GetLineSelStartPosition" type="int" overloaded="no">
+        <autodoc>GetLineSelStartPosition(int line) -&gt; int</autodoc>
+        <paramlist>
+          <param name="line" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="GetLineSelEndPosition" type="int" overloaded="no">
+        <autodoc>GetLineSelEndPosition(int line) -&gt; int</autodoc>
+        <paramlist>
+          <param name="line" type="int" default=""/>
+        </paramlist>
+      </method>
+      <method name="SetWhitespaceChars" type="" overloaded="no">
+        <autodoc>SetWhitespaceChars(String characters)</autodoc>
+        <paramlist>
+          <param name="characters" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="StartRecord" type="void" overloaded="no">
+      <method name="SetCharsDefault" type="" overloaded="no">
+        <autodoc>SetCharsDefault()</autodoc>
+      </method>
+      <method name="AutoCompGetCurrent" type="int" overloaded="no">
+        <autodoc>AutoCompGetCurrent() -&gt; int</autodoc>
+      </method>
+      <method name="StartRecord" type="" overloaded="no">

         <autodoc>StartRecord()</autodoc>
       </method>
         <autodoc>StartRecord()</autodoc>
       </method>

-      <method name="StopRecord" type="void" overloaded="no">
+      <method name="StopRecord" type="" overloaded="no">

         <autodoc>StopRecord()</autodoc>
       </method>
         <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=""/>
         <autodoc>SetLexer(int lexer)</autodoc>
         <paramlist>
           <param name="lexer" type="int" default=""/>


@@ -33492,95 +36096,95 @@ ControlPoint =      PyControlPoint
       <method name="GetLexer" type="int" overloaded="no">
         <autodoc>GetLexer() -&gt; int</autodoc>
       </method>
       <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>
         <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>
         <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>
         </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=""/>
         <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>
         </paramlist>
       </method>

-      <method name="SetLexerLanguage" type="void" overloaded="no">
+      <method name="SetLexerLanguage" type="" overloaded="no">

         <autodoc>SetLexerLanguage(String language)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <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>
           <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>
         <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>
         <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>
         <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>
         </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>
         <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>
         <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=""/>
         <autodoc>ScrollToColumn(int column)</autodoc>
         <paramlist>
           <param name="column" type="int" default=""/>


@@ -33594,22 +36198,22 @@ ControlPoint =      PyControlPoint
           <param name="lp" type="long" default="0"/>
         </paramlist>
       </method>
           <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>
         <autodoc>SetVScrollBar(wxScrollBar bar)</autodoc>
         <paramlist>

-          <param name="bar" type="p.wxScrollBar" default=""/>
+          <param name="bar" type="ScrollBar" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetHScrollBar" type="void" overloaded="no">
+      <method name="SetHScrollBar" type="" overloaded="no">

         <autodoc>SetHScrollBar(wxScrollBar bar)</autodoc>
         <paramlist>
         <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>
         </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=""/>
         <autodoc>SetLastKeydownProcessed(bool val)</autodoc>
         <paramlist>
           <param name="val" type="bool" default=""/>


@@ -33618,17 +36222,17 @@ ControlPoint =      PyControlPoint
       <method name="SaveFile" type="bool" overloaded="no">
         <autodoc>SaveFile(String filename) -&gt; bool</autodoc>
         <paramlist>
       <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>
         </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">
         </paramlist>
       </method>
       <method name="DoDragOver" type="wxDragResult" overloaded="no">

-        <autodoc>DoDragOver(int x, int y, wxDragResult def) -&gt; wxDragResult</autodoc>
+        <autodoc>DoDragOver(int x, int y, int def) -&gt; int</autodoc>

         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>
         <paramlist>
           <param name="x" type="int" default=""/>
           <param name="y" type="int" default=""/>


@@ -33640,12 +36244,21 @@ ControlPoint =      PyControlPoint
         <paramlist>
           <param name="x" type="long" default=""/>
           <param name="y" type="long" default=""/>
         <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>
+      <method name="SetUseAntiAliasing" type="" overloaded="no">
+        <autodoc>SetUseAntiAliasing(bool useAA)</autodoc>
+        <paramlist>
+          <param name="useAA" type="bool" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

+      <method name="GetUseAntiAliasing" type="bool" overloaded="no">
+        <autodoc>GetUseAntiAliasing() -&gt; bool</autodoc>
+      </method>

     </class>
     <class name="StyledTextEvent" oldname="wxStyledTextEvent" module="stc">
     </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>
       <constructor name="StyledTextEvent" overloaded="no">
         <autodoc>__init__(wxEventType commandType=0, int id=0) -&gt; StyledTextEvent</autodoc>
         <paramlist>


@@ -33656,122 +36269,122 @@ ControlPoint =      PyControlPoint
       <destructor name="~wxStyledTextEvent" overloaded="no">
         <autodoc>__del__()</autodoc>
       </destructor>
       <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetText(String t)</autodoc>
         <paramlist>

-          <param name="t" type="r.q(const).wxString" default=""/>
+          <param name="t" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetDragText(String val)</autodoc>
         <paramlist>

-          <param name="val" type="r.q(const).wxString" default=""/>
+          <param name="val" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <autodoc>SetDragAllowMove(bool val)</autodoc>
         <paramlist>
           <param name="val" type="bool" default=""/>
         </paramlist>
       </method>

-      <method name="SetDragResult" type="void" overloaded="no">
-        <autodoc>SetDragResult(wxDragResult val)</autodoc>
+      <method name="SetDragResult" type="" overloaded="no">
+        <autodoc>SetDragResult(int val)</autodoc>

         <paramlist>
           <param name="val" type="wxDragResult" default=""/>
         </paramlist>
         <paramlist>
           <param name="val" type="wxDragResult" default=""/>
         </paramlist>


@@ -33788,7 +36401,7 @@ ControlPoint =      PyControlPoint
       <method name="GetModificationType" type="int" overloaded="no">
         <autodoc>GetModificationType() -&gt; int</autodoc>
       </method>
       <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">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetLength" type="int" overloaded="no">


@@ -33827,14 +36440,14 @@ ControlPoint =      PyControlPoint
       <method name="GetY" type="int" overloaded="no">
         <autodoc>GetY() -&gt; int</autodoc>
       </method>
       <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">
         <autodoc>GetDragAllowMove() -&gt; bool</autodoc>
       </method>
       <method name="GetDragResult" type="wxDragResult" overloaded="no">
         <autodoc>GetDragText() -&gt; String</autodoc>
       </method>
       <method name="GetDragAllowMove" type="bool" overloaded="no">
         <autodoc>GetDragAllowMove() -&gt; bool</autodoc>
       </method>
       <method name="GetDragResult" type="wxDragResult" overloaded="no">

-        <autodoc>GetDragResult() -&gt; wxDragResult</autodoc>
+        <autodoc>GetDragResult() -&gt; int</autodoc>

       </method>
       <method name="GetShift" type="bool" overloaded="no">
         <autodoc>GetShift() -&gt; bool</autodoc>
       </method>
       <method name="GetShift" type="bool" overloaded="no">
         <autodoc>GetShift() -&gt; bool</autodoc>


@@ -33845,7 +36458,7 @@ ControlPoint =      PyControlPoint
       <method name="GetAlt" type="bool" overloaded="no">
         <autodoc>GetAlt() -&gt; bool</autodoc>
       </method>
       <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>
         <autodoc>Clone() -&gt; Event</autodoc>
       </method>
     </class>


@@ -33885,11 +36498,11 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="XmlResource" oldname="wxXmlResource" module="xrc">
 #---------------------------------------------------------------------------
 </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>
       <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>
           <param name="flags" type="int" default="wxXRC_USE_LOCALE"/>
         </paramlist>
       </constructor>


@@ -33905,151 +36518,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>
       <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>
         </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>
         </paramlist>
       </method>

-      <method name="InitAllHandlers" type="void" overloaded="no">
+      <method name="InitAllHandlers" type="" overloaded="no">

         <autodoc>InitAllHandlers()</autodoc>
       </method>
         <autodoc>InitAllHandlers()</autodoc>
       </method>

-      <method name="AddHandler" type="void" overloaded="no">
+      <method name="AddHandler" type="" overloaded="no">

         <autodoc>AddHandler(XmlResourceHandler handler)</autodoc>
         <paramlist>
         <autodoc>AddHandler(XmlResourceHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxPyXmlResourceHandler" default=""/>
+          <param name="handler" type="wxPyXmlResourceHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="InsertHandler" type="void" overloaded="no">
+      <method name="InsertHandler" type="" overloaded="no">

         <autodoc>InsertHandler(XmlResourceHandler handler)</autodoc>
         <paramlist>
         <autodoc>InsertHandler(XmlResourceHandler handler)</autodoc>
         <paramlist>

-          <param name="handler" type="p.wxPyXmlResourceHandler" default=""/>
+          <param name="handler" type="wxPyXmlResourceHandler" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ClearHandlers" type="void" overloaded="no">
+      <method name="ClearHandlers" type="" overloaded="no">

         <autodoc>ClearHandlers()</autodoc>
       </method>
         <autodoc>ClearHandlers()</autodoc>
       </method>

-      <staticmethod name="AddSubclassFactory" type="void" overloaded="no">
-        <autodoc>XmlResource.AddSubclassFactory(XmlSubclassFactory factory)</autodoc>
+      <staticmethod name="AddSubclassFactory" type="" overloaded="no">
+        <autodoc>AddSubclassFactory(XmlSubclassFactory factory)</autodoc>

         <paramlist>
         <paramlist>

-          <param name="factory" type="p.wxPyXmlSubclassFactory" default=""/>
+          <param name="factory" type="wxPyXmlSubclassFactory" default=""/>

         </paramlist>
       </staticmethod>
         </paramlist>
       </staticmethod>

-      <method name="LoadMenu" type="wxMenu" overloaded="no">
+      <method name="LoadMenu" type="Menu" overloaded="no">

         <autodoc>LoadMenu(String name) -&gt; Menu</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="LoadMenuBar" type="wxMenuBar" overloaded="no">
+      <method name="LoadMenuBar" type="MenuBar" overloaded="no">

         <autodoc>LoadMenuBar(String name) -&gt; MenuBar</autodoc>
         <paramlist>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
         </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>
         <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>
         </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>
         </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>
         <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>
         </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>
         </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>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="LoadBitmap" type="wxBitmap" overloaded="no">
+      <method name="LoadBitmap" type="Bitmap" overloaded="no">

         <autodoc>LoadBitmap(String name) -&gt; Bitmap</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="LoadIcon" type="wxIcon" overloaded="no">
+      <method name="LoadIcon" type="Icon" overloaded="no">

         <autodoc>LoadIcon(String name) -&gt; Icon</autodoc>
         <paramlist>
         <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>
         </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">
         </paramlist>
       </method>
       <staticmethod name="GetXRCID" type="int" overloaded="no">

-        <autodoc>XmlResource.GetXRCID(String str_id) -&gt; int</autodoc>
+        <autodoc>GetXRCID(String str_id) -&gt; int</autodoc>

         <paramlist>
         <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">
         </paramlist>
       </staticmethod>
       <method name="GetVersion" type="long" overloaded="no">


@@ -34064,19 +36677,19 @@ EVT_STC_CALLTIP_CLICK = wx.PyEventBinder( wxEVT_STC_CALLTIP_CLICK, 1 )
           <param name="revision" type="int" default=""/>
         </paramlist>
       </method>
           <param name="revision" type="int" default=""/>
         </paramlist>
       </method>

-      <staticmethod name="Get" type="wxXmlResource" overloaded="no">
-        <autodoc>XmlResource.Get() -&gt; XmlResource</autodoc>
+      <staticmethod name="Get" type="XmlResource" overloaded="no">
+        <autodoc>Get() -&gt; XmlResource</autodoc>

       </staticmethod>
       </staticmethod>

-      <staticmethod name="Set" type="wxXmlResource" overloaded="no">
-        <autodoc>XmlResource.Set(XmlResource res) -&gt; XmlResource</autodoc>
+      <staticmethod name="Set" type="XmlResource" overloaded="no">
+        <autodoc>Set(XmlResource res) -&gt; XmlResource</autodoc>

         <paramlist>
         <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>
         </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=""/>
         <autodoc>SetFlags(int flags)</autodoc>
         <paramlist>
           <param name="flags" type="int" default=""/>


@@ -34097,11 +36710,11 @@ def XRCCTRL(window, str_id, *ignoreargs):
       <constructor name="wxPyXmlSubclassFactory" overloaded="no">
         <autodoc>__init__() -&gt; XmlSubclassFactory</autodoc>
       </constructor>
       <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>
         <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>
         </paramlist>
       </method>
     </class>


@@ -34113,36 +36726,36 @@ def XRCCTRL(window, str_id, *ignoreargs):
         <autodoc>__init__(String name=EmptyString, String value=EmptyString, 
     XmlProperty next=None) -&gt; XmlProperty</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </constructor>

-      <method name="GetName" type="wxString" overloaded="no">
+      <method name="GetName" type="String" overloaded="no">

         <autodoc>GetName() -&gt; String</autodoc>
       </method>
         <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>
         <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>
         <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>
         <autodoc>SetName(String name)</autodoc>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetValue" type="void" overloaded="no">
+      <method name="SetValue" type="" overloaded="no">

         <autodoc>SetValue(String value)</autodoc>
         <paramlist>
         <autodoc>SetValue(String value)</autodoc>
         <paramlist>

-          <param name="value" type="r.q(const).wxString" default=""/>
+          <param name="value" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">

         <autodoc>SetNext(XmlProperty next)</autodoc>
         <paramlist>
         <autodoc>SetNext(XmlProperty next)</autodoc>
         <paramlist>

-          <param name="next" type="p.wxXmlProperty" default=""/>
+          <param name="next" type="XmlProperty" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -34152,154 +36765,154 @@ def XRCCTRL(window, str_id, *ignoreargs):
     String content=EmptyString, XmlProperty props=None, 
     XmlNode next=None) -&gt; XmlNode</autodoc>
         <paramlist>
     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="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=""/>
         </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>
         </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>
         <autodoc>AddChild(XmlNode child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxXmlNode" default=""/>
+          <param name="child" type="XmlNode" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="InsertChild" type="void" overloaded="no">
+      <method name="InsertChild" type="" overloaded="no">

         <autodoc>InsertChild(XmlNode child, XmlNode before_node)</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="AddProperty" type="void" overloaded="no">
+      <method name="AddProperty" type="" overloaded="no">

         <autodoc>AddProperty(XmlProperty prop)</autodoc>
         <paramlist>
         <autodoc>AddProperty(XmlProperty prop)</autodoc>
         <paramlist>

-          <param name="prop" type="p.wxXmlProperty" default=""/>
+          <param name="prop" type="XmlProperty" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddPropertyName" type="void" overloaded="no">
+      <method name="AddPropertyName" type="" overloaded="no">

         <autodoc>AddPropertyName(String name, String value)</autodoc>
         <paramlist>
         <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>
         </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>
         </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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         </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>
         </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>
         <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>
         <autodoc>SetName(String name)</autodoc>
         <paramlist>

-          <param name="name" type="r.q(const).wxString" default=""/>
+          <param name="name" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetContent" type="void" overloaded="no">
+      <method name="SetContent" type="" overloaded="no">

         <autodoc>SetContent(String con)</autodoc>
         <paramlist>
         <autodoc>SetContent(String con)</autodoc>
         <paramlist>

-          <param name="con" type="r.q(const).wxString" default=""/>
+          <param name="con" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetParent" type="void" overloaded="no">
+      <method name="SetParent" type="" overloaded="no">

         <autodoc>SetParent(XmlNode parent)</autodoc>
         <paramlist>
         <autodoc>SetParent(XmlNode parent)</autodoc>
         <paramlist>

-          <param name="parent" type="p.wxXmlNode" default=""/>
+          <param name="parent" type="XmlNode" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetNext" type="void" overloaded="no">
+      <method name="SetNext" type="" overloaded="no">

         <autodoc>SetNext(XmlNode next)</autodoc>
         <paramlist>
         <autodoc>SetNext(XmlNode next)</autodoc>
         <paramlist>

-          <param name="next" type="p.wxXmlNode" default=""/>
+          <param name="next" type="XmlNode" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetChildren" type="void" overloaded="no">
+      <method name="SetChildren" type="" overloaded="no">

         <autodoc>SetChildren(XmlNode child)</autodoc>
         <paramlist>
         <autodoc>SetChildren(XmlNode child)</autodoc>
         <paramlist>

-          <param name="child" type="p.wxXmlNode" default=""/>
+          <param name="child" type="XmlNode" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetProperties" type="void" overloaded="no">
+      <method name="SetProperties" type="" overloaded="no">

         <autodoc>SetProperties(XmlProperty prop)</autodoc>
         <paramlist>
         <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">
         </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>
       <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>
         </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">
         </paramlist>
       </constructor>
       <constructor name="EmptyXmlDocument" overloaded="no">


@@ -34311,57 +36924,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>
       <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>
         </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>
         </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>
         </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>
         </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>
         <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>
         <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>
         <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>
         <autodoc>SetRoot(XmlNode node)</autodoc>
         <paramlist>

-          <param name="node" type="p.wxXmlNode" default=""/>
+          <param name="node" type="XmlNode" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetVersion" type="void" overloaded="no">
+      <method name="SetVersion" type="" overloaded="no">

         <autodoc>SetVersion(String version)</autodoc>
         <paramlist>
         <autodoc>SetVersion(String version)</autodoc>
         <paramlist>

-          <param name="version" type="r.q(const).wxString" default=""/>
+          <param name="version" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetFileEncoding" type="void" overloaded="no">
+      <method name="SetFileEncoding" type="" overloaded="no">

         <autodoc>SetFileEncoding(String encoding)</autodoc>
         <paramlist>
         <autodoc>SetFileEncoding(String encoding)</autodoc>
         <paramlist>

-          <param name="encoding" type="r.q(const).wxString" default=""/>
+          <param name="encoding" type="String" default=""/>

         </paramlist>
       </method>
     </class>
         </paramlist>
       </method>
     </class>


@@ -34369,205 +36982,205 @@ def XRCCTRL(window, str_id, *ignoreargs):
 #---------------------------------------------------------------------------
 </pythoncode>
     <class name="XmlResourceHandler" oldname="wxPyXmlResourceHandler" module="xrc">
 #---------------------------------------------------------------------------
 </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>
       <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>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="SetParentResource" type="void" overloaded="no">
+      <method name="SetParentResource" type="" overloaded="no">

         <autodoc>SetParentResource(XmlResource res)</autodoc>
         <paramlist>
         <autodoc>SetParentResource(XmlResource res)</autodoc>
         <paramlist>

-          <param name="res" type="p.wxXmlResource" default=""/>
+          <param name="res" type="XmlResource" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="GetResource" type="wxXmlResource" overloaded="no">
+      <method name="GetResource" type="XmlResource" overloaded="no">

         <autodoc>GetResource() -&gt; XmlResource</autodoc>
       </method>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetNodeContent" type="wxString" overloaded="no">
+      <method name="GetNodeContent" type="String" overloaded="no">

         <autodoc>GetNodeContent(XmlNode node) -&gt; String</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="GetParamNode" type="wxXmlNode" overloaded="no">
+      <method name="GetParamNode" type="XmlNode" overloaded="no">

         <autodoc>GetParamNode(String param) -&gt; XmlNode</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetParamValue" type="wxString" overloaded="no">
+      <method name="GetParamValue" type="String" overloaded="no">

         <autodoc>GetParamValue(String param) -&gt; String</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="AddStyle" type="void" overloaded="no">
+      <method name="AddStyle" type="" overloaded="no">

         <autodoc>AddStyle(String name, int value)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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="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>
           <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </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>
           <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>
         <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>
         </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>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="SetupWindow" type="void" overloaded="no">
+      <method name="SetupWindow" type="" overloaded="no">

         <autodoc>SetupWindow(Window wnd)</autodoc>
         <paramlist>
         <autodoc>SetupWindow(Window wnd)</autodoc>
         <paramlist>

-          <param name="wnd" type="p.wxWindow" default=""/>
+          <param name="wnd" type="Window" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
           <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>
         <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>
         </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>
         <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>
         </paramlist>
       </method>

-      <method name="GetCurFileSystem" type="wxFileSystem" overloaded="no">
+      <method name="GetCurFileSystem" type="FileSystem" overloaded="no">

         <autodoc>GetCurFileSystem() -&gt; FileSystem</autodoc>
       </method>
     </class>
         <autodoc>GetCurFileSystem() -&gt; FileSystem</autodoc>
       </method>
     </class>


@@ -34614,36 +37227,36 @@ XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
     <import name="controls"/>
     <pythoncode> wx = core </pythoncode>
     <class name="DynamicSashSplitEvent" oldname="wxDynamicSashSplitEvent" module="gizmos">
     <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>
       <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">
         </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>
       <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">
         </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreDynamicSashWindow" overloaded="no">


@@ -34654,24 +37267,24 @@ XmlResource_AddSubclassFactory(XmlSubclassFactory_Python())
     long style=wxCLIP_CHILDREN|wxDS_MANAGE_SCROLLBARS|wxDS_DRAG_CORNER, 
     String name=DynamicSashNameStr) -&gt; bool</autodoc>
         <paramlist>
     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="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="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>
         </paramlist>
       </method>

-      <method name="GetHScrollBar" type="wxScrollBar" overloaded="no">
+      <method name="GetHScrollBar" type="ScrollBar" overloaded="no">

         <autodoc>GetHScrollBar(Window child) -&gt; ScrollBar</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetVScrollBar" type="wxScrollBar" overloaded="no">
+      <method name="GetVScrollBar" type="ScrollBar" overloaded="no">

         <autodoc>GetVScrollBar(Window child) -&gt; ScrollBar</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>
     </class>


@@ -34680,25 +37293,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">
 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>
       <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="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="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>
         </paramlist>
       </constructor>

-      <method name="SetStrings" type="void" overloaded="no">
+      <method name="SetStrings" type="" overloaded="no">

         <autodoc>SetStrings(wxArrayString strings)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetStrings" type="PyObject" overloaded="no">


@@ -34707,129 +37320,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="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>
         <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>
         <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>
         <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>
         <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">
         <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>
       <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="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>
           <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>
         <autodoc>HideVScrollbar()</autodoc>
       </method>

-      <method name="AdjustRemoteScrollbars" type="void" overloaded="no">
+      <method name="AdjustRemoteScrollbars" type="" overloaded="no">

         <autodoc>AdjustRemoteScrollbars()</autodoc>
       </method>
         <autodoc>AdjustRemoteScrollbars()</autodoc>
       </method>

-      <method name="GetScrolledWindow" type="wxScrolledWindow" overloaded="no">
+      <method name="GetScrolledWindow" type="ScrolledWindow" overloaded="no">

         <autodoc>GetScrolledWindow() -&gt; ScrolledWindow</autodoc>
       </method>
         <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>
         <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>
         <autodoc>SetCompanionWindow(Window companion)</autodoc>
         <paramlist>

-          <param name="companion" type="p.wxWindow" default=""/>
+          <param name="companion" type="Window" default=""/>

         </paramlist>
       </method>
         </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">
         <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>
       <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="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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetTreeCtrl" type="wxRemotelyScrolledTreeCtrl" overloaded="no">
+      <method name="GetTreeCtrl" type="RemotelyScrolledTreeCtrl" overloaded="no">

         <autodoc>GetTreeCtrl() -&gt; RemotelyScrolledTreeCtrl</autodoc>
       </method>
         <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>
         <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">
         </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>
       <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="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">
           <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>
       <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="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">
           <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>
       <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="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>
           <param name="style" type="long" default="wxLED_ALIGN_LEFT|wxLED_DRAW_FADED"/>
         </paramlist>
       </constructor>


@@ -34840,10 +37453,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>
         <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="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>
           <param name="style" type="long" default="wxLED_ALIGN_LEFT|wxLED_DRAW_FADED"/>
         </paramlist>
       </method>


@@ -34853,38 +37466,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="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>
         <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>
         <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>
         <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>
         <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">
           <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>
       <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"/>
           <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 +37506,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="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">
         <autodoc>GetText() -&gt; String</autodoc>
       </method>
       <method name="GetImage" type="int" overloaded="no">


@@ -34905,31 +37518,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="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>
         <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>
         <autodoc>SetText(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         <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=""/>
         <autodoc>SetWidth(size_t with)</autodoc>
         <paramlist>
           <param name="with" type="size_t" default=""/>


@@ -34937,20 +37550,20 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
       </method>
     </class>
     <class name="TreeListCtrl" oldname="wxPyTreeListCtrl" module="gizmos">
       </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>
       <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="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="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">
         </paramlist>
       </constructor>
       <constructor name="PreTreeListCtrl" overloaded="no">


@@ -34961,21 +37574,22 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeListCtrlNameStr) -&gt; bool</autodoc>
     Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
     Validator validator=DefaultValidator, 
     String name=TreeListCtrlNameStr) -&gt; bool</autodoc>

+        <docstring>Do the 2nd phase and create the GUI control.</docstring>

         <paramlist>
         <paramlist>

-          <param name="parent" type="p.wxWindow" default=""/>
+          <param name="parent" type="Window" default=""/>

           <param name="id" type="int" default="-1"/>
           <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="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>
         </paramlist>
       </method>

-      <method name="_setCallbackInfo" type="void" overloaded="no">
+      <method name="_setCallbackInfo" type="" overloaded="no">

         <autodoc>_setCallbackInfo(PyObject self, PyObject _class)</autodoc>
         <paramlist>
         <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">
         </paramlist>
       </method>
       <method name="GetCount" type="size_t" overloaded="no">


@@ -34984,7 +37598,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="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=""/>
         <autodoc>SetIndent(unsigned int indent)</autodoc>
         <paramlist>
           <param name="indent" type="unsigned int" default=""/>


@@ -34993,7 +37607,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="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=""/>
         <autodoc>SetSpacing(unsigned int spacing)</autodoc>
         <paramlist>
           <param name="spacing" type="unsigned int" default=""/>


@@ -35002,84 +37616,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="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>
         <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>
         <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>
         <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>
         <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>
         <autodoc>SetImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetStateImageList" type="void" overloaded="no">
+      <method name="SetStateImageList" type="" overloaded="no">

         <autodoc>SetStateImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>SetStateImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SetButtonsImageList" type="void" overloaded="no">
+      <method name="SetButtonsImageList" type="" overloaded="no">

         <autodoc>SetButtonsImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>SetButtonsImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AssignImageList" type="void" overloaded="no">
+      <method name="AssignImageList" type="" overloaded="no">

         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>AssignImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AssignStateImageList" type="void" overloaded="no">
+      <method name="AssignStateImageList" type="" overloaded="no">

         <autodoc>AssignStateImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>AssignStateImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AssignButtonsImageList" type="void" overloaded="no">
+      <method name="AssignButtonsImageList" type="" overloaded="no">

         <autodoc>AssignButtonsImageList(ImageList imageList)</autodoc>
         <paramlist>
         <autodoc>AssignButtonsImageList(ImageList imageList)</autodoc>
         <paramlist>

-          <param name="imageList" type="p.wxImageList" default=""/>
+          <param name="imageList" type="ImageList" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddColumn" type="void" overloaded="no">
+      <method name="AddColumn" type="" overloaded="no">

         <autodoc>AddColumn(String text)</autodoc>
         <paramlist>
         <autodoc>AddColumn(String text)</autodoc>
         <paramlist>

-          <param name="text" type="r.q(const).wxString" default=""/>
+          <param name="text" type="String" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="AddColumnInfo" type="void" overloaded="no">
+      <method name="AddColumnInfo" type="" overloaded="no">

         <autodoc>AddColumnInfo(TreeListColumnInfo col)</autodoc>
         <paramlist>
         <autodoc>AddColumnInfo(TreeListColumnInfo col)</autodoc>
         <paramlist>

-          <param name="col" type="r.q(const).wxTreeListColumnInfo" default=""/>
+          <param name="col" type="TreeListColumnInfo" default=""/>

         </paramlist>
       </method>
         </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=""/>
         <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>
         </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=""/>
         <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>
         </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=""/>
         <autodoc>RemoveColumn(size_t column)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>


@@ -35088,7 +37702,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="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=""/>
         <autodoc>SetColumnWidth(size_t column, size_t width)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>


@@ -35101,7 +37715,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetMainColumn(size_t column)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>


@@ -35110,33 +37724,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="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=""/>
         <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>
         </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>
         <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=""/>
         <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>
         </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>
         <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=""/>
         <autodoc>SetColumnAlignment(size_t column, int align)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>


@@ -35149,7 +37763,7 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
           <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=""/>
         <autodoc>SetColumnImage(size_t column, int image)</autodoc>
         <paramlist>
           <param name="column" type="size_t" default=""/>


@@ -35162,403 +37776,403 @@ EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
           <param name="column" type="size_t" default=""/>
         </paramlist>
       </method>
           <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>
         <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="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>
           <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>
         <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>
           <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>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemData" type="void" overloaded="no">
+      <method name="SetItemData" type="" overloaded="no">

         <autodoc>SetItemData(TreeItemId item, TreeItemData data)</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="SetItemPyData" type="void" overloaded="no">
+      <method name="SetItemPyData" type="" overloaded="no">

         <autodoc>SetItemPyData(TreeItemId item, PyObject obj)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemHasChildren" type="void" overloaded="no">
+      <method name="SetItemHasChildren" type="" overloaded="no">

         <autodoc>SetItemHasChildren(TreeItemId item, bool has=True)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemBackgroundColour" type="void" overloaded="no">
+      <method name="SetItemBackgroundColour" type="" overloaded="no">

         <autodoc>SetItemBackgroundColour(TreeItemId item, Colour col)</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="SetItemFont" type="void" overloaded="no">
+      <method name="SetItemFont" type="" overloaded="no">

         <autodoc>SetItemFont(TreeItemId item, Font font)</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="GetItemTextColour" type="wxColour" overloaded="no">
+      <method name="GetItemTextColour" type="Colour" overloaded="no">

         <autodoc>GetItemTextColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetItemBackgroundColour" type="wxColour" overloaded="no">
+      <method name="GetItemBackgroundColour" type="Colour" overloaded="no">

         <autodoc>GetItemBackgroundColour(TreeItemId item) -&gt; Colour</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetItemFont" type="wxFont" overloaded="no">
+      <method name="GetItemFont" type="Font" overloaded="no">

         <autodoc>GetItemFont(TreeItemId item) -&gt; Font</autodoc>
         <paramlist>
         <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>
         </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>
         </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>
         </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>
         </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>
         </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>
         </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>
           <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>
         <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>
         <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>
         <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>
         </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>
         </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>
           <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetNextSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetNextSibling" type="TreeItemId" overloaded="no">

         <autodoc>GetNextSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetPrevSibling" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevSibling" type="TreeItemId" overloaded="no">

         <autodoc>GetPrevSibling(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetFirstVisibleItem" type="wxTreeItemId" overloaded="no">
+      <method name="GetFirstVisibleItem" type="TreeItemId" overloaded="no">

         <autodoc>GetFirstVisibleItem() -&gt; TreeItemId</autodoc>
       </method>
         <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>
         <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>
         </paramlist>
       </method>

-      <method name="GetPrevVisible" type="wxTreeItemId" overloaded="no">
+      <method name="GetPrevVisible" type="TreeItemId" overloaded="no">

         <autodoc>GetPrevVisible(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </paramlist>
       </method>

-      <method name="GetNext" type="wxTreeItemId" overloaded="no">
+      <method name="GetNext" type="TreeItemId" overloaded="no">

         <autodoc>GetNext(TreeItemId item) -&gt; TreeItemId</autodoc>
         <paramlist>
         <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>
         </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>
         <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="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>
         </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>
         <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="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>
         </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>
         <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="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>
         </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>
         <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="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="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>
         </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>
         <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="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>
         </paramlist>
       </method>

-      <method name="Delete" type="void" overloaded="no">
+      <method name="Delete" type="" overloaded="no">

         <autodoc>Delete(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Delete(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DeleteChildren" type="void" overloaded="no">
+      <method name="DeleteChildren" type="" overloaded="no">

         <autodoc>DeleteChildren(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>DeleteChildren(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="DeleteAllItems" type="void" overloaded="no">
+      <method name="DeleteAllItems" type="" overloaded="no">

         <autodoc>DeleteAllItems()</autodoc>
       </method>
         <autodoc>DeleteAllItems()</autodoc>
       </method>

-      <method name="Expand" type="void" overloaded="no">
+      <method name="Expand" type="" overloaded="no">

         <autodoc>Expand(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Expand(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ExpandAll" type="void" overloaded="no">
+      <method name="ExpandAll" type="" overloaded="no">

         <autodoc>ExpandAll(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>ExpandAll(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Collapse" type="void" overloaded="no">
+      <method name="Collapse" type="" overloaded="no">

         <autodoc>Collapse(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Collapse(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="CollapseAndReset" type="void" overloaded="no">
+      <method name="CollapseAndReset" type="" overloaded="no">

         <autodoc>CollapseAndReset(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>CollapseAndReset(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Toggle" type="void" overloaded="no">
+      <method name="Toggle" type="" overloaded="no">

         <autodoc>Toggle(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Toggle(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Unselect" type="void" overloaded="no">
+      <method name="Unselect" type="" overloaded="no">

         <autodoc>Unselect()</autodoc>
       </method>
         <autodoc>Unselect()</autodoc>
       </method>

-      <method name="UnselectAll" type="void" overloaded="no">
+      <method name="UnselectAll" type="" overloaded="no">

         <autodoc>UnselectAll()</autodoc>
       </method>
         <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>
         <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>
           <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>
         <autodoc>EnsureVisible(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="ScrollTo" type="void" overloaded="no">
+      <method name="ScrollTo" type="" overloaded="no">

         <autodoc>ScrollTo(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>ScrollTo(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </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>
         <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>
         </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>
           <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>
         <autodoc>EditLabel(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="Edit" type="void" overloaded="no">
+      <method name="Edit" type="" overloaded="no">

         <autodoc>Edit(TreeItemId item)</autodoc>
         <paramlist>
         <autodoc>Edit(TreeItemId item)</autodoc>
         <paramlist>

-          <param name="item" type="r.q(const).wxTreeItemId" default=""/>
+          <param name="item" type="TreeItemId" default=""/>

         </paramlist>
       </method>
         </paramlist>
       </method>

-      <method name="SortChildren" type="void" overloaded="no">
+      <method name="SortChildren" type="" overloaded="no">

         <autodoc>SortChildren(TreeItemId item)</autodoc>
         <paramlist>
         <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>
         </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>
         </paramlist>
       </method>

-      <method name="SetItemSelectedImage" type="void" overloaded="no">
+      <method name="SetItemSelectedImage" type="" overloaded="no">

         <autodoc>SetItemSelectedImage(TreeItemId item, int image)</autodoc>
         <paramlist>
         <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>
           <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>
         <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>
         <autodoc>GetMainWindow() -&gt; Window</autodoc>
       </method>
     </class>