use Windows revised display-left-top-offset, no new[] in OS X ppc
svn: r3076
This commit is contained in:
parent
95c4a62896
commit
550edc0700
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user