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

@@ -19,16 +19,16 @@
 #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"
 
-#if wxUSE_PNM
-
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
@@ -37,9 +37,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 #endif
 
-#if wxUSE_STREAMS
-
-//#include <stream.h> // for cout
 
 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