Reduced deprecation warning frequency

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

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 87ff7f124b53d904d362b0380cfda45ba5bbdea8..8edf80b879cb132f8150681f0d57d4d5d9605b19 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -10,39 +10,50 @@
 #ifndef _WX_IMAGPNG_H_
 #define _WX_IMAGPNG_H_
 
-#ifdef __GNUG__
-#pragma interface "imagpng.h"
-#endif
-
-#include "wx/image.h"
+#include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBPNG
-class WXDLLEXPORT wxPNGHandler: public wxImageHandler
+
+#include "wx/image.h"
+
+#define wxIMAGE_OPTION_PNG_FORMAT    wxT("PngFormat")
+#define wxIMAGE_OPTION_PNG_BITDEPTH  wxT("PngBitDepth")
+
+enum
 {
-  DECLARE_DYNAMIC_CLASS(wxPNGHandler)
+    wxPNG_TYPE_COLOUR = 0,
+    wxPNG_TYPE_GREY = 2,
+    wxPNG_TYPE_GREY_RED = 3
+};
 
+class WXDLLEXPORT wxPNGHandler: public wxImageHandler
+{
 public:
-
-  inline wxPNGHandler()
-  {
-      m_name = "PNG file";
-      m_extension = "png";
-      m_type = wxBITMAP_TYPE_PNG;
-      m_mime = "image/png";
-  };
+    inline wxPNGHandler()
+    {
+        m_name = wxT("PNG file");
+        m_extension = wxT("png");
+        m_type = wxBITMAP_TYPE_PNG;
+        m_mime = wxT("image/png");
+    }
 
 #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 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
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 };
-#endif
 
+#endif
+  // wxUSE_LIBPNG
 
 #endif
   // _WX_IMAGPNG_H_