synchronize GTK2 minimum version in docs

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 157a6ff05cd84a13f6720c86289688518f2e3be9..4a1ee4fc7dbf1dc66ae2abdcf39fb40af7f68abb 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -3,24 +3,23 @@
 // 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 WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxColour;

 
 
 
 

-class WXDLLEXPORT wxGenericImageList: public wxObject
+class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject

 {
 public:
     wxGenericImageList() { m_width = m_height = 0; }
 {
 public:
     wxGenericImageList() { m_width = m_height = 0; }


@@ -49,21 +48,22 @@ 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)

 };
 
 };
 

-#if !defined(__WXMSW__) && !defined(__WXMAC__)
+#ifndef wxHAS_NATIVE_IMAGELIST
+

 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
  */
 
 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
  */
 

-class WXDLLEXPORT wxImageList: public wxGenericImageList
+class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList

 {
     DECLARE_DYNAMIC_CLASS(wxImageList)
 
 {
     DECLARE_DYNAMIC_CLASS(wxImageList)
 


@@ -75,7 +75,6 @@ public:
     {
     }
 };
     {
     }
 };

-#endif // !HAVE_NATIVE_IMAGELIST
-
-#endif  // __IMAGELISTH_G__
+#endif // !wxHAS_NATIVE_IMAGELIST

 
 

+#endif  // _WX_IMAGLISTG_H_