From 973b546e8eb626e3849f2a708b8fbac80727a094 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 2 Sep 2008 11:50:44 +0000 Subject: [PATCH] forward to generic implementations where the corresponding osx variant doesn't have an implementation yet git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/icon.h | 2 +- include/wx/listctrl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/icon.h b/include/wx/icon.h index 23ece7720e..fbd402dc17 100644 --- 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 19c9cd1383..d24c3007de 100644 --- 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" -- 2.45.2