A bugfix in the wxTreeCtrl.GetItem wrapper

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

diff --git a/include/wx/image.h b/include/wx/image.h
index cc07d24d2401c5c94b7cdbe96bad92ca9ad680c0..b66e23c6206545ae9eab3fa8a21f50dc5fe98f6d 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -29,22 +29,6 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;

-#if wxUSE_LIBPNG
-class WXDLLEXPORT wxPNGHandler;
-#endif
-#if wxUSE_LIBJPEG
-class WXDLLEXPORT wxJPEGHandler;
-#endif
-class WXDLLEXPORT wxBMPHandler;
-#if wxUSE_GIF
-class WXDLLEXPORT wxGIFHandler;
-#endif
-#if wxUSE_PNM
-class WXDLLEXPORT wxPNMHandler;
-#endif
-#if wxUSE_PCX
-class WXDLLEXPORT wxPCXHandler;
-#endif

 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------
 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------


@@ -53,214 +37,55 @@ class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
 
 class WXDLLEXPORT wxImageHandler: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxImageHandler)
+  DECLARE_CLASS(wxImageHandler)

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

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );

   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 

-  virtual bool CanRead( wxInputStream& stream );
-  virtual bool CanRead( const wxString& name );
-#endif
+  virtual int GetImageCount( wxInputStream& stream );
+
+  bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+  bool CanRead( const wxString& name );
+#endif // wxUSE_STREAMS

 
 

-  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; }
+  void SetName(const wxString& name) { m_name = name; }
+  void SetExtension(const wxString& ext) { m_extension = ext; }
+  void SetType(long type) { m_type = type; }
+  void SetMimeType(const wxString& type) { m_mime = type; }
+  wxString GetName() const { return m_name; }
+  wxString GetExtension() const { return m_extension; }
+  long GetType() const { return m_type; }
+  wxString GetMimeType() const { return m_mime; }

 
 protected:
 
 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;
   wxString  m_name;
   wxString  m_extension;
   wxString  m_mime;
   long      m_type;

-
-};
-
-//-----------------------------------------------------------------------------
-// wxPNGHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBPNG
-class WXDLLEXPORT wxPNGHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxPNGHandler)
-
-public:
-
-  inline wxPNGHandler()
-  {
-      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, bool verbose=TRUE );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#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, bool verbose=TRUE );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
-};
-#endif
-
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxBMPHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPHandler)
-
-public:
-
-  inline wxBMPHandler()
-  {
-      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, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif

 };
 
 };
 

-//-----------------------------------------------------------------------------
-// wxGIFHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_GIF
-
-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, bool verbose=TRUE );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
-};
-#endif

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxPNMHandler
+// wxImage

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#if wxUSE_PNM
-class WXDLLEXPORT wxPNMHandler : public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxPNMHandler)

 
 

-public:
-
-  inline wxPNMHandler()
-  {
-      m_name = "PNM file";
-      m_extension = "pnm";
-      m_type = wxBITMAP_TYPE_PNM;
-      m_mime = "image/pnm";
-  };
-
-#if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
-};
-#endif
-
-//-----------------------------------------------------------------------------
-// wxPCXHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_PCX
-class WXDLLEXPORT wxPCXHandler : public wxImageHandler
+// GRG: Dic/99
+class WXDLLEXPORT wxHNode

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPCXHandler)
-

 public:
 public:

-
-  inline wxPCXHandler()
-  {
-      m_name = "PCX file";
-      m_extension = "pcx";
-      m_type = wxBITMAP_TYPE_PCX;
-      m_mime = "image/pcx";
-  };
-
-#if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-#endif
+    unsigned long index;
+    unsigned long value;

 };
 };

-#endif

 
 

-//-----------------------------------------------------------------------------
-// wxImage
-//-----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxImage: public wxObject
 {
 
 class WXDLLEXPORT wxImage: public wxObject
 {


@@ -295,7 +120,7 @@ public:
   wxImage Scale( int width, int height ) const;
 
   // rescales the image in place
   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 );
 
   // these routines are slow but safe
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );


@@ -303,10 +128,12 @@ public:
   unsigned char GetGreen( int x, int y );
   unsigned char GetBlue( int x, int y );
 
   unsigned char GetGreen( int x, int y );
   unsigned char GetBlue( int x, int y );
 

+  static bool CanRead( const wxString& name );

   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
   virtual bool LoadFile( const wxString& name, const wxString& mimetype );
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
   virtual bool LoadFile( const wxString& name, const wxString& mimetype );
 
 #if wxUSE_STREAMS

+  static bool CanRead( wxInputStream& stream );

   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
   virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
 #endif
   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
   virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
 #endif


@@ -357,14 +184,33 @@ public:
   static void CleanUpHandlers();
   static void InitStandardHandlers();
 
   static void CleanUpHandlers();
   static void InitStandardHandlers();
 

+  // GRG: Dic/99
+  unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 );
+  unsigned long ComputeHistogram( wxHashTable &h );
+
+

 protected:
 
   static wxList sm_handlers;
 
 };
 
 protected:
 
   static wxList sm_handlers;
 
 };
 

+

 extern void WXDLLEXPORT wxInitAllImageHandlers();
 
 extern void WXDLLEXPORT wxInitAllImageHandlers();
 

+
+//-----------------------------------------------------------------------------
+// wxImage handlers
+//-----------------------------------------------------------------------------
+
+#include "wx/imagbmp.h"
+#include "wx/imagpng.h"
+#include "wx/imaggif.h"
+#include "wx/imagpcx.h"
+#include "wx/imagjpeg.h"
+#include "wx/imagtiff.h"
+#include "wx/imagpnm.h"
+

 #endif
   // _WX_IMAGE_H_
 
 #endif
   // _WX_IMAGE_H_