X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db34b2d45de32b374dbccecb96ff8a0100b2def1..d94974609888885e0b75d0e01d901b03a6213979:/wxPython/src/gtk/image.py?ds=sidebyside

diff --git a/wxPython/src/gtk/image.py b/wxPython/src/gtk/image.py
index 1e6fc2e2fa..c4d1896bd2 100644
--- a/wxPython/src/gtk/image.py
+++ b/wxPython/src/gtk/image.py
@@ -4,6 +4,27 @@ import imagec
 from misc import *
 
 from gdi import *
+
+from fonts import *
+
+from streams import *
+class wxImageHistogramPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def FindFirstUnusedColour(self, *_args, **_kwargs):
+        val = apply(imagec.wxImageHistogram_FindFirstUnusedColour,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxImageHistogram instance at %s>" % (self.this,)
+class wxImageHistogram(wxImageHistogramPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(imagec.new_wxImageHistogram,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxImageHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
@@ -188,17 +209,12 @@ class wxImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    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 __del__(self, delfunc=imagec.delete_wxImage):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Create(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs)
         return val
@@ -209,6 +225,10 @@ class wxImagePtr(wxObjectPtr):
         val = apply(imagec.wxImage_Scale,(self,) + _args, _kwargs)
         if val: val = wxImagePtr(val) ; val.thisown = 1
         return val
+    def ShrinkBy(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_ShrinkBy,(self,) + _args, _kwargs)
+        if val: val = wxImagePtr(val) ; val.thisown = 1
+        return val
     def Rescale(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_Rescale,(self,) + _args, _kwargs)
         if val: val = wxImagePtr(val) 
@@ -225,6 +245,21 @@ class wxImagePtr(wxObjectPtr):
     def GetBlue(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetBlue,(self,) + _args, _kwargs)
         return val
+    def SetAlpha(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetAlpha,(self,) + _args, _kwargs)
+        return val
+    def GetAlpha(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetAlpha,(self,) + _args, _kwargs)
+        return val
+    def HasAlpha(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_HasAlpha,(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
@@ -237,6 +272,12 @@ class wxImagePtr(wxObjectPtr):
     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
@@ -263,6 +304,24 @@ class wxImagePtr(wxObjectPtr):
     def SetData(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_SetData,(self,) + _args, _kwargs)
         return val
+    def GetDataBuffer(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetDataBuffer,(self,) + _args, _kwargs)
+        return val
+    def SetDataBuffer(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetDataBuffer,(self,) + _args, _kwargs)
+        return val
+    def GetAlphaData(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetAlphaData,(self,) + _args, _kwargs)
+        return val
+    def SetAlphaData(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetAlphaData,(self,) + _args, _kwargs)
+        return val
+    def GetAlphaBuffer(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetAlphaBuffer,(self,) + _args, _kwargs)
+        return val
+    def SetAlphaBuffer(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetAlphaBuffer,(self,) + _args, _kwargs)
+        return val
     def SetMaskColour(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_SetMaskColour,(self,) + _args, _kwargs)
         return val
@@ -318,6 +377,17 @@ class wxImagePtr(wxObjectPtr):
     def CountColours(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_CountColours,(self,) + _args, _kwargs)
         return val
+    def ComputeHistogram(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_ComputeHistogram,(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):
@@ -352,6 +422,16 @@ def 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):
@@ -359,10 +439,14 @@ def wxBitmapFromImage(*_args, **_kwargs):
     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 
+wxImageHistogram_MakeKey = imagec.wxImageHistogram_MakeKey
+
 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