made wxCommandEvent::GetInt() return int, not long (patch 1473771)

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

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 576a25d962e88e9712534b9239c5b327827e73c0..c46283825e6485817741ca50216531562c4a817e 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) */


@@ -75,6 +74,8 @@ public:
     unsigned char *pal;             /* palette */
     GIFImage *next;                 /* next image */
     GIFImage *prev;                 /* prev image */
     unsigned char *pal;             /* palette */
     GIFImage *next;                 /* next image */
     GIFImage *prev;                 /* prev image */

+
+    DECLARE_NO_COPY_CLASS(GIFImage)

 };
 
 
 };
 
 


@@ -131,13 +132,13 @@ public:
     // 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 +146,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)

 };
 
 
 };