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

diff --git a/wxPython/src/gtk/image.py b/wxPython/src/gtk/image.py
index 29da52dcc2..c4d1896bd2 100644
--- a/wxPython/src/gtk/image.py
+++ b/wxPython/src/gtk/image.py
@@ -4,7 +4,28 @@ import imagec
 from misc import *
 
 from gdi import *
-class wxImageHandlerPtr :
+
+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
         self.thisown = 0
@@ -20,6 +41,9 @@ class wxImageHandlerPtr :
     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
@@ -83,6 +107,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
@@ -139,17 +205,16 @@ class wxTIFFHandler(wxTIFFHandlerPtr):
 
 
 
-class wxImagePtr :
+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 __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
@@ -160,6 +225,10 @@ class wxImagePtr :
         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) 
@@ -176,6 +245,21 @@ class wxImagePtr :
     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
@@ -188,6 +272,12 @@ class wxImagePtr :
     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
@@ -214,6 +304,24 @@ class wxImagePtr :
     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
@@ -247,9 +355,39 @@ class wxImagePtr :
     def Replace(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_Replace,(self,) + _args, _kwargs)
         return val
+    def ConvertToMono(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_ConvertToMono,(self,) + _args, _kwargs)
+        if val: val = wxImagePtr(val) ; val.thisown = 1
+        return val
+    def SetOption(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetOption,(self,) + _args, _kwargs)
+        return val
+    def SetOptionInt(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetOptionInt,(self,) + _args, _kwargs)
+        return val
+    def GetOption(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetOption,(self,) + _args, _kwargs)
+        return val
+    def GetOptionInt(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetOptionInt,(self,) + _args, _kwargs)
+        return val
+    def HasOption(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_HasOption,(self,) + _args, _kwargs)
+        return val
     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):
@@ -264,11 +402,6 @@ class wxImage(wxImagePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-def wxNullImage(*_args, **_kwargs):
-    val = apply(imagec.wxNullImage,_args,_kwargs)
-    if val: val = wxImagePtr(val); val.thisown = 1
-    return val
-
 def wxEmptyImage(*_args, **_kwargs):
     val = apply(imagec.wxEmptyImage,_args,_kwargs)
     if val: val = wxImagePtr(val); val.thisown = 1
@@ -284,11 +417,45 @@ def wxImageFromBitmap(*_args, **_kwargs):
     if val: val = wxImagePtr(val); val.thisown = 1
     return val
 
-wxImage_AddHandler = imagec.wxImage_AddHandler
+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):
+    val = apply(imagec.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
+
+wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+cvar = imagec.cvar
+wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)