no changes, just remove #if'd out code

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

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 4c1a68cd43b7712776711de6b061deeffe738604..75bfe80a14f050f1ad74fe15151e50255a6990e1 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagtiff.h"
-#endif
-

 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------


@@ -30,7 +26,7 @@
 #define wxIMAGE_OPTION_COMPRESSION                 wxString(_T("Compression"))
 #define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(_T("ImageDescriptor"))
 
 #define wxIMAGE_OPTION_COMPRESSION                 wxString(_T("Compression"))
 #define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(_T("ImageDescriptor"))
 

-class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
+class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler

 {
 public:
     wxTIFFHandler();
 {
 public:
     wxTIFFHandler();


@@ -38,8 +34,9 @@ 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 );
 #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 );
     virtual int GetImageCount( wxInputStream& stream );

+protected:
+    virtual bool DoCanRead( wxInputStream& stream );

 #endif
 
 private:
 #endif
 
 private: