Script updates

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

diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index f4fab397554628871f03c46969671a55b7359be0..b9da9091e1e5d997b84da216869ad490ef51a897 100644 (file)
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -45,10 +45,31 @@ _gdi.GDIObject_swigregister(GDIObjectPtr)
 #---------------------------------------------------------------------------
 
 class Colour(core.Object):
 #---------------------------------------------------------------------------
 
 class Colour(core.Object):

+    """
+    A colour is an object representing a combination of Red, Green, and Blue (RGB)
+    intensity values, and is used to determine drawing colours, window colours,
+    etc.  Valid RGB values are in the range 0 to 255.
+
+    In wxPython there are typemaps that will automatically convert from a colour
+    name, or from a "#RRGGBB" colour hex value string to a wx.Colour object when
+    calling C++ methods that expect a wxColour.  This means that the following are
+    all equivallent:
+
+        win.SetBackgroundColour(wxColour(0,0,255))
+        win.SetBackgroundColour("BLUE")
+        win.SetBackgroundColour("#0000FF")
+
+    You can retrieve the various current system colour settings with
+    wx.SystemSettings.GetColour.
+    """

     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):

-        """__init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -> Colour"""
+        """
+        __init__(unsigned char red=0, unsigned char green=0, unsigned char blue=0) -> Colour
+
+        Constructs a colour from red, green and blue values.
+        """

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


@@ -60,48 +81,110 @@ class Colour(core.Object):
         except: pass
 
     def Red(*args, **kwargs):
         except: pass
 
     def Red(*args, **kwargs):

-        """Red() -> unsigned char"""
+        """
+        Red() -> unsigned char
+
+        Returns the red intensity.
+        """

         return _gdi.Colour_Red(*args, **kwargs)
 
     def Green(*args, **kwargs):
         return _gdi.Colour_Red(*args, **kwargs)
 
     def Green(*args, **kwargs):

-        """Green() -> unsigned char"""
+        """
+        Green() -> unsigned char
+
+        Returns the green intensity.
+        """

         return _gdi.Colour_Green(*args, **kwargs)
 
     def Blue(*args, **kwargs):
         return _gdi.Colour_Green(*args, **kwargs)
 
     def Blue(*args, **kwargs):

-        """Blue() -> unsigned char"""
+        """
+        Blue() -> unsigned char
+
+        Returns the blue intensity.
+        """

         return _gdi.Colour_Blue(*args, **kwargs)
 
     def Ok(*args, **kwargs):
         return _gdi.Colour_Blue(*args, **kwargs)
 
     def Ok(*args, **kwargs):

-        """Ok() -> bool"""
+        """
+        Ok() -> bool
+
+        Returns True if the colour object is valid (the colour has been
+        initialised with RGB values).
+        """

         return _gdi.Colour_Ok(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _gdi.Colour_Ok(*args, **kwargs)
 
     def Set(*args, **kwargs):

-        """Set(unsigned char red, unsigned char green, unsigned char blue)"""
+        """
+        Set(unsigned char red, unsigned char green, unsigned char blue)
+
+        Sets the RGB intensity values.
+        """

         return _gdi.Colour_Set(*args, **kwargs)
 
         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)
+
+        Sets the RGB intensity values from a packed RGB value.
+        """
+        return _gdi.Colour_SetRGB(*args, **kwargs)
+
+    def SetFromName(*args, **kwargs):
+        """
+        SetFromName(String colourName)
+
+        Sets the RGB intensity values using a colour name listed in wx.TheColourDatabase.
+        """
+        return _gdi.Colour_SetFromName(*args, **kwargs)
+
+    def GetPixel(*args, **kwargs):
+        """
+        GetPixel() -> long
+
+        Returns a pixel value which is platform-dependent. On Windows, a
+        COLORREF is returned. On X, an allocated pixel value is returned.
+        -1 is returned if the pixel is invalid (on X, unallocated).
+        """
+        return _gdi.Colour_GetPixel(*args, **kwargs)

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

-        """__eq__(Colour colour) -> bool"""
+        """
+        __eq__(Colour colour) -> bool
+
+        Compare colours for equality
+        """

         return _gdi.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _gdi.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(Colour colour) -> bool"""
+        """
+        __ne__(Colour colour) -> bool
+
+        Compare colours for inequality
+        """

         return _gdi.Colour___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):
         return _gdi.Colour___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):

-        """Get() -> PyObject"""
+        """
+        Get() -> (r, g, b)
+
+        Returns the RGB intensity values as a tuple.
+        """

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

+    def GetRGB(*args, **kwargs):
+        """
+        GetRGB() -> unsigned long
+
+        Return the colour as a packed RGB value
+        """
+        return _gdi.Colour_GetRGB(*args, **kwargs)
+

     asTuple = Get
     def __str__(self):                  return str(self.asTuple())
     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):


@@ -112,17 +195,29 @@ 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
+
+    Constructs a colour object using a colour name listed in wx.TheColourDatabase.
+    """

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

-    """ColourRGB(unsigned long colRGB) -> Colour"""
+    """
+    ColourRGB(unsigned long colRGB) -> Colour
+
+    Constructs a colour from a packed RGB value.
+    """

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

+Color = Colour
+NamedColor = NamedColour
+ColorRGB = ColourRGB
+

 class Palette(GDIObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 class Palette(GDIObject):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -228,6 +323,18 @@ class Pen(GDIObject):
         """GetDashes() -> PyObject"""
         return _gdi.Pen_GetDashes(*args, **kwargs)
 
         """GetDashes() -> PyObject"""
         return _gdi.Pen_GetDashes(*args, **kwargs)
 

+    def __eq__(*args, **kwargs):
+        """__eq__(Pen other) -> bool"""
+        return _gdi.Pen___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(Pen other) -> bool"""
+        return _gdi.Pen___ne__(*args, **kwargs)
+
+    def GetDashCount(*args, **kwargs):
+        """GetDashCount() -> int"""
+        return _gdi.Pen_GetDashCount(*args, **kwargs)
+

     def GetStipple(*args, **kwargs):
         """GetStipple() -> Bitmap"""
         return _gdi.Pen_GetStipple(*args, **kwargs)
     def GetStipple(*args, **kwargs):
         """GetStipple() -> Bitmap"""
         return _gdi.Pen_GetStipple(*args, **kwargs)


