test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

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

diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 8a1cbdb74672c0042dfce31bf6cbf4fcef160bbc..8edf80b879cb132f8150681f0d57d4d5d9605b19 100644 (file)
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -10,11 +10,7 @@
 #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/image.h"
+#include "wx/defs.h"

 
 //-----------------------------------------------------------------------------
 // wxPNGHandler
 
 //-----------------------------------------------------------------------------
 // wxPNGHandler


@@ -22,6 +18,8 @@
 
 #if wxUSE_LIBPNG
 
 
 #if wxUSE_LIBPNG
 

+#include "wx/image.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")
 


@@ -29,7 +27,7 @@ enum
 {
     wxPNG_TYPE_COLOUR = 0,
     wxPNG_TYPE_GREY = 2,
 {
     wxPNG_TYPE_COLOUR = 0,
     wxPNG_TYPE_GREY = 2,

-    wxPNG_TYPE_GREY_RED = 3,
+    wxPNG_TYPE_GREY_RED = 3

 };
 
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 };
 
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler


@@ -46,14 +44,16 @@ 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 );
 #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
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 };
     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPNGHandler)
 };

-#endif

 
 

+#endif
+  // wxUSE_LIBPNG

 
 #endif
   // _WX_IMAGPNG_H_
 
 #endif
   // _WX_IMAGPNG_H_