# Now assign all the reverse-renamed names:
wxGDIObject = wx.gdi.GDIObject
wxGDIObjectPtr = wx.gdi.GDIObjectPtr
-wxNamedColour = wx.gdi.NamedColour
-wxColourRGB = wx.gdi.ColourRGB
wxColour = wx.gdi.Colour
wxColourPtr = wx.gdi.ColourPtr
+wxNamedColour = wx.gdi.NamedColour
+wxColourRGB = wx.gdi.ColourRGB
wxPalette = wx.gdi.Palette
wxPalettePtr = wx.gdi.PalettePtr
wxPen = wx.gdi.Pen
wxPyPenPtr = wx.gdi.PyPenPtr
wxBrush = wx.gdi.Brush
wxBrushPtr = wx.gdi.BrushPtr
+wxBitmap = wx.gdi.Bitmap
+wxBitmapPtr = wx.gdi.BitmapPtr
wxEmptyBitmap = wx.gdi.EmptyBitmap
wxBitmapFromIcon = wx.gdi.BitmapFromIcon
wxBitmapFromImage = wx.gdi.BitmapFromImage
wxBitmapFromXPMData = wx.gdi.BitmapFromXPMData
wxBitmapFromBits = wx.gdi.BitmapFromBits
-wxBitmap = wx.gdi.Bitmap
-wxBitmapPtr = wx.gdi.BitmapPtr
-wxMaskColour = wx.gdi.MaskColour
wxMask = wx.gdi.Mask
wxMaskPtr = wx.gdi.MaskPtr
+wxIcon = wx.gdi.Icon
+wxIconPtr = wx.gdi.IconPtr
wxEmptyIcon = wx.gdi.EmptyIcon
wxIconFromLocation = wx.gdi.IconFromLocation
wxIconFromBitmap = wx.gdi.IconFromBitmap
wxIconFromXPMData = wx.gdi.IconFromXPMData
-wxIcon = wx.gdi.Icon
-wxIconPtr = wx.gdi.IconPtr
wxIconLocation = wx.gdi.IconLocation
wxIconLocationPtr = wx.gdi.IconLocationPtr
-wxIconBundleFromFile = wx.gdi.IconBundleFromFile
-wxIconBundleFromIcon = wx.gdi.IconBundleFromIcon
wxIconBundle = wx.gdi.IconBundle
wxIconBundlePtr = wx.gdi.IconBundlePtr
-wxStockCursor = wx.gdi.StockCursor
-wxCursorFromImage = wx.gdi.CursorFromImage
-wxCursorFromBits = wx.gdi.CursorFromBits
+wxIconBundleFromFile = wx.gdi.IconBundleFromFile
+wxIconBundleFromIcon = wx.gdi.IconBundleFromIcon
wxCursor = wx.gdi.Cursor
wxCursorPtr = wx.gdi.CursorPtr
+wxStockCursor = wx.gdi.StockCursor
+wxCursorFromImage = wx.gdi.CursorFromImage
wxOutRegion = wx.gdi.OutRegion
wxPartRegion = wx.gdi.PartRegion
wxInRegion = wx.gdi.InRegion
-wxRegionFromBitmap = wx.gdi.RegionFromBitmap
-wxRegionFromPoints = wx.gdi.RegionFromPoints
wxRegion = wx.gdi.Region
wxRegionPtr = wx.gdi.RegionPtr
+wxRegionFromBitmap = wx.gdi.RegionFromBitmap
+wxRegionFromPoints = wx.gdi.RegionFromPoints
wxRegionIterator = wx.gdi.RegionIterator
wxRegionIteratorPtr = wx.gdi.RegionIteratorPtr
wxFONTFAMILY_DEFAULT = wx.gdi.FONTFAMILY_DEFAULT
wxFONTENCODING_UTF16LE = wx.gdi.FONTENCODING_UTF16LE
wxFONTENCODING_UTF32BE = wx.gdi.FONTENCODING_UTF32BE
wxFONTENCODING_UTF32LE = wx.gdi.FONTENCODING_UTF32LE
+wxFONTENCODING_MACROMAN = wx.gdi.FONTENCODING_MACROMAN
+wxFONTENCODING_MACJAPANESE = wx.gdi.FONTENCODING_MACJAPANESE
+wxFONTENCODING_MACCHINESETRAD = wx.gdi.FONTENCODING_MACCHINESETRAD
+wxFONTENCODING_MACKOREAN = wx.gdi.FONTENCODING_MACKOREAN
+wxFONTENCODING_MACARABIC = wx.gdi.FONTENCODING_MACARABIC
+wxFONTENCODING_MACHEBREW = wx.gdi.FONTENCODING_MACHEBREW
+wxFONTENCODING_MACGREEK = wx.gdi.FONTENCODING_MACGREEK
+wxFONTENCODING_MACCYRILLIC = wx.gdi.FONTENCODING_MACCYRILLIC
+wxFONTENCODING_MACDEVANAGARI = wx.gdi.FONTENCODING_MACDEVANAGARI
+wxFONTENCODING_MACGURMUKHI = wx.gdi.FONTENCODING_MACGURMUKHI
+wxFONTENCODING_MACGUJARATI = wx.gdi.FONTENCODING_MACGUJARATI
+wxFONTENCODING_MACORIYA = wx.gdi.FONTENCODING_MACORIYA
+wxFONTENCODING_MACBENGALI = wx.gdi.FONTENCODING_MACBENGALI
+wxFONTENCODING_MACTAMIL = wx.gdi.FONTENCODING_MACTAMIL
+wxFONTENCODING_MACTELUGU = wx.gdi.FONTENCODING_MACTELUGU
+wxFONTENCODING_MACKANNADA = wx.gdi.FONTENCODING_MACKANNADA
+wxFONTENCODING_MACMALAJALAM = wx.gdi.FONTENCODING_MACMALAJALAM
+wxFONTENCODING_MACSINHALESE = wx.gdi.FONTENCODING_MACSINHALESE
+wxFONTENCODING_MACBURMESE = wx.gdi.FONTENCODING_MACBURMESE
+wxFONTENCODING_MACKHMER = wx.gdi.FONTENCODING_MACKHMER
+wxFONTENCODING_MACTHAI = wx.gdi.FONTENCODING_MACTHAI
+wxFONTENCODING_MACLAOTIAN = wx.gdi.FONTENCODING_MACLAOTIAN
+wxFONTENCODING_MACGEORGIAN = wx.gdi.FONTENCODING_MACGEORGIAN
+wxFONTENCODING_MACARMENIAN = wx.gdi.FONTENCODING_MACARMENIAN
+wxFONTENCODING_MACCHINESESIMP = wx.gdi.FONTENCODING_MACCHINESESIMP
+wxFONTENCODING_MACTIBETAN = wx.gdi.FONTENCODING_MACTIBETAN
+wxFONTENCODING_MACMONGOLIAN = wx.gdi.FONTENCODING_MACMONGOLIAN
+wxFONTENCODING_MACETHIOPIC = wx.gdi.FONTENCODING_MACETHIOPIC
+wxFONTENCODING_MACCENTRALEUR = wx.gdi.FONTENCODING_MACCENTRALEUR
+wxFONTENCODING_MACVIATNAMESE = wx.gdi.FONTENCODING_MACVIATNAMESE
+wxFONTENCODING_MACARABICEXT = wx.gdi.FONTENCODING_MACARABICEXT
+wxFONTENCODING_MACSYMBOL = wx.gdi.FONTENCODING_MACSYMBOL
+wxFONTENCODING_MACDINGBATS = wx.gdi.FONTENCODING_MACDINGBATS
+wxFONTENCODING_MACTURKISH = wx.gdi.FONTENCODING_MACTURKISH
+wxFONTENCODING_MACCROATIAN = wx.gdi.FONTENCODING_MACCROATIAN
+wxFONTENCODING_MACICELANDIC = wx.gdi.FONTENCODING_MACICELANDIC
+wxFONTENCODING_MACROMANIAN = wx.gdi.FONTENCODING_MACROMANIAN
+wxFONTENCODING_MACCELTIC = wx.gdi.FONTENCODING_MACCELTIC
+wxFONTENCODING_MACGAELIC = wx.gdi.FONTENCODING_MACGAELIC
+wxFONTENCODING_MACKEYBOARD = wx.gdi.FONTENCODING_MACKEYBOARD
+wxFONTENCODING_MACMIN = wx.gdi.FONTENCODING_MACMIN
+wxFONTENCODING_MACMAX = wx.gdi.FONTENCODING_MACMAX
wxFONTENCODING_MAX = wx.gdi.FONTENCODING_MAX
wxFONTENCODING_UTF16 = wx.gdi.FONTENCODING_UTF16
wxFONTENCODING_UTF32 = wx.gdi.FONTENCODING_UTF32
wxNativeEncodingInfoPtr = wx.gdi.NativeEncodingInfoPtr
wxGetNativeFontEncoding = wx.gdi.GetNativeFontEncoding
wxTestFontEncoding = wx.gdi.TestFontEncoding
+wxFontMapper = wx.gdi.FontMapper
+wxFontMapperPtr = wx.gdi.FontMapperPtr
wxFontMapper_Get = wx.gdi.FontMapper_Get
wxFontMapper_Set = wx.gdi.FontMapper_Set
wxFontMapper_GetSupportedEncodingsCount = wx.gdi.FontMapper_GetSupportedEncodingsCount
wxFontMapper_GetEncodingName = wx.gdi.FontMapper_GetEncodingName
wxFontMapper_GetEncodingDescription = wx.gdi.FontMapper_GetEncodingDescription
wxFontMapper_GetDefaultConfigPath = wx.gdi.FontMapper_GetDefaultConfigPath
-wxFontMapper = wx.gdi.FontMapper
-wxFontMapperPtr = wx.gdi.FontMapperPtr
+wxFont = wx.gdi.Font
+wxFontPtr = wx.gdi.FontPtr
wxFontFromNativeInfo = wx.gdi.FontFromNativeInfo
wxFontFromNativeInfoString = wx.gdi.FontFromNativeInfoString
wxFont2 = wx.gdi.Font2
wxFont_GetDefaultEncoding = wx.gdi.Font_GetDefaultEncoding
wxFont_SetDefaultEncoding = wx.gdi.Font_SetDefaultEncoding
-wxFont = wx.gdi.Font
-wxFontPtr = wx.gdi.FontPtr
wxFontEnumerator = wx.gdi.FontEnumerator
wxFontEnumeratorPtr = wx.gdi.FontEnumeratorPtr
wxLANGUAGE_DEFAULT = wx.gdi.LANGUAGE_DEFAULT
wxLOCALE_DECIMAL_POINT = wx.gdi.LOCALE_DECIMAL_POINT
wxLOCALE_LOAD_DEFAULT = wx.gdi.LOCALE_LOAD_DEFAULT
wxLOCALE_CONV_ENCODING = wx.gdi.LOCALE_CONV_ENCODING
+wxLocale = wx.gdi.Locale
+wxLocalePtr = wx.gdi.LocalePtr
wxLocale_GetSystemLanguage = wx.gdi.Locale_GetSystemLanguage
wxLocale_GetSystemEncoding = wx.gdi.Locale_GetSystemEncoding
wxLocale_GetSystemEncodingName = wx.gdi.Locale_GetSystemEncodingName
wxLocale_GetLanguageName = wx.gdi.Locale_GetLanguageName
wxLocale_FindLanguageInfo = wx.gdi.Locale_FindLanguageInfo
wxLocale_AddLanguage = wx.gdi.Locale_AddLanguage
-wxLocale = wx.gdi.Locale
-wxLocalePtr = wx.gdi.LocalePtr
wxGetLocale = wx.gdi.GetLocale
wxGetTranslation = wx.gdi.GetTranslation
wxGetTranslation = wx.gdi.GetTranslation
wxPLATFORM_WINDOWS = wx.gdi.PLATFORM_WINDOWS
wxPLATFORM_OS2 = wx.gdi.PLATFORM_OS2
wxPLATFORM_MAC = wx.gdi.PLATFORM_MAC
+wxEncodingConverter = wx.gdi.EncodingConverter
+wxEncodingConverterPtr = wx.gdi.EncodingConverterPtr
wxEncodingConverter_GetPlatformEquivalents = wx.gdi.EncodingConverter_GetPlatformEquivalents
wxEncodingConverter_GetAllEquivalents = wx.gdi.EncodingConverter_GetAllEquivalents
wxEncodingConverter_CanConvert = wx.gdi.EncodingConverter_CanConvert
-wxEncodingConverter = wx.gdi.EncodingConverter
-wxEncodingConverterPtr = wx.gdi.EncodingConverterPtr
wxDC = wx.gdi.DC
wxDCPtr = wx.gdi.DCPtr
-wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC
wxMemoryDC = wx.gdi.MemoryDC
wxMemoryDCPtr = wx.gdi.MemoryDCPtr
-wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer
+wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC
wxBufferedDC = wx.gdi.BufferedDC
wxBufferedDCPtr = wx.gdi.BufferedDCPtr
+wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer
wxBufferedPaintDC = wx.gdi.BufferedPaintDC
wxBufferedPaintDCPtr = wx.gdi.BufferedPaintDCPtr
wxScreenDC = wx.gdi.ScreenDC
wxWindowDCPtr = wx.gdi.WindowDCPtr
wxMirrorDC = wx.gdi.MirrorDC
wxMirrorDCPtr = wx.gdi.MirrorDCPtr
-wxPostScriptDC_SetResolution = wx.gdi.PostScriptDC_SetResolution
-wxPostScriptDC_GetResolution = wx.gdi.PostScriptDC_GetResolution
wxPostScriptDC = wx.gdi.PostScriptDC
wxPostScriptDCPtr = wx.gdi.PostScriptDCPtr
+wxPostScriptDC_SetResolution = wx.gdi.PostScriptDC_SetResolution
+wxPostScriptDC_GetResolution = wx.gdi.PostScriptDC_GetResolution
wxMetaFile = wx.gdi.MetaFile
wxMetaFilePtr = wx.gdi.MetaFilePtr
wxMetaFileDC = wx.gdi.MetaFileDC
wxIMAGE_LIST_STATE = wx.gdi.IMAGE_LIST_STATE
wxImageList = wx.gdi.ImageList
wxImageListPtr = wx.gdi.ImageListPtr
-wxPenList = wx.gdi.PenList
-wxPenListPtr = wx.gdi.PenListPtr
-wxBrushList = wx.gdi.BrushList
-wxBrushListPtr = wx.gdi.BrushListPtr
-wxColourDatabase = wx.gdi.ColourDatabase
-wxColourDatabasePtr = wx.gdi.ColourDatabasePtr
-wxFontList = wx.gdi.FontList
-wxFontListPtr = wx.gdi.FontListPtr
wxNORMAL_FONT = wx.gdi.NORMAL_FONT
wxSMALL_FONT = wx.gdi.SMALL_FONT
wxITALIC_FONT = wx.gdi.ITALIC_FONT
wxNullPalette = wx.gdi.NullPalette
wxNullFont = wx.gdi.NullFont
wxNullColour = wx.gdi.NullColour
+wxPenList = wx.gdi.PenList
+wxPenListPtr = wx.gdi.PenListPtr
+wxBrushList = wx.gdi.BrushList
+wxBrushListPtr = wx.gdi.BrushListPtr
+wxColourDatabase = wx.gdi.ColourDatabase
+wxColourDatabasePtr = wx.gdi.ColourDatabasePtr
+wxFontList = wx.gdi.FontList
+wxFontListPtr = wx.gdi.FontListPtr
wxTheFontList = wx.gdi.TheFontList
wxThePenList = wx.gdi.ThePenList
wxTheBrushList = wx.gdi.TheBrushList
wxTheColourDatabase = wx.gdi.TheColourDatabase
wxEffects = wx.gdi.Effects
wxEffectsPtr = wx.gdi.EffectsPtr
-wxColor = wx.gdi.Color
-wxNamedColor = wx.gdi.NamedColor
+wxDC_old = wx.gdi.DC_old
+wxMemoryDC_old = wx.gdi.MemoryDC_old
+wxBufferedDC_old = wx.gdi.BufferedDC_old
+wxBufferedPaintDC_old = wx.gdi.BufferedPaintDC_old
+wxScreenDC_old = wx.gdi.ScreenDC_old
+wxClientDC_old = wx.gdi.ClientDC_old
+wxPaintDC_old = wx.gdi.PaintDC_old
+wxWindowDC_old = wx.gdi.WindowDC_old
+wxMirrorDC_old = wx.gdi.MirrorDC_old
+wxPostScriptDC_old = wx.gdi.PostScriptDC_old
+wxMetaFileDC_old = wx.gdi.MetaFileDC_old
+wxPrinterDC_old = wx.gdi.PrinterDC_old
+wxMaskColour = wx.gdi.MaskColour