Some compilation fixes

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

diff --git a/wxPython/src/mac/image.py b/wxPython/src/mac/image.py
index 4cbc7762d2847be6f453930b53e4bd73cd20bf3b..d2200ceafb679cfb5248d46f4a3315d01306e31b 100644 (file)
--- a/wxPython/src/mac/image.py
+++ b/wxPython/src/mac/image.py
@@ -20,6 +20,9 @@ class wxImageHandlerPtr(wxObjectPtr):
     def GetMimeType(self, *_args, **_kwargs):
         val = apply(imagec.wxImageHandler_GetMimeType,(self,) + _args, _kwargs)
         return val
     def GetMimeType(self, *_args, **_kwargs):
         val = apply(imagec.wxImageHandler_GetMimeType,(self,) + _args, _kwargs)
         return val

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

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


@@ -83,6 +86,20 @@ class wxBMPHandler(wxBMPHandlerPtr):
 
 
 
 
 
 

+class wxICOHandlerPtr(wxBMPHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxICOHandler instance at %s>" % (self.this,)
+class wxICOHandler(wxICOHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxICOHandler,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

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


@@ -298,6 +315,11 @@ def wxImageFromBitmap(*_args, **_kwargs):
     if val: val = wxImagePtr(val); val.thisown = 1
     return val
 
     if val: val = wxImagePtr(val); val.thisown = 1
     return val
 

+def wxImageFromData(*_args, **_kwargs):
+    val = apply(imagec.wxImageFromData,_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):


@@ -307,6 +329,8 @@ def wxBitmapFromImage(*_args, **_kwargs):
 
 wxImage_CanRead = imagec.wxImage_CanRead
 
 
 wxImage_CanRead = imagec.wxImage_CanRead
 

+wxImage_GetImageCount = imagec.wxImage_GetImageCount
+

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