Ops. wxUSE_XXX and wxUSE_STREAMS are separated again :-)

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 7b3e5ba0df582ee1596d50802d092ba5e55543da..e9a0fc880a39705c916a5996d1988774535df7e0 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -23,7 +23,7 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_STREAMS && wxUSE_GIF
+#if wxUSE_GIF

 
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 
 #include "wx/image.h"
 #include "wx/gifdecod.h"


@@ -38,6 +38,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_STREAMS
+

 bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     wxGIFDecoder *decod;
 bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     wxGIFDecoder *decod;


@@ -89,4 +91,6 @@ bool wxGIFHandler::CanRead( wxInputStream& stream )
     return ok;
 }
 
     return ok;
 }
 

-#endif  // wxUSE_STREAMS && wxUSE_GIF
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 890985f9575ffe89aca57b815f33fa4bd5d62f40..b2e4447a024f58272d3c88b5d560e71246b44aa9 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -21,7 +21,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_STREAMS && wxUSE_LIBJPEG
+#if wxUSE_LIBJPEG

 
 #include "wx/image.h"
 #include "wx/bitmap.h"
 
 #include "wx/image.h"
 #include "wx/bitmap.h"


@@ -59,6 +59,8 @@ extern "C" {
 IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
 #endif
 

+#if wxUSE_STREAMS
+

 //------------- JPEG Data Source Manager
 
 typedef struct {
 //------------- JPEG Data Source Manager
 
 typedef struct {


@@ -318,7 +320,9 @@ bool wxJPEGHandler::CanRead( wxInputStream& stream )
     return (hdr[0] == 0xFF && hdr[1] == 0xD8);
 }
 
     return (hdr[0] == 0xFF && hdr[1] == 0xD8);
 }
 

-#endif   // wxUSE_STREAMS && wxUSE_LIBJPEG
+#endif   // wxUSE_STREAMS
+
+#endif   // wxUSE_LIBJPEG

 
 
 
 
 
 

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 7d8cfcad54aff520f35689ab4a2dce964d6b6cd5..1815bcb1bab4f3e866f83d110d9893dc2e9a92c6 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -23,7 +23,7 @@
   #include "wx/defs.h"
 #endif
 
   #include "wx/defs.h"
 #endif
 

-#if wxUSE_STREAMS && wxUSE_LIBPNG
+#if wxUSE_LIBPNG

 
 #include "wx/image.h"
 #include "wx/bitmap.h"
 
 #include "wx/image.h"
 #include "wx/bitmap.h"


@@ -57,6 +57,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
 #endif
 

+#if wxUSE_LIBPNG
+

 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
 #else
 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
 #else


@@ -353,5 +355,6 @@ bool wxPNGHandler::CanRead( wxInputStream& stream )
     return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
 }
 
     return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
 }
 

-#endif  // wxUSE_STREAMS && wxUSE_LIBPNG
+#endif  // wxUSE_STREAMS

 
 

+#endif  // wxUSE_LIBPNG

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index d50e4247a23450d1619c4dfa6c6f92fe421c1803..28bf08eba303e2b2d3cc18d26f7631a6cd4b7273 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -23,7 +23,7 @@
 #  include "wx/setup.h"
 #endif
 
 #  include "wx/setup.h"
 #endif
 

-#if wxUSE_STREAMS && wxUSE_PNM
+#if wxUSE_PNM

 
 #include "wx/image.h"
 #include "wx/log.h"
 
 #include "wx/image.h"
 #include "wx/log.h"


@@ -37,6 +37,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 #endif
 

+#if wxUSE_STREAMS

 
 void Skip_Comment(wxInputStream &stream)
 {
 
 void Skip_Comment(wxInputStream &stream)
 {


@@ -155,5 +156,6 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 }
 
 
 }
 
 

-#endif // wxUSE_STREAMS && wxUSE_PNM
+#endif // wxUSE_STREAMS

 
 

+#endif // wxUSE_PNM