GetRegion is not needed anymore

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 157a6ff05cd84a13f6720c86289688518f2e3be9..4d42a170d151a15db1460a6c7a432f3342021338 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -15,12 +15,12 @@
 #include "wx/list.h"
 #include "wx/icon.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 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; }


@@ -57,13 +57,14 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 
     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.
  */
 
 /*
  * 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 +76,7 @@ public:
     {
     }
 };
     {
     }
 };

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

 
 #endif  // __IMAGELISTH_G__
 
 
 #endif  // __IMAGELISTH_G__