Patch from Bo for generic wxDataViewCtrl

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 157a6ff05cd84a13f6720c86289688518f2e3be9..418aa964384367e439314eae6e09f191085787da 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -15,9 +15,9 @@
 #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 wxColour;
 
 
 class WXDLLEXPORT wxGenericImageList: public wxObject
@@ -57,7 +57,8 @@ private:
     DECLARE_DYNAMIC_CLASS(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.
@@ -75,7 +76,7 @@ public:
     {
     }
 };
-#endif // !HAVE_NATIVE_IMAGELIST
+#endif // !wxHAS_NATIVE_IMAGELIST
 
 #endif  // __IMAGELISTH_G__