[wxGTK2] Return wxTELETYPE with GetFamily() for monospaced fonts, fixing IsFixedWidth...

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

diff --git a/wxPython/wxPython/_gdi.py b/wxPython/wxPython/_gdi.py
index 0e09dad35dfc609949888f4e599486775dc520c4..3484752a3a78be4bfd1f078d3ae885725cd83c95 100644 (file)
--- a/wxPython/wxPython/_gdi.py
+++ b/wxPython/wxPython/_gdi.py
@@ -31,6 +31,7 @@ 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
@@ -210,8 +211,9 @@ 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
@@ -579,6 +581,30 @@ wxTheBrushList = wx._gdi.TheBrushList
 wxTheColourDatabase = wx._gdi.TheColourDatabase
 wxEffects = wx._gdi.Effects
 wxEffectsPtr = wx._gdi.EffectsPtr
+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