X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/649d13e837b25f7b948ccfae02b18131f3a0a743..52c71b808f1c7fd161bb0bc5082683320f15dbb2:/include/wx/imagtiff.h diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 55d3ff0689..67657d6d4f 100644 --- a/include/wx/imagtiff.h +++ b/include/wx/imagtiff.h @@ -10,7 +10,7 @@ #ifndef _WX_IMAGTIFF_H_ #define _WX_IMAGTIFF_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "imagtiff.h" #endif @@ -24,24 +24,24 @@ #if wxUSE_LIBTIFF class WXDLLEXPORT wxTIFFHandler: public wxImageHandler { - DECLARE_DYNAMIC_CLASS(wxTIFFHandler) - public: - - inline wxTIFFHandler() - { - m_name = "TIFF file"; - m_extension = "tif"; - m_type = wxBITMAP_TYPE_TIF; - m_mime = "image/tiff"; - }; + inline wxTIFFHandler() + { + m_name = wxT("TIFF file"); + m_extension = wxT("tif"); + m_type = wxBITMAP_TYPE_TIF; + m_mime = wxT("image/tiff"); + } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); - virtual bool DoCanRead( wxInputStream& stream ); - virtual int GetImageCount( wxInputStream& stream ); + 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 ); #endif + +private: + DECLARE_DYNAMIC_CLASS(wxTIFFHandler) }; #endif