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/imagpcx.cpp

@@ -20,13 +20,17 @@
 #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"
 
-#if wxUSE_PCX
 
 //-----------------------------------------------------------------------------
 // PCX decoding
@@ -218,8 +222,6 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
 #endif
 
-#if wxUSE_STREAMS
-
 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     int error;
@@ -275,7 +277,5 @@ bool wxPCXHandler::CanRead( wxInputStream& stream )
     return (c == 10);
 }
 
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_PCX
+#endif // wxUSE_STREAMS && wxUSE_PCX