Various tweaks, fixes, and additions

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

diff --git a/wxPython/src/gtk/image.py b/wxPython/src/gtk/image.py
index cddec60bc77ecc81720427e17c1a05d2647c2770..637c3e31ce06ad5b5631047d9a2a704f2febbf80 100644 (file)
--- a/wxPython/src/gtk/image.py
+++ b/wxPython/src/gtk/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
@@ -150,6 +150,10 @@ class wxImagePtr :
         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
@@ -264,11 +268,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 +285,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 +302,5 @@ wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+cvar = imagec.cvar
+wxNullImage = wxImagePtr(imagec.cvar.wxNullImage)