- Updated to Waste 2.0.

- Use waste included with CW in stead of separate package.

Mac/Modules/waste/wastescan.py

@@ -4,10 +4,11 @@ import sys
 import os
 BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
 sys.path.append(BGENDIR)
-from scantools import Scanner_PreUH3
+from scantools import Scanner
 from bgenlocations import MWERKSDIR, TOOLBOXDIR
 
-WASTEDIR=":::::Waste 1.3 Distribution:WASTE C/C++ Headers:"
+#WASTEDIR=":::::Waste 1.3 Distribution:WASTE C/C++ Headers:"
+WASTEDIR=MWERKSDIR + 'MacOS Support:(Third Party Support):Waste 2.0 Distribution:C_C++ Headers:'
 
 OBJECT = "TEHandle"
 SHORT = "waste"
@@ -26,7 +27,8 @@ def main():
 	exec "import " + SHORT + "support"
 	print "=== Done.  It's up to you to compile it now! ==="
 
-class MyScanner(Scanner_PreUH3):
+#class MyScanner(Scanner_PreUH3):
+class MyScanner(Scanner):
 
 	def destination(self, type, name, arglist):
 		classname = "Function"
@@ -52,6 +54,8 @@ class MyScanner(Scanner_PreUH3):
 			"WESetInfo", # Argument type unknown...
 			"WEGetInfo",
 			"WEVersion", # Unfortunately...
+			"WEPut", # XXXX TBD: needs array of flavortypes.
+			"WEGetOneAttribute", # XXXX TBD: output buffer
 			]
 
 	def makeblacklisttypes(self):
@@ -60,6 +64,34 @@ class MyScanner(Scanner_PreUH3):
 			"UniversalProcPtr",
 			"WEFontIDToNameUPP",
 			"WEFontNameToIDUPP",
+			"WEClickLoopUPP",
+			"WEScrollUPP",
+			"WETSMPreUpdateUPP",
+			"WETSMPostUpdateUPP",
+			"WEPreTrackDragUPP",
+			"WETranslateDragUPP",
+			"WEHiliteDropAreaUPP",
+			"WEDrawTextUPP",
+			"WEDrawTSMHiliteUPP",
+			"WEPixelToCharUPP",
+			"WECharToPixelUPP",
+			"WELineBreakUPP",
+			"WEWordBreakUPP",
+			"WECharByteUPP",
+			"WECharTypeUPP",
+			"WEEraseUPP",
+			"WEFluxUPP",
+			"WENewObjectUPP",
+			"WEDisposeObjectUPP",
+			"WEDrawObjectUPP",
+			"WEClickObjectUPP",
+			"WEStreamObjectUPP",
+			"WEHoverObjectUPP",
+			"WERuler",		# XXXX To be done
+			"WERuler_ptr",	# ditto
+			"WEParaInfo",	# XXXX To be done
+			"WEPrintSession",	# XXXX To be done
+			"WEPrintOptions_ptr", # XXXX To be done
 			]
 
 	def makerepairinstructions(self):
@@ -68,24 +100,31 @@ class MyScanner(Scanner_PreUH3):
 			 [("InBuffer", "*", "*")]),
 
 			# WEContinuousStyle
-			([("WEStyleMode", "mode", "OutMode"), ("TextStyle", "ts", "OutMode")],
-			 [("WEStyleMode", "mode", "InOutMode"), ("TextStyle", "ts", "OutMode")]),
+			([("WEStyleMode", "ioMode", "OutMode"), ("TextStyle", "outTextStyle", "OutMode")],
+			 [("WEStyleMode", "*", "InOutMode"), ("TextStyle", "*", "*")]),
 			 
 			# WECopyRange
-			([('Handle', 'hText', 'InMode'), ('StScrpHandle', 'hStyles', 'InMode'),
-    			('WESoupHandle', 'hSoup', 'InMode')],
-    		 [('OptHandle', 'hText', 'InMode'), ('OptStScrpHandle', 'hStyles', 'InMode'),
-    			('OptSoupHandle', 'hSoup', 'InMode')]),
+			([('Handle', 'outText', 'InMode'), ('StScrpHandle', 'outStyles', 'InMode'),
+    			('WESoupHandle', 'outSoup', 'InMode')],
+    		 [('OptHandle', '*', '*'), ('OptStScrpHandle', '*', '*'),
+    			('OptSoupHandle', '*', '*')]),
 			 
 			# WEInsert
-			([('StScrpHandle', 'hStyles', 'InMode'), ('WESoupHandle', 'hSoup', 'InMode')],
-    		 [('OptStScrpHandle', 'hStyles', 'InMode'), ('OptSoupHandle', 'hSoup', 'InMode')]),
+			([('StScrpHandle', 'inStyles', 'InMode'), ('WESoupHandle', 'inSoup', 'InMode')],
+    		 [('OptStScrpHandle', '*', '*'), ('OptSoupHandle', '*', '*')]),
     		 
     		# WEGetObjectOwner
     		("WEGetObjectOwner",
     		 [('WEReference', '*', 'ReturnMode')],
-    		 [('ExistingWEReference', '*', 'ReturnMode')])
+    		 [('ExistingWEReference', '*', 'ReturnMode')]),
     		 
+    		# WEFindParagraph
+    		([("char_ptr", "inKey", "InMode")],
+    		 [("stringptr", "*", "*")]),
+			
+			# WESetOneAttribute
+			([("void_ptr", "*", "InMode"), ("ByteCount", "*", "InMode")],
+			 [("InBuffer", "*", "*")]),
 			]
 			
 if __name__ == "__main__":

Mac/Modules/waste/wastesupport.py

@@ -36,6 +36,7 @@ OptSoupHandle = OpaqueByValueType("WESoupHandle", "OptResObj")
 OptStScrpHandle = OpaqueByValueType("StScrpHandle", "OptResObj")
 
 WEStyleMode = Type("WEStyleMode", "H")
+WERulerMode = Type("WERulerMode", "l")
 WEActionKind = Type("WEActionKind", "h")
 WEAlignment = Type("WEAlignment", "B")
 WEEdge = Type("WEEdge", "B")
@@ -55,6 +56,9 @@ LongPt_ptr = LongPt
 LongRect = OpaqueType("LongRect", "LongRect")
 LongRect_ptr = LongRect
 
+TextEncodingVariant = Type("TextEncodingVariant", "l")
+TextEncodingFormat = Type("TextEncodingFormat", "l")
+
 includestuff = includestuff + """
 #include <%s>""" % MACHEADERFILE + """
 #include <WEObjectHandlers.h>