don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 4c1a68cd43b7712776711de6b061deeffe738604..4beb66c6ce0948db55fce82ea838e4c7962cfce2 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagtiff.h"
-#endif
-
 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
@@ -30,7 +26,7 @@
 #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();
@@ -38,8 +34,10 @@ 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: