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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index f8c799a2559ec3cc25a53b2cc78cb2d4ed17bf8f..7b3e5ba0df582ee1596d50802d092ba5e55543da 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_LIBGIF
+#if wxUSE_STREAMS && wxUSE_GIF

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


@@ -34,8 +34,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 #endif
 

-#if wxUSE_STREAMS
-

 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------


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

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 94bded7c0198904eafebe1e40143b78c22aa548e..890985f9575ffe89aca57b815f33fa4bd5d62f40 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_LIBJPEG
+#if wxUSE_STREAMS && wxUSE_LIBJPEG

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


@@ -59,8 +59,6 @@ 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 {


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

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

 
 
 
 
 
 

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 76bacb32851076fac8d502e94954749510f25623..2c29b90489a79dfdf102b04f701e14a3859d3d3d 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -20,13 +20,17 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/setup.h"
+#ifndef WX_PRECOMP
+#  include "wx/defs.h"
+#endif
+
+#if wxUSE_STREAMS && wxUSE_PCX 
+

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

-#if wxUSE_PCX

 
 //-----------------------------------------------------------------------------
 // PCX decoding
 
 //-----------------------------------------------------------------------------
 // PCX decoding


@@ -218,8 +222,6 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
 #endif
 

-#if wxUSE_STREAMS
-

 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     int error;
 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     int error;


@@ -275,7 +277,5 @@ bool wxPCXHandler::CanRead( wxInputStream& stream )
     return (c == 10);
 }
 
     return (c == 10);
 }
 

-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_PCX
+#endif // wxUSE_STREAMS && wxUSE_PCX

 
 

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 5c3f19eeee075ac2856a204ce82844d3c492cde8..7d8cfcad54aff520f35689ab4a2dce964d6b6cd5 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_LIBPNG
+#if wxUSE_STREAMS && wxUSE_LIBPNG

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


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

-#if wxUSE_STREAMS
-

 #if defined(__VISAGECPP__)
 #define LINKAGEMODE _Optlink
 #else
 #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');
 }
 
     return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
 }
 

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

 
 

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index d2200424336037cc4d162f5c83721cab5bdc7dbb..d50e4247a23450d1619c4dfa6c6f92fe421c1803 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -19,16 +19,16 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+#  include "wx/setup.h"
+#endif
+
+#if wxUSE_STREAMS && wxUSE_PNM
+

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

-#if wxUSE_PNM
-
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-

 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------


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

-#if wxUSE_STREAMS
-
-//#include <stream.h> // for cout

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


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

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