changed charset to iso8859-2

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

diff --git a/wxPython/src/image.i b/wxPython/src/image.i
index adcf9ebaa6337117824d8efa84ba60390d155b23..ba3f7ecb154078e24c4f592b74af7264c99e1d87 100644 (file)
--- a/wxPython/src/image.i
+++ b/wxPython/src/image.i
@@ -15,6 +15,7 @@
 
 %{
 #include "helpers.h"
+#include "pyistream.h"
 #include <wx/image.h>
 %}
 
@@ -27,6 +28,7 @@
 %import _defs.i
 %import misc.i
 %import gdi.i
+%import streams.i
 
 //---------------------------------------------------------------------------
 
@@ -75,6 +77,16 @@ public:
     wxICOHandler();
 };
 
+class wxCURHandler : public wxICOHandler {
+public:
+    wxCURHandler();
+};
+
+class wxANIHandler : public wxCURHandler {
+public:
+    wxANIHandler();
+};
+
 class wxGIFHandler : public wxImageHandler {
 public:
     wxGIFHandler();
@@ -96,6 +108,7 @@ public:
 };
 
 
+
 //---------------------------------------------------------------------------
 
 class wxImage : public wxObject {
@@ -127,6 +140,10 @@ public:
     bool SaveFile( const wxString& name, int type );
     %name(SaveMimeFile)bool SaveFile( const wxString& name, const wxString& mimetype );
 
+    %name(CanReadStream) static bool CanRead( wxInputStream& stream );
+    %name(LoadStream) bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    %name(LoadMimeStream) bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
+
     bool Ok();
     int GetWidth();
     int GetHeight();
@@ -198,6 +215,9 @@ public:
 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index = -1);
 %new wxImage* wxImageFromBitmap(const wxBitmap &bitmap);
 %new wxImage* wxImageFromData(int width, int height, unsigned char* data);
+%new wxImage* wxImageFromStream(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
+%new wxImage* wxImageFromStreamMime(wxInputStream& stream, const wxString& mimetype, int index = -1 );
+
 %{
     wxImage* wxEmptyImage(int width=0, int height=0) {
         if (width == 0 && height == 0)
@@ -206,14 +226,17 @@ public:
             return new wxImage(width, height);
     }
 
+
     wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index) {
         return new wxImage(name, mimetype, index);
     }
 
+
     wxImage* wxImageFromBitmap(const wxBitmap &bitmap) {
         return new wxImage(bitmap);
     }
 
+
     wxImage* wxImageFromData(int width, int height, unsigned char* data) {
         // Copy the source data so the wxImage can clean it up later
         unsigned char* copy = (unsigned char*)malloc(width*height*3);
@@ -224,8 +247,22 @@ public:
         memcpy(copy, data, width*height*3);
         return new wxImage(width, height, copy, FALSE);
     }
+
+
+    wxImage* wxImageFromStream(wxInputStream& stream,
+                               long type = wxBITMAP_TYPE_ANY, int index = -1) {
+        return new wxImage(stream, type, index);
+    }
+
+
+    wxImage* wxImageFromStreamMime(wxInputStream& stream,
+                                   const wxString& mimetype, int index = -1 ) {
+        return new wxImage(stream, mimetype, index);
+    }
 %}
 
+
+
 void wxInitAllImageHandlers();