fixed problem with image handlers in two headers (and yes, tested)

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 018d2932b5dc3ea624f946af1d8011a29d80ec61..e716998d2b918acd2b27b960b799cd375c34553b 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -45,12 +45,12 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  
+
   virtual int GetImageCount( wxInputStream& stream );
 
   bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
   bool CanRead( const wxString& name );
-#endif
+#endif // wxUSE_STREAMS
 
   void SetName(const wxString& name) { m_name = name; }
   void SetExtension(const wxString& ext) { m_extension = ext; }
@@ -62,17 +62,17 @@ public:
   wxString GetMimeType() const { return m_mime; }
 
 protected:
+#if wxUSE_STREAMS
   virtual bool DoCanRead( wxInputStream& stream ) = 0;
+#endif // wxUSE_STREAMS
 
   wxString  m_name;
   wxString  m_extension;
   wxString  m_mime;
   long      m_type;
-
 };
 
 
-
 //-----------------------------------------------------------------------------
 // wxImage
 //-----------------------------------------------------------------------------
@@ -120,7 +120,7 @@ public:
   wxImage Scale( int width, int height ) const;
 
   // rescales the image in place
-  void Rescale( int width, int height ) { *this = Scale(width, height); }
+  wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }
 
   // these routines are slow but safe
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );