X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..afc0db8ca0bcae488ed7efa8ee3bcd873873a8d9:/include/wx/generic/imaglist.h?ds=sidebyside diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index 418aa96438..1c18dfc9a2 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLEXPORT wxGenericImageList: public wxObject +class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject { public: wxGenericImageList() { m_width = m_height = 0; } @@ -49,12 +49,12 @@ public: // Internal use only const wxBitmap *GetBitmapPtr(int index) const; private: - wxList m_images; + wxObjectList m_images; int m_width; int m_height; - DECLARE_DYNAMIC_CLASS(wxGenericImageList) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericImageList) }; #ifndef wxHAS_NATIVE_IMAGELIST @@ -64,7 +64,7 @@ private: * the run-time information. */ -class WXDLLEXPORT wxImageList: public wxGenericImageList +class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList { DECLARE_DYNAMIC_CLASS(wxImageList)