X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96bfd05319f9e393843e84ca5274d85ff248bad4..ec5d77998a16fbdf328ec689a48449c84f0d4336:/wxPython/src/msw/image.py diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py index cddec60bc7..7d0e7fe23d 100644 --- a/wxPython/src/msw/image.py +++ b/wxPython/src/msw/image.py @@ -264,11 +264,6 @@ class wxImage(wxImagePtr): #-------------- FUNCTION WRAPPERS ------------------ -def wxNullImage(*_args, **_kwargs): - val = apply(imagec.wxNullImage,_args,_kwargs) - if val: val = wxImagePtr(val); val.thisown = 1 - return val - def wxEmptyImage(*_args, **_kwargs): val = apply(imagec.wxEmptyImage,_args,_kwargs) if val: val = wxImagePtr(val); val.thisown = 1 @@ -286,6 +281,11 @@ def wxImageFromBitmap(*_args, **_kwargs): wxInitAllImageHandlers = imagec.wxInitAllImageHandlers +def wxBitmapFromImage(*_args, **_kwargs): + val = apply(imagec.wxBitmapFromImage,_args,_kwargs) + if val: val = wxBitmapPtr(val); val.thisown = 1 + return val + wxImage_CanRead = imagec.wxImage_CanRead wxImage_AddHandler = imagec.wxImage_AddHandler @@ -298,3 +298,5 @@ wxImage_RemoveHandler = imagec.wxImage_RemoveHandler #-------------- VARIABLE WRAPPERS ------------------ +cvar = imagec.cvar +wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)