Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index a953bad4e4272791713710648b7aa7e0dba18b21..288c7444b423ad00d53232b888a2477909df8934 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -4,21 +4,23 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // 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__
 
 // 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"
 #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
 
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to


@@ -84,5 +86,25 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 
     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__
 
 #endif  // __IMAGELISTH_G__