wxCriticalSection implemented using mutexes for !MSW (sample compiles again)

[wxWidgets.git] / include / wx / image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index fe15103b2a0b9fbea3a06f0809d12cb545b14561..f411b6eab151abb019962a70d142f20d6b7a8b99 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -18,13 +18,16 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
+#include "wx/stream.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
+#ifdef wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler;
+#endif
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
@@ -41,8 +44,8 @@ class WXDLLEXPORT wxImageHandler: public wxObject
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
-  virtual bool LoadFile( wxImage *image, const wxString& name );
-  virtual bool SaveFile( wxImage *image, const wxString& name );
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
@@ -62,6 +65,7 @@ protected:
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
+#ifdef wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)
@@ -75,9 +79,10 @@ public:
       m_type = wxBITMAP_TYPE_PNG;
   };
 
-  virtual bool LoadFile( wxImage *image, const wxString& name );
-  virtual bool SaveFile( wxImage *image, const wxString& name );
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
 };
+#endif
 
 //-----------------------------------------------------------------------------
 // wxBMPHandler
@@ -96,7 +101,7 @@ public:
       m_type = wxBITMAP_TYPE_BMP;
   };
 
-  virtual bool LoadFile( wxImage *image, const wxString& name );
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
 };
 
 //-----------------------------------------------------------------------------
@@ -114,6 +119,7 @@ public:
   wxImage();
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
+  wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
   
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
@@ -134,7 +140,9 @@ public:
   unsigned char GetBlue( int x, int y );
   
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
+  virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
   virtual bool SaveFile( const wxString& name, int type );
+  virtual bool SaveFile( wxOutputStream& stream, int type );
 
   bool Ok() const;
   int GetWidth() const;