Fixed a deadlock problem when using threads

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

diff --git a/utils/wxPython/src/msw/image.py b/utils/wxPython/src/msw/image.py
index 15ad9c368b970dd39339d5f0ed8ff7517375c38a..1f0924638da1ff4b95aeed49933211248f43ff95 100644 (file)
--- a/utils/wxPython/src/msw/image.py
+++ b/utils/wxPython/src/msw/image.py
@@ -35,9 +35,8 @@ class wxImageHandlerPtr :
     def __repr__(self):
         return "<C wxImageHandler instance at %s>" % (self.this,)
 class wxImageHandler(wxImageHandlerPtr):
     def __repr__(self):
         return "<C wxImageHandler instance at %s>" % (self.this,)
 class wxImageHandler(wxImageHandlerPtr):

-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(imagec.new_wxImageHandler,_args,_kwargs)
-        self.thisown = 1
+    def __init__(self,this):
+        self.this = this

 
 
 
 
 
 


@@ -183,6 +182,10 @@ class wxImagePtr :
     def GetHeight(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetHeight,(self,) + _args, _kwargs)
         return val
     def GetHeight(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetHeight,(self,) + _args, _kwargs)
         return val

+    def GetSubImage(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetSubImage,(self,) + _args, _kwargs)
+        if val: val = wxImagePtr(val) ; val.thisown = 1
+        return val

     def GetData(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetData,(self,) + _args, _kwargs)
         return val
     def GetData(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetData,(self,) + _args, _kwargs)
         return val