Kaydet (Commit) 14cd7500 authored tarafından Jack Jansen's avatar Jack Jansen

Fixed callback function arguments to be carbon-compatible.

(Temporarily?) removed call to ProcessHighLevelEvent until we find out how to do this (Carbon only).
üst d564d5f2
...@@ -167,7 +167,7 @@ PyMac_GetFullPath (FSSpec *fss, char *buf) ...@@ -167,7 +167,7 @@ PyMac_GetFullPath (FSSpec *fss, char *buf)
/* Check that there aren't any args remaining in the event */ /* Check that there aren't any args remaining in the event */
static OSErr static OSErr
get_missing_params(AppleEvent *theAppleEvent) get_missing_params(const AppleEvent *theAppleEvent)
{ {
DescType theType; DescType theType;
Size actualSize; Size actualSize;
...@@ -186,7 +186,7 @@ static int got_one; /* Flag that we can stop getting events */ ...@@ -186,7 +186,7 @@ static int got_one; /* Flag that we can stop getting events */
/* Handle the Print or Quit events (by failing) */ /* Handle the Print or Quit events (by failing) */
static pascal OSErr static pascal OSErr
handle_not(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) handle_not(const AppleEvent *theAppleEvent, AppleEvent *reply, unsigned long refCon)
{ {
#pragma unused (reply, refCon) #pragma unused (reply, refCon)
got_one = 1; got_one = 1;
...@@ -196,7 +196,7 @@ handle_not(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) ...@@ -196,7 +196,7 @@ handle_not(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon)
/* Handle the Open Application event (by ignoring it) */ /* Handle the Open Application event (by ignoring it) */
static pascal OSErr static pascal OSErr
handle_open_app(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) handle_open_app(const AppleEvent *theAppleEvent, AppleEvent *reply, unsigned long refCon)
{ {
#pragma unused (reply, refCon) #pragma unused (reply, refCon)
#if 0 #if 0
...@@ -209,7 +209,7 @@ handle_open_app(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) ...@@ -209,7 +209,7 @@ handle_open_app(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon)
/* Handle the Open Document event, by adding an argument */ /* Handle the Open Document event, by adding an argument */
static pascal OSErr static pascal OSErr
handle_open_doc(AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) handle_open_doc(const AppleEvent *theAppleEvent, AppleEvent *reply, unsigned long refCon)
{ {
#pragma unused (reply, refCon) #pragma unused (reply, refCon)
OSErr err; OSErr err;
...@@ -281,6 +281,7 @@ reset_ae_handlers() ...@@ -281,6 +281,7 @@ reset_ae_handlers()
static void static void
event_loop() event_loop()
{ {
#ifndef TARGET_API_MAC_CARBON
EventRecord event; EventRecord event;
int n; int n;
int ok; int ok;
...@@ -293,6 +294,7 @@ event_loop() ...@@ -293,6 +294,7 @@ event_loop()
AEProcessAppleEvent(&event); AEProcessAppleEvent(&event);
} }
} }
#endif
} }
/* Get the argv vector, return argc */ /* Get the argv vector, return argc */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment