Updated overview

[wxWidgets.git] / wxPython / src / mac / gdi.py

diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py
index b0e8ffb3f1ef56df7d1ab3663bd38be3f9ab3c92..cfeb50db2396994678f28ab00e072b5971d3ec1f 100644 (file)
--- a/wxPython/src/mac/gdi.py
+++ b/wxPython/src/mac/gdi.py
@@ -8,7 +8,6 @@ wx = core
 #---------------------------------------------------------------------------
 
 class GDIObject(core.Object):
 #---------------------------------------------------------------------------
 
 class GDIObject(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGDIObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxGDIObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -46,7 +45,6 @@ _gdi.GDIObject_swigregister(GDIObjectPtr)
 #---------------------------------------------------------------------------
 
 class Colour(core.Object):
 #---------------------------------------------------------------------------
 
 class Colour(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -81,9 +79,9 @@ class Colour(core.Object):
         """Set(unsigned char red, unsigned char green, unsigned char blue)"""
         return _gdi.Colour_Set(*args, **kwargs)
 
         """Set(unsigned char red, unsigned char green, unsigned char blue)"""
         return _gdi.Colour_Set(*args, **kwargs)
 

-    def SetRBG(*args, **kwargs):
-        """SetRBG(unsigned long colRGB)"""
-        return _gdi.Colour_SetRBG(*args, **kwargs)
+    def SetRGB(*args, **kwargs):
+        """SetRGB(unsigned long colRGB)"""
+        return _gdi.Colour_SetRGB(*args, **kwargs)

 
     def __eq__(*args, **kwargs):
         """__eq__(Colour colour) -> bool"""
 
     def __eq__(*args, **kwargs):
         """__eq__(Colour colour) -> bool"""


@@ -93,17 +91,20 @@ class Colour(core.Object):
         """__ne__(Colour colour) -> bool"""
         return _gdi.Colour___ne__(*args, **kwargs)
 
         """__ne__(Colour colour) -> bool"""
         return _gdi.Colour___ne__(*args, **kwargs)
 

+    def InitFromName(*args, **kwargs):
+        """InitFromName(String colourName)"""
+        return _gdi.Colour_InitFromName(*args, **kwargs)
+

     def Get(*args, **kwargs):
         """Get() -> PyObject"""
         return _gdi.Colour_Get(*args, **kwargs)
 
     asTuple = Get
     def __str__(self):                  return str(self.asTuple())
     def Get(*args, **kwargs):
         """Get() -> PyObject"""
         return _gdi.Colour_Get(*args, **kwargs)
 
     asTuple = Get
     def __str__(self):                  return str(self.asTuple())

-    def __repr__(self):                 return 'wxColour' + str(self.asTuple())
+    def __repr__(self):                 return 'wx.Colour' + str(self.asTuple())

     def __nonzero__(self):              return self.Ok()
     def __nonzero__(self):              return self.Ok()

-    def __getinitargs__(self):          return ()
-    def __getstate__(self):             return self.asTuple()
-    def __setstate__(self, state):      self.Set(*state)
+    __safe_for_unpickling__ = True
+    def __reduce__(self):               return (Colour, self.Get())

 
 
 class ColourPtr(Colour):
 
 
 class ColourPtr(Colour):


@@ -114,7 +115,7 @@ class ColourPtr(Colour):
 _gdi.Colour_swigregister(ColourPtr)
 
 def NamedColour(*args, **kwargs):
 _gdi.Colour_swigregister(ColourPtr)
 
 def NamedColour(*args, **kwargs):

-    """NamedColour(wxString colorName) -> Colour"""
+    """NamedColour(String colorName) -> Colour"""

     val = _gdi.new_NamedColour(*args, **kwargs)
     val.thisown = 1
     return val
     val = _gdi.new_NamedColour(*args, **kwargs)
     val.thisown = 1
     return val


@@ -126,7 +127,6 @@ def ColourRGB(*args, **kwargs):
     return val
 
 class Palette(GDIObject):
     return val
 
 class Palette(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -146,13 +146,14 @@ class Palette(GDIObject):
         return _gdi.Palette_GetPixel(*args, **kwargs)
 
     def GetRGB(*args, **kwargs):
         return _gdi.Palette_GetPixel(*args, **kwargs)
 
     def GetRGB(*args, **kwargs):

-        """GetRGB(int pixel, byte OUTPUT, byte OUTPUT, byte OUTPUT) -> bool"""
+        """GetRGB(int pixel) -> (R,G,B)"""

         return _gdi.Palette_GetRGB(*args, **kwargs)
 
     def Ok(*args, **kwargs):
         """Ok() -> bool"""
         return _gdi.Palette_Ok(*args, **kwargs)
 
         return _gdi.Palette_GetRGB(*args, **kwargs)
 
     def Ok(*args, **kwargs):
         """Ok() -> bool"""
         return _gdi.Palette_Ok(*args, **kwargs)
 

+    def __nonzero__(self): return self.Ok() 

 
 class PalettePtr(Palette):
     def __init__(self, this):
 
 class PalettePtr(Palette):
     def __init__(self, this):


@@ -164,7 +165,6 @@ _gdi.Palette_swigregister(PalettePtr)
 #---------------------------------------------------------------------------
 
 class Pen(GDIObject):
 #---------------------------------------------------------------------------
 
 class Pen(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -241,7 +241,6 @@ class PenPtr(Pen):
 _gdi.Pen_swigregister(PenPtr)
 
 class PyPen(Pen):
 _gdi.Pen_swigregister(PenPtr)
 
 class PyPen(Pen):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -272,11 +271,18 @@ Pen = PyPen
 #---------------------------------------------------------------------------
 
 class Brush(GDIObject):
 #---------------------------------------------------------------------------
 
 class Brush(GDIObject):

-    """"""
+    """
+    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.
+    """

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(Colour colour, int style=SOLID) -> Brush"""
+        """
+        __init__(Colour colour, int style=SOLID) -> Brush
+
+        Constructs a brush from a colour object and style.
+        """

         newobj = _gdi.new_Brush(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Brush(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -333,11 +339,14 @@ class BrushPtr(Brush):
 _gdi.Brush_swigregister(BrushPtr)
 
 class Bitmap(GDIObject):
 _gdi.Brush_swigregister(BrushPtr)
 
 class Bitmap(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString name, wxBitmapType type=BITMAP_TYPE_ANY) -> Bitmap"""
+        """
+        __init__(String name, int type=BITMAP_TYPE_ANY) -> Bitmap
+
+        Loads a bitmap from a file.
+        """

         newobj = _gdi.new_Bitmap(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Bitmap(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -353,43 +362,88 @@ class Bitmap(GDIObject):
         return _gdi.Bitmap_Ok(*args, **kwargs)
 
     def GetWidth(*args, **kwargs):
         return _gdi.Bitmap_Ok(*args, **kwargs)
 
     def GetWidth(*args, **kwargs):

-        """GetWidth() -> int"""
+        """
+        GetWidth() -> int
+
+        Gets the width of the bitmap in pixels.
+        """

         return _gdi.Bitmap_GetWidth(*args, **kwargs)
 
     def GetHeight(*args, **kwargs):
         return _gdi.Bitmap_GetWidth(*args, **kwargs)
 
     def GetHeight(*args, **kwargs):

-        """GetHeight() -> int"""
+        """
+        GetHeight() -> int
+
+        Gets the height of the bitmap in pixels.
+        """

         return _gdi.Bitmap_GetHeight(*args, **kwargs)
 
     def GetDepth(*args, **kwargs):
         return _gdi.Bitmap_GetHeight(*args, **kwargs)
 
     def GetDepth(*args, **kwargs):

-        """GetDepth() -> int"""
+        """
+        GetDepth() -> int
+
+        Gets the colour depth of the bitmap. A value of 1 indicates a
+        monochrome bitmap.
+        """

         return _gdi.Bitmap_GetDepth(*args, **kwargs)
 
     def ConvertToImage(*args, **kwargs):
         return _gdi.Bitmap_GetDepth(*args, **kwargs)
 
     def ConvertToImage(*args, **kwargs):

-        """ConvertToImage() -> Image"""
+        """
+        ConvertToImage() -> Image
+
+        Creates a platform-independent image from a platform-dependent bitmap. This
+        preserves mask information so that bitmaps and images can be converted back
+        and forth without loss in that respect.
+        """

         return _gdi.Bitmap_ConvertToImage(*args, **kwargs)
 
     def GetMask(*args, **kwargs):
         return _gdi.Bitmap_ConvertToImage(*args, **kwargs)
 
     def GetMask(*args, **kwargs):

-        """GetMask() -> Mask"""
+        """
+        GetMask() -> Mask
+
+        Gets the associated mask (if any) which may have been loaded from a file
+        or explpicitly set for the bitmap.
+        """

         return _gdi.Bitmap_GetMask(*args, **kwargs)
 
     def SetMask(*args, **kwargs):
         return _gdi.Bitmap_GetMask(*args, **kwargs)
 
     def SetMask(*args, **kwargs):

-        """SetMask(Mask mask)"""
+        """
+        SetMask(Mask mask)
+
+        Sets the mask for this bitmap.
+        """

         return _gdi.Bitmap_SetMask(*args, **kwargs)
 
     def SetMaskColour(*args, **kwargs):
         return _gdi.Bitmap_SetMask(*args, **kwargs)
 
     def SetMaskColour(*args, **kwargs):

-        """SetMaskColour(Colour colour)"""
+        """
+        SetMaskColour(Colour colour)
+
+        Create a Mask based on a specified colour in the Bitmap.
+        """

         return _gdi.Bitmap_SetMaskColour(*args, **kwargs)
 
     def GetSubBitmap(*args, **kwargs):
         return _gdi.Bitmap_SetMaskColour(*args, **kwargs)
 
     def GetSubBitmap(*args, **kwargs):

-        """GetSubBitmap(Rect rect) -> Bitmap"""
+        """
+        GetSubBitmap(Rect rect) -> Bitmap
+
+        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.
+        """

         return _gdi.Bitmap_GetSubBitmap(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):
         return _gdi.Bitmap_GetSubBitmap(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):

-        """SaveFile(wxString name, wxBitmapType type, Palette palette=(wxPalette *) NULL) -> bool"""
+        """
+        SaveFile(String name, int type, Palette palette=(wxPalette *) NULL) -> bool
+
+        Saves a bitmap in the named file.
+        """

         return _gdi.Bitmap_SaveFile(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
         return _gdi.Bitmap_SaveFile(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString name, wxBitmapType type) -> bool"""
+        """
+        LoadFile(String name, int type) -> bool
+
+        Loads a bitmap from a file
+        """

         return _gdi.Bitmap_LoadFile(*args, **kwargs)
 
     def CopyFromIcon(*args, **kwargs):
         return _gdi.Bitmap_LoadFile(*args, **kwargs)
 
     def CopyFromIcon(*args, **kwargs):


@@ -397,15 +451,27 @@ class Bitmap(GDIObject):
         return _gdi.Bitmap_CopyFromIcon(*args, **kwargs)
 
     def SetHeight(*args, **kwargs):
         return _gdi.Bitmap_CopyFromIcon(*args, **kwargs)
 
     def SetHeight(*args, **kwargs):

-        """SetHeight(int height)"""
+        """
+        SetHeight(int height)
+
+        Set the height property (does not affect the bitmap data).
+        """

         return _gdi.Bitmap_SetHeight(*args, **kwargs)
 
     def SetWidth(*args, **kwargs):
         return _gdi.Bitmap_SetHeight(*args, **kwargs)
 
     def SetWidth(*args, **kwargs):

-        """SetWidth(int width)"""
+        """
+        SetWidth(int width)
+
+        Set the width property (does not affect the bitmap data).
+        """

         return _gdi.Bitmap_SetWidth(*args, **kwargs)
 
     def SetDepth(*args, **kwargs):
         return _gdi.Bitmap_SetWidth(*args, **kwargs)
 
     def SetDepth(*args, **kwargs):

-        """SetDepth(int depth)"""
+        """
+        SetDepth(int depth)
+
+        Set the depth property (does not affect the bitmap data).
+        """

         return _gdi.Bitmap_SetDepth(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
         return _gdi.Bitmap_SetDepth(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 


@@ -418,41 +484,78 @@ class BitmapPtr(Bitmap):
 _gdi.Bitmap_swigregister(BitmapPtr)
 
 def EmptyBitmap(*args, **kwargs):
 _gdi.Bitmap_swigregister(BitmapPtr)
 
 def EmptyBitmap(*args, **kwargs):

-    """EmptyBitmap(int width, int height, int depth=-1) -> Bitmap"""
+    """
+    EmptyBitmap(int width, int height, int depth=-1) -> Bitmap
+
+    Creates a new bitmap of the given size.  A depth of -1 indicates the depth of
+    the current screen or visual. Some platforms only support 1 for monochrome and
+    -1 for the current colour setting.
+    """

     val = _gdi.new_EmptyBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromIcon(*args, **kwargs):
     val = _gdi.new_EmptyBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromIcon(*args, **kwargs):

-    """BitmapFromIcon(Icon icon) -> Bitmap"""
+    """
+    BitmapFromIcon(Icon icon) -> Bitmap
+
+    Create a new bitmap from an Icon object.
+    """

     val = _gdi.new_BitmapFromIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromImage(*args, **kwargs):
     val = _gdi.new_BitmapFromIcon(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromImage(*args, **kwargs):

-    """BitmapFromImage(Image image, int depth=-1) -> Bitmap"""
+    """
+    BitmapFromImage(Image image, int depth=-1) -> Bitmap
+
+    Creates bitmap object from the image. This has to be done to actually display
+    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.
+    """

     val = _gdi.new_BitmapFromImage(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromXPMData(*args, **kwargs):
     val = _gdi.new_BitmapFromImage(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromXPMData(*args, **kwargs):

-    """BitmapFromXPMData(PyObject listOfStrings) -> Bitmap"""
+    """
+    BitmapFromXPMData(PyObject listOfStrings) -> Bitmap
+
+    Construct a Bitmap from a list of strings formatted as XPM data.
+    """

     val = _gdi.new_BitmapFromXPMData(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromBits(*args, **kwargs):
     val = _gdi.new_BitmapFromXPMData(*args, **kwargs)
     val.thisown = 1
     return val
 
 def BitmapFromBits(*args, **kwargs):

-    """BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap"""
+    """
+    BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap
+
+    Creates a bitmap from an array of bits.  You should only use this function for
+    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.
+    """

     val = _gdi.new_BitmapFromBits(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Mask(core.Object):
     val = _gdi.new_BitmapFromBits(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Mask(core.Object):

-    """"""
+    """
+    This class encapsulates a monochrome mask bitmap, where the masked area is
+    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.
+    """

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(Bitmap bitmap) -> Mask"""
+        """
+        __init__(Bitmap bitmap) -> Mask
+
+        Constructs a mask from a monochrome bitmap.
+        """

         newobj = _gdi.new_Mask(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Mask(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -466,17 +569,21 @@ class MaskPtr(Mask):
 _gdi.Mask_swigregister(MaskPtr)
 
 def MaskColour(*args, **kwargs):
 _gdi.Mask_swigregister(MaskPtr)
 
 def MaskColour(*args, **kwargs):

-    """MaskColour(Bitmap bitmap, Colour colour) -> Mask"""
+    """
+    MaskColour(Bitmap bitmap, Colour colour) -> Mask
+
+    Constructs a mask from a bitmap and a colour in that bitmap that indicates the
+    background.
+    """

     val = _gdi.new_MaskColour(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Icon(GDIObject):
     val = _gdi.new_MaskColour(*args, **kwargs)
     val.thisown = 1
     return val
 
 class Icon(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
+        """__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""

         newobj = _gdi.new_Icon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Icon(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -553,11 +660,10 @@ def IconFromXPMData(*args, **kwargs):
     return val
 
 class IconLocation(object):
     return val
 
 class IconLocation(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filename=&wxPyEmptyString, int num=0) -> IconLocation"""
+        """__init__(String filename=&wxPyEmptyString, int num=0) -> IconLocation"""

         newobj = _gdi.new_IconLocation(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_IconLocation(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -574,11 +680,11 @@ class IconLocation(object):
 
     def __nonzero__(self): return self.Ok() 
     def SetFileName(*args, **kwargs):
 
     def __nonzero__(self): return self.Ok() 
     def SetFileName(*args, **kwargs):

-        """SetFileName(wxString filename)"""
+        """SetFileName(String filename)"""

         return _gdi.IconLocation_SetFileName(*args, **kwargs)
 
     def GetFileName(*args, **kwargs):
         return _gdi.IconLocation_SetFileName(*args, **kwargs)
 
     def GetFileName(*args, **kwargs):

-        """GetFileName() -> wxString"""
+        """GetFileName() -> String"""

         return _gdi.IconLocation_GetFileName(*args, **kwargs)
 
     def SetIndex(*args, **kwargs):
         return _gdi.IconLocation_GetFileName(*args, **kwargs)
 
     def SetIndex(*args, **kwargs):


@@ -598,7 +704,6 @@ class IconLocationPtr(IconLocation):
 _gdi.IconLocation_swigregister(IconLocationPtr)
 
 class IconBundle(object):
 _gdi.IconLocation_swigregister(IconLocationPtr)
 
 class IconBundle(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIconBundle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxIconBundle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -618,7 +723,7 @@ class IconBundle(object):
         return _gdi.IconBundle_AddIcon(*args, **kwargs)
 
     def AddIconFromFile(*args, **kwargs):
         return _gdi.IconBundle_AddIcon(*args, **kwargs)
 
     def AddIconFromFile(*args, **kwargs):

-        """AddIconFromFile(wxString file, long type)"""
+        """AddIconFromFile(String file, long type)"""

         return _gdi.IconBundle_AddIconFromFile(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
         return _gdi.IconBundle_AddIconFromFile(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):


@@ -634,7 +739,7 @@ class IconBundlePtr(IconBundle):
 _gdi.IconBundle_swigregister(IconBundlePtr)
 
 def IconBundleFromFile(*args, **kwargs):
 _gdi.IconBundle_swigregister(IconBundlePtr)
 
 def IconBundleFromFile(*args, **kwargs):

-    """IconBundleFromFile(wxString file, long type) -> IconBundle"""
+    """IconBundleFromFile(String file, long type) -> IconBundle"""

     val = _gdi.new_IconBundleFromFile(*args, **kwargs)
     val.thisown = 1
     return val
     val = _gdi.new_IconBundleFromFile(*args, **kwargs)
     val.thisown = 1
     return val


@@ -646,11 +751,10 @@ def IconBundleFromIcon(*args, **kwargs):
     return val
 
 class Cursor(GDIObject):
     return val
 
 class Cursor(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor"""
+        """__init__(String cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor"""

         newobj = _gdi.new_Cursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Cursor(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -687,8 +791,10 @@ def CursorFromImage(*args, **kwargs):
     return val
 
 def CursorFromBits(*args, **kwargs):
     return val
 
 def CursorFromBits(*args, **kwargs):

-    """CursorFromBits(PyObject bits, int width, int height, int hotSpotX=-1, 
-    int hotSpotY=-1, PyObject maskBits=0) -> Cursor"""
+    """
+    CursorFromBits(PyObject bits, int width, int height, int hotSpotX=-1, 
+        int hotSpotY=-1, PyObject maskBits=0) -> Cursor
+    """

     val = _gdi.new_CursorFromBits(*args, **kwargs)
     val.thisown = 1
     return val
     val = _gdi.new_CursorFromBits(*args, **kwargs)
     val.thisown = 1
     return val


@@ -699,7 +805,6 @@ OutRegion = _gdi.OutRegion
 PartRegion = _gdi.PartRegion
 InRegion = _gdi.InRegion
 class Region(GDIObject):
 PartRegion = _gdi.PartRegion
 InRegion = _gdi.InRegion
 class Region(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -719,19 +824,19 @@ class Region(GDIObject):
         return _gdi.Region_Clear(*args, **kwargs)
 
     def Contains(*args, **kwargs):
         return _gdi.Region_Clear(*args, **kwargs)
 
     def Contains(*args, **kwargs):

-        """Contains(int x, int y) -> wxRegionContain"""
+        """Contains(int x, int y) -> int"""

         return _gdi.Region_Contains(*args, **kwargs)
 
     def ContainsPoint(*args, **kwargs):
         return _gdi.Region_Contains(*args, **kwargs)
 
     def ContainsPoint(*args, **kwargs):

-        """ContainsPoint(Point pt) -> wxRegionContain"""
+        """ContainsPoint(Point pt) -> int"""

         return _gdi.Region_ContainsPoint(*args, **kwargs)
 
     def ContainsRect(*args, **kwargs):
         return _gdi.Region_ContainsPoint(*args, **kwargs)
 
     def ContainsRect(*args, **kwargs):

-        """ContainsRect(Rect rect) -> wxRegionContain"""
+        """ContainsRect(Rect rect) -> int"""

         return _gdi.Region_ContainsRect(*args, **kwargs)
 
     def ContainsRectDim(*args, **kwargs):
         return _gdi.Region_ContainsRect(*args, **kwargs)
 
     def ContainsRectDim(*args, **kwargs):

-        """ContainsRectDim(int x, int y, int w, int h) -> wxRegionContain"""
+        """ContainsRectDim(int x, int y, int w, int h) -> int"""

         return _gdi.Region_ContainsRectDim(*args, **kwargs)
 
     def GetBox(*args, **kwargs):
         return _gdi.Region_ContainsRectDim(*args, **kwargs)
 
     def GetBox(*args, **kwargs):


@@ -819,7 +924,6 @@ def RegionFromPoints(*args, **kwargs):
     return val
 
 class RegionIterator(core.Object):
     return val
 
 class RegionIterator(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -972,7 +1076,6 @@ FONTENCODING_SHIFT_JIS = _gdi.FONTENCODING_SHIFT_JIS
 #---------------------------------------------------------------------------
 
 class NativeFontInfo(object):
 #---------------------------------------------------------------------------
 
 class NativeFontInfo(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxNativeFontInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxNativeFontInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1000,11 +1103,11 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):
         return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs)
 
     def GetStyle(*args, **kwargs):

-        """GetStyle() -> wxFontStyle"""
+        """GetStyle() -> int"""

         return _gdi.NativeFontInfo_GetStyle(*args, **kwargs)
 
     def GetWeight(*args, **kwargs):
         return _gdi.NativeFontInfo_GetStyle(*args, **kwargs)
 
     def GetWeight(*args, **kwargs):

-        """GetWeight() -> wxFontWeight"""
+        """GetWeight() -> int"""

         return _gdi.NativeFontInfo_GetWeight(*args, **kwargs)
 
     def GetUnderlined(*args, **kwargs):
         return _gdi.NativeFontInfo_GetWeight(*args, **kwargs)
 
     def GetUnderlined(*args, **kwargs):


@@ -1012,15 +1115,15 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):
         return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):

-        """GetFaceName() -> wxString"""
+        """GetFaceName() -> String"""

         return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs)
 
     def GetFamily(*args, **kwargs):
         return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs)
 
     def GetFamily(*args, **kwargs):

-        """GetFamily() -> wxFontFamily"""
+        """GetFamily() -> int"""

         return _gdi.NativeFontInfo_GetFamily(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):
         return _gdi.NativeFontInfo_GetFamily(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):

-        """GetEncoding() -> wxFontEncoding"""
+        """GetEncoding() -> int"""

         return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):
         return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):


@@ -1028,11 +1131,11 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):
         return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs)
 
     def SetStyle(*args, **kwargs):

-        """SetStyle(wxFontStyle style)"""
+        """SetStyle(int style)"""

         return _gdi.NativeFontInfo_SetStyle(*args, **kwargs)
 
     def SetWeight(*args, **kwargs):
         return _gdi.NativeFontInfo_SetStyle(*args, **kwargs)
 
     def SetWeight(*args, **kwargs):

-        """SetWeight(wxFontWeight weight)"""
+        """SetWeight(int weight)"""

         return _gdi.NativeFontInfo_SetWeight(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):
         return _gdi.NativeFontInfo_SetWeight(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):


@@ -1040,35 +1143,35 @@ class NativeFontInfo(object):
         return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):
         return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):

-        """SetFaceName(wxString facename)"""
+        """SetFaceName(String facename)"""

         return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs)
 
     def SetFamily(*args, **kwargs):
         return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs)
 
     def SetFamily(*args, **kwargs):

-        """SetFamily(wxFontFamily family)"""
+        """SetFamily(int family)"""

         return _gdi.NativeFontInfo_SetFamily(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):
         return _gdi.NativeFontInfo_SetFamily(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):

-        """SetEncoding(wxFontEncoding encoding)"""
+        """SetEncoding(int encoding)"""

         return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs)
 
     def FromString(*args, **kwargs):
         return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs)
 
     def FromString(*args, **kwargs):

-        """FromString(wxString s) -> bool"""
+        """FromString(String s) -> bool"""

         return _gdi.NativeFontInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):
         return _gdi.NativeFontInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):

-        """ToString() -> wxString"""
+        """ToString() -> String"""

         return _gdi.NativeFontInfo_ToString(*args, **kwargs)
 
     def __str__(*args, **kwargs):
         return _gdi.NativeFontInfo_ToString(*args, **kwargs)
 
     def __str__(*args, **kwargs):

-        """__str__() -> wxString"""
+        """__str__() -> String"""

         return _gdi.NativeFontInfo___str__(*args, **kwargs)
 
     def FromUserString(*args, **kwargs):
         return _gdi.NativeFontInfo___str__(*args, **kwargs)
 
     def FromUserString(*args, **kwargs):

-        """FromUserString(wxString s) -> bool"""
+        """FromUserString(String s) -> bool"""

         return _gdi.NativeFontInfo_FromUserString(*args, **kwargs)
 
     def ToUserString(*args, **kwargs):
         return _gdi.NativeFontInfo_FromUserString(*args, **kwargs)
 
     def ToUserString(*args, **kwargs):

-        """ToUserString() -> wxString"""
+        """ToUserString() -> String"""

         return _gdi.NativeFontInfo_ToUserString(*args, **kwargs)
 
 
         return _gdi.NativeFontInfo_ToUserString(*args, **kwargs)
 
 


@@ -1080,7 +1183,6 @@ class NativeFontInfoPtr(NativeFontInfo):
 _gdi.NativeFontInfo_swigregister(NativeFontInfoPtr)
 
 class NativeEncodingInfo(object):
 _gdi.NativeFontInfo_swigregister(NativeFontInfoPtr)
 
 class NativeEncodingInfo(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxNativeEncodingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     facename = property(_gdi.NativeEncodingInfo_facename_get, _gdi.NativeEncodingInfo_facename_set)
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxNativeEncodingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     facename = property(_gdi.NativeEncodingInfo_facename_get, _gdi.NativeEncodingInfo_facename_set)


@@ -1098,11 +1200,11 @@ class NativeEncodingInfo(object):
         except: pass
 
     def FromString(*args, **kwargs):
         except: pass
 
     def FromString(*args, **kwargs):

-        """FromString(wxString s) -> bool"""
+        """FromString(String s) -> bool"""

         return _gdi.NativeEncodingInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):
         return _gdi.NativeEncodingInfo_FromString(*args, **kwargs)
 
     def ToString(*args, **kwargs):

-        """ToString() -> wxString"""
+        """ToString() -> String"""

         return _gdi.NativeEncodingInfo_ToString(*args, **kwargs)
 
 
         return _gdi.NativeEncodingInfo_ToString(*args, **kwargs)
 
 


@@ -1115,7 +1217,7 @@ _gdi.NativeEncodingInfo_swigregister(NativeEncodingInfoPtr)
 
 
 def GetNativeFontEncoding(*args, **kwargs):
 
 
 def GetNativeFontEncoding(*args, **kwargs):

-    """GetNativeFontEncoding(wxFontEncoding encoding) -> NativeEncodingInfo"""
+    """GetNativeFontEncoding(int encoding) -> NativeEncodingInfo"""

     return _gdi.GetNativeFontEncoding(*args, **kwargs)
 
 def TestFontEncoding(*args, **kwargs):
     return _gdi.GetNativeFontEncoding(*args, **kwargs)
 
 def TestFontEncoding(*args, **kwargs):


@@ -1124,7 +1226,6 @@ def TestFontEncoding(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class FontMapper(object):
 #---------------------------------------------------------------------------
 
 class FontMapper(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1150,7 +1251,7 @@ class FontMapper(object):
 
     Set = staticmethod(Set)
     def CharsetToEncoding(*args, **kwargs):
 
     Set = staticmethod(Set)
     def CharsetToEncoding(*args, **kwargs):

-        """CharsetToEncoding(wxString charset, bool interactive=True) -> wxFontEncoding"""
+        """CharsetToEncoding(String charset, bool interactive=True) -> int"""

         return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs)
 
     def GetSupportedEncodingsCount(*args, **kwargs):
         return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs)
 
     def GetSupportedEncodingsCount(*args, **kwargs):


@@ -1159,40 +1260,39 @@ class FontMapper(object):
 
     GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
     def GetEncoding(*args, **kwargs):
 
     GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
     def GetEncoding(*args, **kwargs):

-        """FontMapper.GetEncoding(size_t n) -> wxFontEncoding"""
+        """FontMapper.GetEncoding(size_t n) -> int"""

         return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
     GetEncoding = staticmethod(GetEncoding)
     def GetEncodingName(*args, **kwargs):
         return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
     GetEncoding = staticmethod(GetEncoding)
     def GetEncodingName(*args, **kwargs):

-        """FontMapper.GetEncodingName(wxFontEncoding encoding) -> wxString"""
+        """FontMapper.GetEncodingName(int encoding) -> String"""

         return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
     GetEncodingName = staticmethod(GetEncodingName)
     def GetEncodingDescription(*args, **kwargs):
         return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
     GetEncodingName = staticmethod(GetEncodingName)
     def GetEncodingDescription(*args, **kwargs):

-        """FontMapper.GetEncodingDescription(wxFontEncoding encoding) -> wxString"""
+        """FontMapper.GetEncodingDescription(int encoding) -> String"""

         return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
     GetEncodingDescription = staticmethod(GetEncodingDescription)
     def SetConfig(*args, **kwargs):
         return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
     GetEncodingDescription = staticmethod(GetEncodingDescription)
     def SetConfig(*args, **kwargs):

-        """SetConfig(wxConfigBase config)"""
+        """SetConfig(ConfigBase config)"""

         return _gdi.FontMapper_SetConfig(*args, **kwargs)
 
     def SetConfigPath(*args, **kwargs):
         return _gdi.FontMapper_SetConfig(*args, **kwargs)
 
     def SetConfigPath(*args, **kwargs):

-        """SetConfigPath(wxString prefix)"""
+        """SetConfigPath(String prefix)"""

         return _gdi.FontMapper_SetConfigPath(*args, **kwargs)
 
     def GetDefaultConfigPath(*args, **kwargs):
         return _gdi.FontMapper_SetConfigPath(*args, **kwargs)
 
     def GetDefaultConfigPath(*args, **kwargs):

-        """FontMapper.GetDefaultConfigPath() -> wxString"""
+        """FontMapper.GetDefaultConfigPath() -> String"""

         return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
     GetDefaultConfigPath = staticmethod(GetDefaultConfigPath)
     def GetAltForEncoding(*args, **kwargs):
         return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
     GetDefaultConfigPath = staticmethod(GetDefaultConfigPath)
     def GetAltForEncoding(*args, **kwargs):

-        """GetAltForEncoding(wxFontEncoding encoding, wxString facename=wxPyEmptyString, 
-    bool interactive=True) -> PyObject"""
+        """GetAltForEncoding(int encoding, String facename=EmptyString, bool interactive=True) -> PyObject"""

         return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs)
 
     def IsEncodingAvailable(*args, **kwargs):
         return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs)
 
     def IsEncodingAvailable(*args, **kwargs):

-        """IsEncodingAvailable(wxFontEncoding encoding, wxString facename=wxPyEmptyString) -> bool"""
+        """IsEncodingAvailable(int encoding, String facename=EmptyString) -> bool"""

         return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs)
 
     def SetDialogParent(*args, **kwargs):
         return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs)
 
     def SetDialogParent(*args, **kwargs):


@@ -1200,7 +1300,7 @@ class FontMapper(object):
         return _gdi.FontMapper_SetDialogParent(*args, **kwargs)
 
     def SetDialogTitle(*args, **kwargs):
         return _gdi.FontMapper_SetDialogParent(*args, **kwargs)
 
     def SetDialogTitle(*args, **kwargs):

-        """SetDialogTitle(wxString title)"""
+        """SetDialogTitle(String title)"""

         return _gdi.FontMapper_SetDialogTitle(*args, **kwargs)
 
 
         return _gdi.FontMapper_SetDialogTitle(*args, **kwargs)
 
 


@@ -1224,31 +1324,32 @@ def FontMapper_GetSupportedEncodingsCount(*args, **kwargs):
     return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
 def FontMapper_GetEncoding(*args, **kwargs):
     return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
 def FontMapper_GetEncoding(*args, **kwargs):

-    """FontMapper_GetEncoding(size_t n) -> wxFontEncoding"""
+    """FontMapper_GetEncoding(size_t n) -> int"""

     return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
 def FontMapper_GetEncodingName(*args, **kwargs):
     return _gdi.FontMapper_GetEncoding(*args, **kwargs)
 
 def FontMapper_GetEncodingName(*args, **kwargs):

-    """FontMapper_GetEncodingName(wxFontEncoding encoding) -> wxString"""
+    """FontMapper_GetEncodingName(int encoding) -> String"""

     return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
 def FontMapper_GetEncodingDescription(*args, **kwargs):
     return _gdi.FontMapper_GetEncodingName(*args, **kwargs)
 
 def FontMapper_GetEncodingDescription(*args, **kwargs):

-    """FontMapper_GetEncodingDescription(wxFontEncoding encoding) -> wxString"""
+    """FontMapper_GetEncodingDescription(int encoding) -> String"""

     return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
 def FontMapper_GetDefaultConfigPath(*args, **kwargs):
     return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs)
 
 def FontMapper_GetDefaultConfigPath(*args, **kwargs):

-    """FontMapper_GetDefaultConfigPath() -> wxString"""
+    """FontMapper_GetDefaultConfigPath() -> String"""

     return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class Font(GDIObject):
     return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class Font(GDIObject):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFont instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFont instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(int pointSize, int family, int style, int weight, bool underline=False, 
-    wxString face=wxPyEmptyString, 
-    wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font"""
+        """
+        __init__(int pointSize, int family, int style, int weight, bool underline=False, 
+            String face=EmptyString, 
+            int encoding=FONTENCODING_DEFAULT) -> Font
+        """

         newobj = _gdi.new_Font(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_Font(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1293,11 +1394,11 @@ class Font(GDIObject):
         return _gdi.Font_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):
         return _gdi.Font_GetUnderlined(*args, **kwargs)
 
     def GetFaceName(*args, **kwargs):

-        """GetFaceName() -> wxString"""
+        """GetFaceName() -> String"""

         return _gdi.Font_GetFaceName(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):
         return _gdi.Font_GetFaceName(*args, **kwargs)
 
     def GetEncoding(*args, **kwargs):

-        """GetEncoding() -> wxFontEncoding"""
+        """GetEncoding() -> int"""

         return _gdi.Font_GetEncoding(*args, **kwargs)
 
     def GetNativeFontInfo(*args, **kwargs):
         return _gdi.Font_GetEncoding(*args, **kwargs)
 
     def GetNativeFontInfo(*args, **kwargs):


@@ -1309,11 +1410,11 @@ class Font(GDIObject):
         return _gdi.Font_IsFixedWidth(*args, **kwargs)
 
     def GetNativeFontInfoDesc(*args, **kwargs):
         return _gdi.Font_IsFixedWidth(*args, **kwargs)
 
     def GetNativeFontInfoDesc(*args, **kwargs):

-        """GetNativeFontInfoDesc() -> wxString"""
+        """GetNativeFontInfoDesc() -> String"""

         return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs)
 
     def GetNativeFontInfoUserDesc(*args, **kwargs):
         return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs)
 
     def GetNativeFontInfoUserDesc(*args, **kwargs):

-        """GetNativeFontInfoUserDesc() -> wxString"""
+        """GetNativeFontInfoUserDesc() -> String"""

         return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):
         return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs)
 
     def SetPointSize(*args, **kwargs):


@@ -1333,7 +1434,7 @@ class Font(GDIObject):
         return _gdi.Font_SetWeight(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):
         return _gdi.Font_SetWeight(*args, **kwargs)
 
     def SetFaceName(*args, **kwargs):

-        """SetFaceName(wxString faceName)"""
+        """SetFaceName(String faceName)"""

         return _gdi.Font_SetFaceName(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):
         return _gdi.Font_SetFaceName(*args, **kwargs)
 
     def SetUnderlined(*args, **kwargs):


@@ -1341,7 +1442,7 @@ class Font(GDIObject):
         return _gdi.Font_SetUnderlined(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):
         return _gdi.Font_SetUnderlined(*args, **kwargs)
 
     def SetEncoding(*args, **kwargs):

-        """SetEncoding(wxFontEncoding encoding)"""
+        """SetEncoding(int encoding)"""

         return _gdi.Font_SetEncoding(*args, **kwargs)
 
     def SetNativeFontInfo(*args, **kwargs):
         return _gdi.Font_SetEncoding(*args, **kwargs)
 
     def SetNativeFontInfo(*args, **kwargs):


@@ -1349,23 +1450,23 @@ class Font(GDIObject):
         return _gdi.Font_SetNativeFontInfo(*args, **kwargs)
 
     def SetNativeFontInfoFromString(*args, **kwargs):
         return _gdi.Font_SetNativeFontInfo(*args, **kwargs)
 
     def SetNativeFontInfoFromString(*args, **kwargs):

-        """SetNativeFontInfoFromString(wxString info)"""
+        """SetNativeFontInfoFromString(String info)"""

         return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs)
 
     def SetNativeFontInfoUserDesc(*args, **kwargs):
         return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs)
 
     def SetNativeFontInfoUserDesc(*args, **kwargs):

-        """SetNativeFontInfoUserDesc(wxString info)"""
+        """SetNativeFontInfoUserDesc(String info)"""

         return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs)
 
     def GetFamilyString(*args, **kwargs):
         return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs)
 
     def GetFamilyString(*args, **kwargs):

-        """GetFamilyString() -> wxString"""
+        """GetFamilyString() -> String"""

         return _gdi.Font_GetFamilyString(*args, **kwargs)
 
     def GetStyleString(*args, **kwargs):
         return _gdi.Font_GetFamilyString(*args, **kwargs)
 
     def GetStyleString(*args, **kwargs):

-        """GetStyleString() -> wxString"""
+        """GetStyleString() -> String"""

         return _gdi.Font_GetStyleString(*args, **kwargs)
 
     def GetWeightString(*args, **kwargs):
         return _gdi.Font_GetStyleString(*args, **kwargs)
 
     def GetWeightString(*args, **kwargs):

-        """GetWeightString() -> wxString"""
+        """GetWeightString() -> String"""

         return _gdi.Font_GetWeightString(*args, **kwargs)
 
     def SetNoAntiAliasing(*args, **kwargs):
         return _gdi.Font_GetWeightString(*args, **kwargs)
 
     def SetNoAntiAliasing(*args, **kwargs):


@@ -1377,12 +1478,12 @@ class Font(GDIObject):
         return _gdi.Font_GetNoAntiAliasing(*args, **kwargs)
 
     def GetDefaultEncoding(*args, **kwargs):
         return _gdi.Font_GetNoAntiAliasing(*args, **kwargs)
 
     def GetDefaultEncoding(*args, **kwargs):

-        """Font.GetDefaultEncoding() -> wxFontEncoding"""
+        """Font.GetDefaultEncoding() -> int"""

         return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
     GetDefaultEncoding = staticmethod(GetDefaultEncoding)
     def SetDefaultEncoding(*args, **kwargs):
         return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
     GetDefaultEncoding = staticmethod(GetDefaultEncoding)
     def SetDefaultEncoding(*args, **kwargs):

-        """Font.SetDefaultEncoding(wxFontEncoding encoding)"""
+        """Font.SetDefaultEncoding(int encoding)"""

         return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
     SetDefaultEncoding = staticmethod(SetDefaultEncoding)
         return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
     SetDefaultEncoding = staticmethod(SetDefaultEncoding)


@@ -1401,30 +1502,31 @@ def FontFromNativeInfo(*args, **kwargs):
     return val
 
 def FontFromNativeInfoString(*args, **kwargs):
     return val
 
 def FontFromNativeInfoString(*args, **kwargs):

-    """FontFromNativeInfoString(wxString info) -> Font"""
+    """FontFromNativeInfoString(String info) -> Font"""

     val = _gdi.new_FontFromNativeInfoString(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font2(*args, **kwargs):
     val = _gdi.new_FontFromNativeInfoString(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font2(*args, **kwargs):

-    """Font2(int pointSize, wxFontFamily family, int flags=FONTFLAG_DEFAULT, 
-    wxString face=wxPyEmptyString, wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font"""
+    """
+    Font2(int pointSize, int family, int flags=FONTFLAG_DEFAULT, 
+        String face=EmptyString, int encoding=FONTENCODING_DEFAULT) -> Font
+    """

     val = _gdi.new_Font2(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font_GetDefaultEncoding(*args, **kwargs):
     val = _gdi.new_Font2(*args, **kwargs)
     val.thisown = 1
     return val
 
 def Font_GetDefaultEncoding(*args, **kwargs):

-    """Font_GetDefaultEncoding() -> wxFontEncoding"""
+    """Font_GetDefaultEncoding() -> int"""

     return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
 def Font_SetDefaultEncoding(*args, **kwargs):
     return _gdi.Font_GetDefaultEncoding(*args, **kwargs)
 
 def Font_SetDefaultEncoding(*args, **kwargs):

-    """Font_SetDefaultEncoding(wxFontEncoding encoding)"""
+    """Font_SetDefaultEncoding(int encoding)"""

     return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class FontEnumerator(object):
     return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class FontEnumerator(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyFontEnumerator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyFontEnumerator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1446,11 +1548,11 @@ class FontEnumerator(object):
         return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs)
 
     def EnumerateFacenames(*args, **kwargs):
         return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs)
 
     def EnumerateFacenames(*args, **kwargs):

-        """EnumerateFacenames(wxFontEncoding encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool"""
+        """EnumerateFacenames(int encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool"""

         return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs)
 
     def EnumerateEncodings(*args, **kwargs):
         return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs)
 
     def EnumerateEncodings(*args, **kwargs):

-        """EnumerateEncodings(wxString facename=wxPyEmptyString) -> bool"""
+        """EnumerateEncodings(String facename=EmptyString) -> bool"""

         return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs)
 
     def GetEncodings(*args, **kwargs):
         return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs)
 
     def GetEncodings(*args, **kwargs):


@@ -1703,7 +1805,6 @@ LANGUAGE_ZHUANG = _gdi.LANGUAGE_ZHUANG
 LANGUAGE_ZULU = _gdi.LANGUAGE_ZULU
 LANGUAGE_USER_DEFINED = _gdi.LANGUAGE_USER_DEFINED
 class LanguageInfo(object):
 LANGUAGE_ZULU = _gdi.LANGUAGE_ZULU
 LANGUAGE_USER_DEFINED = _gdi.LANGUAGE_USER_DEFINED
 class LanguageInfo(object):

-    """"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLanguageInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLanguageInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -1727,7 +1828,6 @@ LOCALE_DECIMAL_POINT = _gdi.LOCALE_DECIMAL_POINT
 LOCALE_LOAD_DEFAULT = _gdi.LOCALE_LOAD_DEFAULT
 LOCALE_CONV_ENCODING = _gdi.LOCALE_CONV_ENCODING
 class Locale(object):
 LOCALE_LOAD_DEFAULT = _gdi.LOCALE_LOAD_DEFAULT
 LOCALE_CONV_ENCODING = _gdi.LOCALE_CONV_ENCODING
 class Locale(object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1743,9 +1843,11 @@ class Locale(object):
         except: pass
 
     def Init1(*args, **kwargs):
         except: pass
 
     def Init1(*args, **kwargs):

-        """Init1(wxString szName, wxString szShort=wxPyEmptyString, 
-    wxString szLocale=wxPyEmptyString, bool bLoadDefault=True, 
-    bool bConvertEncoding=False) -> bool"""
+        """
+        Init1(String szName, String szShort=EmptyString, String szLocale=EmptyString, 
+            bool bLoadDefault=True, 
+            bool bConvertEncoding=False) -> bool
+        """

         return _gdi.Locale_Init1(*args, **kwargs)
 
     def Init2(*args, **kwargs):
         return _gdi.Locale_Init1(*args, **kwargs)
 
     def Init2(*args, **kwargs):


@@ -1765,12 +1867,12 @@ class Locale(object):
 
     GetSystemLanguage = staticmethod(GetSystemLanguage)
     def GetSystemEncoding(*args, **kwargs):
 
     GetSystemLanguage = staticmethod(GetSystemLanguage)
     def GetSystemEncoding(*args, **kwargs):

-        """Locale.GetSystemEncoding() -> wxFontEncoding"""
+        """Locale.GetSystemEncoding() -> int"""

         return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
     GetSystemEncoding = staticmethod(GetSystemEncoding)
     def GetSystemEncodingName(*args, **kwargs):
         return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
     GetSystemEncoding = staticmethod(GetSystemEncoding)
     def GetSystemEncodingName(*args, **kwargs):

-        """Locale.GetSystemEncodingName() -> wxString"""
+        """Locale.GetSystemEncodingName() -> String"""

         return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
     GetSystemEncodingName = staticmethod(GetSystemEncodingName)
         return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
     GetSystemEncodingName = staticmethod(GetSystemEncodingName)


@@ -1780,7 +1882,7 @@ class Locale(object):
 
     def __nonzero__(self): return self.IsOk() 
     def GetLocale(*args, **kwargs):
 
     def __nonzero__(self): return self.IsOk() 
     def GetLocale(*args, **kwargs):

-        """GetLocale() -> wxString"""
+        """GetLocale() -> String"""

         return _gdi.Locale_GetLocale(*args, **kwargs)
 
     def GetLanguage(*args, **kwargs):
         return _gdi.Locale_GetLocale(*args, **kwargs)
 
     def GetLanguage(*args, **kwargs):


@@ -1788,24 +1890,24 @@ class Locale(object):
         return _gdi.Locale_GetLanguage(*args, **kwargs)
 
     def GetSysName(*args, **kwargs):
         return _gdi.Locale_GetLanguage(*args, **kwargs)
 
     def GetSysName(*args, **kwargs):

-        """GetSysName() -> wxString"""
+        """GetSysName() -> String"""

         return _gdi.Locale_GetSysName(*args, **kwargs)
 
     def GetCanonicalName(*args, **kwargs):
         return _gdi.Locale_GetSysName(*args, **kwargs)
 
     def GetCanonicalName(*args, **kwargs):

-        """GetCanonicalName() -> wxString"""
+        """GetCanonicalName() -> String"""

         return _gdi.Locale_GetCanonicalName(*args, **kwargs)
 
     def AddCatalogLookupPathPrefix(*args, **kwargs):
         return _gdi.Locale_GetCanonicalName(*args, **kwargs)
 
     def AddCatalogLookupPathPrefix(*args, **kwargs):

-        """Locale.AddCatalogLookupPathPrefix(wxString prefix)"""
+        """Locale.AddCatalogLookupPathPrefix(String prefix)"""

         return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
     AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
     def AddCatalog(*args, **kwargs):
         return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
     AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
     def AddCatalog(*args, **kwargs):

-        """AddCatalog(wxString szDomain) -> bool"""
+        """AddCatalog(String szDomain) -> bool"""

         return _gdi.Locale_AddCatalog(*args, **kwargs)
 
     def IsLoaded(*args, **kwargs):
         return _gdi.Locale_AddCatalog(*args, **kwargs)
 
     def IsLoaded(*args, **kwargs):

-        """IsLoaded(wxString szDomain) -> bool"""
+        """IsLoaded(String szDomain) -> bool"""

         return _gdi.Locale_IsLoaded(*args, **kwargs)
 
     def GetLanguageInfo(*args, **kwargs):
         return _gdi.Locale_IsLoaded(*args, **kwargs)
 
     def GetLanguageInfo(*args, **kwargs):


@@ -1814,12 +1916,12 @@ class Locale(object):
 
     GetLanguageInfo = staticmethod(GetLanguageInfo)
     def GetLanguageName(*args, **kwargs):
 
     GetLanguageInfo = staticmethod(GetLanguageInfo)
     def GetLanguageName(*args, **kwargs):

-        """Locale.GetLanguageName(int lang) -> wxString"""
+        """Locale.GetLanguageName(int lang) -> String"""

         return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
     GetLanguageName = staticmethod(GetLanguageName)
     def FindLanguageInfo(*args, **kwargs):
         return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
     GetLanguageName = staticmethod(GetLanguageName)
     def FindLanguageInfo(*args, **kwargs):

-        """Locale.FindLanguageInfo(wxString locale) -> LanguageInfo"""
+        """Locale.FindLanguageInfo(String locale) -> LanguageInfo"""

         return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
     FindLanguageInfo = staticmethod(FindLanguageInfo)
         return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
     FindLanguageInfo = staticmethod(FindLanguageInfo)


@@ -1829,11 +1931,11 @@ class Locale(object):
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):

-        """GetString(wxString szOrigString, wxString szDomain=wxPyEmptyString) -> wxString"""
+        """GetString(String szOrigString, String szDomain=EmptyString) -> String"""

         return _gdi.Locale_GetString(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _gdi.Locale_GetString(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _gdi.Locale_GetName(*args, **kwargs)
 
 
         return _gdi.Locale_GetName(*args, **kwargs)
 
 


@@ -1849,15 +1951,15 @@ def Locale_GetSystemLanguage(*args, **kwargs):
     return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
 def Locale_GetSystemEncoding(*args, **kwargs):
     return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
 def Locale_GetSystemEncoding(*args, **kwargs):

-    """Locale_GetSystemEncoding() -> wxFontEncoding"""
+    """Locale_GetSystemEncoding() -> int"""

     return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
 def Locale_GetSystemEncodingName(*args, **kwargs):
     return _gdi.Locale_GetSystemEncoding(*args, **kwargs)
 
 def Locale_GetSystemEncodingName(*args, **kwargs):

-    """Locale_GetSystemEncodingName() -> wxString"""
+    """Locale_GetSystemEncodingName() -> String"""

     return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
 def Locale_AddCatalogLookupPathPrefix(*args, **kwargs):
     return _gdi.Locale_GetSystemEncodingName(*args, **kwargs)
 
 def Locale_AddCatalogLookupPathPrefix(*args, **kwargs):

-    """Locale_AddCatalogLookupPathPrefix(wxString prefix)"""
+    """Locale_AddCatalogLookupPathPrefix(String prefix)"""

     return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
 def Locale_GetLanguageInfo(*args, **kwargs):
     return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs)
 
 def Locale_GetLanguageInfo(*args, **kwargs):


@@ -1865,11 +1967,11 @@ def Locale_GetLanguageInfo(*args, **kwargs):
     return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
 def Locale_GetLanguageName(*args, **kwargs):
     return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
 def Locale_GetLanguageName(*args, **kwargs):

-    """Locale_GetLanguageName(int lang) -> wxString"""
+    """Locale_GetLanguageName(int lang) -> String"""

     return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
 def Locale_FindLanguageInfo(*args, **kwargs):
     return _gdi.Locale_GetLanguageName(*args, **kwargs)
 
 def Locale_FindLanguageInfo(*args, **kwargs):

-    """Locale_FindLanguageInfo(wxString locale) -> LanguageInfo"""
+    """Locale_FindLanguageInfo(String locale) -> LanguageInfo"""

     return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
 def Locale_AddLanguage(*args, **kwargs):
     return _gdi.Locale_FindLanguageInfo(*args, **kwargs)
 
 def Locale_AddLanguage(*args, **kwargs):


@@ -1890,7 +1992,6 @@ PLATFORM_WINDOWS = _gdi.PLATFORM_WINDOWS
 PLATFORM_OS2 = _gdi.PLATFORM_OS2
 PLATFORM_MAC = _gdi.PLATFORM_MAC
 class EncodingConverter(core.Object):
 PLATFORM_OS2 = _gdi.PLATFORM_OS2
 PLATFORM_MAC = _gdi.PLATFORM_MAC
 class EncodingConverter(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxEncodingConverter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxEncodingConverter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1906,26 +2007,25 @@ class EncodingConverter(core.Object):
         except: pass
 
     def Init(*args, **kwargs):
         except: pass
 
     def Init(*args, **kwargs):

-        """Init(wxFontEncoding input_enc, wxFontEncoding output_enc, 
-    int method=CONVERT_STRICT) -> bool"""
+        """Init(int input_enc, int output_enc, int method=CONVERT_STRICT) -> bool"""

         return _gdi.EncodingConverter_Init(*args, **kwargs)
 
     def Convert(*args, **kwargs):
         return _gdi.EncodingConverter_Init(*args, **kwargs)
 
     def Convert(*args, **kwargs):

-        """Convert(wxString input) -> wxString"""
+        """Convert(String input) -> String"""

         return _gdi.EncodingConverter_Convert(*args, **kwargs)
 
     def GetPlatformEquivalents(*args, **kwargs):
         return _gdi.EncodingConverter_Convert(*args, **kwargs)
 
     def GetPlatformEquivalents(*args, **kwargs):

-        """EncodingConverter.GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""
+        """EncodingConverter.GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""

         return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
     GetPlatformEquivalents = staticmethod(GetPlatformEquivalents)
     def GetAllEquivalents(*args, **kwargs):
         return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
     GetPlatformEquivalents = staticmethod(GetPlatformEquivalents)
     def GetAllEquivalents(*args, **kwargs):

-        """EncodingConverter.GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray"""
+        """EncodingConverter.GetAllEquivalents(int enc) -> wxFontEncodingArray"""

         return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
     GetAllEquivalents = staticmethod(GetAllEquivalents)
     def CanConvert(*args, **kwargs):
         return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
     GetAllEquivalents = staticmethod(GetAllEquivalents)
     def CanConvert(*args, **kwargs):

-        """EncodingConverter.CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool"""
+        """EncodingConverter.CanConvert(int encIn, int encOut) -> bool"""

         return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
     CanConvert = staticmethod(CanConvert)
         return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
     CanConvert = staticmethod(CanConvert)


@@ -1939,20 +2039,22 @@ class EncodingConverterPtr(EncodingConverter):
 _gdi.EncodingConverter_swigregister(EncodingConverterPtr)
 
 def GetTranslation(*args):
 _gdi.EncodingConverter_swigregister(EncodingConverterPtr)
 
 def GetTranslation(*args):

-    """GetTranslation(wxString sz) -> wxString
-GetTranslation(wxString sz1, wxString sz2, size_t n) -> wxString"""
+    """
+    GetTranslation(String sz) -> String
+    GetTranslation(String sz1, String sz2, size_t n) -> String
+    """

     return _gdi.GetTranslation(*args)
 
 def EncodingConverter_GetPlatformEquivalents(*args, **kwargs):
     return _gdi.GetTranslation(*args)
 
 def EncodingConverter_GetPlatformEquivalents(*args, **kwargs):

-    """EncodingConverter_GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""
+    """EncodingConverter_GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray"""

     return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
 def EncodingConverter_GetAllEquivalents(*args, **kwargs):
     return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs)
 
 def EncodingConverter_GetAllEquivalents(*args, **kwargs):

-    """EncodingConverter_GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray"""
+    """EncodingConverter_GetAllEquivalents(int enc) -> wxFontEncodingArray"""

     return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
 def EncodingConverter_CanConvert(*args, **kwargs):
     return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs)
 
 def EncodingConverter_CanConvert(*args, **kwargs):

-    """EncodingConverter_CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool"""
+    """EncodingConverter_CanConvert(int encIn, int encOut) -> bool"""

     return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
 #----------------------------------------------------------------------------
     return _gdi.EncodingConverter_CanConvert(*args, **kwargs)
 
 #----------------------------------------------------------------------------


@@ -1978,7 +2080,6 @@ if wx.Platform == "__WXMSW__":
 #---------------------------------------------------------------------------
 
 class DC(core.Object):
 #---------------------------------------------------------------------------
 
 class DC(core.Object):

-    """"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -2121,30 +2222,34 @@ class DC(core.Object):
         return _gdi.DC_DrawBitmap(*args, **kwargs)
 
     def DrawTextXY(*args, **kwargs):
         return _gdi.DC_DrawBitmap(*args, **kwargs)
 
     def DrawTextXY(*args, **kwargs):

-        """DrawTextXY(wxString text, int x, int y)"""
+        """DrawTextXY(String text, int x, int y)"""

         return _gdi.DC_DrawTextXY(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
         return _gdi.DC_DrawTextXY(*args, **kwargs)
 
     def DrawText(*args, **kwargs):

-        """DrawText(wxString text, Point pt)"""
+        """DrawText(String text, Point pt)"""

         return _gdi.DC_DrawText(*args, **kwargs)
 
     def DrawRotatedTextXY(*args, **kwargs):
         return _gdi.DC_DrawText(*args, **kwargs)
 
     def DrawRotatedTextXY(*args, **kwargs):

-        """DrawRotatedTextXY(wxString text, int x, int y, double angle)"""
+        """DrawRotatedTextXY(String text, int x, int y, double angle)"""

         return _gdi.DC_DrawRotatedTextXY(*args, **kwargs)
 
     def DrawRotatedText(*args, **kwargs):
         return _gdi.DC_DrawRotatedTextXY(*args, **kwargs)
 
     def DrawRotatedText(*args, **kwargs):

-        """DrawRotatedText(wxString text, Point pt, double angle)"""
+        """DrawRotatedText(String text, Point pt, double angle)"""

         return _gdi.DC_DrawRotatedText(*args, **kwargs)
 
     def BlitXY(*args, **kwargs):
         return _gdi.DC_DrawRotatedText(*args, **kwargs)
 
     def BlitXY(*args, **kwargs):

-        """BlitXY(int xdest, int ydest, int width, int height, DC source, 
-    int xsrc, int ysrc, int rop=COPY, bool useMask=False, 
-    int xsrcMask=-1, int ysrcMask=-1) -> bool"""
+        """
+        BlitXY(int xdest, int ydest, int width, int height, DC source, 
+            int xsrc, int ysrc, int rop=COPY, bool useMask=False, 
+            int xsrcMask=-1, int ysrcMask=-1) -> bool
+        """

         return _gdi.DC_BlitXY(*args, **kwargs)
 
     def Blit(*args, **kwargs):
         return _gdi.DC_BlitXY(*args, **kwargs)
 
     def Blit(*args, **kwargs):

-        """Blit(Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, 
-    bool useMask=False, Point srcPtMask=DefaultPosition) -> bool"""
+        """
+        Blit(Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, 
+            bool useMask=False, Point srcPtMask=DefaultPosition) -> bool
+        """

         return _gdi.DC_Blit(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):
         return _gdi.DC_Blit(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):


@@ -2152,18 +2257,24 @@ class DC(core.Object):
         return _gdi.DC_DrawLines(*args, **kwargs)
 
     def DrawPolygon(*args, **kwargs):
         return _gdi.DC_DrawLines(*args, **kwargs)
 
     def DrawPolygon(*args, **kwargs):

-        """DrawPolygon(int points, Point points_array, int xoffset=0, int yoffset=0, 
-    int fillStyle=ODDEVEN_RULE)"""
+        """
+        DrawPolygon(int points, Point points_array, int xoffset=0, int yoffset=0, 
+            int fillStyle=ODDEVEN_RULE)
+        """

         return _gdi.DC_DrawPolygon(*args, **kwargs)
 
     def DrawLabel(*args, **kwargs):
         return _gdi.DC_DrawPolygon(*args, **kwargs)
 
     def DrawLabel(*args, **kwargs):

-        """DrawLabel(wxString text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
-    int indexAccel=-1)"""
+        """
+        DrawLabel(String text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+            int indexAccel=-1)
+        """

         return _gdi.DC_DrawLabel(*args, **kwargs)
 
     def DrawImageLabel(*args, **kwargs):
         return _gdi.DC_DrawLabel(*args, **kwargs)
 
     def DrawImageLabel(*args, **kwargs):

-        """DrawImageLabel(wxString text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
-    int indexAccel=-1) -> Rect"""
+        """
+        DrawImageLabel(String text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+            int indexAccel=-1) -> Rect
+        """

         return _gdi.DC_DrawImageLabel(*args, **kwargs)
 
     def DrawSpline(*args, **kwargs):
         return _gdi.DC_DrawImageLabel(*args, **kwargs)
 
     def DrawSpline(*args, **kwargs):


@@ -2175,7 +2286,7 @@ class DC(core.Object):
         return _gdi.DC_Clear(*args, **kwargs)
 
     def StartDoc(*args, **kwargs):
         return _gdi.DC_Clear(*args, **kwargs)
 
     def StartDoc(*args, **kwargs):

-        """StartDoc(wxString message) -> bool"""
+        """StartDoc(String message) -> bool"""

         return _gdi.DC_StartDoc(*args, **kwargs)
 
     def EndDoc(*args, **kwargs):
         return _gdi.DC_StartDoc(*args, **kwargs)
 
     def EndDoc(*args, **kwargs):


@@ -2214,8 +2325,12 @@ class DC(core.Object):
         """SetPalette(Palette palette)"""
         return _gdi.DC_SetPalette(*args, **kwargs)
 
         """SetPalette(Palette palette)"""
         return _gdi.DC_SetPalette(*args, **kwargs)
 

+    def SetClippingRegionXY(*args, **kwargs):
+        """SetClippingRegionXY(int x, int y, int width, int height)"""
+        return _gdi.DC_SetClippingRegionXY(*args, **kwargs)
+

     def SetClippingRegion(*args, **kwargs):
     def SetClippingRegion(*args, **kwargs):

-        """SetClippingRegion(int x, int y, int width, int height)"""
+        """SetClippingRegion(Point pt, Size sz)"""

         return _gdi.DC_SetClippingRegion(*args, **kwargs)
 
     def SetClippingRect(*args, **kwargs):
         return _gdi.DC_SetClippingRegion(*args, **kwargs)
 
     def SetClippingRect(*args, **kwargs):


@@ -2231,7 +2346,7 @@ class DC(core.Object):
         return _gdi.DC_DestroyClippingRegion(*args, **kwargs)
 
     def GetClippingBox(*args, **kwargs):
         return _gdi.DC_DestroyClippingRegion(*args, **kwargs)
 
     def GetClippingBox(*args, **kwargs):

-        """GetClippingBox(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
+        """GetClippingBox() -> (x, y, width, height)"""

         return _gdi.DC_GetClippingBox(*args, **kwargs)
 
     def GetClippingRect(*args, **kwargs):
         return _gdi.DC_GetClippingBox(*args, **kwargs)
 
     def GetClippingRect(*args, **kwargs):


@@ -2247,35 +2362,66 @@ class DC(core.Object):
         return _gdi.DC_GetCharWidth(*args, **kwargs)
 
     def GetTextExtent(*args, **kwargs):
         return _gdi.DC_GetCharWidth(*args, **kwargs)
 
     def GetTextExtent(*args, **kwargs):

-        """GetTextExtent(wxString string, int OUTPUT, int OUTPUT)"""
+        """
+        GetTextExtent(wxString string) -> (width, height)
+
+        Get the width and height of the text using the current font.
+        Only works for single line strings.
+        """

         return _gdi.DC_GetTextExtent(*args, **kwargs)
 
     def GetFullTextExtent(*args, **kwargs):
         return _gdi.DC_GetTextExtent(*args, **kwargs)
 
     def GetFullTextExtent(*args, **kwargs):

-        """GetFullTextExtent(wxString string, int OUTPUT, int OUTPUT, int OUTPUT, 
-    int OUTPUT, Font font=None)"""
+        """
+        GetFullTextExtent(wxString string, Font font=None) ->
+           (width, height, descent, externalLeading)
+
+        Get the width, height, decent and leading of the text using the current or specified font.
+        Only works for single line strings.
+        """

         return _gdi.DC_GetFullTextExtent(*args, **kwargs)
 
     def GetMultiLineTextExtent(*args, **kwargs):
         return _gdi.DC_GetFullTextExtent(*args, **kwargs)
 
     def GetMultiLineTextExtent(*args, **kwargs):

-        """GetMultiLineTextExtent(wxString text, int OUTPUT, int OUTPUT, int OUTPUT, 
-    Font font=None)"""
-        return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
+        """
+        GetMultiLineTextExtent(wxString string, Font font=None) ->
+           (width, height, descent, externalLeading)

 
 

-    def GetSizeTuple(*args, **kwargs):
-        """GetSizeTuple(int OUTPUT, int OUTPUT)"""
-        return _gdi.DC_GetSizeTuple(*args, **kwargs)
+        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.
+        """
+        return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)

 
     def GetSize(*args, **kwargs):
 
     def GetSize(*args, **kwargs):

-        """GetSize() -> Size"""
+        """
+        GetSize() -> Size
+
+        Get the DC size in device units.
+        """

         return _gdi.DC_GetSize(*args, **kwargs)
 
         return _gdi.DC_GetSize(*args, **kwargs)
 

-    def GetSizeMMWH(*args, **kwargs):
-        """GetSizeMMWH(int OUTPUT, int OUTPUT)"""
-        return _gdi.DC_GetSizeMMWH(*args, **kwargs)
+    def GetSizeTuple(*args, **kwargs):
+        """
+        GetSizeTuple() -> (width, height)
+
+        Get the DC size in device units.
+        """
+        return _gdi.DC_GetSizeTuple(*args, **kwargs)

 
     def GetSizeMM(*args, **kwargs):
 
     def GetSizeMM(*args, **kwargs):

-        """GetSizeMM() -> Size"""
+        """
+        GetSizeMM() -> Size
+
+        Get the DC size in milimeters.
+        """

         return _gdi.DC_GetSizeMM(*args, **kwargs)
 
         return _gdi.DC_GetSizeMM(*args, **kwargs)
 

+    def GetSizeMMTuple(*args, **kwargs):
+        """
+        GetSizeMMTuple() -> (width, height)
+
+        Get the DC size in milimeters.
+        """
+        return _gdi.DC_GetSizeMMTuple(*args, **kwargs)
+

     def DeviceToLogicalX(*args, **kwargs):
         """DeviceToLogicalX(int x) -> int"""
         return _gdi.DC_DeviceToLogicalX(*args, **kwargs)
     def DeviceToLogicalX(*args, **kwargs):
         """DeviceToLogicalX(int x) -> int"""
         return _gdi.DC_DeviceToLogicalX(*args, **kwargs)


@@ -2373,7 +2519,7 @@ class DC(core.Object):
         return _gdi.DC_SetMapMode(*args, **kwargs)
 
     def GetUserScale(*args, **kwargs):
         return _gdi.DC_SetMapMode(*args, **kwargs)
 
     def GetUserScale(*args, **kwargs):

-        """GetUserScale(double OUTPUT, double OUTPUT)"""
+        """GetUserScale() -> (xScale, yScale)"""

         return _gdi.DC_GetUserScale(*args, **kwargs)
 
     def SetUserScale(*args, **kwargs):
         return _gdi.DC_GetUserScale(*args, **kwargs)
 
     def SetUserScale(*args, **kwargs):


@@ -2381,33 +2527,33 @@ class DC(core.Object):
         return _gdi.DC_SetUserScale(*args, **kwargs)
 
     def GetLogicalScale(*args, **kwargs):
         return _gdi.DC_SetUserScale(*args, **kwargs)
 
     def GetLogicalScale(*args, **kwargs):

-        """GetLogicalScale(double OUTPUT, double OUTPUT)"""
+        """GetLogicalScale() -> (xScale, yScale)"""

         return _gdi.DC_GetLogicalScale(*args, **kwargs)
 
     def SetLogicalScale(*args, **kwargs):
         """SetLogicalScale(double x, double y)"""
         return _gdi.DC_SetLogicalScale(*args, **kwargs)
 
         return _gdi.DC_GetLogicalScale(*args, **kwargs)
 
     def SetLogicalScale(*args, **kwargs):
         """SetLogicalScale(double x, double y)"""
         return _gdi.DC_SetLogicalScale(*args, **kwargs)
 

-    def GetLogicalOriginTuple(*args, **kwargs):
-        """GetLogicalOriginTuple(int OUTPUT, int OUTPUT)"""
-        return _gdi.DC_GetLogicalOriginTuple(*args, **kwargs)
-

     def GetLogicalOrigin(*args, **kwargs):
         """GetLogicalOrigin() -> Point"""
         return _gdi.DC_GetLogicalOrigin(*args, **kwargs)
 
     def GetLogicalOrigin(*args, **kwargs):
         """GetLogicalOrigin() -> Point"""
         return _gdi.DC_GetLogicalOrigin(*args, **kwargs)
 

+    def GetLogicalOriginTuple(*args, **kwargs):
+        """GetLogicalOriginTuple() -> (x,y)"""
+        return _gdi.DC_GetLogicalOriginTuple(*args, **kwargs)
+

     def SetLogicalOrigin(*args, **kwargs):
         """SetLogicalOrigin(int x, int y)"""
         return _gdi.DC_SetLogicalOrigin(*args, **kwargs)
 
     def SetLogicalOrigin(*args, **kwargs):
         """SetLogicalOrigin(int x, int y)"""
         return _gdi.DC_SetLogicalOrigin(*args, **kwargs)
 

-    def GetDeviceOriginTuple(*args, **kwargs):
-        """GetDeviceOriginTuple(int OUTPUT, int OUTPUT)"""
-        return _gdi.DC_GetDeviceOriginTuple(*args, **kwargs)
-

     def GetDeviceOrigin(*args, **kwargs):
         """GetDeviceOrigin() -> Point"""
         return _gdi.DC_GetDeviceOrigin(*args, **kwargs)
 
     def GetDeviceOrigin(*args, **kwargs):
         """GetDeviceOrigin() -> Point"""
         return _gdi.DC_GetDeviceOrigin(*args, **kwargs)
 

+    def GetDeviceOriginTuple(*args, **kwargs):
+        """GetDeviceOriginTuple() -> (x,y)"""
+        return _gdi.DC_GetDeviceOriginTuple(*args, **kwargs)
+

     def SetDeviceOrigin(*args, **kwargs):
         """SetDeviceOrigin(int x, int y)"""
         return _gdi.DC_SetDeviceOrigin(*args, **kwargs)
     def SetDeviceOrigin(*args, **kwargs):
         """SetDeviceOrigin(int x, int y)"""
         return _gdi.DC_SetDeviceOrigin(*args, **kwargs)


@@ -2457,7 +2603,7 @@ class DC(core.Object):
         return _gdi.DC_MaxY(*args, **kwargs)
 
     def GetBoundingBox(*args, **kwargs):
         return _gdi.DC_MaxY(*args, **kwargs)
 
     def GetBoundingBox(*args, **kwargs):

-        """GetBoundingBox(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
+        """GetBoundingBox() -> (x1,y1, x2,y2)"""

         return _gdi.DC_GetBoundingBox(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
         return _gdi.DC_GetBoundingBox(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 


@@ -2482,8 +2628,10 @@ class DC(core.Object):
         return _gdi.DC__DrawPolygonList(*args, **kwargs)
 
     def _DrawTextList(*args, **kwargs):
         return _gdi.DC__DrawPolygonList(*args, **kwargs)
 
     def _DrawTextList(*args, **kwargs):

-        """_DrawTextList(PyObject textList, PyObject pyPoints, PyObject foregroundList, 
-    PyObject backgroundList) -> PyObject"""
+        """
+        _DrawTextList(PyObject textList, PyObject pyPoints, PyObject foregroundList, 
+            PyObject backgroundList) -> PyObject
+        """

         return _gdi.DC__DrawTextList(*args, **kwargs)
 
     def DrawPointList(self, points, pens=None):
         return _gdi.DC__DrawTextList(*args, **kwargs)
 
     def DrawPointList(self, points, pens=None):


@@ -2566,13 +2714,13 @@ class DC(core.Object):
            raise ValueError('textlist and coords must have same length')
         if foregrounds is None:
            foregrounds = []
            raise ValueError('textlist and coords must have same length')
         if foregrounds is None:
            foregrounds = []

-        elif isinstance(foregrounds, wxColour):
+        elif isinstance(foregrounds, wx.Colour):

            foregrounds = [foregrounds]
         elif len(foregrounds) != len(coords):
            raise ValueError('foregrounds and coords must have same length')
         if backgrounds is None:
            backgrounds = []
            foregrounds = [foregrounds]
         elif len(foregrounds) != len(coords):
            raise ValueError('foregrounds and coords must have same length')
         if backgrounds is None:
            backgrounds = []

-        elif isinstance(backgrounds, wxColour):
+        elif isinstance(backgrounds, wx.Colour):

            backgrounds = [backgrounds]
         elif len(backgrounds) != len(coords):
            raise ValueError('backgrounds and coords must have same length')
            backgrounds = [backgrounds]
         elif len(backgrounds) != len(coords):
            raise ValueError('backgrounds and coords must have same length')


@@ -2589,7 +2737,6 @@ _gdi.DC_swigregister(DCPtr)
 #---------------------------------------------------------------------------
 
 class MemoryDC(DC):
 #---------------------------------------------------------------------------
 
 class MemoryDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMemoryDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMemoryDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2619,7 +2766,6 @@ def MemoryDCFromDC(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class BufferedDC(MemoryDC):
 #---------------------------------------------------------------------------
 
 class BufferedDC(MemoryDC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2650,7 +2796,6 @@ def BufferedDCInternalBuffer(*args, **kwargs):
     return val
 
 class BufferedPaintDC(BufferedDC):
     return val
 
 class BufferedPaintDC(BufferedDC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2670,7 +2815,6 @@ _gdi.BufferedPaintDC_swigregister(BufferedPaintDCPtr)
 #---------------------------------------------------------------------------
 
 class ScreenDC(DC):
 #---------------------------------------------------------------------------
 
 class ScreenDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxScreenDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxScreenDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2702,7 +2846,6 @@ _gdi.ScreenDC_swigregister(ScreenDCPtr)
 #---------------------------------------------------------------------------
 
 class ClientDC(DC):
 #---------------------------------------------------------------------------
 
 class ClientDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxClientDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxClientDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2722,7 +2865,6 @@ _gdi.ClientDC_swigregister(ClientDCPtr)
 #---------------------------------------------------------------------------
 
 class PaintDC(DC):
 #---------------------------------------------------------------------------
 
 class PaintDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2742,7 +2884,6 @@ _gdi.PaintDC_swigregister(PaintDCPtr)
 #---------------------------------------------------------------------------
 
 class WindowDC(DC):
 #---------------------------------------------------------------------------
 
 class WindowDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWindowDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxWindowDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2762,7 +2903,6 @@ _gdi.WindowDC_swigregister(WindowDCPtr)
 #---------------------------------------------------------------------------
 
 class MirrorDC(DC):
 #---------------------------------------------------------------------------
 
 class MirrorDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2782,7 +2922,6 @@ _gdi.MirrorDC_swigregister(MirrorDCPtr)
 #---------------------------------------------------------------------------
 
 class PostScriptDC(DC):
 #---------------------------------------------------------------------------
 
 class PostScriptDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPostScriptDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPostScriptDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2828,11 +2967,10 @@ def PostScriptDC_GetResolution(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class MetaFile(core.Object):
 #---------------------------------------------------------------------------
 
 class MetaFile(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filename=wxPyEmptyString) -> MetaFile"""
+        """__init__(String filename=EmptyString) -> MetaFile"""

         newobj = _gdi.new_MetaFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_MetaFile(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2846,12 +2984,13 @@ class MetaFilePtr(MetaFile):
 _gdi.MetaFile_swigregister(MetaFilePtr)
 
 class MetaFileDC(DC):
 _gdi.MetaFile_swigregister(MetaFilePtr)
 
 class MetaFileDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(wxString filename=wxPyEmptyString, int width=0, int height=0, 
-    wxString description=wxPyEmptyString) -> MetaFileDC"""
+        """
+        __init__(String filename=EmptyString, int width=0, int height=0, 
+            String description=EmptyString) -> MetaFileDC
+        """

         newobj = _gdi.new_MetaFileDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _gdi.new_MetaFileDC(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -2865,7 +3004,6 @@ class MetaFileDCPtr(MetaFileDC):
 _gdi.MetaFileDC_swigregister(MetaFileDCPtr)
 
 class PrinterDC(DC):
 _gdi.MetaFileDC_swigregister(MetaFileDCPtr)
 
 class PrinterDC(DC):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrinterDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrinterDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2892,7 +3030,6 @@ IMAGE_LIST_NORMAL = _gdi.IMAGE_LIST_NORMAL
 IMAGE_LIST_SMALL = _gdi.IMAGE_LIST_SMALL
 IMAGE_LIST_STATE = _gdi.IMAGE_LIST_STATE
 class ImageList(core.Object):
 IMAGE_LIST_SMALL = _gdi.IMAGE_LIST_SMALL
 IMAGE_LIST_STATE = _gdi.IMAGE_LIST_STATE
 class ImageList(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImageList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxImageList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -2924,8 +3061,10 @@ class ImageList(core.Object):
         return _gdi.ImageList_Replace(*args, **kwargs)
 
     def Draw(*args, **kwargs):
         return _gdi.ImageList_Replace(*args, **kwargs)
 
     def Draw(*args, **kwargs):

-        """Draw(int index, DC dc, int x, int x, int flags=IMAGELIST_DRAW_NORMAL, 
-    bool solidBackground=False) -> bool"""
+        """
+        Draw(int index, DC dc, int x, int x, int flags=IMAGELIST_DRAW_NORMAL, 
+            bool solidBackground=False) -> bool
+        """

         return _gdi.ImageList_Draw(*args, **kwargs)
 
     def GetImageCount(*args, **kwargs):
         return _gdi.ImageList_Draw(*args, **kwargs)
 
     def GetImageCount(*args, **kwargs):


@@ -2941,7 +3080,7 @@ class ImageList(core.Object):
         return _gdi.ImageList_RemoveAll(*args, **kwargs)
 
     def GetSize(*args, **kwargs):
         return _gdi.ImageList_RemoveAll(*args, **kwargs)
 
     def GetSize(*args, **kwargs):

-        """GetSize(int index, int OUTPUT, int OUTPUT)"""
+        """GetSize() -> (width,height)"""

         return _gdi.ImageList_GetSize(*args, **kwargs)
 
 
         return _gdi.ImageList_GetSize(*args, **kwargs)
 
 


@@ -2955,7 +3094,6 @@ _gdi.ImageList_swigregister(ImageListPtr)
 #---------------------------------------------------------------------------
 
 class PenList(core.Object):
 #---------------------------------------------------------------------------
 
 class PenList(core.Object):

-    """"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPenList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPenList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -2984,7 +3122,6 @@ class PenListPtr(PenList):
 _gdi.PenList_swigregister(PenListPtr)
 
 class BrushList(core.Object):
 _gdi.PenList_swigregister(PenListPtr)
 
 class BrushList(core.Object):

-    """"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBrushList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBrushList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -3013,7 +3150,6 @@ class BrushListPtr(BrushList):
 _gdi.BrushList_swigregister(BrushListPtr)
 
 class ColourDatabase(core.Object):
 _gdi.BrushList_swigregister(BrushListPtr)
 
 class ColourDatabase(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxColourDatabase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxColourDatabase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -3029,20 +3165,20 @@ class ColourDatabase(core.Object):
         except: pass
 
     def Find(*args, **kwargs):
         except: pass
 
     def Find(*args, **kwargs):

-        """Find(wxString name) -> Colour"""
+        """Find(String name) -> Colour"""

         return _gdi.ColourDatabase_Find(*args, **kwargs)
 
     def FindName(*args, **kwargs):
         return _gdi.ColourDatabase_Find(*args, **kwargs)
 
     def FindName(*args, **kwargs):

-        """FindName(Colour colour) -> wxString"""
+        """FindName(Colour colour) -> String"""

         return _gdi.ColourDatabase_FindName(*args, **kwargs)
 
     FindColour = Find 
     def AddColour(*args, **kwargs):
         return _gdi.ColourDatabase_FindName(*args, **kwargs)
 
     FindColour = Find 
     def AddColour(*args, **kwargs):

-        """AddColour(wxString name, Colour colour)"""
+        """AddColour(String name, Colour colour)"""

         return _gdi.ColourDatabase_AddColour(*args, **kwargs)
 
     def Append(*args, **kwargs):
         return _gdi.ColourDatabase_AddColour(*args, **kwargs)
 
     def Append(*args, **kwargs):

-        """Append(wxString name, int red, int green, int blue)"""
+        """Append(String name, int red, int green, int blue)"""

         return _gdi.ColourDatabase_Append(*args, **kwargs)
 
 
         return _gdi.ColourDatabase_Append(*args, **kwargs)
 
 


@@ -3054,7 +3190,6 @@ class ColourDatabasePtr(ColourDatabase):
 _gdi.ColourDatabase_swigregister(ColourDatabasePtr)
 
 class FontList(core.Object):
 _gdi.ColourDatabase_swigregister(ColourDatabasePtr)
 
 class FontList(core.Object):

-    """"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxFontList instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -3063,9 +3198,11 @@ class FontList(core.Object):
         return _gdi.FontList_AddFont(*args, **kwargs)
 
     def FindOrCreateFont(*args, **kwargs):
         return _gdi.FontList_AddFont(*args, **kwargs)
 
     def FindOrCreateFont(*args, **kwargs):

-        """FindOrCreateFont(int point_size, int family, int style, int weight, 
-    bool underline=False, wxString facename=wxPyEmptyString, 
-    wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font"""
+        """
+        FindOrCreateFont(int point_size, int family, int style, int weight, 
+            bool underline=False, String facename=EmptyString, 
+            int encoding=FONTENCODING_DEFAULT) -> Font
+        """

         return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
 
     def RemoveFont(*args, **kwargs):
         return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
 
     def RemoveFont(*args, **kwargs):


@@ -3089,7 +3226,6 @@ _gdi.FontList_swigregister(FontListPtr)
 #---------------------------------------------------------------------------
 
 class Effects(core.Object):
 #---------------------------------------------------------------------------
 
 class Effects(core.Object):

-    """"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxEffects instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxEffects instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -3139,8 +3275,10 @@ class Effects(core.Object):
         return _gdi.Effects_SetDarkShadow(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _gdi.Effects_SetDarkShadow(*args, **kwargs)
 
     def Set(*args, **kwargs):

-        """Set(Colour highlightColour, Colour lightShadow, Colour faceColour, 
-    Colour mediumShadow, Colour darkShadow)"""
+        """
+        Set(Colour highlightColour, Colour lightShadow, Colour faceColour, 
+            Colour mediumShadow, Colour darkShadow)
+        """

         return _gdi.Effects_Set(*args, **kwargs)
 
     def DrawSunkenEdge(*args, **kwargs):
         return _gdi.Effects_Set(*args, **kwargs)
 
     def DrawSunkenEdge(*args, **kwargs):