Kevin's prefered way to do the last fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 8c4bec7bcc919a824aa74a11b43e7abb1a5a3f5d..7a2747e594754e04fbd8729ce013c1520640c692 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -39,13 +39,14 @@ enum {
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+    #include "wx/generic/imaglist.h"
+#endif
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC_CARBON__)
     #include "wx/mac/imaglist.h"
-#else
-    #include "wx/generic/imaglist.h"
 #endif
 
 #endif

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 56be31e3324101943fa35866ed43408ae39bdb76..f9b4629f211a3a77f1de2cf1d5ca6583f615c4e3 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -28,12 +28,14 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+    #include "wx/generic/listctrl.h"
+#endif
+
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/carbon/listctrl.h"
-#else
-    #include "wx/generic/listctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------