@@ -340,7 +447,7 @@ class Bitmap(GDIObject):
         return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         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.
         """
 
         Loads a bitmap from a file.
         """


@@ -441,7 +548,7 @@ class Bitmap(GDIObject):
 
     def SaveFile(*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.
         """
 
         Saves a bitmap in the named file.
         """


@@ -449,7 +556,7 @@ class Bitmap(GDIObject):
 
     def LoadFile(*args, **kwargs):
         """
 
     def LoadFile(*args, **kwargs):
         """

-        LoadFile(wxString name, wxBitmapType type) -> bool
+        LoadFile(String name, int type) -> bool

 
         Loads a bitmap from a file
         """
 
         Loads a bitmap from a file
         """


@@ -573,9 +680,10 @@ class Mask(core.Object):
         return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         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, Colour colour=NullColour) -> Mask

 
 

-        Constructs a mask from a monochrome bitmap.
+        Constructs a mask from a bitmap and a colour in that bitmap that indicates
+        the transparent portions of the mask, by default BLACK is used.

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


@@ -589,22 +697,12 @@ class MaskPtr(Mask):
         self.__class__ = Mask
 _gdi.Mask_swigregister(MaskPtr)
 
         self.__class__ = Mask
 _gdi.Mask_swigregister(MaskPtr)
 

-def MaskColour(*args, **kwargs):
-    """
-    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
-
+MaskColour = Mask 

 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):
 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):

-        """__init__(wxString name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
+        """__init__(String name, int type, 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


@@ -616,7 +714,7 @@ class Icon(GDIObject):
         except: pass
 
     def LoadFile(*args, **kwargs):
         except: pass
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString name, long flags) -> bool"""
+        """LoadFile(String name, int type) -> bool"""

         return _gdi.Icon_LoadFile(*args, **kwargs)
 
     def GetHandle(*args, **kwargs):
         return _gdi.Icon_LoadFile(*args, **kwargs)
 
     def GetHandle(*args, **kwargs):


@@ -700,7 +798,7 @@ 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


@@ -717,11 +815,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):


@@ -760,7 +858,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):


@@ -776,7 +874,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


@@ -791,7 +889,7 @@ 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


@@ -901,19 +999,19 @@ class Region(GDIObject):
         return _gdi.Region_Offset(*args, **kwargs)
 
     def Contains(*args, **kwargs):
         return _gdi.Region_Offset(*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):


@@ -1143,6 +1241,48 @@ FONTENCODING_UTF16BE = _gdi.FONTENCODING_UTF16BE
 FONTENCODING_UTF16LE = _gdi.FONTENCODING_UTF16LE
 FONTENCODING_UTF32BE = _gdi.FONTENCODING_UTF32BE
 FONTENCODING_UTF32LE = _gdi.FONTENCODING_UTF32LE
 FONTENCODING_UTF16LE = _gdi.FONTENCODING_UTF16LE
 FONTENCODING_UTF32BE = _gdi.FONTENCODING_UTF32BE
 FONTENCODING_UTF32LE = _gdi.FONTENCODING_UTF32LE

