more x86 OS X fixes

svn: r2279
This commit is contained in:
Matthew Flatt 2006-02-18 15:05:35 +00:00
parent 68e2376793
commit bd813113a2
3 changed files with 13 additions and 19 deletions

View File

@ -28,8 +28,8 @@
#endif #endif
#ifdef __i386__ #ifdef __i386__
# include "Endian.h" # include <CoreServices/CoreServices.h>
# define wxNATIVE_LONG(x) EndianS32_BtoN(x) # define wxNATIVE_LONG(x) EndianS32_BtoN((x).bigEndianValue)
#else #else
# define wxNATIVE_LONG(x) x # define wxNATIVE_LONG(x) x
#endif #endif

View File

@ -20,6 +20,13 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef __i386__
# include <CoreServices/CoreServices.h>
# define wxNATIVE_LONG(x) EndianS32_BtoN((x).bigEndianValue)
#else
# define wxNATIVE_LONG(x) x
#endif
static int dispatched = 1; static int dispatched = 1;
extern "C" { extern "C" {
@ -479,13 +486,13 @@ static int GetMods(void)
int mods = 0; int mods = 0;
GetKeys(km); GetKeys(km);
if (km[1] & 32768) if (wxNATIVE_LONG(km[1]) & 32768)
mods |= cmdKey; mods |= cmdKey;
if (km[1] & 1) if (wxNATIVE_LONG(km[1]) & 1)
mods |= shiftKey; mods |= shiftKey;
if (km[1] & 4) if (wxNATIVE_LONG(km[1]) & 4)
mods |= optionKey; mods |= optionKey;
if (km[1] & 8) if (wxNATIVE_LONG(km[1]) & 8)
mods |= controlKey; mods |= controlKey;
return mods; return mods;

View File

@ -309,23 +309,10 @@ int main(int argc, char *argv[])
#ifdef wx_mac #ifdef wx_mac
wxMacDisableMods = controlKey; wxMacDisableMods = controlKey;
# ifndef OS_X # ifndef OS_X
scheme_creator_id = 'mReD'; scheme_creator_id = 'mReD';
wxMediaCreatorId = 'mReD'; wxMediaCreatorId = 'mReD';
# endif # endif
# if !defined(__powerc) && !defined(__ppc__)
long calcLimit, size;
THz zone;
zone = GetZone();
size = ((long)LMGetCurStackBase()-(*(long *)zone)-sizeof(Zone));
calcLimit = size - 1048576; /* 1 MB stack */
if (calcLimit % 2)
calcLimit++;
SetApplLimit((Ptr)((*(long *)zone)+sizeof(Zone)+calcLimit));
# endif
#endif #endif
#ifdef wx_mac #ifdef wx_mac