Fixed the bugs in the constant definitions, and in the code to test

them.
The FutureWarnings are still there, until a way has been found to
say "I know what I'm doing here when I say 0xff000000".

4 files changed, 14 insertions, 10 deletions

diff --git a/Mac/Modules/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py
index 2525009..eb6d789 100644
--- a/Mac/Modules/ctl/ctlscan.py
+++ b/Mac/Modules/ctl/ctlscan.py
@@ -34,14 +34,14 @@ class MyScanner(Scanner):
 
 	def writeinitialdefs(self):
 		self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
-		self.defsfile.write("from TextEdit import *\n")
-		self.defsfile.write("from QuickDraw import *\n")
-		self.defsfile.write("from Dragconst import *\n")
-		self.defsfile.write("from CarbonEvents import *\n")
-		self.defsfile.write("from Appearance import *\n")
+		self.defsfile.write("from Carbon.TextEdit import *\n")
+		self.defsfile.write("from Carbon.QuickDraw import *\n")
+		self.defsfile.write("from Carbon.Dragconst import *\n")
+		self.defsfile.write("from Carbon.CarbonEvents import *\n")
+		self.defsfile.write("from Carbon.Appearance import *\n")
 		self.defsfile.write("kDataBrowserItemAnyState = -1\n")
 		self.defsfile.write("kControlBevelButtonCenterPopupGlyphTag = -1\n")
-		self.defsfile.write("kDataBrowserClientPropertyFlagsMask = 0xFF << 24  # kDataBrowserClientPropertyFlagsOffset\n")
+		self.defsfile.write("kDataBrowserClientPropertyFlagsMask = 0xFF000000\n")
 		self.defsfile.write("\n")
 
 	def makeblacklistnames(self):
diff --git a/Mac/Modules/drag/dragscan.py b/Mac/Modules/drag/dragscan.py
index e305e04..158cfff 100644
--- a/Mac/Modules/drag/dragscan.py
+++ b/Mac/Modules/drag/dragscan.py
@@ -45,8 +45,8 @@ class MyScanner(Scanner):
 
 	def writeinitialdefs(self):
 		self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
-		self.defsfile.write("from TextEdit import *\n")
-		self.defsfile.write("from QuickDraw import *\n")
+		self.defsfile.write("from Carbon.TextEdit import *\n")
+		self.defsfile.write("from Carbon.QuickDraw import *\n")
 		self.defsfile.write("\n")
 		# Defines unparseable in Drag.h
 		self.defsfile.write(MISSING_DEFINES)
diff --git a/Mac/Modules/mlte/mltescan.py b/Mac/Modules/mlte/mltescan.py
index 980a98e..f6c93e2 100644
--- a/Mac/Modules/mlte/mltescan.py
+++ b/Mac/Modules/mlte/mltescan.py
@@ -50,6 +50,8 @@ kTXNUseCurrentSelection = 0xFFFFFFFF
 kTXNStartOffset = 0
 kTXNEndOffset = 0x7FFFFFFF
 MovieFileType = FOUR_CHAR_CODE('moov')
+kTXNUseEncodingWordRulesMask = 0x80000000
+kTXNFontSizeAttributeSize = 4
 """)
 
 	def makeblacklistnames(self):
@@ -72,6 +74,8 @@ MovieFileType = FOUR_CHAR_CODE('moov')
 			"kTXNQDFontStyleAttributeSize",
 			"kTXNQDFontColorAttributeSize",
 			"kTXNTextEncodingAttributeSize",
+			"kTXNUseEncodingWordRulesMask",
+			"kTXNFontSizeAttributeSize",
 			"status",
 			"justification",
 			]
diff --git a/Mac/Modules/scrap/scrapscan.py b/Mac/Modules/scrap/scrapscan.py
index b54d09d..379ded3 100644
--- a/Mac/Modules/scrap/scrapscan.py
+++ b/Mac/Modules/scrap/scrapscan.py
@@ -19,8 +19,8 @@ def main():
 	scanner = MyScanner(input, output, defsoutput)
 	scanner.scan()
 	scanner.close()
-	print "=== Testing definitions output code ==="
-	execfile(defsoutput, {}, {})
+##	print "=== Testing definitions output code ==="
+##	execfile(defsoutput, {}, {})
 	print "=== Done scanning and generating, now importing the generated code... ==="
 	exec "import " + SHORT + "support"
 	print "=== Done.  It's up to you to compile it now! ==="