Applied patch [ 746547 ] fixes 'wrong header file included' in fontmap.h

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

diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index 909a69c17a6a89ea7d8bd38afbe173a5499677c2..5af07e40720fcdace67d9c9e7e5837dc7df0b4e0 100644 (file)
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -1,46 +1,51 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.h

-// Purpose:     wxImage handler for GIFs (read-only)
-// Author:      Vaclav Slavik (of this header only)
+// Purpose:     wxImage GIF handler
+// Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
+// RCS-ID:      $Id$
+// Copyright:   (c) Guillermo Rodriguez Garcia

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGGIF_H_
 #define _WX_IMAGGIF_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGGIF_H_
 #define _WX_IMAGGIF_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "imaggif.h"
 #endif
 
 #pragma interface "imaggif.h"
 #endif
 

-#include <wx/setup.h>
-#include <wx/object.h>
-#include <wx/string.h>
-#include <wx/gdicmn.h>
-#include <wx/stream.h>
-#include <wx/image.h>
+#include "wx/image.h"
+

 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_GIF
+

 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {

-  DECLARE_DYNAMIC_CLASS(wxGIFHandler)
-

 public:
 public:

+    inline wxGIFHandler()
+    {
+        m_name = wxT("GIF file");
+        m_extension = wxT("gif");
+        m_type = wxBITMAP_TYPE_GIF;
+        m_mime = wxT("image/gif");
+    }
+
+#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

 
 

-  inline wxGIFHandler()
-  {
-      m_name = "GIF file";
-      m_extension = "gif";
-      m_type = wxBITMAP_TYPE_GIF;
-      m_mime = "image/gif";
-  };
-
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
+private:
+    DECLARE_DYNAMIC_CLASS(wxGIFHandler)

 };
 };

+#endif
+

 
 #endif
 
 #endif

-    // _WX_IMAGGIF_H_
+  // _WX_IMAGGIF_H_