X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe9308c639e9738796028b56c40c58f2e8a648de..03a187ccae181e3736ec206d6d716846bfcb2007:/include/wx/imagtiff.h

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 44e8c6fa64..4beb66c6ce 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,12 +26,7 @@
 #define wxIMAGE_OPTION_COMPRESSION                 wxString(_T("Compression"))
 #define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(_T("ImageDescriptor"))
 
-//-----------------------------------------------------------------------------
-// wxTIFFHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBTIFF
-class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
+class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler
 {
 public:
     wxTIFFHandler();
@@ -35,16 +34,17 @@ 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 );
+
+protected:
+    virtual int DoGetImageCount( wxInputStream& stream );
     virtual bool DoCanRead( wxInputStream& stream );
-    virtual int GetImageCount( wxInputStream& stream );
 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
 };
-#endif
 
+#endif // wxUSE_LIBTIFF
 
-#endif
-  // _WX_IMAGTIFF_H_
+#endif // _WX_IMAGTIFF_H_