git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55416
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
#elif defined(__WXDFB__)
#include "wx/generic/icon.h"
#elif defined(__WXMAC__)
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
#include "wx/osx/icon.h"
#else
#include "wx/generic/icon.h"
#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
#include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
#include "wx/osx/carbon/listctrl.h"
#else
#include "wx/generic/listctrl.h"