Compilation fixes.

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

diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py
index 761e00e6bdbf51f0ad1300e9f5934a510b3e2a95..53f6d7bf6e8c6aa12e4f1aab99486062207504af 100644 (file)
--- a/wxPython/wxPython/gdi.py
+++ b/wxPython/wxPython/gdi.py
@@ -20,41 +20,53 @@ del sys, _wx
 
 # Now assign all the reverse-renamed names:
 wxGDIObject = wx.gdi.GDIObject
 
 # Now assign all the reverse-renamed names:
 wxGDIObject = wx.gdi.GDIObject

+wxGDIObjectPtr = wx.gdi.GDIObjectPtr
+wxColour = wx.gdi.Colour
+wxColourPtr = wx.gdi.ColourPtr

 wxNamedColour = wx.gdi.NamedColour
 wxColourRGB = wx.gdi.ColourRGB
 wxNamedColour = wx.gdi.NamedColour
 wxColourRGB = wx.gdi.ColourRGB

-wxColour = wx.gdi.Colour

 wxPalette = wx.gdi.Palette
 wxPalette = wx.gdi.Palette

+wxPalettePtr = wx.gdi.PalettePtr

 wxPen = wx.gdi.Pen
 wxPen = wx.gdi.Pen

+wxPenPtr = wx.gdi.PenPtr

 wxPyPen = wx.gdi.PyPen
 wxPyPen = wx.gdi.PyPen

+wxPyPenPtr = wx.gdi.PyPenPtr

 wxBrush = wx.gdi.Brush
 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
 wxEmptyBitmap = wx.gdi.EmptyBitmap
 wxBitmapFromIcon = wx.gdi.BitmapFromIcon
 wxBitmapFromImage = wx.gdi.BitmapFromImage
 wxBitmapFromXPMData = wx.gdi.BitmapFromXPMData
 wxBitmapFromBits = wx.gdi.BitmapFromBits

-wxBitmap = wx.gdi.Bitmap
-wxMaskColour = wx.gdi.MaskColour

 wxMask = wx.gdi.Mask
 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
 wxEmptyIcon = wx.gdi.EmptyIcon
 wxIconFromLocation = wx.gdi.IconFromLocation
 wxIconFromBitmap = wx.gdi.IconFromBitmap
 wxIconFromXPMData = wx.gdi.IconFromXPMData

-wxIcon = wx.gdi.Icon

 wxIconLocation = wx.gdi.IconLocation
 wxIconLocation = wx.gdi.IconLocation

+wxIconLocationPtr = wx.gdi.IconLocationPtr
+wxIconBundle = wx.gdi.IconBundle
+wxIconBundlePtr = wx.gdi.IconBundlePtr

 wxIconBundleFromFile = wx.gdi.IconBundleFromFile
 wxIconBundleFromIcon = wx.gdi.IconBundleFromIcon
 wxIconBundleFromFile = wx.gdi.IconBundleFromFile
 wxIconBundleFromIcon = wx.gdi.IconBundleFromIcon

-wxIconBundle = wx.gdi.IconBundle
+wxCursor = wx.gdi.Cursor
+wxCursorPtr = wx.gdi.CursorPtr

 wxStockCursor = wx.gdi.StockCursor
 wxCursorFromImage = wx.gdi.CursorFromImage
 wxStockCursor = wx.gdi.StockCursor
 wxCursorFromImage = wx.gdi.CursorFromImage

-wxCursorFromBits = wx.gdi.CursorFromBits
-wxCursor = wx.gdi.Cursor

 wxOutRegion = wx.gdi.OutRegion
 wxPartRegion = wx.gdi.PartRegion
 wxInRegion = wx.gdi.InRegion
 wxOutRegion = wx.gdi.OutRegion
 wxPartRegion = wx.gdi.PartRegion
 wxInRegion = wx.gdi.InRegion

