Changed how the stock objects (wx.RED, wx.RED_PEN, wx.RED_BRUSH, etc.)
are initialized. They are now created as a wrapper object that initializes itself on first use (when an attribute of the object is requested.) This was needed because of similar delayed initialization functionality that was implemented in wxWidgets, but the end result is cleaner for wxPython as well, and allowed me to remove some ugly code under the covers. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -490,6 +490,53 @@ 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
|
||||
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
|
||||
@@ -524,44 +571,8 @@ wxLIGHT_GREY = wx._gdi.LIGHT_GREY
|
||||
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
|
||||
wxBrushList = wx._gdi.BrushList
|
||||
wxColourDatabase = wx._gdi.ColourDatabase
|
||||
wxFontList = wx._gdi.FontList
|
||||
wxTheFontList = wx._gdi.TheFontList
|
||||
wxThePenList = wx._gdi.ThePenList
|
||||
wxTheBrushList = wx._gdi.TheBrushList
|
||||
wxTheColourDatabase = wx._gdi.TheColourDatabase
|
||||
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
|
||||
wxTheFontList = wx._gdi.wxTheFontList
|
||||
wxTheBrushList = wx._gdi.wxTheBrushList
|
||||
wxTheColourDatabase = wx._gdi.wxTheColourDatabase
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user