Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ops. wxUSE_XXX and wxUSE_STREAMS are separated again :-)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
1999-09-09 22:19:18 +00:00
parent 2b98cb1f84
commit 9ab6ee851e
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/imaggif.cpp
View File

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

8
src/common/imagjpeg.cpp
View File

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

7
src/common/imagpng.cpp
View File

@@ -23,7 +23,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#endif #endif
#if wxUSE_STREAMS && wxUSE_LIBPNG #if wxUSE_LIBPNG
#include "wx/image.h" #include "wx/image.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
@@ -57,6 +57,8 @@
IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
#endif #endif
#if wxUSE_LIBPNG
#if defined(__VISAGECPP__) #if defined(__VISAGECPP__)
#define LINKAGEMODE _Optlink #define LINKAGEMODE _Optlink
#else #else
@@ -353,5 +355,6 @@ 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 && wxUSE_LIBPNG #endif // wxUSE_STREAMS
#endif // wxUSE_LIBPNG

6
src/common/imagpnm.cpp
View File

@@ -23,7 +23,7 @@
# include "wx/setup.h" # include "wx/setup.h"
#endif #endif
#if wxUSE_STREAMS && wxUSE_PNM #if wxUSE_PNM
#include "wx/image.h" #include "wx/image.h"
#include "wx/log.h" #include "wx/log.h"
@@ -37,6 +37,7 @@
IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler) IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
#endif #endif
#if wxUSE_STREAMS
void Skip_Comment(wxInputStream &stream) void Skip_Comment(wxInputStream &stream)
{ {
@@ -155,5 +156,6 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
} }
#endif // wxUSE_STREAMS && wxUSE_PNM #endif // wxUSE_STREAMS
#endif // wxUSE_PNM