Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 6558755bc761bfb3705a851c7a245ebc972029b2..8a752751d7f54f4161036a062bd8da54a4588493 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,13 +1,10 @@
 #ifndef _WX_IMAGLIST_H_BASE_
 #define _WX_IMAGLIST_H_BASE_
 
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/imaglist.h"
-#endif
-#include "wx/generic/imaglist.h"
-#if !defined(__WIN32__)
-    #define wxImageList wxGenericImageList
-    #define sm_classwxImageList sm_classwxGenericImageList
+#else
+    #include "wx/generic/imaglist.h"
 #endif
 
 #endif