+FONTENCODING_MACROMAN = _gdi.FONTENCODING_MACROMAN
+FONTENCODING_MACJAPANESE = _gdi.FONTENCODING_MACJAPANESE
+FONTENCODING_MACCHINESETRAD = _gdi.FONTENCODING_MACCHINESETRAD
+FONTENCODING_MACKOREAN = _gdi.FONTENCODING_MACKOREAN
+FONTENCODING_MACARABIC = _gdi.FONTENCODING_MACARABIC
+FONTENCODING_MACHEBREW = _gdi.FONTENCODING_MACHEBREW
+FONTENCODING_MACGREEK = _gdi.FONTENCODING_MACGREEK
+FONTENCODING_MACCYRILLIC = _gdi.FONTENCODING_MACCYRILLIC
+FONTENCODING_MACDEVANAGARI = _gdi.FONTENCODING_MACDEVANAGARI
+FONTENCODING_MACGURMUKHI = _gdi.FONTENCODING_MACGURMUKHI
+FONTENCODING_MACGUJARATI = _gdi.FONTENCODING_MACGUJARATI
+FONTENCODING_MACORIYA = _gdi.FONTENCODING_MACORIYA
+FONTENCODING_MACBENGALI = _gdi.FONTENCODING_MACBENGALI
+FONTENCODING_MACTAMIL = _gdi.FONTENCODING_MACTAMIL
+FONTENCODING_MACTELUGU = _gdi.FONTENCODING_MACTELUGU
+FONTENCODING_MACKANNADA = _gdi.FONTENCODING_MACKANNADA
+FONTENCODING_MACMALAJALAM = _gdi.FONTENCODING_MACMALAJALAM
+FONTENCODING_MACSINHALESE = _gdi.FONTENCODING_MACSINHALESE
+FONTENCODING_MACBURMESE = _gdi.FONTENCODING_MACBURMESE
+FONTENCODING_MACKHMER = _gdi.FONTENCODING_MACKHMER
+FONTENCODING_MACTHAI = _gdi.FONTENCODING_MACTHAI
+FONTENCODING_MACLAOTIAN = _gdi.FONTENCODING_MACLAOTIAN
+FONTENCODING_MACGEORGIAN = _gdi.FONTENCODING_MACGEORGIAN
+FONTENCODING_MACARMENIAN = _gdi.FONTENCODING_MACARMENIAN
+FONTENCODING_MACCHINESESIMP = _gdi.FONTENCODING_MACCHINESESIMP
+FONTENCODING_MACTIBETAN = _gdi.FONTENCODING_MACTIBETAN
+FONTENCODING_MACMONGOLIAN = _gdi.FONTENCODING_MACMONGOLIAN
+FONTENCODING_MACETHIOPIC = _gdi.FONTENCODING_MACETHIOPIC
+FONTENCODING_MACCENTRALEUR = _gdi.FONTENCODING_MACCENTRALEUR
+FONTENCODING_MACVIATNAMESE = _gdi.FONTENCODING_MACVIATNAMESE
+FONTENCODING_MACARABICEXT = _gdi.FONTENCODING_MACARABICEXT
+FONTENCODING_MACSYMBOL = _gdi.FONTENCODING_MACSYMBOL
+FONTENCODING_MACDINGBATS = _gdi.FONTENCODING_MACDINGBATS
+FONTENCODING_MACTURKISH = _gdi.FONTENCODING_MACTURKISH
+FONTENCODING_MACCROATIAN = _gdi.FONTENCODING_MACCROATIAN
+FONTENCODING_MACICELANDIC = _gdi.FONTENCODING_MACICELANDIC
+FONTENCODING_MACROMANIAN = _gdi.FONTENCODING_MACROMANIAN
+FONTENCODING_MACCELTIC = _gdi.FONTENCODING_MACCELTIC
+FONTENCODING_MACGAELIC = _gdi.FONTENCODING_MACGAELIC
+FONTENCODING_MACKEYBOARD = _gdi.FONTENCODING_MACKEYBOARD
+FONTENCODING_MACMIN = _gdi.FONTENCODING_MACMIN
+FONTENCODING_MACMAX = _gdi.FONTENCODING_MACMAX

 FONTENCODING_MAX = _gdi.FONTENCODING_MAX
 FONTENCODING_UTF16 = _gdi.FONTENCODING_UTF16
 FONTENCODING_UTF32 = _gdi.FONTENCODING_UTF32
 FONTENCODING_MAX = _gdi.FONTENCODING_MAX
 FONTENCODING_UTF16 = _gdi.FONTENCODING_UTF16
 FONTENCODING_UTF32 = _gdi.FONTENCODING_UTF32


@@ -1180,11 +1320,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):


@@ -1192,15 +1332,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):


@@ -1208,11 +1348,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):


@@ -1220,35 +1360,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)
 
 


@@ -1277,11 +1417,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)
 
 


@@ -1294,7 +1434,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):


@@ -1318,61 +1458,58 @@ class FontMapper(object):
         except: pass
 
     def Get(*args, **kwargs):
         except: pass
 
     def Get(*args, **kwargs):

-        """FontMapper.Get() -> FontMapper"""
+        """Get() -> FontMapper"""

         return _gdi.FontMapper_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
     def Set(*args, **kwargs):
         return _gdi.FontMapper_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
     def Set(*args, **kwargs):

-        """FontMapper.Set(FontMapper mapper) -> FontMapper"""
+        """Set(FontMapper mapper) -> FontMapper"""

         return _gdi.FontMapper_Set(*args, **kwargs)
 
     Set = staticmethod(Set)
     def CharsetToEncoding(*args, **kwargs):
         return _gdi.FontMapper_Set(*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):

-        """FontMapper.GetSupportedEncodingsCount() -> size_t"""
+        """GetSupportedEncodingsCount() -> size_t"""

         return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
     GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
     def GetEncoding(*args, **kwargs):
         return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs)
 
     GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount)
     def GetEncoding(*args, **kwargs):

-        """FontMapper.GetEncoding(size_t n) -> wxFontEncoding"""
+        """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"""
+        """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"""
+        """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"""
+        """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):


@@ -1380,7 +1517,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)
 
 


@@ -1404,19 +1541,19 @@ 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)
 
 #---------------------------------------------------------------------------
     return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -1427,8 +1564,8 @@ class Font(GDIObject):
     def __init__(self, *args, **kwargs):
         """
         __init__(int pointSize, int family, int style, int weight, bool underline=False, 
     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
+            String face=EmptyString, 
+            int encoding=FONTENCODING_DEFAULT) -> Font

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


@@ -1446,11 +1583,11 @@ class Font(GDIObject):
 
     def __nonzero__(self): return self.Ok() 
     def __eq__(*args, **kwargs):
 
     def __nonzero__(self): return self.Ok() 
     def __eq__(*args, **kwargs):

-        """__eq__(Font font) -> bool"""
+        """__eq__(Font other) -> bool"""

         return _gdi.Font___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _gdi.Font___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(Font font) -> bool"""
+        """__ne__(Font other) -> bool"""

         return _gdi.Font___ne__(*args, **kwargs)
 
     def GetPointSize(*args, **kwargs):
         return _gdi.Font___ne__(*args, **kwargs)
 
     def GetPointSize(*args, **kwargs):


@@ -1474,11 +1611,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):


@@ -1490,11 +1627,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):


@@ -1514,7 +1651,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):


@@ -1522,7 +1659,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):


@@ -1530,23 +1667,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):


@@ -1558,12 +1695,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"""
+        """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)"""
+        """SetDefaultEncoding(int encoding)"""

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


