1. wxAppBase class appers, wxApp in wxGTK and wxMSW modified accordingly

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

diff --git a/include/wx/image.h b/include/wx/image.h
index c548f26c91e759f78d51ddfd2830220c3a7981a0..bd3d4845826b0570f66cb35f627db8167f6ca911 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -31,6 +31,9 @@ class WXDLLEXPORT wxImageHandler;
 #if wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler;
 #endif
+#if wxUSE_LIBJPEG
+class WXDLLEXPORT wxJPEGHandler;
+#endif
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
@@ -55,13 +58,16 @@ 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 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 GetMimeType() const { return m_mime; }
+
 protected:
   wxString  m_name;
   wxString  m_extension;
+  wxString  m_mime;
   long      m_type;
   
 };
@@ -82,13 +88,39 @@ public:
       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
+};
+#endif
+
+//-----------------------------------------------------------------------------
+// wxJPEGHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBJPEG
+class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
+
+public:
+
+  inline wxJPEGHandler()
+  {
+      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 );
+#endif
 };
 #endif
 
@@ -107,10 +139,35 @@ public:
       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 );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
 #endif
 };
 
@@ -130,19 +187,26 @@ public:
   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 );
   
   // these functions get implemented in /src/(platform)/bitmap.cpp 
   wxImage( const wxBitmap &bitmap );
+  operator wxBitmap() const { return ConvertToBitmap(); }
   wxBitmap ConvertToBitmap() const;
 
   void Create( int width, int height );
   void Destroy();
   
-  wxImage Scale( int width, int height );
-  
+  // return the new image with size width*height
+  wxImage Scale( int width, int height ) const;
+
+  // rescales the image in place
+  wxImage 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 );
@@ -150,15 +214,19 @@ public:
   unsigned char GetBlue( int x, int y );
   
   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 );
+  virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
 #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 );
+  virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );
 #endif
 
   bool Ok() const;
@@ -175,25 +243,27 @@ public:
   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);
-      return *this; }
+    return *this;
+  }
 
-  inline bool operator == (const wxImage& image)
+  bool operator == (const wxImage& image)
     { return m_refData == image.m_refData; }
-  inline bool operator != (const wxImage& image) 
+  bool operator != (const wxImage& image) 
     { 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 wxImageHandler *FindHandlerMime( const wxString& mimetype );
+
   static void CleanUpHandlers();
   static void InitStandardHandlers();
 
@@ -205,3 +275,4 @@ protected:
 
 #endif
   // _WX_IMAGE_H_
+