use wxSTRINGIZE instead of redefining a special STRINGIZE in this file

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

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 769169fd4c2f5e6599a650ff52fddda659b3eb9e..cb9490e8922f6e6b3f1ee87526591b621484a048 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -11,11 +11,7 @@
 #ifndef _WX_GIFDECOD_H
 #define _WX_GIFDECOD_H
 
 #ifndef _WX_GIFDECOD_H
 #define _WX_GIFDECOD_H
 

-#ifdef __GNUG__
-#pragma interface "gifdecod.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_STREAMS && wxUSE_GIF
 
 
 #if wxUSE_STREAMS && wxUSE_GIF
 


@@ -64,6 +60,9 @@ enum
 class GIFImage
 {
 public:
 class GIFImage
 {
 public:

+    // def ctor
+    GIFImage();
+

     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     unsigned int left;              /* x coord (in logical screen) */
     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     unsigned int left;              /* x coord (in logical screen) */


@@ -73,8 +72,11 @@ public:
     long delay;                     /* delay in ms (-1 = unused) */
     unsigned char *p;               /* bitmap */
     unsigned char *pal;             /* palette */
     long delay;                     /* delay in ms (-1 = unused) */
     unsigned char *p;               /* bitmap */
     unsigned char *pal;             /* palette */

+    unsigned int ncolours;          /* number of colours */

     GIFImage *next;                 /* next image */
     GIFImage *prev;                 /* prev image */
     GIFImage *next;                 /* next image */
     GIFImage *prev;                 /* prev image */

+
+    DECLARE_NO_COPY_CLASS(GIFImage)

 };
 
 
 };
 
 


@@ -108,11 +110,12 @@ private:
     int getcode(int bits, int abfin);
     int dgif(GIFImage *img, int interl, int bits);
 
     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;
     unsigned char* GetPalette() const;
     // get data of current frame
     int GetFrameIndex() const;
     unsigned char* GetData() const;
     unsigned char* GetPalette() const;

+    unsigned int GetNcolours() const;

     unsigned int GetWidth() const;
     unsigned int GetHeight() const;
     unsigned int GetLeft() const;
     unsigned int GetWidth() const;
     unsigned int GetHeight() const;
     unsigned int GetLeft() const;


@@ -131,13 +134,13 @@ protected:
     // move through the animation
     bool GoFirstFrame();
     bool GoLastFrame();
     // 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.
     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();
     ~wxGIFDecoder();
     bool CanRead();
     int ReadGIF();


@@ -145,6 +148,8 @@ public:
 
     // convert current frame to wxImage
     bool ConvertToImage(wxImage *image) const;
 
     // convert current frame to wxImage
     bool ConvertToImage(wxImage *image) const;

+
+    DECLARE_NO_COPY_CLASS(wxGIFDecoder)

 };
 
 
 };