fixing warning and compile error against 10.4

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

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 73c465a90d6eb0a3096cbc66db2e592e636643f3..e7ba4646d67053b92518407d3d628ce0e510a81d 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGPNG_H_
 #define _WX_IMAGPNG_H_
 
 #ifndef _WX_IMAGPNG_H_
 #define _WX_IMAGPNG_H_
 

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

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


@@ -23,9 +19,15 @@
 #if wxUSE_LIBPNG
 
 #include "wx/image.h"
 #if wxUSE_LIBPNG
 
 #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_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
 {
 
 enum
 {


@@ -34,7 +36,7 @@ enum
     wxPNG_TYPE_GREY_RED = 3
 };
 
     wxPNG_TYPE_GREY_RED = 3
 };
 

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

 {
 public:
     inline wxPNGHandler()
 {
 public:
     inline wxPNGHandler()


@@ -45,9 +47,12 @@ public:
         m_mime = wxT("image/png");
     }
 
         m_mime = wxT("image/png");
     }
 

+    static wxVersionInfo GetLibraryVersionInfo();
+

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