Added full UNICODE support for VisualAge C++ for OS/2 V4.0

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 0b7cc551b26ae61151b57ad4a5a501a7edfb984d..f72667091b7c1f33fc2a3504485f9c231af60260 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -53,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; }


@@ -290,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