+wxRegion = wx.gdi.Region
+wxRegionPtr = wx.gdi.RegionPtr

 wxRegionFromBitmap = wx.gdi.RegionFromBitmap
 wxRegionFromPoints = wx.gdi.RegionFromPoints
 wxRegionFromBitmap = wx.gdi.RegionFromBitmap
 wxRegionFromPoints = wx.gdi.RegionFromPoints

-wxRegion = wx.gdi.Region

 wxRegionIterator = wx.gdi.RegionIterator
 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
 wxFONTFAMILY_DEFAULT = wx.gdi.FONTFAMILY_DEFAULT
 wxFONTFAMILY_DECORATIVE = wx.gdi.FONTFAMILY_DECORATIVE
 wxFONTFAMILY_ROMAN = wx.gdi.FONTFAMILY_ROMAN


@@ -129,6 +141,48 @@ wxFONTENCODING_UTF16BE = wx.gdi.FONTENCODING_UTF16BE
 wxFONTENCODING_UTF16LE = wx.gdi.FONTENCODING_UTF16LE
 wxFONTENCODING_UTF32BE = wx.gdi.FONTENCODING_UTF32BE
 wxFONTENCODING_UTF32LE = wx.gdi.FONTENCODING_UTF32LE
 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
 wxFONTENCODING_MAX = wx.gdi.FONTENCODING_MAX
 wxFONTENCODING_UTF16 = wx.gdi.FONTENCODING_UTF16
 wxFONTENCODING_UTF32 = wx.gdi.FONTENCODING_UTF32


@@ -137,9 +191,13 @@ wxFONTENCODING_GB2312 = wx.gdi.FONTENCODING_GB2312
 wxFONTENCODING_BIG5 = wx.gdi.FONTENCODING_BIG5
 wxFONTENCODING_SHIFT_JIS = wx.gdi.FONTENCODING_SHIFT_JIS
 wxNativeFontInfo = wx.gdi.NativeFontInfo
 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
 wxNativeEncodingInfo = wx.gdi.NativeEncodingInfo

+wxNativeEncodingInfoPtr = wx.gdi.NativeEncodingInfoPtr

 wxGetNativeFontEncoding = wx.gdi.GetNativeFontEncoding
 wxTestFontEncoding = wx.gdi.TestFontEncoding
 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_Get = wx.gdi.FontMapper_Get
 wxFontMapper_Set = wx.gdi.FontMapper_Set
 wxFontMapper_GetSupportedEncodingsCount = wx.gdi.FontMapper_GetSupportedEncodingsCount


@@ -147,14 +205,15 @@ wxFontMapper_GetEncoding = wx.gdi.FontMapper_GetEncoding
 wxFontMapper_GetEncodingName = wx.gdi.FontMapper_GetEncodingName
 wxFontMapper_GetEncodingDescription = wx.gdi.FontMapper_GetEncodingDescription
 wxFontMapper_GetDefaultConfigPath = wx.gdi.FontMapper_GetDefaultConfigPath
 wxFontMapper_GetEncodingName = wx.gdi.FontMapper_GetEncodingName
 wxFontMapper_GetEncodingDescription = wx.gdi.FontMapper_GetEncodingDescription
 wxFontMapper_GetDefaultConfigPath = wx.gdi.FontMapper_GetDefaultConfigPath

-wxFontMapper = wx.gdi.FontMapper
+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
 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

 wxFontEnumerator = wx.gdi.FontEnumerator
 wxFontEnumerator = wx.gdi.FontEnumerator

+wxFontEnumeratorPtr = wx.gdi.FontEnumeratorPtr

 wxLANGUAGE_DEFAULT = wx.gdi.LANGUAGE_DEFAULT
 wxLANGUAGE_UNKNOWN = wx.gdi.LANGUAGE_UNKNOWN
 wxLANGUAGE_ABKHAZIAN = wx.gdi.LANGUAGE_ABKHAZIAN
 wxLANGUAGE_DEFAULT = wx.gdi.LANGUAGE_DEFAULT
 wxLANGUAGE_UNKNOWN = wx.gdi.LANGUAGE_UNKNOWN
 wxLANGUAGE_ABKHAZIAN = wx.gdi.LANGUAGE_ABKHAZIAN


