wxGTK compilation fixes

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 1962bd3f87a31b0100608c8a72424871413efe5f..7db3f34479e8fe8f0f671bdd3af52318f1a96e73 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_


@@ -18,9 +18,10 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"

+#include "wx/bitmap.h"

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

-#include "wx/stream.h"
+    #include "wx/stream.h"

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -37,8 +38,6 @@ class WXDLLEXPORT wxJPEGHandler;
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 

-class WXDLLEXPORT wxBitmap;
-

 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------


@@ -46,7 +45,7 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxImageHandler)
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxImageHandler)

-  
+

 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 


@@ -58,15 +57,18 @@ public:
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
   inline void SetType(long type) { m_type = type; }
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
   inline void SetType(long type) { m_type = type; }

+  inline void SetMimeType(const wxString& type) { m_mime = type; }

   inline wxString GetName() const { return m_name; }
   inline wxString GetExtension() const { return m_extension; }
   inline long GetType() const { return m_type; }
   inline wxString GetName() const { return m_name; }
   inline wxString GetExtension() const { return m_extension; }
   inline long GetType() const { return m_type; }

-  
+  inline wxString GetMimeType() const { return m_mime; }
+

 protected:
   wxString  m_name;
   wxString  m_extension;
 protected:
   wxString  m_name;
   wxString  m_extension;

+  wxString  m_mime;

   long      m_type;
   long      m_type;

-  
+

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -77,7 +79,7 @@ protected:
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)

-  
+

 public:
 
   inline wxPNGHandler()
 public:
 
   inline wxPNGHandler()


@@ -85,13 +87,13 @@ public:
       m_name = "PNG file";
       m_extension = "png";
       m_type = wxBITMAP_TYPE_PNG;
       m_name = "PNG file";
       m_extension = "png";
       m_type = wxBITMAP_TYPE_PNG;

+      m_mime = "image/png";

   };
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
 #endif
   };
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
 #endif

-

 };
 #endif
 
 };
 #endif
 


@@ -111,10 +113,13 @@ public:
       m_name = "JPEG file";
       m_extension = "jpg";
       m_type = wxBITMAP_TYPE_JPEG;
       m_name = "JPEG file";
       m_extension = "jpg";
       m_type = wxBITMAP_TYPE_JPEG;

+      m_mime = "image/jpeg";

   };
 
   };
 

+#if wxUSE_STREAMS

   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream );

+#endif

 };
 #endif
 
 };
 #endif
 


@@ -125,7 +130,7 @@ public:
 class WXDLLEXPORT wxBMPHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPHandler)
 class WXDLLEXPORT wxBMPHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxBMPHandler)

-  
+

 public:
 
   inline wxBMPHandler()
 public:
 
   inline wxBMPHandler()


@@ -133,10 +138,35 @@ public:
       m_name = "BMP file";
       m_extension = "bmp";
       m_type = wxBITMAP_TYPE_BMP;
       m_name = "BMP file";
       m_extension = "bmp";
       m_type = wxBITMAP_TYPE_BMP;

+      m_mime = "image/bmp";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+#endif
+};
+
+//-----------------------------------------------------------------------------
+// wxGIFHandler
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGIFHandler : public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxGIFHandler)
+
+public:
+
+  inline wxGIFHandler()
+  {
+      m_name = "GIF file";
+      m_extension = "gif";
+      m_type = wxBITMAP_TYPE_GIF;
+      m_mime = "image/gif";

   };
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );
   };
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream );

+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );

 #endif
 };
 
 #endif
 };
 


@@ -156,35 +186,46 @@ public:
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
   wxImage( int width, int height );
   wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );

-  
+  wxImage( const wxString& name, const wxString& mimetype );
+  wxImage( wxInputStream& stream, const wxString& mimetype );
+

   wxImage( const wxImage& image );
   wxImage( const wxImage* image );
   wxImage( const wxImage& image );
   wxImage( const wxImage* image );

