wxUniversal fixes:

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

diff --git a/wxPython/src/gtk/image.py b/wxPython/src/gtk/image.py
index 94a14b2e442ed8ced1ed127ec3d74304d9a57d65..844a22e9549664affb9678b2b0def8d3dd119662 100644 (file)
--- a/wxPython/src/gtk/image.py
+++ b/wxPython/src/gtk/image.py
@@ -4,6 +4,10 @@ import imagec
 from misc import *
 
 from gdi import *
 from misc import *
 
 from gdi import *

+
+from fonts import *
+
+from streams import *

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


@@ -20,6 +24,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 +90,48 @@ 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 wxCURHandlerPtr(wxICOHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxCURHandler instance at %s>" % (self.this,)
+class wxCURHandler(wxCURHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxCURHandler,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxANIHandlerPtr(wxCURHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxANIHandler instance at %s>" % (self.this,)
+class wxANIHandler(wxANIHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxANIHandler,_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


@@ -146,14 +195,6 @@ class wxImagePtr(wxObjectPtr):
     def __del__(self,imagec=imagec):
         if self.thisown == 1 :
             imagec.delete_wxImage(self)
     def __del__(self,imagec=imagec):
         if self.thisown == 1 :
             imagec.delete_wxImage(self)

-    def ConvertToBitmap(self, *_args, **_kwargs):
-        val = apply(imagec.wxImage_ConvertToBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) ; val.thisown = 1
-        return val
-    def ConvertToMonoBitmap(self, *_args, **_kwargs):
-        val = apply(imagec.wxImage_ConvertToMonoBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) ; val.thisown = 1
-        return val

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


@@ -180,6 +221,12 @@ class wxImagePtr(wxObjectPtr):
     def GetBlue(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetBlue,(self,) + _args, _kwargs)
         return val
     def GetBlue(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetBlue,(self,) + _args, _kwargs)
         return val

+    def FindFirstUnusedColour(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_FindFirstUnusedColour,(self,) + _args, _kwargs)
+        return val
+    def SetMaskFromImage(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetMaskFromImage,(self,) + _args, _kwargs)
+        return val

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


@@ -192,6 +239,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


@@ -273,6 +326,14 @@ class wxImagePtr(wxObjectPtr):
     def CountColours(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_CountColours,(self,) + _args, _kwargs)
         return val
     def CountColours(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_CountColours,(self,) + _args, _kwargs)
         return val

+    def ConvertToBitmap(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_ConvertToBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
+        return val
+    def ConvertToMonoBitmap(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_ConvertToMonoBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
+        return val

     def __repr__(self):
         return "<C wxImage instance at %s>" % (self.this,)
 class wxImage(wxImagePtr):
     def __repr__(self):
         return "<C wxImage instance at %s>" % (self.this,)
 class wxImage(wxImagePtr):


@@ -302,6 +363,21 @@ 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
+
+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):


@@ -311,6 +387,10 @@ def wxBitmapFromImage(*_args, **_kwargs):
 
 wxImage_CanRead = imagec.wxImage_CanRead
 
 
 wxImage_CanRead = imagec.wxImage_CanRead
 

+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