X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8141573c1ed2d7f02b201c7b78f32ffca2925eeb..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/gifdecod.h?ds=sidebyside

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 769169fd4c..f61739ed7e 100644
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -11,11 +11,11 @@
 #ifndef _WX_GIFDECOD_H
 #define _WX_GIFDECOD_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "gifdecod.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_STREAMS && wxUSE_GIF
 
@@ -64,6 +64,9 @@ enum
 class GIFImage
 {
 public:
+    // def ctor
+    GIFImage();
+
     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     unsigned int left;              /* x coord (in logical screen) */
@@ -75,6 +78,8 @@ public:
     unsigned char *pal;             /* palette */
     GIFImage *next;                 /* next image */
     GIFImage *prev;                 /* prev image */
+
+    DECLARE_NO_COPY_CLASS(GIFImage)
 };
 
 
@@ -108,7 +113,7 @@ private:
     int getcode(int bits, int abfin);
     int dgif(GIFImage *img, int interl, int bits);
 
-protected:
+public:
     // get data of current frame
     int GetFrameIndex() const;
     unsigned char* GetData() const;
@@ -131,13 +136,13 @@ protected:
     // move through the animation
     bool GoFirstFrame();
     bool GoLastFrame();
-    bool GoNextFrame(bool cyclic = FALSE);
-    bool GoPrevFrame(bool cyclic = FALSE);
+    bool GoNextFrame(bool cyclic = false);
+    bool GoPrevFrame(bool cyclic = false);
     bool GoFrame(int which);
 
 public:
     // constructor, destructor, etc.
-    wxGIFDecoder(wxInputStream *s, bool anim = FALSE);
+    wxGIFDecoder(wxInputStream *s, bool anim = false);
     ~wxGIFDecoder();
     bool CanRead();
     int ReadGIF();
@@ -145,6 +150,8 @@ public:
 
     // convert current frame to wxImage
     bool ConvertToImage(wxImage *image) const;
+
+    DECLARE_NO_COPY_CLASS(wxGIFDecoder)
 };