Added SetToWeekOfYear, deprecated SetToTheWeek and GetWeek

[wxWidgets.git] / wxPython / src / _image.i

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 57ab53657f9cdc2b5936696139536fb4ba3fd2b6..bcd1deb33de4a291d23784f8c3f8b622c5a6b3ff 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -134,7 +134,19 @@ public:
 values than startR, startG, startB.  Returns a tuple consisting of a
 success flag and rgb values.", "");
 
 values than startR, startG, startB.  Returns a tuple consisting of a
 success flag and rgb values.", "");
 

+    
+    DocDeclStr(
+        bool , ConvertAlphaToMask(byte threshold = 128),
+        "If the image has alpha channel, this method converts it to mask. All pixels
+with alpha value less than ``threshold`` are replaced with mask colour and the
+alpha channel is removed. Mask colour is chosen automatically using
+`FindFirstUnusedColour`.
+
+If the image image doesn't have alpha channel, ConvertAlphaToMask does
+nothing.", "");
+    

 
 

+    

     // Set image's mask to the area of 'mask' that has <mr,mg,mb> colour
     bool SetMaskFromImage(const wxImage & mask,
                           byte mr, byte mg, byte mb);
     // Set image's mask to the area of 'mask' that has <mr,mg,mb> colour
     bool SetMaskFromImage(const wxImage & mask,
                           byte mr, byte mg, byte mb);


@@ -317,8 +329,8 @@ MustHaveApp(ConvertToBitmap);
 MustHaveApp(ConvertToMonoBitmap);
 
     %extend {
 MustHaveApp(ConvertToMonoBitmap);
 
     %extend {

-        wxBitmap ConvertToBitmap() {
-            wxBitmap bitmap(*self);
+        wxBitmap ConvertToBitmap(int depth=-1) {
+            wxBitmap bitmap(*self, depth);

             return bitmap;
         }
 
             return bitmap;
         }
 


@@ -479,7 +491,7 @@ public:
         DocStr(
             Quantize,
             "Reduce the colours in the source image and put the result into the
         DocStr(
             Quantize,
             "Reduce the colours in the source image and put the result into the

-destination image, setting the palette in the detination if
+destination image, setting the palette in the destination if

 needed. Both images may be the same, to overwrite the source image.", "
 :todo: Create a version that returns the wx.Palette used.");
     
 needed. Both images may be the same, to overwrite the source image.", "
 :todo: Create a version that returns the wx.Palette used.");