Added #include "wx/setup.h" (or "wx/defs.h") before checking for

wxUSE_***

Merged wxUSE_*** and wxUSE_STREAM (is this right?)

Replaced wxUSE_LIBGIF with wxUSE_GIF everywhere


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/imagpng.cpp

@@ -23,7 +23,7 @@
   #include "wx/defs.h"
 #endif
 
-#if wxUSE_LIBPNG
+#if wxUSE_STREAMS && wxUSE_LIBPNG
 
 #include "wx/image.h"
 #include "wx/bitmap.h"
@@ -57,8 +57,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #endif
 
-#if wxUSE_STREAMS
-
 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
 #else
@@ -355,9 +353,5 @@ bool wxPNGHandler::CanRead( wxInputStream& stream )
     return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
 }
 
-#endif
-  // wxUSE_STREAMS
-
-#endif
-  // wxUSE_LIBPNG
+#endif  // wxUSE_STREAMS && wxUSE_LIBPNG