@@ -1582,26 +1719,26 @@ 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)
 
 #---------------------------------------------------------------------------
     return _gdi.Font_SetDefaultEncoding(*args, **kwargs)
 
 #---------------------------------------------------------------------------


@@ -1628,11 +1765,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):


@@ -1924,8 +2061,8 @@ class Locale(object):
 
     def Init1(*args, **kwargs):
         """
 
     def Init1(*args, **kwargs):
         """

-        Init1(wxString szName, wxString szShort=wxPyEmptyString, 
-            wxString szLocale=wxPyEmptyString, bool bLoadDefault=True, 
+        Init1(String szName, String szShort=EmptyString, String szLocale=EmptyString, 
+            bool bLoadDefault=True, 

             bool bConvertEncoding=False) -> bool
         """
         return _gdi.Locale_Init1(*args, **kwargs)
             bool bConvertEncoding=False) -> bool
         """
         return _gdi.Locale_Init1(*args, **kwargs)


@@ -1942,17 +2079,17 @@ class Locale(object):
         return val
 
     def GetSystemLanguage(*args, **kwargs):
         return val
 
     def GetSystemLanguage(*args, **kwargs):

-        """Locale.GetSystemLanguage() -> int"""
+        """GetSystemLanguage() -> int"""

         return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
     GetSystemLanguage = staticmethod(GetSystemLanguage)
     def GetSystemEncoding(*args, **kwargs):
         return _gdi.Locale_GetSystemLanguage(*args, **kwargs)
 
     GetSystemLanguage = staticmethod(GetSystemLanguage)
     def GetSystemEncoding(*args, **kwargs):

-        """Locale.GetSystemEncoding() -> wxFontEncoding"""
+        """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"""
+        """GetSystemEncodingName() -> String"""

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


@@ -1962,7 +2099,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):


@@ -1970,52 +2107,52 @@ 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)"""
+        """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):

-        """Locale.GetLanguageInfo(int lang) -> LanguageInfo"""
+        """GetLanguageInfo(int lang) -> LanguageInfo"""

         return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
     GetLanguageInfo = staticmethod(GetLanguageInfo)
     def GetLanguageName(*args, **kwargs):
         return _gdi.Locale_GetLanguageInfo(*args, **kwargs)
 
     GetLanguageInfo = staticmethod(GetLanguageInfo)
     def GetLanguageName(*args, **kwargs):

-        """Locale.GetLanguageName(int lang) -> wxString"""
+        """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"""
+        """FindLanguageInfo(String locale) -> LanguageInfo"""

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

-        """Locale.AddLanguage(LanguageInfo info)"""
+        """AddLanguage(LanguageInfo info)"""

         return _gdi.Locale_AddLanguage(*args, **kwargs)
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):
         return _gdi.Locale_AddLanguage(*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)
 
 


@@ -2031,15 +2168,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):


@@ -2047,11 +2184,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):


@@ -2087,28 +2224,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"""
+        """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"""
+        """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"""
+        """CanConvert(int encIn, int encOut) -> bool"""

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


@@ -2123,21 +2257,21 @@ _gdi.EncodingConverter_swigregister(EncodingConverterPtr)
 
 def GetTranslation(*args):
     """
 
 def GetTranslation(*args):
     """

-    GetTranslation(wxString sz) -> wxString
-    GetTranslation(wxString sz1, wxString sz2, size_t n) -> wxString
+    GetTranslation(String str) -> String
+    GetTranslation(String str, String strPlural, 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)
 
 #----------------------------------------------------------------------------


@@ -2305,19 +2439,19 @@ 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):


@@ -2348,14 +2482,14 @@ class DC(core.Object):
 
     def DrawLabel(*args, **kwargs):
         """
 
     def DrawLabel(*args, **kwargs):
         """

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

             int indexAccel=-1)
         """
         return _gdi.DC_DrawLabel(*args, **kwargs)
 
     def DrawImageLabel(*args, **kwargs):
         """
             int indexAccel=-1)
         """
         return _gdi.DC_DrawLabel(*args, **kwargs)
 
     def DrawImageLabel(*args, **kwargs):
         """

-        DrawImageLabel(wxString text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 
+        DrawImageLabel(String text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, 

             int indexAccel=-1) -> Rect
         """
         return _gdi.DC_DrawImageLabel(*args, **kwargs)
             int indexAccel=-1) -> Rect
         """
         return _gdi.DC_DrawImageLabel(*args, **kwargs)


@@ -2369,7 +2503,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):


@@ -2408,8 +2542,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):


@@ -2469,6 +2607,10 @@ class DC(core.Object):
         """
         return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
 
         """
         return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
 

+    def GetPartialTextExtents(*args, **kwargs):
+        """GetPartialTextExtents(String text) -> wxArrayInt"""
+        return _gdi.DC_GetPartialTextExtents(*args, **kwargs)
+

     def GetSize(*args, **kwargs):
         """
         GetSize() -> Size
     def GetSize(*args, **kwargs):
         """
         GetSize() -> Size


@@ -2766,8 +2908,8 @@ class DC(core.Object):
 
 
     def DrawPolygonList(self, polygons, pens=None, brushes=None):
 
 
     def DrawPolygonList(self, polygons, pens=None, brushes=None):

-        
-        
+        ## Note: This does not currently support fill style or offset
+        ## you can always use the non-List version if need be.

         if pens is None:
            pens = []
         elif isinstance(pens, wx.Pen):
         if pens is None:
            pens = []
         elif isinstance(pens, wx.Pen):


@@ -2784,9 +2926,9 @@ class DC(core.Object):
 
 
     def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):
 
 
     def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):

-        
-        
-        
+        ## NOTE: this does not currently support changing the font
+        ##       Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
+        ##       If you want backgounds to do anything.

         if type(textList) == type(''):
            textList = [textList]
         elif len(textList) != len(coords):
         if type(textList) == type(''):
            textList = [textList]
         elif len(textList) != len(coords):


@@ -2847,14 +2989,23 @@ def MemoryDCFromDC(*args, **kwargs):
 class BufferedDC(MemoryDC):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 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):
-        """__init__(DC dc, Bitmap buffer) -> BufferedDC"""
-        newobj = _gdi.new_BufferedDC(*args, **kwargs)
+    def __init__(self, *args):
+        """
+        __init__(DC dc, Bitmap buffer) -> BufferedDC
+        __init__(DC dc, Size area) -> BufferedDC
+        """
+        newobj = _gdi.new_BufferedDC(*args)

         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._dc = args[0] # save a ref so the other dc will not be deleted before self
 
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._dc = args[0] # save a ref so the other dc will not be deleted before self
 

+    def __del__(self, destroy=_gdi.delete_BufferedDC):
+        """__del__()"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+

     def UnMask(*args, **kwargs):
         """UnMask()"""
         return _gdi.BufferedDC_UnMask(*args, **kwargs)
     def UnMask(*args, **kwargs):
         """UnMask()"""
         return _gdi.BufferedDC_UnMask(*args, **kwargs)


