added wxMenu::AppendSubMenu() to avoid having to specify a dummy id when adding a...

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 6558755bc761bfb3705a851c7a245ebc972029b2..1b2c2c4cc28dd82828c90b96dc39c82a79c99c50 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,13 +1,23 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/imaglist.h
+// Purpose:     wxImageList base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #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
+#elif defined(__WXMAC_CARBON__)
+    #include "wx/mac/imaglist.h"
+#else
+    #include "wx/generic/imaglist.h"
 #endif
 
 #endif