Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."

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

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 091a9de46f53c1b54310f93917fc7b420e55a0c4..27d0237be940047aa33d4afc22613a8b2ded5b0b 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -22,6 +22,11 @@
 
 #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
 {
@@ -30,7 +35,7 @@ enum
     wxPNG_TYPE_GREY_RED = 3
 };
 
-class WXDLLEXPORT wxPNGHandler: public wxImageHandler
+class WXDLLIMPEXP_CORE wxPNGHandler: public wxImageHandler
 {
 public:
     inline wxPNGHandler()
@@ -44,6 +49,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 );
+protected:
     virtual bool DoCanRead( wxInputStream& stream );
 #endif