@@ -2867,9 +3018,9 @@ class BufferedDCPtr(BufferedDC):
         self.__class__ = BufferedDC
 _gdi.BufferedDC_swigregister(BufferedDCPtr)
 
         self.__class__ = BufferedDC
 _gdi.BufferedDC_swigregister(BufferedDCPtr)
 

-def BufferedDCInternalBuffer(*args, **kwargs):
+def BufferedDCInternalBuffer(*args):

     """BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC"""
     """BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC"""

-    val = _gdi.new_BufferedDCInternalBuffer(*args, **kwargs)
+    val = _gdi.new_BufferedDCInternalBuffer(*args)

     val.thisown = 1
     val._dc = args[0] # save a ref so the other dc will not be deleted before self
     return val
     val.thisown = 1
     val._dc = args[0] # save a ref so the other dc will not be deleted before self
     return val


@@ -3018,12 +3169,12 @@ class PostScriptDC(DC):
         return _gdi.PostScriptDC_SetPrintData(*args, **kwargs)
 
     def SetResolution(*args, **kwargs):
         return _gdi.PostScriptDC_SetPrintData(*args, **kwargs)
 
     def SetResolution(*args, **kwargs):

-        """PostScriptDC.SetResolution(int ppi)"""
+        """SetResolution(int ppi)"""

         return _gdi.PostScriptDC_SetResolution(*args, **kwargs)
 
     SetResolution = staticmethod(SetResolution)
     def GetResolution(*args, **kwargs):
         return _gdi.PostScriptDC_SetResolution(*args, **kwargs)
 
     SetResolution = staticmethod(SetResolution)
     def GetResolution(*args, **kwargs):

-        """PostScriptDC.GetResolution() -> int"""
+        """GetResolution() -> int"""

         return _gdi.PostScriptDC_GetResolution(*args, **kwargs)
 
     GetResolution = staticmethod(GetResolution)
         return _gdi.PostScriptDC_GetResolution(*args, **kwargs)
 
     GetResolution = staticmethod(GetResolution)


@@ -3049,7 +3200,7 @@ 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


@@ -3081,7 +3232,7 @@ class MetaFile(core.Object):
         return _gdi.MetaFile_GetHeight(*args, **kwargs)
 
     def GetFileName(*args, **kwargs):
         return _gdi.MetaFile_GetHeight(*args, **kwargs)
 
     def GetFileName(*args, **kwargs):

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

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


