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

@@ -23,7 +23,7 @@
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_LIBGIF
+#if wxUSE_STREAMS && wxUSE_GIF
 
 #include "wx/image.h"
 #include "wx/gifdecod.h"
@@ -34,8 +34,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 #endif
 
-#if wxUSE_STREAMS
-
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
@@ -91,8 +89,4 @@ bool wxGIFHandler::CanRead( wxInputStream& stream )
     return ok;
 }
 
-#endif
-  // wxUSE_STREAMS
-
-#endif
-  // wxUSE_LIBGIF
+#endif  // wxUSE_STREAMS && wxUSE_GIF