3 files changed, 8 insertions, 4 deletions
diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index e12c6c8..c479950 100644
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *);
 extern PyObject *BMObj_New(BitMapPtr);
 extern int BMObj_Convert(PyObject *, BitMapPtr *);
 
+extern PyObject *PMObj_New(PixMapHandle);
+extern int PMObj_Convert(PyObject *, PixMapHandle *);
+
 extern PyObject *WinObj_WhichWindow(WindowPtr);
 
 #include <AppleEvents.h>
diff --git a/Mac/Modules/ae/aegen.py b/Mac/Modules/ae/aegen.py
index 896eb78..d622cf8 100644
--- a/Mac/Modules/ae/aegen.py
+++ b/Mac/Modules/ae/aegen.py
@@ -1,4 +1,4 @@
-# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AppleEvents.h'
+# Generated from 'Sap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AppleEvents.h'
 
 f = AEFunction(OSErr, 'AECreateDesc',
     (DescType, 'typeCode', InMode),
diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py
index bc6cc58..4317195 100644
--- a/Mac/Modules/ae/aescan.py
+++ b/Mac/Modules/ae/aescan.py
@@ -10,6 +10,7 @@ import string
 import regex
 import regsub
 import MacOS
+from bgenlocations import TOOLBOXDIR
 
 from scantools import Scanner
 
@@ -17,7 +18,7 @@ def main():
 	print "=== Scanning AERegistry.h for defines ==="
 	input = "AERegistry.h"
 	output = "@dummy-registry.py"
-	defsoutput = "AERegistry.py"
+	defsoutput = TOOLBOXDIR + "AERegistry.py"
 	scanner = AppleEventsScanner(input, output, defsoutput)
 	scanner.scan()
 	scanner.close()
@@ -27,14 +28,14 @@ def main():
 	# once we start writing servers in python.
 	input = "AEObjects.h"
 	output = "@dummy-objects.py"
-	defsoutput = "AEObjects.py"
+	defsoutput = TOOLBOXDIR + "AEObjects.py"
 	scanner = AppleEventsScanner(input, output, defsoutput)
 	scanner.scan()
 	scanner.close()
 	print "=== Scanning AppleEvents.py ==="
 	input = "AppleEvents.h"
 	output = "aegen.py"
-	defsoutput = "AppleEvents.py"
+	defsoutput = TOOLBOXDIR + "AppleEvents.py"
 	scanner = AppleEventsScanner(input, output, defsoutput)
 	scanner.scan()
 	scanner.close()