@@ -387,6 +446,7 @@ wxLANGUAGE_ZHUANG = wx.gdi.LANGUAGE_ZHUANG
 wxLANGUAGE_ZULU = wx.gdi.LANGUAGE_ZULU
 wxLANGUAGE_USER_DEFINED = wx.gdi.LANGUAGE_USER_DEFINED
 wxLanguageInfo = wx.gdi.LanguageInfo
 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_CAT_NUMBER = wx.gdi.LOCALE_CAT_NUMBER
 wxLOCALE_CAT_DATE = wx.gdi.LOCALE_CAT_DATE
 wxLOCALE_CAT_MONEY = wx.gdi.LOCALE_CAT_MONEY


@@ -395,6 +455,8 @@ wxLOCALE_THOUSANDS_SEP = wx.gdi.LOCALE_THOUSANDS_SEP
 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_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_GetSystemLanguage = wx.gdi.Locale_GetSystemLanguage
 wxLocale_GetSystemEncoding = wx.gdi.Locale_GetSystemEncoding
 wxLocale_GetSystemEncodingName = wx.gdi.Locale_GetSystemEncodingName


@@ -403,7 +465,6 @@ wxLocale_GetLanguageInfo = wx.gdi.Locale_GetLanguageInfo
 wxLocale_GetLanguageName = wx.gdi.Locale_GetLanguageName
 wxLocale_FindLanguageInfo = wx.gdi.Locale_FindLanguageInfo
 wxLocale_AddLanguage = wx.gdi.Locale_AddLanguage
 wxLocale_GetLanguageName = wx.gdi.Locale_GetLanguageName
 wxLocale_FindLanguageInfo = wx.gdi.Locale_FindLanguageInfo
 wxLocale_AddLanguage = wx.gdi.Locale_AddLanguage

-wxLocale = wx.gdi.Locale

 wxGetLocale = wx.gdi.GetLocale
 wxGetTranslation = wx.gdi.GetTranslation
 wxGetTranslation = wx.gdi.GetTranslation
 wxGetLocale = wx.gdi.GetLocale
 wxGetTranslation = wx.gdi.GetTranslation
 wxGetTranslation = wx.gdi.GetTranslation


@@ -414,27 +475,41 @@ wxPLATFORM_UNIX = wx.gdi.PLATFORM_UNIX
 wxPLATFORM_WINDOWS = wx.gdi.PLATFORM_WINDOWS
 wxPLATFORM_OS2 = wx.gdi.PLATFORM_OS2
 wxPLATFORM_MAC = wx.gdi.PLATFORM_MAC
 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_GetPlatformEquivalents = wx.gdi.EncodingConverter_GetPlatformEquivalents
 wxEncodingConverter_GetAllEquivalents = wx.gdi.EncodingConverter_GetAllEquivalents
 wxEncodingConverter_CanConvert = wx.gdi.EncodingConverter_CanConvert

-wxEncodingConverter = wx.gdi.EncodingConverter

 wxDC = wx.gdi.DC
 wxDC = wx.gdi.DC

-wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC
+wxDCPtr = wx.gdi.DCPtr

 wxMemoryDC = wx.gdi.MemoryDC
 wxMemoryDC = wx.gdi.MemoryDC

-wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer
+wxMemoryDCPtr = wx.gdi.MemoryDCPtr
+wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC

 wxBufferedDC = wx.gdi.BufferedDC
 wxBufferedDC = wx.gdi.BufferedDC

+wxBufferedDCPtr = wx.gdi.BufferedDCPtr
+wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer

 wxBufferedPaintDC = wx.gdi.BufferedPaintDC
 wxBufferedPaintDC = wx.gdi.BufferedPaintDC

+wxBufferedPaintDCPtr = wx.gdi.BufferedPaintDCPtr

 wxScreenDC = wx.gdi.ScreenDC
 wxScreenDC = wx.gdi.ScreenDC

