From 58dc544700817a40908f98bb8a223ae78fceeca6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jul 2013 14:58:45 +0000
Subject: [PATCH] Use Cocoa by default under OS X in configure.

Carbon is deprecated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure        | 2 +-
 configure.in     | 2 +-
 docs/changes.txt | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index fde766a63b..afab070806 100755
--- a/configure
+++ b/configure
@@ -4102,7 +4102,7 @@ case "${host}" in
 
     $as_echo "#define TARGET_CARBON 1" >>confdefs.h
 
-    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+    DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
   ;;
 
   *-*-beos* )
diff --git a/configure.in b/configure.in
index 68edc08835..d5fe0e1990 100644
--- a/configure.in
+++ b/configure.in
@@ -336,7 +336,7 @@ case "${host}" in
     AC_DEFINE(__BSD__)
     AC_DEFINE(__DARWIN__)
     AC_DEFINE(TARGET_CARBON)
-    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+    DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
   ;;
 
   *-*-beos* )
diff --git a/docs/changes.txt b/docs/changes.txt
index 7b8d132349..621e4aae7b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -501,6 +501,9 @@ Changes in behaviour visible to end users
 Build system changes
 --------------------
 
+- Cocoa is now used by default under OS X instead of Carbon. Pass --with-carbon
+  option to configure to use wxCarbon.
+
 - In wxMSW makefile builds, "_x64" is used instead of "_amd64" when compiling
   for this architecture in the architecture-specific paths and library names.
   TARGET_CPU can still be specified as "amd64" for compatibility but "x64"
-- 
2.45.2