rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

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

diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index a2f151785f58224c76f22bb8138f087e1c5acd6f..8cd3f9f8840d7180a9fbad5151e8476a26aeb30f 100644 (file)
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 

-#ifdef __GNUG__
-#pragma interface "imagpnm.h"
-#endif
-

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


@@ -21,25 +17,26 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PNM
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PNM

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPNMHandler)
-

 public:
 public:

-
-  inline wxPNMHandler()
-  {
-      m_name = "PNM file";
-      m_extension = "pnm";
-      m_type = wxBITMAP_TYPE_PNM;
-      m_mime = "image/pnm";
-  };
+    inline wxPNMHandler()
+    {
+        m_name = wxT("PNM file");
+        m_extension = wxT("pnm");
+        m_type = wxBITMAP_TYPE_PNM;
+        m_mime = wxT("image/pnm");
+    }

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

-  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 DoCanRead( wxInputStream& stream );
+    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
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPNMHandler)

 };
 #endif
 
 };
 #endif