Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 8b10b0f524d8a51bee661f7bf03d3f0bb6206ac9..8a752751d7f54f4161036a062bd8da54a4588493 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,26 +1,10 @@
 #ifndef _WX_IMAGLIST_H_BASE_
 #define _WX_IMAGLIST_H_BASE_
 
-#if defined(__WXUNIVERSAL__)
-#include "wx/generic/imaglist.h"
-#elif defined(__WXMSW__)
-#if defined(__WIN16__)
-#include "wx/generic/imaglist.h"
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/imaglist.h"
 #else
-#include "wx/msw/imaglist.h"
-#endif
-#elif defined(__WXMOTIF__)
-#include "wx/generic/imaglist.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/imaglist.h"
-#elif defined(__WXQT__)
-#include "wx/generic/imaglist.h"
-#elif defined(__WXMAC__)
-#include "wx/generic/imaglist.h"
-#elif defined(__WXPM__)
-#include "wx/generic/imaglist.h"
-#elif defined(__WXSTUBS__)
-#include "wx/generic/imaglist.h"
+    #include "wx/generic/imaglist.h"
 #endif
 
 #endif