+wxScreenDCPtr = wx.gdi.ScreenDCPtr

 wxClientDC = wx.gdi.ClientDC
 wxClientDC = wx.gdi.ClientDC

+wxClientDCPtr = wx.gdi.ClientDCPtr

 wxPaintDC = wx.gdi.PaintDC
 wxPaintDC = wx.gdi.PaintDC

+wxPaintDCPtr = wx.gdi.PaintDCPtr

 wxWindowDC = wx.gdi.WindowDC
 wxWindowDC = wx.gdi.WindowDC

+wxWindowDCPtr = wx.gdi.WindowDCPtr

 wxMirrorDC = wx.gdi.MirrorDC
 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
 wxPostScriptDC_SetResolution = wx.gdi.PostScriptDC_SetResolution
 wxPostScriptDC_GetResolution = wx.gdi.PostScriptDC_GetResolution

-wxPostScriptDC = wx.gdi.PostScriptDC

 wxMetaFile = wx.gdi.MetaFile
 wxMetaFile = wx.gdi.MetaFile

+wxMetaFilePtr = wx.gdi.MetaFilePtr

 wxMetaFileDC = wx.gdi.MetaFileDC
 wxMetaFileDC = wx.gdi.MetaFileDC

+wxMetaFileDCPtr = wx.gdi.MetaFileDCPtr

 wxPrinterDC = wx.gdi.PrinterDC
 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
 wxIMAGELIST_DRAW_NORMAL = wx.gdi.IMAGELIST_DRAW_NORMAL
 wxIMAGELIST_DRAW_TRANSPARENT = wx.gdi.IMAGELIST_DRAW_TRANSPARENT
 wxIMAGELIST_DRAW_SELECTED = wx.gdi.IMAGELIST_DRAW_SELECTED


@@ -443,10 +518,7 @@ wxIMAGE_LIST_NORMAL = wx.gdi.IMAGE_LIST_NORMAL
 wxIMAGE_LIST_SMALL = wx.gdi.IMAGE_LIST_SMALL
 wxIMAGE_LIST_STATE = wx.gdi.IMAGE_LIST_STATE
 wxImageList = wx.gdi.ImageList
 wxIMAGE_LIST_SMALL = wx.gdi.IMAGE_LIST_SMALL
 wxIMAGE_LIST_STATE = wx.gdi.IMAGE_LIST_STATE
 wxImageList = wx.gdi.ImageList

-wxPenList = wx.gdi.PenList
-wxBrushList = wx.gdi.BrushList
-wxColourDatabase = wx.gdi.ColourDatabase
-wxFontList = wx.gdi.FontList
+wxImageListPtr = wx.gdi.ImageListPtr

 wxNORMAL_FONT = wx.gdi.NORMAL_FONT
 wxSMALL_FONT = wx.gdi.SMALL_FONT
 wxITALIC_FONT = wx.gdi.ITALIC_FONT
 wxNORMAL_FONT = wx.gdi.NORMAL_FONT
 wxSMALL_FONT = wx.gdi.SMALL_FONT
 wxITALIC_FONT = wx.gdi.ITALIC_FONT


@@ -489,15 +561,32 @@ wxNullBrush = wx.gdi.NullBrush
 wxNullPalette = wx.gdi.NullPalette
 wxNullFont = wx.gdi.NullFont
 wxNullColour = wx.gdi.NullColour
 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
 wxTheFontList = wx.gdi.TheFontList
 wxThePenList = wx.gdi.ThePenList
 wxTheBrushList = wx.gdi.TheBrushList
 wxTheColourDatabase = wx.gdi.TheColourDatabase

-wxDragIcon = wx.gdi.DragIcon
-wxDragString = wx.gdi.DragString
-wxDragTreeItem = wx.gdi.DragTreeItem
-wxDragListItem = wx.gdi.DragListItem
-wxDragImage = wx.gdi.DragImage

 wxEffects = wx.gdi.Effects
 wxEffects = wx.gdi.Effects

+wxEffectsPtr = wx.gdi.EffectsPtr
+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