Ported to Universal Header 2.0.1f (i.e. CW6)
diff --git a/Mac/Modules/evt/evtgen.py b/Mac/Modules/evt/evtgen.py
index deac64e..1ca2962 100644
--- a/Mac/Modules/evt/evtgen.py
+++ b/Mac/Modules/evt/evtgen.py
@@ -1,34 +1,34 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Events.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Events.h'
 
-f = Function(long, 'GetDblTime',
-)
-functions.append(f)
-
-f = Function(long, 'GetCaretTime',
+f = Function(UInt32, 'GetCaretTime',
 )
 functions.append(f)
 
 f = Function(void, 'SetEventMask',
-    (short, 'value', InMode),
+    (MacOSEventMask, 'value', InMode),
+)
+functions.append(f)
+
+f = Function(UInt32, 'GetDblTime',
 )
 functions.append(f)
 
 f = Function(Boolean, 'GetNextEvent',
-    (short, 'eventMask', InMode),
+    (MacOSEventMask, 'eventMask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'WaitNextEvent',
-    (short, 'eventMask', InMode),
+    (MacOSEventMask, 'eventMask', InMode),
     (EventRecord, 'theEvent', OutMode),
-    (unsigned_long, 'sleep', InMode),
+    (UInt32, 'sleep', InMode),
     (RgnHandle, 'mouseRgn', InMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'EventAvail',
-    (short, 'eventMask', InMode),
+    (MacOSEventMask, 'eventMask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
@@ -55,31 +55,31 @@
 )
 functions.append(f)
 
-f = Function(unsigned_long, 'TickCount',
+f = Function(UInt32, 'TickCount',
 )
 functions.append(f)
 
 f = Function(OSErr, 'PostEvent',
-    (short, 'eventNum', InMode),
-    (long, 'eventMsg', InMode),
+    (MacOSEventKind, 'eventNum', InMode),
+    (UInt32, 'eventMsg', InMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'OSEventAvail',
-    (short, 'mask', InMode),
+    (MacOSEventMask, 'mask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
 
 f = Function(Boolean, 'GetOSEvent',
-    (short, 'mask', InMode),
+    (MacOSEventMask, 'mask', InMode),
     (EventRecord, 'theEvent', OutMode),
 )
 functions.append(f)
 
 f = Function(void, 'FlushEvents',
-    (short, 'whichMask', InMode),
-    (short, 'stopMask', InMode),
+    (MacOSEventMask, 'whichMask', InMode),
+    (MacOSEventMask, 'stopMask', InMode),
 )
 functions.append(f)