#undef Yield

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

diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py
index cddec60bc77ecc81720427e17c1a05d2647c2770..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 *
 from misc import *
 
 from gdi import *

-class wxImageHandlerPtr :
+class wxImageHandlerPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -264,11 +264,6 @@ class wxImage(wxImagePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- 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
 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
 
 
 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
 wxImage_CanRead = imagec.wxImage_CanRead
 
 wxImage_AddHandler = imagec.wxImage_AddHandler


@@ -298,3 +298,5 @@ wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+cvar = imagec.cvar
+wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)