More unicode related cleanup and fixes for wxPython

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

diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py
index cddec60bc77ecc81720427e17c1a05d2647c2770..f725822176e22f876bb8a1890bbf24f50b0648e1 100644 (file)
--- a/wxPython/src/msw/image.py
+++ b/wxPython/src/msw/image.py
@@ -4,7 +4,9 @@ import imagec
 from misc import *
 
 from gdi import *
-class wxImageHandlerPtr :
+
+from streams import *
+class wxImageHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -20,6 +22,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 +88,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,7 +186,7 @@ class wxTIFFHandler(wxTIFFHandlerPtr):
 
 
 
-class wxImagePtr :
+class wxImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -188,6 +235,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
@@ -247,6 +300,25 @@ 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
@@ -264,11 +336,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,10 +351,34 @@ def wxImageFromBitmap(*_args, **_kwargs):
     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):
+    val = apply(imagec.wxBitmapFromImage,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1
+    return val
+
 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
@@ -298,3 +389,5 @@ wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+cvar = imagec.cvar
+wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)