X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cd94a0d119ade811cd876a309cfe6d28b5c36dd..687dcff3a46a55c11851b1cabdbbbef5492a2f5f:/include/wx/generic/imaglist.h diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index a953bad4e4..288c7444b4 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -4,21 +4,23 @@ // Author: Robert Roebling // Created: 01/02/97 // Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __IMAGELISTH_G__ #define __IMAGELISTH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "imaglist.h" #endif #include "wx/defs.h" -#include "wx/gdicmn.h" -#include "wx/bitmap.h" -#include "wx/dc.h" +#include "wx/list.h" + +class WXDLLEXPORT wxDC; +class WXDLLEXPORT wxBitmap; +class WXDLLEXPORT wxColour; /* * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to @@ -84,5 +86,25 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericImageList) }; +#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) +/* + * wxImageList has to be a real class or we have problems with + * the run-time information. + */ + +class WXDLLEXPORT wxImageList: public wxGenericImageList +{ + DECLARE_DYNAMIC_CLASS(wxImageList) + +public: + wxImageList() {} + + wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 ) + : wxGenericImageList(width, height, mask, initialCount) + { + } +}; +#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__ + #endif // __IMAGELISTH_G__