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

@@ -21,7 +21,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_LIBJPEG
+#if wxUSE_STREAMS && wxUSE_LIBJPEG
 
 #include "wx/image.h"
 #include "wx/bitmap.h"
@@ -59,8 +59,6 @@ extern "C" {
 IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
 #endif
 
-#if wxUSE_STREAMS
-
 //------------- JPEG Data Source Manager
 
 typedef struct {
@@ -320,11 +318,7 @@ bool wxJPEGHandler::CanRead( wxInputStream& stream )
     return (hdr[0] == 0xFF && hdr[1] == 0xD8);
 }
 
-#endif 
-  // wxUSE_STREAMS
-
-#endif 
-  // wxUSE_LIBJPEG
+#endif   // wxUSE_STREAMS && wxUSE_LIBJPEG