moved definition of TARGET_CARBON to generated setup.h when compiling with

Apple Developer Tools git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-28 22:23:02 +00:00 · 2003-01-28 22:23:02 +00:00 · 82d4311313
commit 82d4311313
parent 1e4786bb37
4 changed files with 761 additions and 756 deletions
--- a/1512
+++ b/1512
--- a/configure.in
+++ b/configure.in
@ -268,6 +268,7 @@ case "${host}" in
    AC_DEFINE(__BSD__)
    AC_DEFINE(__DARWIN__)
    AC_DEFINE(__POWERPC__)
+    AC_DEFINE(TARGET_CARBON)
    DEFAULT_DEFAULT_wxUSE_MAC=1
  ;;

--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@ -17,9 +17,8 @@
 #include "wx/defs.h"
 #include "wx/app.h"

-#if defined(__POWERPC__) && defined(__DARWIN__)
+#ifdef __DARWIN__
 #    include <Carbon/Carbon.h>
-#    define TARGET_CARBON 1
 #else
 #    include <Quickdraw.h>
 #    include <Appearance.h>
--- a/setup.h.in
+++ b/setup.h.in
@ -94,6 +94,7 @@

 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
+#undef TARGET_CARBON

 /* MS-DOS with DJGPP */
 #undef __DOS__