Merge recent wxPython changes from 2.8 branch to HEAD

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

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 43bec0c1c2ea53eae98796a5e82816e6e7777a1a..c58b04947f19e8c78ef305bf965c22501fdddc80 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -27,7 +27,6 @@ enum {
     wxIMAGE_ALPHA_OPAQUE
 };
 
-
 // Constants for wxImage::Scale() for determining the level of quality
 enum
 {
@@ -232,6 +231,7 @@ public:
 };
 
 
+
 class wxImage : public wxObject {
 public:
     %typemap(out) wxImage*;    // turn off this typemap
@@ -642,6 +642,17 @@ string.", "",
         bool , SaveFile( const wxString& name, const wxString& mimetype ),
         "Saves an image in the named file.", "",
         SaveMimeFile);
+
+    DocDeclStrName(
+        bool , SaveFile( wxOutputStream& stream, int type ),
+        "Saves an image in the named file.", "",
+        SaveStream);
+
+    
+    DocDeclStrName(
+        bool , SaveFile( wxOutputStream& stream, const wxString& mimetype ),
+        "Saves an image in the named file.", "",
+        SaveMimeStream);
     
 
     DocDeclStrName(
@@ -1140,13 +1151,21 @@ MAKE_CONST_WXSTRING(IMAGE_OPTION_RESOLUTIONY);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_RESOLUTIONUNIT);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_QUALITY);
 
-enum
+// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
+enum wxImageResolution
 {
+    // Resolution not specified
+    wxIMAGE_RESOLUTION_NONE = 0,
+
+    // Resolution specified in inches
     wxIMAGE_RESOLUTION_INCHES = 1,
+
+    // Resolution specified in centimeters
     wxIMAGE_RESOLUTION_CM = 2
 };
 
 
+
 MAKE_CONST_WXSTRING(IMAGE_OPTION_BITSPERSAMPLE);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_SAMPLESPERPIXEL); 
 MAKE_CONST_WXSTRING(IMAGE_OPTION_COMPRESSION);
@@ -1262,7 +1281,12 @@ public:
 };
 
 
-#if wxUSE_IFF
+
+#if 0
+%{
+#include <wx/imagiff.h>
+%}
+
 DocStr(wxIFFHandler,
 "A `wx.ImageHandler` for IFF image files.", "");
 class wxIFFHandler : public wxImageHandler {
@@ -1271,6 +1295,19 @@ public:
 };
 #endif
 
+
+%{
+#include <wx/imagtga.h>
+%}
+
+DocStr(wxTGAHandler,
+"A `wx.ImageHandler` for TGA image files.", "");
+class wxTGAHandler : public wxImageHandler {
+public:
+    wxTGAHandler();
+};
+
+
 //---------------------------------------------------------------------------
 
 %{