@@ -3098,8 +3249,8 @@ class MetaFileDC(DC):
         return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         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
         """
         newobj = _gdi.new_MetaFileDC(*args, **kwargs)
         self.this = newobj.this


@@ -3134,6 +3285,246 @@ class PrinterDCPtr(PrinterDC):
         self.__class__ = PrinterDC
 _gdi.PrinterDC_swigregister(PrinterDCPtr)
 
         self.__class__ = PrinterDC
 _gdi.PrinterDC_swigregister(PrinterDCPtr)
 

+class DC_old(DC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = DC.FloodFillXY
+    GetPixel = DC.GetPixelXY
+    DrawLine = DC.DrawLineXY
+    CrossHair = DC.CrossHairXY
+    DrawArc = DC.DrawArcXY
+    DrawCheckMark = DC.DrawCheckMarkXY
+    DrawEllipticArc = DC.DrawEllipticArcXY
+    DrawPoint = DC.DrawPointXY
+    DrawRectangle = DC.DrawRectangleXY
+    DrawRoundedRectangle = DC.DrawRoundedRectangleXY
+    DrawCircle = DC.DrawCircleXY
+    DrawEllipse = DC.DrawEllipseXY
+    DrawIcon = DC.DrawIconXY
+    DrawBitmap = DC.DrawBitmapXY
+    DrawText = DC.DrawTextXY
+    DrawRotatedText = DC.DrawRotatedTextXY
+    Blit = DC.BlitXY
+
+class MemoryDC_old(MemoryDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = MemoryDC.FloodFillXY
+    GetPixel = MemoryDC.GetPixelXY
+    DrawLine = MemoryDC.DrawLineXY
+    CrossHair = MemoryDC.CrossHairXY
+    DrawArc = MemoryDC.DrawArcXY
+    DrawCheckMark = MemoryDC.DrawCheckMarkXY
+    DrawEllipticArc = MemoryDC.DrawEllipticArcXY
+    DrawPoint = MemoryDC.DrawPointXY
+    DrawRectangle = MemoryDC.DrawRectangleXY
+    DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY
+    DrawCircle = MemoryDC.DrawCircleXY
+    DrawEllipse = MemoryDC.DrawEllipseXY
+    DrawIcon = MemoryDC.DrawIconXY
+    DrawBitmap = MemoryDC.DrawBitmapXY
+    DrawText = MemoryDC.DrawTextXY
+    DrawRotatedText = MemoryDC.DrawRotatedTextXY
+    Blit = MemoryDC.BlitXY
+
+class BufferedDC_old(BufferedDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = BufferedDC.FloodFillXY
+    GetPixel = BufferedDC.GetPixelXY
+    DrawLine = BufferedDC.DrawLineXY
+    CrossHair = BufferedDC.CrossHairXY
+    DrawArc = BufferedDC.DrawArcXY
+    DrawCheckMark = BufferedDC.DrawCheckMarkXY
+    DrawEllipticArc = BufferedDC.DrawEllipticArcXY
+    DrawPoint = BufferedDC.DrawPointXY
+    DrawRectangle = BufferedDC.DrawRectangleXY
+    DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY
+    DrawCircle = BufferedDC.DrawCircleXY
+    DrawEllipse = BufferedDC.DrawEllipseXY
+    DrawIcon = BufferedDC.DrawIconXY
+    DrawBitmap = BufferedDC.DrawBitmapXY
+    DrawText = BufferedDC.DrawTextXY
+    DrawRotatedText = BufferedDC.DrawRotatedTextXY
+    Blit = BufferedDC.BlitXY
+
+class BufferedPaintDC_old(BufferedPaintDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = BufferedPaintDC.FloodFillXY
+    GetPixel = BufferedPaintDC.GetPixelXY
+    DrawLine = BufferedPaintDC.DrawLineXY
+    CrossHair = BufferedPaintDC.CrossHairXY
+    DrawArc = BufferedPaintDC.DrawArcXY
+    DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY
+    DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY
+    DrawPoint = BufferedPaintDC.DrawPointXY
+    DrawRectangle = BufferedPaintDC.DrawRectangleXY
+    DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY
+    DrawCircle = BufferedPaintDC.DrawCircleXY
+    DrawEllipse = BufferedPaintDC.DrawEllipseXY
+    DrawIcon = BufferedPaintDC.DrawIconXY
+    DrawBitmap = BufferedPaintDC.DrawBitmapXY
+    DrawText = BufferedPaintDC.DrawTextXY
+    DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY
+    Blit = BufferedPaintDC.BlitXY
+
+class ScreenDC_old(ScreenDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = ScreenDC.FloodFillXY
+    GetPixel = ScreenDC.GetPixelXY
+    DrawLine = ScreenDC.DrawLineXY
+    CrossHair = ScreenDC.CrossHairXY
+    DrawArc = ScreenDC.DrawArcXY
+    DrawCheckMark = ScreenDC.DrawCheckMarkXY
+    DrawEllipticArc = ScreenDC.DrawEllipticArcXY
+    DrawPoint = ScreenDC.DrawPointXY
+    DrawRectangle = ScreenDC.DrawRectangleXY
+    DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY
+    DrawCircle = ScreenDC.DrawCircleXY
+    DrawEllipse = ScreenDC.DrawEllipseXY
+    DrawIcon = ScreenDC.DrawIconXY
+    DrawBitmap = ScreenDC.DrawBitmapXY
+    DrawText = ScreenDC.DrawTextXY
+    DrawRotatedText = ScreenDC.DrawRotatedTextXY
+    Blit = ScreenDC.BlitXY
+
+class ClientDC_old(ClientDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = ClientDC.FloodFillXY
+    GetPixel = ClientDC.GetPixelXY
+    DrawLine = ClientDC.DrawLineXY
+    CrossHair = ClientDC.CrossHairXY
+    DrawArc = ClientDC.DrawArcXY
+    DrawCheckMark = ClientDC.DrawCheckMarkXY
+    DrawEllipticArc = ClientDC.DrawEllipticArcXY
+    DrawPoint = ClientDC.DrawPointXY
+    DrawRectangle = ClientDC.DrawRectangleXY
+    DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY
+    DrawCircle = ClientDC.DrawCircleXY
+    DrawEllipse = ClientDC.DrawEllipseXY
+    DrawIcon = ClientDC.DrawIconXY
+    DrawBitmap = ClientDC.DrawBitmapXY
+    DrawText = ClientDC.DrawTextXY
+    DrawRotatedText = ClientDC.DrawRotatedTextXY
+    Blit = ClientDC.BlitXY
+
+class PaintDC_old(PaintDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = PaintDC.FloodFillXY
+    GetPixel = PaintDC.GetPixelXY
+    DrawLine = PaintDC.DrawLineXY
+    CrossHair = PaintDC.CrossHairXY
+    DrawArc = PaintDC.DrawArcXY
+    DrawCheckMark = PaintDC.DrawCheckMarkXY
+    DrawEllipticArc = PaintDC.DrawEllipticArcXY
+    DrawPoint = PaintDC.DrawPointXY
+    DrawRectangle = PaintDC.DrawRectangleXY
+    DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY
+    DrawCircle = PaintDC.DrawCircleXY
+    DrawEllipse = PaintDC.DrawEllipseXY
+    DrawIcon = PaintDC.DrawIconXY
+    DrawBitmap = PaintDC.DrawBitmapXY
+    DrawText = PaintDC.DrawTextXY
+    DrawRotatedText = PaintDC.DrawRotatedTextXY
+    Blit = PaintDC.BlitXY
+
+class WindowDC_old(WindowDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = WindowDC.FloodFillXY
+    GetPixel = WindowDC.GetPixelXY
+    DrawLine = WindowDC.DrawLineXY
+    CrossHair = WindowDC.CrossHairXY
+    DrawArc = WindowDC.DrawArcXY
+    DrawCheckMark = WindowDC.DrawCheckMarkXY
+    DrawEllipticArc = WindowDC.DrawEllipticArcXY
+    DrawPoint = WindowDC.DrawPointXY
+    DrawRectangle = WindowDC.DrawRectangleXY
+    DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY
+    DrawCircle = WindowDC.DrawCircleXY
+    DrawEllipse = WindowDC.DrawEllipseXY
+    DrawIcon = WindowDC.DrawIconXY
+    DrawBitmap = WindowDC.DrawBitmapXY
+    DrawText = WindowDC.DrawTextXY
+    DrawRotatedText = WindowDC.DrawRotatedTextXY
+    Blit = WindowDC.BlitXY
+
+class MirrorDC_old(MirrorDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = MirrorDC.FloodFillXY
+    GetPixel = MirrorDC.GetPixelXY
+    DrawLine = MirrorDC.DrawLineXY
+    CrossHair = MirrorDC.CrossHairXY
+    DrawArc = MirrorDC.DrawArcXY
+    DrawCheckMark = MirrorDC.DrawCheckMarkXY
+    DrawEllipticArc = MirrorDC.DrawEllipticArcXY
+    DrawPoint = MirrorDC.DrawPointXY
+    DrawRectangle = MirrorDC.DrawRectangleXY
+    DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY
+    DrawCircle = MirrorDC.DrawCircleXY
+    DrawEllipse = MirrorDC.DrawEllipseXY
+    DrawIcon = MirrorDC.DrawIconXY
+    DrawBitmap = MirrorDC.DrawBitmapXY
+    DrawText = MirrorDC.DrawTextXY
+    DrawRotatedText = MirrorDC.DrawRotatedTextXY
+    Blit = MirrorDC.BlitXY
+
+class PostScriptDC_old(PostScriptDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = PostScriptDC.FloodFillXY
+    GetPixel = PostScriptDC.GetPixelXY
+    DrawLine = PostScriptDC.DrawLineXY
+    CrossHair = PostScriptDC.CrossHairXY
+    DrawArc = PostScriptDC.DrawArcXY
+    DrawCheckMark = PostScriptDC.DrawCheckMarkXY
+    DrawEllipticArc = PostScriptDC.DrawEllipticArcXY
+    DrawPoint = PostScriptDC.DrawPointXY
+    DrawRectangle = PostScriptDC.DrawRectangleXY
+    DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY
+    DrawCircle = PostScriptDC.DrawCircleXY
+    DrawEllipse = PostScriptDC.DrawEllipseXY
+    DrawIcon = PostScriptDC.DrawIconXY
+    DrawBitmap = PostScriptDC.DrawBitmapXY
+    DrawText = PostScriptDC.DrawTextXY
+    DrawRotatedText = PostScriptDC.DrawRotatedTextXY
+    Blit = PostScriptDC.BlitXY
+
+class MetaFileDC_old(MetaFileDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = MetaFileDC.FloodFillXY
+    GetPixel = MetaFileDC.GetPixelXY
+    DrawLine = MetaFileDC.DrawLineXY
+    CrossHair = MetaFileDC.CrossHairXY
+    DrawArc = MetaFileDC.DrawArcXY
+    DrawCheckMark = MetaFileDC.DrawCheckMarkXY
+    DrawEllipticArc = MetaFileDC.DrawEllipticArcXY
+    DrawPoint = MetaFileDC.DrawPointXY
+    DrawRectangle = MetaFileDC.DrawRectangleXY
+    DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY
+    DrawCircle = MetaFileDC.DrawCircleXY
+    DrawEllipse = MetaFileDC.DrawEllipseXY
+    DrawIcon = MetaFileDC.DrawIconXY
+    DrawBitmap = MetaFileDC.DrawBitmapXY
+    DrawText = MetaFileDC.DrawTextXY
+    DrawRotatedText = MetaFileDC.DrawRotatedTextXY
+    Blit = MetaFileDC.BlitXY
+
+class PrinterDC_old(PrinterDC):
+    """DC class that has methods with 2.4 compatible parameters."""
+    FloodFill = PrinterDC.FloodFillXY
+    GetPixel = PrinterDC.GetPixelXY
+    DrawLine = PrinterDC.DrawLineXY
+    CrossHair = PrinterDC.CrossHairXY
+    DrawArc = PrinterDC.DrawArcXY
+    DrawCheckMark = PrinterDC.DrawCheckMarkXY
+    DrawEllipticArc = PrinterDC.DrawEllipticArcXY
+    DrawPoint = PrinterDC.DrawPointXY
+    DrawRectangle = PrinterDC.DrawRectangleXY
+    DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY
+    DrawCircle = PrinterDC.DrawCircleXY
+    DrawEllipse = PrinterDC.DrawEllipseXY
+    DrawIcon = PrinterDC.DrawIconXY
+    DrawBitmap = PrinterDC.DrawBitmapXY
+    DrawText = PrinterDC.DrawTextXY
+    DrawRotatedText = PrinterDC.DrawRotatedTextXY
+    Blit = PrinterDC.BlitXY
+

 #---------------------------------------------------------------------------
 
 IMAGELIST_DRAW_NORMAL = _gdi.IMAGELIST_DRAW_NORMAL
 #---------------------------------------------------------------------------
 
 IMAGELIST_DRAW_NORMAL = _gdi.IMAGELIST_DRAW_NORMAL


@@ -3234,6 +3625,49 @@ class PenListPtr(PenList):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = PenList
 _gdi.PenList_swigregister(PenListPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = PenList
 _gdi.PenList_swigregister(PenListPtr)

+cvar = _gdi.cvar
+NORMAL_FONT = cvar.NORMAL_FONT
+SMALL_FONT = cvar.SMALL_FONT
+ITALIC_FONT = cvar.ITALIC_FONT
+SWISS_FONT = cvar.SWISS_FONT
+RED_PEN = cvar.RED_PEN
+CYAN_PEN = cvar.CYAN_PEN
+GREEN_PEN = cvar.GREEN_PEN
+BLACK_PEN = cvar.BLACK_PEN
+WHITE_PEN = cvar.WHITE_PEN
+TRANSPARENT_PEN = cvar.TRANSPARENT_PEN
+BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN
+GREY_PEN = cvar.GREY_PEN
+MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN
+LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN
+BLUE_BRUSH = cvar.BLUE_BRUSH
+GREEN_BRUSH = cvar.GREEN_BRUSH
+WHITE_BRUSH = cvar.WHITE_BRUSH
+BLACK_BRUSH = cvar.BLACK_BRUSH
+TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH
+CYAN_BRUSH = cvar.CYAN_BRUSH
+RED_BRUSH = cvar.RED_BRUSH
+GREY_BRUSH = cvar.GREY_BRUSH
+MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH
+LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH
+BLACK = cvar.BLACK
+WHITE = cvar.WHITE
+RED = cvar.RED
+BLUE = cvar.BLUE
+GREEN = cvar.GREEN
+CYAN = cvar.CYAN
+LIGHT_GREY = cvar.LIGHT_GREY
+STANDARD_CURSOR = cvar.STANDARD_CURSOR
+HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR
+CROSS_CURSOR = cvar.CROSS_CURSOR
+NullBitmap = cvar.NullBitmap
+NullIcon = cvar.NullIcon
+NullCursor = cvar.NullCursor
+NullPen = cvar.NullPen
+NullBrush = cvar.NullBrush
+NullPalette = cvar.NullPalette
+NullFont = cvar.NullFont
+NullColour = cvar.NullColour

 
 class BrushList(core.Object):
     def __init__(self): raise RuntimeError, "No constructor defined"
 
 class BrushList(core.Object):
     def __init__(self): raise RuntimeError, "No constructor defined"


@@ -3279,20 +3713,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)
 
 


@@ -3314,8 +3748,8 @@ class FontList(core.Object):
     def FindOrCreateFont(*args, **kwargs):
         """
         FindOrCreateFont(int point_size, int family, int style, int weight, 
     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
+            bool underline=False, String facename=EmptyString, 
+            int encoding=FONTENCODING_DEFAULT) -> Font

         """
         return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
 
         """
         return _gdi.FontList_FindOrCreateFont(*args, **kwargs)
 


