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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 9aa1510c1ef12216272b4d3724708f2f256ef1ae..ce538affaea5209fe6c5b8d5c621b6ce784147e2 100644 (file)
--- 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 7ef3ca689eef028510f41a93971cb1a193062b78..868eeb5ca3a61b4b7b1571018ec69d18290c22bd 100644 (file)
--- 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_ */