don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 4a41f8a8093c5453e21632489c96e66260dd6a21..89df0d08071abeb06ea12e477783bde64744060f 100644 (file)
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -4,16 +4,12 @@
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagpnm.h"
-#endif
-

 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------


@@ -21,20 +17,24 @@
 //-----------------------------------------------------------------------------
 
 #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");
     }
 
 #if wxUSE_STREAMS
         m_type = wxBITMAP_TYPE_PNM;
         m_mime = wxT("image/pnm");
     }
 
 #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 );
+    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