GTK2: gtk_timeout_add -> g_timeout_add; gtk_timeout_remove -> g_source_remove.

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

diff --git a/wxPython/wxPython/_gdi.py b/wxPython/wxPython/_gdi.py
index 713d1816cc6a6962bb01e6fdfaa6312f5309398e..3484752a3a78be4bfd1f078d3ae885725cd83c95 100644 (file)
--- a/wxPython/wxPython/_gdi.py
+++ b/wxPython/wxPython/_gdi.py
@@ -1,7 +1,7 @@
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##
-## Generated by ./distrib/build_renamers.py
+## Generated by BuildRenamers in config.py
 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package
@@ -29,18 +29,16 @@ wxPalette = wx._gdi.Palette
 wxPalettePtr = wx._gdi.PalettePtr
 wxPen = wx._gdi.Pen
 wxPenPtr = wx._gdi.PenPtr
-wxPyPen = wx._gdi.PyPen
-wxPyPenPtr = wx._gdi.PyPenPtr
 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
-wxEmptyBitmap = wx._gdi.EmptyBitmap
-wxEmptyBitmap = wx._gdi.EmptyBitmap
 wxMask = wx._gdi.Mask
 wxMaskPtr = wx._gdi.MaskPtr
 wxIcon = wx._gdi.Icon
@@ -65,6 +63,7 @@ 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
@@ -212,11 +211,14 @@ 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
@@ -488,9 +490,10 @@ 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
-wxBufferedDCInternalBuffer = wx._gdi.BufferedDCInternalBuffer
 wxBufferedPaintDC = wx._gdi.BufferedPaintDC
 wxBufferedPaintDCPtr = wx._gdi.BufferedPaintDCPtr
 wxScreenDC = wx._gdi.ScreenDC
@@ -578,18 +581,30 @@ wxTheBrushList = wx._gdi.TheBrushList
 wxTheColourDatabase = wx._gdi.TheColourDatabase
 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
+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
+wxSplitterRenderParamsPtr = wx._gdi.SplitterRenderParamsPtr
+wxRendererVersion = wx._gdi.RendererVersion
+wxRendererVersionPtr = wx._gdi.RendererVersionPtr
+wxRendererVersion_IsCompatible = wx._gdi.RendererVersion_IsCompatible
+wxRendererNative = wx._gdi.RendererNative
+wxRendererNativePtr = wx._gdi.RendererNativePtr
+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