Commented out the bitmap-greying code until I have time to debug it

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

diff --git a/wxPython/src/mac/image.py b/wxPython/src/mac/image.py
index 227aa78dcdc0c0049df90875c21244c7c37f0fbe..f725822176e22f876bb8a1890bbf24f50b0648e1 100644 (file)
--- a/wxPython/src/mac/image.py
+++ b/wxPython/src/mac/image.py
@@ -4,6 +4,8 @@ import imagec
 from misc import *
 
 from gdi import *
 from misc import *
 
 from gdi import *

+
+from streams import *

 class wxImageHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxImageHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -233,6 +235,12 @@ class wxImagePtr(wxObjectPtr):
     def SaveMimeFile(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_SaveMimeFile,(self,) + _args, _kwargs)
         return val
     def SaveMimeFile(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_SaveMimeFile,(self,) + _args, _kwargs)
         return val

+    def LoadStream(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_LoadStream,(self,) + _args, _kwargs)
+        return val
+    def LoadMimeStream(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_LoadMimeStream,(self,) + _args, _kwargs)
+        return val

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


@@ -348,6 +356,16 @@ def wxImageFromData(*_args, **_kwargs):
     if val: val = wxImagePtr(val); val.thisown = 1
     return val
 
     if val: val = wxImagePtr(val); val.thisown = 1
     return val
 

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

 wxInitAllImageHandlers = imagec.wxInitAllImageHandlers
 
 def wxBitmapFromImage(*_args, **_kwargs):
 wxInitAllImageHandlers = imagec.wxInitAllImageHandlers
 
 def wxBitmapFromImage(*_args, **_kwargs):


@@ -359,6 +377,8 @@ wxImage_CanRead = imagec.wxImage_CanRead
 
 wxImage_GetImageCount = imagec.wxImage_GetImageCount
 
 
 wxImage_GetImageCount = imagec.wxImage_GetImageCount
 

+wxImage_CanReadStream = imagec.wxImage_CanReadStream
+

 wxImage_AddHandler = imagec.wxImage_AddHandler
 
 wxImage_InsertHandler = imagec.wxImage_InsertHandler
 wxImage_AddHandler = imagec.wxImage_AddHandler
 
 wxImage_InsertHandler = imagec.wxImage_InsertHandler