Committing in .

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

diff --git a/include/wx/image.h b/include/wx/image.h
index fb0ebb3bfe43520bc39991fa9b769d798f41cd70..f72667091b7c1f33fc2a3504485f9c231af60260 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -36,9 +36,15 @@ class WXDLLEXPORT wxPNGHandler;
 class WXDLLEXPORT wxJPEGHandler;
 #endif
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxJPEGHandler;
 #endif
 class WXDLLEXPORT wxBMPHandler;

+#if wxUSE_GIF

 class WXDLLEXPORT wxGIFHandler;
 class WXDLLEXPORT wxGIFHandler;

+#endif
+#if wxUSE_PNM

 class WXDLLEXPORT wxPNMHandler;
 class WXDLLEXPORT wxPNMHandler;

+#endif
+#if wxUSE_PCX

 class WXDLLEXPORT wxPCXHandler;
 class WXDLLEXPORT wxPCXHandler;

+#endif

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


@@ -47,7 +53,7 @@ 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; }
 
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }


@@ -56,20 +62,22 @@ public:
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
   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 );
-  virtual bool CanRead( const wxString& name );
+  bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+  bool CanRead( const wxString& name );

 #endif
 
 #endif
 

-  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:

+  virtual bool DoCanRead( wxInputStream& stream ) = 0;
+

   wxString  m_name;
   wxString  m_extension;
   wxString  m_mime;
   wxString  m_name;
   wxString  m_extension;
   wxString  m_mime;


@@ -99,7 +107,7 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 #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 );
+  virtual bool DoCanRead( wxInputStream& stream );

 #endif
 };
 #endif
 #endif
 };
 #endif


@@ -126,7 +134,7 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 #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 );
+  virtual bool DoCanRead( wxInputStream& stream );

 #endif
 };
 #endif
 #endif
 };
 #endif


@@ -151,7 +159,7 @@ public:
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );

-  virtual bool CanRead( wxInputStream& stream );
+  virtual bool DoCanRead( wxInputStream& stream );

 #endif
 };
 
 #endif
 };
 


@@ -159,6 +167,8 @@ public:
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_GIF
+

 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxGIFHandler)
 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxGIFHandler)


@@ -176,14 +186,16 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 #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 );
+  virtual bool DoCanRead( wxInputStream& stream );

 #endif
 };
 #endif
 };

+#endif

 
 //-----------------------------------------------------------------------------
 // wxPNMHandler
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPNMHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_PNM

 class WXDLLEXPORT wxPNMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNMHandler)
 class WXDLLEXPORT wxPNMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNMHandler)


@@ -201,14 +213,16 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 #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 );
+  virtual bool DoCanRead( wxInputStream& stream );

 #endif
 };
 #endif
 };

+#endif

 
 //-----------------------------------------------------------------------------
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_PCX

 class WXDLLEXPORT wxPCXHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPCXHandler)
 class WXDLLEXPORT wxPCXHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPCXHandler)


@@ -226,9 +240,10 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 #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
+  virtual bool DoCanRead( wxInputStream& stream );
+#endif // wxUSE_STREAMS

 };
 };

+#endif // wxUSE_PCX

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


@@ -275,10 +290,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


@@ -335,6 +352,8 @@ protected:
 
 };
 
 
 };
 

+extern void WXDLLEXPORT wxInitAllImageHandlers();
+

 #endif
   // _WX_IMAGE_H_
 
 #endif
   // _WX_IMAGE_H_