Merge branch 'setup-h-cmake' of https://github.com/MaartenBent/wxWidgets

Fix issues with generating setup.h.in.

See https://github.com/wxWidgets/wxWidgets/pull/994

include/wx/osx/setup_inc.h

@@ -60,3 +60,10 @@
 // make sure we have the proper dispatcher for the console event loop
 #define wxUSE_SELECT_DISPATCHER 1
 #define wxUSE_EPOLL_DISPATCHER 0
+
+// set to 1 if you have older code that still needs icon refs
+#define wxOSX_USE_ICONREF 0
+
+// set to 0 if you have code that has problems with the new bitmap implementation
+#define wxOSX_BITMAP_NATIVE_ACCESS 1
+