X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe9308c639e9738796028b56c40c58f2e8a648de..09b67c660cadef225cbf8f1986cfe591f8feae8c:/include/wx/imagtiff.h diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 44e8c6fa64..536cf3926c 100644 --- a/include/wx/imagtiff.h +++ b/include/wx/imagtiff.h @@ -10,9 +10,13 @@ #ifndef _WX_IMAGTIFF_H_ #define _WX_IMAGTIFF_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "imagtiff.h" -#endif +#include "wx/defs.h" + +//----------------------------------------------------------------------------- +// wxTIFFHandler +//----------------------------------------------------------------------------- + +#if wxUSE_LIBTIFF #include "wx/image.h" @@ -22,11 +26,6 @@ #define wxIMAGE_OPTION_COMPRESSION wxString(_T("Compression")) #define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(_T("ImageDescriptor")) -//----------------------------------------------------------------------------- -// wxTIFFHandler -//----------------------------------------------------------------------------- - -#if wxUSE_LIBTIFF class WXDLLEXPORT wxTIFFHandler: public wxImageHandler { public: @@ -35,16 +34,16 @@ public: #if wxUSE_STREAMS virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); - virtual bool DoCanRead( wxInputStream& stream ); virtual int GetImageCount( wxInputStream& stream ); +protected: + virtual bool DoCanRead( wxInputStream& stream ); #endif private: DECLARE_DYNAMIC_CLASS(wxTIFFHandler) }; -#endif +#endif // wxUSE_LIBTIFF -#endif - // _WX_IMAGTIFF_H_ +#endif // _WX_IMAGTIFF_H_