From 357f792971a5f77438bb64115a31185878bb6fe4 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 24 Mar 2020 17:32:12 -0700
Subject: [PATCH] Split decoder interface to match the actual header files

---
 interface/wx/anidecod.h  | 32 +++++++++++++++++++++++++
 interface/wx/animdecod.h | 52 ----------------------------------------
 interface/wx/gifdecod.h  | 34 ++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 52 deletions(-)
 create mode 100644 interface/wx/anidecod.h
 create mode 100644 interface/wx/gifdecod.h

diff --git a/interface/wx/anidecod.h b/interface/wx/anidecod.h
new file mode 100644
index 0000000000..3e727a79ee
--- /dev/null
+++ b/interface/wx/anidecod.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/anidecod.h
+// Purpose:     wxANIDecoder, ANI reader for wxImage and wxAnimation
+// Author:      Francesco Montorsi
+// Copyright:   (c) 2006 Francesco Montorsi
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+   @class wxANIDecoder
+
+   An animation decoder supporting animated cursor (.ani) files.
+*/
+class  wxANIDecoder : public wxAnimationDecoder
+{
+public:
+    wxANIDecoder();
+    ~wxANIDecoder();
+
+    virtual bool Load( wxInputStream& stream );
+    virtual wxAnimationDecoder *Clone() const;
+    virtual wxAnimationType GetType() const;
+    virtual bool ConvertToImage(unsigned int frame, wxImage *image) const;
+    virtual wxSize GetFrameSize(unsigned int frame) const;
+    virtual wxPoint GetFramePosition(unsigned int frame) const;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    virtual long GetDelay(unsigned int frame) const;
+    virtual wxColour GetTransparentColour(unsigned int frame) const;
+
+protected:
+    virtual bool DoCanRead(wxInputStream& stream) const;    
+};
diff --git a/interface/wx/animdecod.h b/interface/wx/animdecod.h
index 295196cf16..f5175d6e24 100644
--- a/interface/wx/animdecod.h
+++ b/interface/wx/animdecod.h
@@ -109,55 +109,3 @@ protected:
 };
 
 
-
-/**
-   @class wxGIFDecoder
-
-   An animation decoder supporting animated GIF files.
-*/
-class  wxGIFDecoder : public wxAnimationDecoder
-{
-public:
-    wxGIFDecoder();
-    ~wxGIFDecoder();
-
-    virtual bool Load( wxInputStream& stream );
-    virtual wxAnimationDecoder *Clone() const;
-    virtual wxAnimationType GetType() const;
-    virtual bool ConvertToImage(unsigned int frame, wxImage *image) const;
-    virtual wxSize GetFrameSize(unsigned int frame) const;
-    virtual wxPoint GetFramePosition(unsigned int frame) const;
-    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
-    virtual long GetDelay(unsigned int frame) const;
-    virtual wxColour GetTransparentColour(unsigned int frame) const;
-
-protected:
-    virtual bool DoCanRead(wxInputStream& stream) const;    
-};
-
-
-
-/**
-   @class wxANIDecoder
-
-   An animation decoder supporting animated cursor (.ani) files.
-*/
-class  wxANIDecoder : public wxAnimationDecoder
-{
-public:
-    wxANIDecoder();
-    ~wxANIDecoder();
-
-    virtual bool Load( wxInputStream& stream );
-    virtual wxAnimationDecoder *Clone() const;
-    virtual wxAnimationType GetType() const;
-    virtual bool ConvertToImage(unsigned int frame, wxImage *image) const;
-    virtual wxSize GetFrameSize(unsigned int frame) const;
-    virtual wxPoint GetFramePosition(unsigned int frame) const;
-    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
-    virtual long GetDelay(unsigned int frame) const;
-    virtual wxColour GetTransparentColour(unsigned int frame) const;
-
-protected:
-    virtual bool DoCanRead(wxInputStream& stream) const;    
-};
diff --git a/interface/wx/gifdecod.h b/interface/wx/gifdecod.h
new file mode 100644
index 0000000000..22c73c73a9
--- /dev/null
+++ b/interface/wx/gifdecod.h
@@ -0,0 +1,34 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gifdecod.h
+// Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
+// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+// Version:     3.02
+// Copyright:   (c) 1999 Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+   @class wxGIFDecoder
+
+   An animation decoder supporting animated GIF files.
+*/
+class  wxGIFDecoder : public wxAnimationDecoder
+{
+public:
+    wxGIFDecoder();
+    ~wxGIFDecoder();
+
+    virtual bool Load( wxInputStream& stream );
+    virtual wxAnimationDecoder *Clone() const;
+    virtual wxAnimationType GetType() const;
+    virtual bool ConvertToImage(unsigned int frame, wxImage *image) const;
+    virtual wxSize GetFrameSize(unsigned int frame) const;
+    virtual wxPoint GetFramePosition(unsigned int frame) const;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    virtual long GetDelay(unsigned int frame) const;
+    virtual wxColour GetTransparentColour(unsigned int frame) const;
+
+protected:
+    virtual bool DoCanRead(wxInputStream& stream) const;    
+};
+