Fix warnings in the MSW IE backend.

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

diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 6f25e9d0272a52022064a1fca54c77e591bb21ed..1c6eaec2f4e31fe33d6db613a3e5442fc51295c7 100644 (file)
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagpnm.h
+// Name:        wx/imagpnm.h

 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$


@@ -17,13 +17,16 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PNM
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PNM

-class WXDLLEXPORT wxPNMHandler : public wxImageHandler
+class WXDLLIMPEXP_CORE wxPNMHandler : public wxImageHandler

 {
 public:
     inline wxPNMHandler()
     {
         m_name = wxT("PNM file");
         m_extension = wxT("pnm");
 {
 public:
     inline wxPNMHandler()
     {
         m_name = wxT("PNM file");
         m_extension = wxT("pnm");

+        m_altExtensions.Add(wxT("ppm"));
+        m_altExtensions.Add(wxT("pgm"));
+        m_altExtensions.Add(wxT("pbm"));

         m_type = wxBITMAP_TYPE_PNM;
         m_mime = wxT("image/pnm");
     }
         m_type = wxBITMAP_TYPE_PNM;
         m_mime = wxT("image/pnm");
     }


@@ -31,6 +34,7 @@ public:
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );

+protected:

     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
     virtual bool DoCanRead( wxInputStream& stream );
 #endif