X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96bfd05319f9e393843e84ca5274d85ff248bad4..922ba68045d84789ab1dfceb4d1aa1b6e2c5e810:/wxPython/src/msw/image.py?ds=sidebyside

diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py
index cddec60bc7..4cbc7762d2 100644
--- a/wxPython/src/msw/image.py
+++ b/wxPython/src/msw/image.py
@@ -4,7 +4,7 @@ import imagec
 from misc import *
 
 from gdi import *
-class wxImageHandlerPtr :
+class wxImageHandlerPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -139,7 +139,7 @@ class wxTIFFHandler(wxTIFFHandlerPtr):
 
 
 
-class wxImagePtr :
+class wxImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -247,6 +247,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 +283,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
@@ -286,6 +300,11 @@ def wxImageFromBitmap(*_args, **_kwargs):
 
 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_AddHandler = imagec.wxImage_AddHandler
@@ -298,3 +317,5 @@ wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+cvar = imagec.cvar
+wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)