implemented toggling of wxCAL_MONDAY_FIRST in the native MSW version of wxCalendarCtrl

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

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 67657d6d4f3984e715fb9ddc91c47c7b5211ad92..75bfe80a14f050f1ad74fe15151e50255a6990e1 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,42 +10,40 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "imagtiff.h"
-#endif
-
-#include "wx/image.h"
-
+#include "wx/defs.h"

 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBTIFF
 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBTIFF

-class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
+
+#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 WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler

 {
 public:
 {
 public:

-    inline wxTIFFHandler()
-    {
-        m_name = wxT("TIFF file");
-        m_extension = wxT("tif");
-        m_type = wxBITMAP_TYPE_TIF;
-        m_mime = wxT("image/tiff");
-    }
+    wxTIFFHandler();

 
 #if wxUSE_STREAMS
 
 #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 bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );

     virtual int GetImageCount( wxInputStream& stream );
     virtual int GetImageCount( wxInputStream& stream );

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

 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
 };
 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
 };

-#endif

 
 

+#endif // wxUSE_LIBTIFF

 
 

-#endif
-  // _WX_IMAGTIFF_H_
+#endif // _WX_IMAGTIFF_H_