# Now assign all the reverse-renamed names:
wxGDIObject = wx._gdi.GDIObject
-wxGDIObjectPtr = wx._gdi.GDIObjectPtr
+wxC2S_NAME = wx._gdi.C2S_NAME
+wxC2S_CSS_SYNTAX = wx._gdi.C2S_CSS_SYNTAX
+wxC2S_HTML_SYNTAX = wx._gdi.C2S_HTML_SYNTAX
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
-wxPenPtr = wx._gdi.PenPtr
wxBrush = wx._gdi.Brush
-wxBrushPtr = wx._gdi.BrushPtr
+wxBrushFromBitmap = wx._gdi.BrushFromBitmap
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
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
wxIconLocation = wx._gdi.IconLocation
-wxIconLocationPtr = wx._gdi.IconLocationPtr
wxIconBundle = wx._gdi.IconBundle
-wxIconBundlePtr = wx._gdi.IconBundlePtr
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
wxRegion = wx._gdi.Region
-wxRegionPtr = wx._gdi.RegionPtr
wxRegionFromBitmap = wx._gdi.RegionFromBitmap
wxRegionFromBitmapColour = wx._gdi.RegionFromBitmapColour
wxRegionFromPoints = wx._gdi.RegionFromPoints
wxRegionIterator = wx._gdi.RegionIterator
-wxRegionIteratorPtr = wx._gdi.RegionIteratorPtr
wxFONTFAMILY_DEFAULT = wx._gdi.FONTFAMILY_DEFAULT
wxFONTFAMILY_DECORATIVE = wx._gdi.FONTFAMILY_DECORATIVE
wxFONTFAMILY_ROMAN = wx._gdi.FONTFAMILY_ROMAN
wxFONTENCODING_BIG5 = wx._gdi.FONTENCODING_BIG5
wxFONTENCODING_SHIFT_JIS = wx._gdi.FONTENCODING_SHIFT_JIS
wxNativeFontInfo = wx._gdi.NativeFontInfo
-wxNativeFontInfoPtr = wx._gdi.NativeFontInfoPtr
wxNativeEncodingInfo = wx._gdi.NativeEncodingInfo
-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_GetEncodingFromName = wx._gdi.FontMapper_GetEncodingFromName
wxFontMapper_GetDefaultConfigPath = wx._gdi.FontMapper_GetDefaultConfigPath
wxFont = wx._gdi.Font
-wxFontPtr = wx._gdi.FontPtr
wxFontFromNativeInfo = wx._gdi.FontFromNativeInfo
wxFontFromNativeInfoString = wx._gdi.FontFromNativeInfoString
-wxFont2 = wx._gdi.Font2
+wxFFont = wx._gdi.FFont
+wxFontFromPixelSize = wx._gdi.FontFromPixelSize
+wxFFontFromPixelSize = wx._gdi.FFontFromPixelSize
wxFont_GetDefaultEncoding = wx._gdi.Font_GetDefaultEncoding
wxFont_SetDefaultEncoding = wx._gdi.Font_SetDefaultEncoding
wxFontEnumerator = wx._gdi.FontEnumerator
-wxFontEnumeratorPtr = wx._gdi.FontEnumeratorPtr
+wxFontEnumerator = wx._gdi.FontEnumerator
wxLANGUAGE_DEFAULT = wx._gdi.LANGUAGE_DEFAULT
wxLANGUAGE_UNKNOWN = wx._gdi.LANGUAGE_UNKNOWN
wxLANGUAGE_ABKHAZIAN = wx._gdi.LANGUAGE_ABKHAZIAN
wxLANGUAGE_ZULU = wx._gdi.LANGUAGE_ZULU
wxLANGUAGE_USER_DEFINED = wx._gdi.LANGUAGE_USER_DEFINED
wxLanguageInfo = wx._gdi.LanguageInfo
-wxLanguageInfoPtr = wx._gdi.LanguageInfoPtr
wxLOCALE_CAT_NUMBER = wx._gdi.LOCALE_CAT_NUMBER
wxLOCALE_CAT_DATE = wx._gdi.LOCALE_CAT_DATE
wxLOCALE_CAT_MONEY = wx._gdi.LOCALE_CAT_MONEY
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
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
wxDC = wx._gdi.DC
-wxDCPtr = wx._gdi.DCPtr
wxMemoryDC = wx._gdi.MemoryDC
-wxMemoryDCPtr = wx._gdi.MemoryDCPtr
wxMemoryDCFromDC = wx._gdi.MemoryDCFromDC
+wxBUFFER_VIRTUAL_AREA = wx._gdi.BUFFER_VIRTUAL_AREA
+wxBUFFER_CLIENT_AREA = wx._gdi.BUFFER_CLIENT_AREA
wxBufferedDC = wx._gdi.BufferedDC
-wxBufferedDCPtr = wx._gdi.BufferedDCPtr
wxBufferedPaintDC = wx._gdi.BufferedPaintDC
-wxBufferedPaintDCPtr = wx._gdi.BufferedPaintDCPtr
wxScreenDC = wx._gdi.ScreenDC
-wxScreenDCPtr = wx._gdi.ScreenDCPtr
wxClientDC = wx._gdi.ClientDC
-wxClientDCPtr = wx._gdi.ClientDCPtr
wxPaintDC = wx._gdi.PaintDC
-wxPaintDCPtr = wx._gdi.PaintDCPtr
wxWindowDC = wx._gdi.WindowDC
-wxWindowDCPtr = wx._gdi.WindowDCPtr
wxMirrorDC = wx._gdi.MirrorDC
-wxMirrorDCPtr = wx._gdi.MirrorDCPtr
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
-wxMetaFileDCPtr = wx._gdi.MetaFileDCPtr
wxPrinterDC = wx._gdi.PrinterDC
-wxPrinterDCPtr = wx._gdi.PrinterDCPtr
wxIMAGELIST_DRAW_NORMAL = wx._gdi.IMAGELIST_DRAW_NORMAL
wxIMAGELIST_DRAW_TRANSPARENT = wx._gdi.IMAGELIST_DRAW_TRANSPARENT
wxIMAGELIST_DRAW_SELECTED = wx._gdi.IMAGELIST_DRAW_SELECTED
wxIMAGE_LIST_SMALL = wx._gdi.IMAGE_LIST_SMALL
wxIMAGE_LIST_STATE = wx._gdi.IMAGE_LIST_STATE
wxImageList = wx._gdi.ImageList
-wxImageListPtr = wx._gdi.ImageListPtr
+wxStockGDI = wx._gdi.StockGDI
+wxStockGDI_DeleteAll = wx._gdi.StockGDI_DeleteAll
+wxStockGDI_instance = wx._gdi.StockGDI_instance
+wxStockGDI_GetBrush = wx._gdi.StockGDI_GetBrush
+wxStockGDI_GetColour = wx._gdi.StockGDI_GetColour
+wxStockGDI_GetCursor = wx._gdi.StockGDI_GetCursor
+wxStockGDI_GetPen = wx._gdi.StockGDI_GetPen
+wxNullBitmap = wx._gdi.NullBitmap
+wxNullIcon = wx._gdi.NullIcon
+wxNullCursor = wx._gdi.NullCursor
+wxNullPen = wx._gdi.NullPen
+wxNullBrush = wx._gdi.NullBrush
+wxNullPalette = wx._gdi.NullPalette
+wxNullFont = wx._gdi.NullFont
+wxNullColour = wx._gdi.NullColour
+wxGDIObjListBase = wx._gdi.GDIObjListBase
+wxPenList = wx._gdi.PenList
+wxBrushList = wx._gdi.BrushList
+wxFontList = wx._gdi.FontList
+wxColourDatabase = wx._gdi.ColourDatabase
+_wxPyInitTheFontList = wx._gdi._wxPyInitTheFontList
+_wxPyInitThePenList = wx._gdi._wxPyInitThePenList
+_wxPyInitTheBrushList = wx._gdi._wxPyInitTheBrushList
+_wxPyInitTheColourDatabase = wx._gdi._wxPyInitTheColourDatabase
+wxEffects = wx._gdi.Effects
+wxCONTROL_DISABLED = wx._gdi.CONTROL_DISABLED
+wxCONTROL_FOCUSED = wx._gdi.CONTROL_FOCUSED
+wxCONTROL_PRESSED = wx._gdi.CONTROL_PRESSED
+wxCONTROL_ISDEFAULT = wx._gdi.CONTROL_ISDEFAULT
+wxCONTROL_ISSUBMENU = wx._gdi.CONTROL_ISSUBMENU
+wxCONTROL_EXPANDED = wx._gdi.CONTROL_EXPANDED
+wxCONTROL_CURRENT = wx._gdi.CONTROL_CURRENT
+wxCONTROL_SELECTED = wx._gdi.CONTROL_SELECTED
+wxCONTROL_CHECKED = wx._gdi.CONTROL_CHECKED
+wxCONTROL_CHECKABLE = wx._gdi.CONTROL_CHECKABLE
+wxCONTROL_UNDETERMINED = wx._gdi.CONTROL_UNDETERMINED
+wxCONTROL_FLAGS_MASK = wx._gdi.CONTROL_FLAGS_MASK
+wxCONTROL_DIRTY = wx._gdi.CONTROL_DIRTY
+wxSplitterRenderParams = wx._gdi.SplitterRenderParams
+wxRendererVersion = wx._gdi.RendererVersion
+wxRendererVersion_IsCompatible = wx._gdi.RendererVersion_IsCompatible
+wxRendererNative = wx._gdi.RendererNative
+wxRendererNative_Get = wx._gdi.RendererNative_Get
+wxRendererNative_GetGeneric = wx._gdi.RendererNative_GetGeneric
+wxRendererNative_GetDefault = wx._gdi.RendererNative_GetDefault
+wxRendererNative_Set = wx._gdi.RendererNative_Set
+wxMaskColour = wx._gdi.MaskColour
wxNORMAL_FONT = wx._gdi.NORMAL_FONT
wxSMALL_FONT = wx._gdi.SMALL_FONT
wxITALIC_FONT = wx._gdi.ITALIC_FONT
wxSTANDARD_CURSOR = wx._gdi.STANDARD_CURSOR
wxHOURGLASS_CURSOR = wx._gdi.HOURGLASS_CURSOR
wxCROSS_CURSOR = wx._gdi.CROSS_CURSOR
-wxNullBitmap = wx._gdi.NullBitmap
-wxNullIcon = wx._gdi.NullIcon
-wxNullCursor = wx._gdi.NullCursor
-wxNullPen = wx._gdi.NullPen
-wxNullBrush = wx._gdi.NullBrush
-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
-wxMaskColour = wx._gdi.MaskColour