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

diff --git a/configure b/configure
index fde766a63bc3f7fc334cdaddcf1075e673afb9bc..afab0708064b150ede0551312838a7a12e0aeeab 100755 (executable)
--- a/configure
+++ b/configure
@@ -4102,7 +4102,7 @@ case "${host}" in
 
     $as_echo "#define TARGET_CARBON 1" >>confdefs.h
 
 
     $as_echo "#define TARGET_CARBON 1" >>confdefs.h
 

-    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+    DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1

   ;;
 
   *-*-beos* )
   ;;
 
   *-*-beos* )

diff --git a/configure.in b/configure.in
index 68edc08835010646b71aaefb1abe6def3fe731c0..d5fe0e19906061349151da9c0d38293a88b52046 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -336,7 +336,7 @@ case "${host}" in
     AC_DEFINE(__BSD__)
     AC_DEFINE(__DARWIN__)
     AC_DEFINE(TARGET_CARBON)
     AC_DEFINE(__BSD__)
     AC_DEFINE(__DARWIN__)
     AC_DEFINE(TARGET_CARBON)

-    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+    DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1

   ;;
 
   *-*-beos* )
   ;;
 
   *-*-beos* )

diff --git a/docs/changes.txt b/docs/changes.txt
index 7b8d1323490d016b653a9c7bfcd72410ff7cb5b3..621e4aae7b57c34704003e8e6056fd4becb9ca52 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -501,6 +501,9 @@ Changes in behaviour visible to end users
 Build system changes
 --------------------
 
 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"
 - 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"