From 4879f2120c925eb2448d70ddaee7340e0724f0c2 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 8 Feb 2009 23:24:29 +0000 Subject: [PATCH] Enable wxDVC on OS X Cocoa using the generic control. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dataview.h | 2 +- include/wx/osx/cocoa/chkconf.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 9aa1510c1e..ce538affae 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList; -#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__) +#if !(defined(__WXGTK20__) || defined(__WXOSX_CARBON__)) || defined(__WXUNIVERSAL__) // #if !(defined(__WXMAC__)) || defined(__WXUNIVERSAL__) #define wxHAS_GENERIC_DATAVIEWCTRL #endif diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h index 7ef3ca689e..868eeb5ca3 100644 --- a/include/wx/osx/cocoa/chkconf.h +++ b/include/wx/osx/cocoa/chkconf.h @@ -44,11 +44,6 @@ * turning off capabilities that don't work under cocoa yet */ -#if wxUSE_DATAVIEWCTRL -#undef wxUSE_DATAVIEWCTRL -#define wxUSE_DATAVIEWCTRL 0 -#endif - #endif /* _WX_MAC_CHKCONF_H_ */ -- 2.45.2