Get rid of TARGET_CARBON as well

Don't define this symbol in configure and don't test for it.

Also remove a stray reference to wxUSE_OSX_CARBON not removed by the previous
commit.

configure

@@ -3887,8 +3887,6 @@ case "${host}" in
 
     $as_echo "#define __DARWIN__ 1" >>confdefs.h
 
-    $as_echo "#define TARGET_CARBON 1" >>confdefs.h
-
     DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
   ;;
 
@@ -23074,9 +23072,6 @@ if test "$wxUSE_ZLIB" != "no" ; then
 
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-                                                if test "$USE_DARWIN" = 1; then
-            system_zlib_h_ok="yes"
-        else
                                                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5
 $as_echo_n "checking for zlib.h >= 1.1.4... " >&6; }
 if ${ac_cv_header_zlib_h+:} false; then :
@@ -23126,10 +23121,7 @@ fi
 
 
 
-            system_zlib_h_ok=$ac_cv_header_zlib_h
+        if test "$ac_cv_header_zlib_h" = "yes"; then
-        fi
-
-        if test "$system_zlib_h_ok" = "yes"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
 $as_echo_n "checking for deflate in -lz... " >&6; }
 if ${ac_cv_lib_z_deflate+:} false; then :
@@ -37765,7 +37757,7 @@ if test "$wxUSE_MAC" = 1 ; then
         else
             EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
 
-                                                                                                if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then
+                                                                        if "$wxUSE_MEDIACTRL" = "yes"; then
 
             if test "$cross_compiling" != "no"; then
                                                                                                 wx_cv_target_x86_64=no
@@ -42637,4 +42629,3 @@ echo "                                       libmspack          ${wxUSE_LIBMSPAC
 echo "                                       sdl                ${wxUSE_LIBSDL}"
 
 echo ""
-

configure.in

@@ -285,7 +285,6 @@ case "${host}" in
     USE_DARWIN=1
     AC_DEFINE(__BSD__)
     AC_DEFINE(__DARWIN__)
-    AC_DEFINE(TARGET_CARBON)
     DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
   ;;
 
@@ -2309,14 +2308,6 @@ if test "$wxUSE_ZLIB" != "no" ; then
     AC_DEFINE(wxUSE_ZLIB)
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-        dnl don't test for zlib under Mac -- its verson there is 1.1.3 but we
-        dnl should still use it because hopefully (can someone confirm this?)
-        dnl Apple did fix the security problem in it and not using the system
-        dnl library results in a whole bunch of warnings when linking with
-        dnl Carbon framework
-        if test "$USE_DARWIN" = 1; then
-            system_zlib_h_ok="yes"
-        else
         dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is
         dnl known to not work) and although I don't know which is
         dnl the minimal required version it's safer to test for 1.1.4 as
@@ -2352,10 +2343,7 @@ if test "$wxUSE_ZLIB" != "no" ; then
         dnl compiling) then this should give a definitive answer
         AC_CHECK_HEADER(zlib.h,,, [ ])
 
-            system_zlib_h_ok=$ac_cv_header_zlib_h
+        if test "$ac_cv_header_zlib_h" = "yes"; then
-        fi
-
-        if test "$system_zlib_h_ok" = "yes"; then
             AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz")
         fi
 
@@ -3273,7 +3261,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
         TOOLKIT=OSX_COCOA
         GUIDIST=OSX_COCOA_DIST
 
-        dnl see the comment above in wxUSE_OSX_CARBON branch
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
     fi
 
@@ -7410,10 +7397,8 @@ if test "$wxUSE_MAC" = 1 ; then
             dnl need it in 32 bit builds and not in 64 bit and, moreover,
             dnl linking with it in 64 bit builds results in a warning because
             dnl the framework is not available in 64 bits itself. So make an
-            dnl effort to avoid using it unnecessarily. Note that with Carbon
+            dnl effort to avoid using it unnecessarily.
-            dnl we also need it for wxSound an as Carbon is itself not
+            if "$wxUSE_MEDIACTRL" = "yes"; then
-            dnl available in 64 bits anyhow, there is no reason to avoid it.
-            if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_MEDIACTRL" = "yes"; then
 
             if test "$cross_compiling" != "no"; then
                 dnl The check below doesn't work well when cross-compiling
@@ -7524,7 +7509,7 @@ elif test "$GXX" = yes ; then
     AX_CXXFLAGS_GCC_OPTION(-Woverloaded-virtual, CXXWARNINGS)
 
     dnl when building under Mac we currently get hundreds of deprecation
-    dnl warnings for Carbon symbols from the standard headers -- disable them
+    dnl warnings for Cocoa symbols from the standard headers -- disable them
     dnl as we already know that they're deprecated and nothing else can be seen
     dnl with these warnings on
     if test "$wxUSE_MAC" = 1 ; then

include/wx/osx/config_xcode.h

@@ -20,7 +20,6 @@
 #define __BSD__ 1
 #define __DARWIN__ 1
 #define wx_USE_NANOX 0
-#define TARGET_CARBON 1
 
 #define HAVE_EXPLICIT 1
 #define HAVE_VA_COPY 1

include/wx/platform.h

@@ -289,10 +289,6 @@
         /*  __DARWIN__ is our own define to mean OS X or pure Darwin */
 #        ifndef __DARWIN__
 #            define __DARWIN__ 1
-#        endif
-        /*  NOTE: TARGET_CARBON is actually a 0/1 and must be 1 for OS X */
-#        ifndef TARGET_CARBON
-#            define TARGET_CARBON 1
 #        endif
         /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */
 #        if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)

setup.h.in

@@ -113,7 +113,6 @@
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
-#undef TARGET_CARBON
 
 /* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
 #undef __Point__