fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / include / wx / generic / imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 4d42a170d151a15db1460a6c7a432f3342021338..4a1ee4fc7dbf1dc66ae2abdcf39fb40af7f68abb 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -3,20 +3,19 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __IMAGELISTH_G__
-#define __IMAGELISTH_G__
+#ifndef _WX_IMAGLISTG_H_
+#define _WX_IMAGLISTG_H_

 
 

-#include "wx/defs.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/icon.h"

 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxBitmap;

+class WXDLLIMPEXP_FWD_CORE wxIcon;

 class WXDLLIMPEXP_FWD_CORE wxColour;
 
 
 class WXDLLIMPEXP_FWD_CORE wxColour;
 
 


@@ -49,12 +48,12 @@ public:
     // Internal use only
     const wxBitmap *GetBitmapPtr(int index) const;
 private:
     // Internal use only
     const wxBitmap *GetBitmapPtr(int index) const;
 private:

-    wxList  m_images;
+    wxObjectList  m_images;

 
     int     m_width;
     int     m_height;
 
 
     int     m_width;
     int     m_height;
 

-    DECLARE_DYNAMIC_CLASS(wxGenericImageList)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericImageList)

 };
 
 #ifndef wxHAS_NATIVE_IMAGELIST
 };
 
 #ifndef wxHAS_NATIVE_IMAGELIST


@@ -78,5 +77,4 @@ public:
 };
 #endif // !wxHAS_NATIVE_IMAGELIST
 
 };
 #endif // !wxHAS_NATIVE_IMAGELIST
 

-#endif  // __IMAGELISTH_G__
-
+#endif  // _WX_IMAGLISTG_H_