#undef Yield

[wxWidgets.git] / wxPython / src / msw / image.py

diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py
index 53ae04d20010e2597058b8f104f58188a3acfbd7..865e18c0b8aaa737dd3a61f29e68854ef1249309 100644 (file)
--- a/wxPython/src/msw/image.py
+++ b/wxPython/src/msw/image.py
@@ -4,7 +4,7 @@ import imagec
 from misc import *
 
 from gdi import *
-class wxImageHandlerPtr :
+class wxImageHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -139,7 +139,7 @@ class wxTIFFHandler(wxTIFFHandlerPtr):
 
 
 
-class wxImagePtr :
+class wxImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -281,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