-  
-  // these functions get implemented in /src/(platform)/bitmap.cpp 
+
+  // these functions get implemented in /src/(platform)/bitmap.cpp

   wxImage( const wxBitmap &bitmap );
   wxImage( const wxBitmap &bitmap );

+  operator wxBitmap() const { return ConvertToBitmap(); }

   wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();
   wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();

-  
-  wxImage Scale( int width, int height );
-  
-  // these routines are slow but safe  
+
+  // return the new image with size width*height
+  wxImage Scale( int width, int height ) const;
+
+  // rescales the image in place
+  void Rescale( int width, int height ) { *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 );
   unsigned char GetRed( int x, int y );
   unsigned char GetGreen( int x, int y );
   unsigned char GetBlue( int x, int y );
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetRed( int x, int y );
   unsigned char GetGreen( int x, int y );
   unsigned char GetBlue( int x, int y );

-  
+

   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );

+  virtual bool LoadFile( const wxString& name, const wxString& mimetype );

 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );

+  virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );

 #endif
 
   virtual bool SaveFile( const wxString& name, int type );
 #endif
 
   virtual bool SaveFile( const wxString& name, int type );

+  virtual bool SaveFile( const wxString& name, const wxString& mimetype );

 
 #if wxUSE_STREAMS
   virtual bool SaveFile( wxOutputStream& stream, int type );
 
 #if wxUSE_STREAMS
   virtual bool SaveFile( wxOutputStream& stream, int type );

+  virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );

 #endif
 
   bool Ok() const;
 #endif
 
   bool Ok() const;


@@ -193,7 +234,7 @@ public:
 
   char unsigned *GetData() const;
   void SetData( char unsigned *data );
 
   char unsigned *GetData() const;
   void SetData( char unsigned *data );

-  
+

   void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetMaskRed() const;
   unsigned char GetMaskGreen() const;
   void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
   unsigned char GetMaskRed() const;
   unsigned char GetMaskGreen() const;


@@ -201,33 +242,36 @@ public:
   void SetMask( bool mask = TRUE );
   bool HasMask() const;
 
   void SetMask( bool mask = TRUE );
   bool HasMask() const;
 

-  inline wxImage& operator = (const wxImage& image)
-    { if ((*this) == image)
-          return (*this);
+  wxImage& operator = (const wxImage& image)
+  {
+    if ( (*this) != image )

       Ref(image);
       Ref(image);

-      return *this; }
+    return *this;
+  }

 
 

-  inline bool operator == (const wxImage& image)
+  bool operator == (const wxImage& image)

     { return m_refData == image.m_refData; }
     { return m_refData == image.m_refData; }

-  inline bool operator != (const wxImage& image) 
+  bool operator != (const wxImage& image)

     { return m_refData != image.m_refData; }
 
     { return m_refData != image.m_refData; }
 

-  static inline wxList& GetHandlers() { return sm_handlers; }
+  static wxList& GetHandlers() { return sm_handlers; }

   static void AddHandler( wxImageHandler *handler );
   static void InsertHandler( wxImageHandler *handler );
   static bool RemoveHandler( const wxString& name );
   static wxImageHandler *FindHandler( const wxString& name );
   static wxImageHandler *FindHandler( const wxString& extension, long imageType );
   static wxImageHandler *FindHandler( long imageType );
   static void AddHandler( wxImageHandler *handler );
   static void InsertHandler( wxImageHandler *handler );
   static bool RemoveHandler( const wxString& name );
   static wxImageHandler *FindHandler( const wxString& name );
   static wxImageHandler *FindHandler( const wxString& extension, long imageType );
   static wxImageHandler *FindHandler( long imageType );

-  
+  static wxImageHandler *FindHandlerMime( const wxString& mimetype );
+

   static void CleanUpHandlers();
   static void InitStandardHandlers();
 
 protected:
 
   static wxList sm_handlers;
   static void CleanUpHandlers();
   static void InitStandardHandlers();
 
 protected:
 
   static wxList sm_handlers;

-  
+

 };
 
 #endif
   // _WX_IMAGE_H_
 };
 
 #endif
   // _WX_IMAGE_H_

+