don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index 2a6affdda7da046e1735868ce1d16e07eb73b0cd..602c2e3233c37bb0e9c1473ac99c77f4acad7aa7 100644 (file)
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imaggif.h
+// Name:        wx/imaggif.h

 // Purpose:     wxImage GIF handler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
 // Purpose:     wxImage GIF handler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$


@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGGIF_H_
 #define _WX_IMAGGIF_H_
 
 #ifndef _WX_IMAGGIF_H_
 #define _WX_IMAGGIF_H_
 

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

 #include "wx/image.h"
 
 
 #include "wx/image.h"
 
 


@@ -23,7 +19,7 @@
 
 #if wxUSE_GIF
 
 
 #if wxUSE_GIF
 

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

 {
 public:
     inline wxGIFHandler()
 {
 public:
     inline wxGIFHandler()


@@ -35,17 +31,21 @@ public:
     }
 
 #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 );
-#endif
+    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);
+#endif // wxUSE_STREAMS

 
 private:
     DECLARE_DYNAMIC_CLASS(wxGIFHandler)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGIFHandler)
 };

-#endif

 
 

+#endif // wxUSE_GIF

 
 

-#endif
-  // _WX_IMAGGIF_H_
+#endif // _WX_IMAGGIF_H_