forward to generic implementations where the corresponding osx variant doesn't have...

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 23ece7720ebe71f29dad422cecf767985760e849..fbd402dc17a599efc27588d7e4df7492823bf49d 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -32,7 +32,7 @@
 #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"

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 19c9cd13831e1d7531a2462ba0d39482e09f5746..d24c3007de0c29518e4eec30b3b08e554306af50 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -30,7 +30,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 
 #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"