From 9a448380559e848abba214dd8075325eafd779bb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 6 May 2014 15:49:15 +0000 Subject: [PATCH] using the base class wxHAS_NATIVE_ENABLED_MANAGEMENT in cocoa disabling/enabling child windows, fixes #16232, fixes #15495 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/window.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/wx/window.h b/include/wx/window.h index 936c2466cb..4b067ac6c7 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -57,6 +57,13 @@ #if defined(__WXMSW__) || defined(__WXPM__) // must do everything ourselves #undef wxHAS_NATIVE_ENABLED_MANAGEMENT +#elif defined(__WXOSX__) + #if wxOSX_USE_CARBON + #define wxHAS_NATIVE_ENABLED_MANAGEMENT + #else + // must do everything ourselves + #undef wxHAS_NATIVE_ENABLED_MANAGEMENT + #endif #else #define wxHAS_NATIVE_ENABLED_MANAGEMENT #endif