fixed compilation if wxUSE_STL=1

[wxWidgets.git] / include / wx / imagtiff.h

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 4607162bf06459fe0819ef1cd61baf8fe463c8af..536cf3926c486eb7d2a9be294fc4dcab23404826 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,18 +10,22 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagtiff.h"
-#endif
-
-#include "wx/image.h"
-
+#include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBTIFF
+
+#include "wx/image.h"
+
+// defines for wxImage::SetOption
+#define wxIMAGE_OPTION_BITSPERSAMPLE               wxString(_T("BitsPerSample"))
+#define wxIMAGE_OPTION_SAMPLESPERPIXEL             wxString(_T("SamplesPerPixel"))
+#define wxIMAGE_OPTION_COMPRESSION                 wxString(_T("Compression"))
+#define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(_T("ImageDescriptor"))
+
 class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {
 public:
@@ -30,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_