From 550edc070018b3c7919009d4f3e9ee6480d66f46 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 26 May 2006 15:19:44 +0000
Subject: [PATCH] use Windows revised display-left-top-offset, no new[] in OS X
 ppc

svn: r3076
---
 src/mred/wxs/wxs_glob.cxx | 6 +++---
 src/mred/wxs/wxs_glob.xc  | 6 +++---
 src/wxcommon/wxGC.cxx     | 8 +-------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/mred/wxs/wxs_glob.cxx b/src/mred/wxs/wxs_glob.cxx
index 7f579161bf..afafe67600 100644
--- a/src/mred/wxs/wxs_glob.cxx
+++ b/src/mred/wxs/wxs_glob.cxx
@@ -61,10 +61,10 @@ static void wxCancelQuit()
 
 static void wxsDisplayOrigin(int *x, int *y, Bool flags = FALSE)
 {
-#ifdef wx_mac
-  wxDisplayOrigin(x, y, flags);
-#else
+#ifdef wx_xt
   wxDisplayOrigin(x, y);
+#else
+  wxDisplayOrigin(x, y, flags);
 #endif	
 }
 
diff --git a/src/mred/wxs/wxs_glob.xc b/src/mred/wxs/wxs_glob.xc
index 4185f95bca..c591f2dfb1 100644
--- a/src/mred/wxs/wxs_glob.xc
+++ b/src/mred/wxs/wxs_glob.xc
@@ -35,10 +35,10 @@ static void wxCancelQuit()
 
 static void wxsDisplayOrigin(int *x, int *y, Bool flags = FALSE)
 {
-#ifdef wx_mac
-  wxDisplayOrigin(x, y, flags);
-#else
+#ifdef wx_xt
   wxDisplayOrigin(x, y);
+#else
+  wxDisplayOrigin(x, y, flags);
 #endif	
 }
 
diff --git a/src/wxcommon/wxGC.cxx b/src/wxcommon/wxGC.cxx
index 9280dae26b..098b414d6d 100644
--- a/src/wxcommon/wxGC.cxx
+++ b/src/wxcommon/wxGC.cxx
@@ -34,13 +34,7 @@ Authors: John R. Ellis and Jesse Hull
    platform. For PPC, we define `new' to help ensure that
    we're not accidentally using it in the OS X port. */
 #if defined(OS_X) && !defined(XONX)
-# ifdef __POWERPC__
-#  define SHOULDNT_USE_BUILTIN_NEW
-#  include <stdio.h>
-#  include <stdlib.h>
-# else
-#  define DONT_DEFINE_BUILTIN_NEW
-# endif
+# define DONT_DEFINE_BUILTIN_NEW
 #endif
 
 #ifdef COMPACT_BACKTRACE_GC