@@ -3337,6 +3771,7 @@ _gdi.FontList_swigregister(FontListPtr)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

+NullColor = NullColour 

 #---------------------------------------------------------------------------
 
 class Effects(core.Object):
 #---------------------------------------------------------------------------
 
 class Effects(core.Object):


@@ -3410,49 +3845,6 @@ class EffectsPtr(Effects):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Effects
 _gdi.Effects_swigregister(EffectsPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Effects
 _gdi.Effects_swigregister(EffectsPtr)

-cvar = _gdi.cvar
-NORMAL_FONT = cvar.NORMAL_FONT
-SMALL_FONT = cvar.SMALL_FONT
-ITALIC_FONT = cvar.ITALIC_FONT
-SWISS_FONT = cvar.SWISS_FONT
-RED_PEN = cvar.RED_PEN
-CYAN_PEN = cvar.CYAN_PEN
-GREEN_PEN = cvar.GREEN_PEN
-BLACK_PEN = cvar.BLACK_PEN
-WHITE_PEN = cvar.WHITE_PEN
-TRANSPARENT_PEN = cvar.TRANSPARENT_PEN
-BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN
-GREY_PEN = cvar.GREY_PEN
-MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN
-LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN
-BLUE_BRUSH = cvar.BLUE_BRUSH
-GREEN_BRUSH = cvar.GREEN_BRUSH
-WHITE_BRUSH = cvar.WHITE_BRUSH
-BLACK_BRUSH = cvar.BLACK_BRUSH
-TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH
-CYAN_BRUSH = cvar.CYAN_BRUSH
-RED_BRUSH = cvar.RED_BRUSH
-GREY_BRUSH = cvar.GREY_BRUSH
-MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH
-LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH
-BLACK = cvar.BLACK
-WHITE = cvar.WHITE
-RED = cvar.RED
-BLUE = cvar.BLUE
-GREEN = cvar.GREEN
-CYAN = cvar.CYAN
-LIGHT_GREY = cvar.LIGHT_GREY
-STANDARD_CURSOR = cvar.STANDARD_CURSOR
-HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR
-CROSS_CURSOR = cvar.CROSS_CURSOR
-NullBitmap = cvar.NullBitmap
-NullIcon = cvar.NullIcon
-NullCursor = cvar.NullCursor
-NullPen = cvar.NullPen
-NullBrush = cvar.NullBrush
-NullPalette = cvar.NullPalette
-NullFont = cvar.NullFont
-NullColour = cvar.NullColour

 TheFontList = cvar.TheFontList
 ThePenList = cvar.ThePenList
 TheBrushList = cvar.TheBrushList
 TheFontList = cvar.TheFontList
 ThePenList = cvar.ThePenList
 TheBrushList = cvar.TheBrushList