Manually added definitions for normal, bold, etc. These are in MacTypes (of all

places) which isn't worth bgenning.

diff --git a/Mac/Lib/lib-toolbox/QuickDraw.py b/Mac/Lib/lib-toolbox/QuickDraw.py
index fd9fe1625d5ca75ea7aae1a04a676f2c2d153704..8983ccaa3fac2a16e5a092f9d844a01f012e653d 100644 (file)
--- a/Mac/Lib/lib-toolbox/QuickDraw.py
+++ b/Mac/Lib/lib-toolbox/QuickDraw.py
@@ -1,6 +1,15 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:QuickDraw.h'
+# Generated from 'flap:CodeWarrior Pro 4:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:QuickDraw.h'
+
 
 def FOUR_CHAR_CODE(x): return x
+normal                                         = 0
+bold                                           = 1
+italic                                         = 2
+underline                                      = 4
+outline                                                = 8
+shadow                                         = 0x10
+condense                                       = 0x20
+extend                                         = 0x40
 invalColReq = -1
 srcCopy = 0
 srcOr = 1
@@ -130,9 +139,18 @@ kUYVY422PixelFormat = FOUR_CHAR_CODE('UYVY')
 kYUV211PixelFormat = FOUR_CHAR_CODE('Y211')
 kCursorImageMajorVersion = 0x0001
 kCursorImageMinorVersion = 0x0000
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:QuickDrawText.h'
+# Generated from 'flap:CodeWarrior Pro 4:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:QuickDrawText.h'
+
 
 def FOUR_CHAR_CODE(x): return x
+normal                                         = 0
+bold                                           = 1
+italic                                         = 2
+underline                                      = 4
+outline                                                = 8
+shadow                                         = 0x10
+condense                                       = 0x20
+extend                                         = 0x40
 leftCaret = 0
 rightCaret = -1
 kHilite = 1

diff --git a/Mac/Modules/qd/qdscan.py b/Mac/Modules/qd/qdscan.py
index 81a5b1c08aa1b90125ec8d352e96ba00b80531d1..969baf3fac7fe509bfc03cbfcc813938ce525df0 100644 (file)
--- a/Mac/Modules/qd/qdscan.py
+++ b/Mac/Modules/qd/qdscan.py
@@ -62,7 +62,17 @@ class MyScanner(Scanner):
 
 
        def writeinitialdefs(self):
-               self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
+               self.defsfile.write("""
+def FOUR_CHAR_CODE(x): return x
+normal                                         = 0
+bold                                           = 1
+italic                                         = 2
+underline                                      = 4
+outline                                                = 8
+shadow                                         = 0x10
+condense                                       = 0x20
+extend                                         = 0x40
+""")
 
        def makeblacklistnames(self):
                return [