Add some basic tests for wxDataViewCtrl selection handling.

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

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 232e880403e3a0fb038ac9aab1e32231066ec3e8..693cd5ae2976805abd95e87c49fcda54caad2010 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -10,39 +10,59 @@
 #ifndef _WX_IMAGPNG_H_
 #define _WX_IMAGPNG_H_
 
 #ifndef _WX_IMAGPNG_H_
 #define _WX_IMAGPNG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "imagpng.h"
-#endif
-
-#include "wx/image.h"
+#include "wx/defs.h"

 
 //-----------------------------------------------------------------------------
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBPNG
 
 //-----------------------------------------------------------------------------
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBPNG

-class WXDLLEXPORT wxPNGHandler: public wxImageHandler
+
+#include "wx/image.h"
+#include "wx/versioninfo.h"
+
+#define wxIMAGE_OPTION_PNG_FORMAT    wxT("PngFormat")
+#define wxIMAGE_OPTION_PNG_BITDEPTH  wxT("PngBitDepth")
+#define wxIMAGE_OPTION_PNG_FILTER    wxT("PngF")
+#define wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL       wxT("PngZL")
+#define wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL   wxT("PngZM")
+#define wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY    wxT("PngZS")
+#define wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE wxT("PngZB")
+
+enum

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPNGHandler)
+    wxPNG_TYPE_COLOUR = 0,
+    wxPNG_TYPE_GREY = 2,
+    wxPNG_TYPE_GREY_RED = 3,
+    wxPNG_TYPE_PALETTE = 4
+};

 
 

+class WXDLLIMPEXP_CORE wxPNGHandler: public wxImageHandler
+{

 public:
 public:

+    inline wxPNGHandler()
+    {
+        m_name = wxT("PNG file");
+        m_extension = wxT("png");
+        m_type = wxBITMAP_TYPE_PNG;
+        m_mime = wxT("image/png");
+    }

 
 

-  inline wxPNGHandler()
-  {
-      m_name = "PNG file";
-      m_extension = "png";
-      m_type = wxBITMAP_TYPE_PNG;
-      m_mime = "image/png";
-  };
+    static wxVersionInfo GetLibraryVersionInfo();

 
 #if wxUSE_STREAMS
 
 #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
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPNGHandler)

 };
 };

-#endif

 
 

+#endif
+  // wxUSE_LIBPNG

 
 #endif
   // _WX_IMAGPNG_H_
 
 #endif
   // _WX_IMAGPNG_H_