Regenerated (from resource files) with sorting version of gensuitemodule.

This is a first step towards regenerating the modules with newer, MacOSX,
versions of these programs, and using the programmatic interface to
get at the terminology in stead of poking in resource files.

3 files changed, 322 insertions, 324 deletions

diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index 7708f38..d8c420a 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -43,36 +43,12 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_export = {
-		'in_' : 'kfil',
-	}
-
-	def export(self, _no_object=None, _attributes={}, **_arguments):
-		"""export: Export the project file as an XML file
-		Keyword argument in_: the XML file in which to export the project
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'EXPT'
-
-		aetools.keysubst(_arguments, self._argmap_export)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def update(self, _no_object=None, _attributes={}, **_arguments):
-		"""update: bring a project or target up to date
+	def build(self, _no_object=None, _attributes={}, **_arguments):
+		"""build: build a project or target (equivalent of the Make menu command)
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
-		_subcode = 'UP2D'
+		_subcode = 'MAKE'
 
 		if _arguments: raise TypeError, 'No optional args expected'
 		if _no_object != None: raise TypeError, 'No direct arg expected'
@@ -146,14 +122,19 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def build(self, _no_object=None, _attributes={}, **_arguments):
-		"""build: build a project or target (equivalent of the Make menu command)
+	_argmap_export = {
+		'in_' : 'kfil',
+	}
+
+	def export(self, _no_object=None, _attributes={}, **_arguments):
+		"""export: Export the project file as an XML file
+		Keyword argument in_: the XML file in which to export the project
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
-		_subcode = 'MAKE'
+		_subcode = 'EXPT'
 
-		if _arguments: raise TypeError, 'No optional args expected'
+		aetools.keysubst(_arguments, self._argmap_export)
 		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
@@ -165,16 +146,15 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def remove_target_files(self, _object, _attributes={}, **_arguments):
-		"""remove target files: remove files from a target
-		Required argument: an AE object reference
+	def remove_object_code(self, _no_object=None, _attributes={}, **_arguments):
+		"""remove object code: remove object code from a project or target
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
-		_subcode = 'RMFL'
+		_subcode = 'RMOB'
 
 		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
+		if _no_object != None: raise TypeError, 'No direct arg expected'
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -185,15 +165,16 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def remove_object_code(self, _no_object=None, _attributes={}, **_arguments):
-		"""remove object code: remove object code from a project or target
+	def remove_target_files(self, _object, _attributes={}, **_arguments):
+		"""remove target files: remove files from a target
+		Required argument: an AE object reference
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'CWIE'
-		_subcode = 'RMOB'
+		_subcode = 'RMFL'
 
 		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
+		_arguments['----'] = _object
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -243,14 +224,39 @@ class CodeWarrior_suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+	def update(self, _no_object=None, _attributes={}, **_arguments):
+		"""update: bring a project or target up to date
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'CWIE'
+		_subcode = 'UP2D'
 
-class build_progress_document(aetools.ComponentItem):
-	"""build progress document - a build progress document """
-	want = 'PRGS'
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+
+class ToolServer_worksheet(aetools.ComponentItem):
+	"""ToolServer worksheet - a ToolServer worksheet """
+	want = 'TOOL'
 class inherits(aetools.NProperty):
 	"""inherits - all properties and elements of the given class are inherited by this class. """
 	which = 'c@#^'
-	want = 'docu'
+	want = 'TXTD'
+
+ToolServer_worksheets = ToolServer_worksheet
+
+class build_progress_document(aetools.ComponentItem):
+	"""build progress document - a build progress document """
+	want = 'PRGS'
 
 build_progress_documents = build_progress_document
 
@@ -266,11 +272,11 @@ class class_browser(aetools.ComponentItem):
 
 class_browsers = class_browser
 
-class class_hierarchy(aetools.ComponentItem):
-	"""class hierarchy - a class hierarchy document """
+class class_hierarchies(aetools.ComponentItem):
+	"""class hierarchies - more than one class hierarchy document """
 	want = 'HIER'
 
-class_hierarchies = class_hierarchy
+class_hierarchy = class_hierarchies
 
 class editor_document(aetools.ComponentItem):
 	"""editor document - an editor document """
@@ -313,11 +319,11 @@ class single_class_browser(aetools.ComponentItem):
 
 single_class_browsers = single_class_browser
 
-class single_class_hierarchy(aetools.ComponentItem):
-	"""single class hierarchy - a single class hierarchy document """
+class single_class_hierarchies(aetools.ComponentItem):
+	"""single class hierarchies - more than one single class hierarchy document """
 	want = '1HIR'
 
-single_class_hierarchies = single_class_hierarchy
+single_class_hierarchy = single_class_hierarchies
 
 class subtarget(aetools.ComponentItem):
 	"""subtarget - a target that is prerequisite for another target """
@@ -353,8 +359,6 @@ class project_document(aetools.NProperty):
 #        element 'SRCF' as ['indx', 'test', 'rang']
 #        element 'SBTG' as ['indx', 'test', 'rang']
 
-targets = target
-
 class target_file(aetools.ComponentItem):
 	"""target file - a source or header file in a target """
 	want = 'SRCF'
@@ -425,6 +429,8 @@ class dependents(aetools.NProperty):
 
 target_files = target_file
 
+targets = target
+
 class text_document(aetools.ComponentItem):
 	"""text document - a document that contains text """
 	want = 'TXTD'
@@ -442,12 +448,12 @@ class selection(aetools.NProperty):
 #        element 'ctxt' as ['rang']
 
 text_documents = text_document
-
-class ToolServer_worksheet(aetools.ComponentItem):
-	"""ToolServer worksheet - a ToolServer worksheet """
-	want = 'TOOL'
-
-ToolServer_worksheets = ToolServer_worksheet
+ToolServer_worksheet._superclassnames = ['text_document']
+ToolServer_worksheet._privpropdict = {
+	'inherits' : inherits,
+}
+ToolServer_worksheet._privelemdict = {
+}
 import Standard_Suite
 build_progress_document._superclassnames = ['document']
 build_progress_document._privpropdict = {
@@ -467,11 +473,10 @@ class_browser._privpropdict = {
 }
 class_browser._privelemdict = {
 }
-class_hierarchy._superclassnames = ['document']
-class_hierarchy._privpropdict = {
-	'inherits' : inherits,
+class_hierarchies._superclassnames = []
+class_hierarchies._privpropdict = {
 }
-class_hierarchy._privelemdict = {
+class_hierarchies._privelemdict = {
 }
 editor_document._superclassnames = ['text_document']
 editor_document._privpropdict = {
@@ -511,11 +516,10 @@ single_class_browser._privpropdict = {
 }
 single_class_browser._privelemdict = {
 }
-single_class_hierarchy._superclassnames = ['document']
-single_class_hierarchy._privpropdict = {
-	'inherits' : inherits,
+single_class_hierarchies._superclassnames = []
+single_class_hierarchies._privpropdict = {
 }
-single_class_hierarchy._privelemdict = {
+single_class_hierarchies._privelemdict = {
 }
 subtarget._superclassnames = ['target']
 subtarget._privpropdict = {
@@ -573,19 +577,6 @@ text_document._privelemdict = {
 	'line' : Standard_Suite.line,
 	'text' : Standard_Suite.text,
 }
-ToolServer_worksheet._superclassnames = ['text_document']
-ToolServer_worksheet._privpropdict = {
-	'inherits' : inherits,
-}
-ToolServer_worksheet._privelemdict = {
-}
-_Enum_Inte = {
-	'never_interact' : 'eNvr',	# never allow user interactions
-	'interact_with_self' : 'eInS',	# allow user interaction only when an AppleEvent is sent from within CodeWarrior
-	'interact_with_local' : 'eInL',	# allow user interaction when AppleEvents are sent from applications on the same machine (default)
-	'interact_with_all' : 'eInA',	# allow user interaction from both local and remote AppleEvents
-}
-
 _Enum_DKND = {
 	'project' : 'PRJD',	# a project document
 	'editor_document' : 'EDIT',	# an editor document
@@ -610,6 +601,13 @@ _Enum_FTYP = {
 	'unknown_file' : 'UNKN',	# unknown file type
 }
 
+_Enum_Inte = {
+	'never_interact' : 'eNvr',	# never allow user interactions
+	'interact_with_self' : 'eInS',	# allow user interaction only when an AppleEvent is sent from within CodeWarrior
+	'interact_with_local' : 'eInL',	# allow user interaction when AppleEvents are sent from applications on the same machine (default)
+	'interact_with_all' : 'eInA',	# allow user interaction from both local and remote AppleEvents
+}
+
 _Enum_PERM = {
 	'read_write' : 'RdWr',	# the file is open with read/write permission
 	'read_only' : 'Read',	# the file is open with read/only permission
@@ -630,18 +628,18 @@ _classdeclarations = {
 	'SYMB' : symbol_browser,
 	'EDIT' : editor_document,
 	'COMP' : file_compare_document,
-	'BROW' : class_browser,
+	'TOOL' : ToolServer_worksheet,
 	'SBTG' : subtarget,
 	'MSSG' : message_document,
 	'INSP' : project_inspector,
 	'TXTD' : text_document,
 	'CTLG' : catalog_document,
-	'HIER' : class_hierarchy,
+	'HIER' : class_hierarchies,
 	'TRGT' : target,
 	'PRGS' : build_progress_document,
 	'SRCF' : target_file,
-	'TOOL' : ToolServer_worksheet,
-	'1HIR' : single_class_hierarchy,
+	'BROW' : class_browser,
+	'1HIR' : single_class_hierarchies,
 }
 
 _propdeclarations = {
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
index 4b0d29d..086990a 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -294,6 +294,47 @@ class Metrowerks_Shell_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+	def Get_member_function_names(self, _object, _attributes={}, **_arguments):
+		"""Get member function names: Returns a list containing the names of all the member functions of a class object
+		Required argument: must be a class object
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: undocumented, typecode 'list'
+		"""
+		_code = 'MMPR'
+		_subcode = 'MbFN'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def Get_nonsimple_classes(self, _no_object=None, _attributes={}, **_arguments):
+		"""Get nonsimple classes: Returns an alphabetical list of classes with member functions, bases classes, or subclasses
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		Returns: undocumented, typecode 'list'
+		"""
+		_code = 'MMPR'
+		_subcode = 'NsCl'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
 	def Goto_Function(self, _object, _attributes={}, **_arguments):
 		"""Goto Function: Goto Specified Function Name
 		Required argument: undocumented, typecode 'TEXT'
@@ -380,6 +421,26 @@ class Metrowerks_Shell_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+	def Open_browser(self, _object, _attributes={}, **_arguments):
+		"""Open browser: Display a class, member function, or data member object in a single class browser window
+		Required argument: an AE object reference
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'MMPR'
+		_subcode = 'Brow'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
 	_argmap_Precompile = {
 		'Saving_As' : 'Targ',
 		'ExternalEditor' : 'Errs',
@@ -728,67 +789,6 @@ class Metrowerks_Shell_Suite_Events:
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	def Open_browser(self, _object, _attributes={}, **_arguments):
-		"""Open browser: Display a class, member function, or data member object in a single class browser window
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'Brow'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_nonsimple_classes(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get nonsimple classes: Returns an alphabetical list of classes with member functions, bases classes, or subclasses
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'MMPR'
-		_subcode = 'NsCl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_member_function_names(self, _object, _attributes={}, **_arguments):
-		"""Get member function names: Returns a list containing the names of all the member functions of a class object
-		Required argument: must be a class object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'MMPR'
-		_subcode = 'MbFN'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
 
 class Access_Paths(aetools.ComponentItem):
 	"""Access Paths - Contains the definitions of a project\xd5s access (search) paths. """
@@ -1554,6 +1554,29 @@ class Local_Path(aetools.NProperty):
 	which = 'VC10'
 	want = 'RlPt'
 
+class base_class(aetools.ComponentItem):
+	"""base class - A base class or super class of a class """
+	want = 'BsCl'
+class class_(aetools.NProperty):
+	"""class - The class object corresponding to this base class """
+	which = 'Clas'
+	want = 'obj '
+class access(aetools.NProperty):
+	"""access -  """
+	which = 'Acce'
+	want = 'Acce'
+class virtual(aetools.NProperty):
+	"""virtual -  """
+	which = 'Virt'
+	want = 'bool'
+
+base_classes = base_class
+
+class browser_catalog(aetools.ComponentItem):
+	"""browser catalog - The browser symbol catalog for the current project """
+	want = 'Cata'
+#        element 'Clas' as ['indx', 'name']
+
 class class_(aetools.ComponentItem):
 	"""class - A class, struct, or record type in the current project. """
 	want = 'Clas'
@@ -1587,21 +1610,19 @@ class all_subclasses(aetools.NProperty):
 
 classes = class_
 
-class member_function(aetools.ComponentItem):
-	"""member function - A class member function or method. """
-	want = 'MbFn'
-class access(aetools.NProperty):
-	"""access -  """
-	which = 'Acce'
-	want = 'Acce'
-class virtual(aetools.NProperty):
-	"""virtual -  """
-	which = 'Virt'
-	want = 'bool'
+class data_member(aetools.ComponentItem):
+	"""data member - A class data member or field """
+	want = 'DtMb'
 class static(aetools.NProperty):
 	"""static -  """
 	which = 'Stat'
 	want = 'bool'
+
+data_members = data_member
+
+class member_function(aetools.ComponentItem):
+	"""member function - A class member function or method. """
+	want = 'MbFn'
 class implementation_file(aetools.NProperty):
 	"""implementation file - Source file containing the member function definition """
 	which = 'DfFl'
@@ -1616,27 +1637,6 @@ class implementation_end_offset(aetools.NProperty):
 	want = 'long'
 
 member_functions = member_function
-
-class data_member(aetools.ComponentItem):
-	"""data member - A class data member or field """
-	want = 'DtMb'
-
-data_members = data_member
-
-class base_class(aetools.ComponentItem):
-	"""base class - A base class or super class of a class """
-	want = 'BsCl'
-class class_(aetools.NProperty):
-	"""class - The class object corresponding to this base class """
-	which = 'Clas'
-	want = 'obj '
-
-base_classes = base_class
-
-class browser_catalog(aetools.ComponentItem):
-	"""browser catalog - The browser symbol catalog for the current project """
-	want = 'Cata'
-#        element 'Clas' as ['indx', 'name']
 Access_Paths._superclassnames = []
 Access_Paths._privpropdict = {
 	'User_Paths' : User_Paths,
@@ -1970,6 +1970,20 @@ VCS_Setup._privpropdict = {
 }
 VCS_Setup._privelemdict = {
 }
+base_class._superclassnames = []
+base_class._privpropdict = {
+	'class_' : class_,
+	'access' : access,
+	'virtual' : virtual,
+}
+base_class._privelemdict = {
+}
+browser_catalog._superclassnames = []
+browser_catalog._privpropdict = {
+}
+browser_catalog._privelemdict = {
+	'class_' : class_,
+}
 class_._superclassnames = []
 class_._privpropdict = {
 	'name' : name,
@@ -1985,6 +1999,16 @@ class_._privelemdict = {
 	'member_function' : member_function,
 	'data_member' : data_member,
 }
+data_member._superclassnames = []
+data_member._privpropdict = {
+	'name' : name,
+	'access' : access,
+	'static' : static,
+	'declaration_start_offset' : declaration_start_offset,
+	'declaration_end_offset' : declaration_end_offset,
+}
+data_member._privelemdict = {
+}
 member_function._superclassnames = []
 member_function._privpropdict = {
 	'name' : name,
@@ -2000,45 +2024,29 @@ member_function._privpropdict = {
 }
 member_function._privelemdict = {
 }
-data_member._superclassnames = []
-data_member._privpropdict = {
-	'name' : name,
-	'access' : access,
-	'static' : static,
-	'declaration_start_offset' : declaration_start_offset,
-	'declaration_end_offset' : declaration_end_offset,
-}
-data_member._privelemdict = {
-}
-base_class._superclassnames = []
-base_class._privpropdict = {
-	'class_' : class_,
-	'access' : access,
-	'virtual' : virtual,
-}
-base_class._privelemdict = {
-}
-browser_catalog._superclassnames = []
-browser_catalog._privpropdict = {
-}
-browser_catalog._privelemdict = {
-	'class_' : class_,
+_Enum_Acce = {
+	'public' : 'Publ',	# 
+	'protected' : 'Prot',	# 
+	'private' : 'Priv',	# 
 }
-_Enum_TmpB = {
-	'User_Specified' : 'Usrs',	# Use user specified symbols when setting temporary breakpoints on program launch.
-	'Default' : 'Dflt',	# Use system default symbols when setting temporary breakpoints on program launch.
+
+_Enum_BXbr = {
+	'Always_Build' : 'BXb1',	# Always build the target before running.
+	'Ask_Build' : 'BXb2',	# Ask before building the target when running.
+	'Never_Build' : 'BXb3',	# Never before building the target before running.
 }
 
-_Enum_TxtF = {
-	'MacOS' : 'TxF0',	# MacOS text format
-	'DOS' : 'TxF1',	# DOS text format
-	'Unix' : 'TxF2',	# Unix text format
+_Enum_DbSA = {
+	'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
+	'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
+	'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
+	'Close_Windows' : 'DSA4',	# Close non-debugging windows
 }
 
-_Enum_savo = {
-	'yes' : 'yes ',	# Save changes
-	'no' : 'no  ',	# Do not save changes
-	'ask' : 'ask ',	# Ask the user whether to save
+_Enum_DgBL = {
+	'Always' : 'DgB0',	# Always build before debugging.
+	'Never' : 'DgB1',	# Never build before debugging.
+	'Ask' : 'DgB2',	# Ask about building before debugging.
 }
 
 _Enum_ErrT = {
@@ -2052,24 +2060,11 @@ _Enum_ErrT = {
 	'generic_error' : 'ErGn',	# 
 }
 
-_Enum_SrcT = {
-	'source' : 'FTxt',	# A source file (.c, .cp, .p, etc).
-	'unknown' : 'FUnk',	# An unknown file type.
-}
-
-_Enum_PPrm = {
-	'absolute' : 'Abso',	# An absolute path name, including volume name.
-	'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
-	'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
-	'system_relative' : 'YRel',	# A path relative to the system folder
-	'root_relative' : 'RRel',	# 
-}
-
-_Enum_DbSA = {
-	'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
-	'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
-	'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
-	'Close_Windows' : 'DSA4',	# Close non-debugging windows
+_Enum_Inte = {
+	'never_interact' : 'eNvr',	# Never allow user interactions
+	'interact_with_self' : 'eInS',	# Allow user interaction only when an AppleEvent is sent from within CodeWarrior
+	'interact_with_local' : 'eInL',	# Allow user interaction when AppleEvents are sent from applications on the same machine (default)
+	'interact_with_all' : 'eInA',	# Allow user interaction from both local and remote AppleEvents
 }
 
 _Enum_Lang = {
@@ -2082,23 +2077,25 @@ _Enum_Lang = {
 	'Unknown' : 'L?  ',	# 
 }
 
-_Enum_Acce = {
-	'public' : 'Publ',	# 
-	'protected' : 'Prot',	# 
-	'private' : 'Priv',	# 
+_Enum_PPrm = {
+	'absolute' : 'Abso',	# An absolute path name, including volume name.
+	'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
+	'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
+	'system_relative' : 'YRel',	# A path relative to the system folder
+	'root_relative' : 'RRel',	# 
 }
 
-_Enum_Inte = {
-	'never_interact' : 'eNvr',	# Never allow user interactions
-	'interact_with_self' : 'eInS',	# Allow user interaction only when an AppleEvent is sent from within CodeWarrior
-	'interact_with_local' : 'eInL',	# Allow user interaction when AppleEvents are sent from applications on the same machine (default)
-	'interact_with_all' : 'eInA',	# Allow user interaction from both local and remote AppleEvents
+_Enum_PXdg = {
+	'Diagnose_None' : 'PXd1',	# No Plugin Diagnostics.
+	'Diagnose_Errors' : 'PXd2',	# Plugin Diagnostics for errors only.
+	'Diagnose_All' : 'PXd3',	# Plugin Diagnostics for everything.
 }
 
-_Enum_DgBL = {
-	'Always' : 'DgB0',	# Always build before debugging.
-	'Never' : 'DgB1',	# Never build before debugging.
-	'Ask' : 'DgB2',	# Ask about building before debugging.
+_Enum_PthF = {
+	'Generic_Path' : 'PFGn',	# 
+	'MacOS_Path' : 'PFMc',	# MacOS path using colon as separator
+	'Windows_Path' : 'PFWn',	# Windows path using backslash as separator
+	'Unix_Path' : 'PFUx',	# Unix path using slash as separator
 }
 
 _Enum_RefP = {
@@ -2106,29 +2103,32 @@ _Enum_RefP = {
 	'QuickView' : 'ALTV',	# 
 }
 
-_Enum_PXdg = {
-	'Diagnose_None' : 'PXd1',	# No Plugin Diagnostics.
-	'Diagnose_Errors' : 'PXd2',	# Plugin Diagnostics for errors only.
-	'Diagnose_All' : 'PXd3',	# Plugin Diagnostics for everything.
-}
-
-_Enum_BXbr = {
-	'Always_Build' : 'BXb1',	# Always build the target before running.
-	'Ask_Build' : 'BXb2',	# Ask before building the target when running.
-	'Never_Build' : 'BXb3',	# Never before building the target before running.
-}
-
 _Enum_STKd = {
 	'Absolute_Path' : 'STK0',	# The \xd2path\xd3 property is an absolute path to the location of the source tree.
 	'Registry_Key' : 'STK1',	# The \xd2path\xd3 property is the name of a registry key that contains the path to the root.
 	'Environment_Variable' : 'STK2',	# The \xd2path\xd3 property is the name of an environment variable that contains the path to the root.
 }
 
-_Enum_PthF = {
-	'Generic_Path' : 'PFGn',	# 
-	'MacOS_Path' : 'PFMc',	# MacOS path using colon as separator
-	'Windows_Path' : 'PFWn',	# Windows path using backslash as separator
-	'Unix_Path' : 'PFUx',	# Unix path using slash as separator
+_Enum_SrcT = {
+	'source' : 'FTxt',	# A source file (.c, .cp, .p, etc).
+	'unknown' : 'FUnk',	# An unknown file type.
+}
+
+_Enum_TmpB = {
+	'User_Specified' : 'Usrs',	# Use user specified symbols when setting temporary breakpoints on program launch.
+	'Default' : 'Dflt',	# Use system default symbols when setting temporary breakpoints on program launch.
+}
+
+_Enum_TxtF = {
+	'MacOS' : 'TxF0',	# MacOS text format
+	'DOS' : 'TxF1',	# DOS text format
+	'Unix' : 'TxF2',	# Unix text format
+}
+
+_Enum_savo = {
+	'yes' : 'yes ',	# Save changes
+	'no' : 'no  ',	# Do not save changes
+	'ask' : 'ask ',	# Ask the user whether to save
 }
 
 
@@ -2354,17 +2354,17 @@ _compdeclarations = {
 }
 
 _enumdeclarations = {
-	'Lang' : _Enum_Lang,
 	'Inte' : _Enum_Inte,
-	'STKd' : _Enum_STKd,
 	'DgBL' : _Enum_DgBL,
+	'STKd' : _Enum_STKd,
 	'Acce' : _Enum_Acce,
 	'RefP' : _Enum_RefP,
 	'TxtF' : _Enum_TxtF,
-	'DbSA' : _Enum_DbSA,
+	'PthF' : _Enum_PthF,
 	'TmpB' : _Enum_TmpB,
+	'Lang' : _Enum_Lang,
 	'savo' : _Enum_savo,
-	'PthF' : _Enum_PthF,
+	'DbSA' : _Enum_DbSA,
 	'SrcT' : _Enum_SrcT,
 	'PXdg' : _Enum_PXdg,
 	'ErrT' : _Enum_ErrT,
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index fdf1592..0c98839 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -4,32 +4,32 @@ Resource aete resid 0 AppleEvent Suites
 """
 import aetools
 Error = aetools.Error
-import Required
-import Standard_Suite
 import CodeWarrior_suite
+import Standard_Suite
 import Metrowerks_Shell_Suite
+import Required
 
 
 _code_to_module = {
-	'reqd' : Required,
-	'CoRe' : Standard_Suite,
 	'CWIE' : CodeWarrior_suite,
+	'CoRe' : Standard_Suite,
 	'MMPR' : Metrowerks_Shell_Suite,
+	'reqd' : Required,
 }
 
 
 
 _code_to_fullname = {
-	'reqd' : ('CodeWarrior.Required', 'Required'),
-	'CoRe' : ('CodeWarrior.Standard_Suite', 'Standard_Suite'),
 	'CWIE' : ('CodeWarrior.CodeWarrior_suite', 'CodeWarrior_suite'),
+	'CoRe' : ('CodeWarrior.Standard_Suite', 'Standard_Suite'),
 	'MMPR' : ('CodeWarrior.Metrowerks_Shell_Suite', 'Metrowerks_Shell_Suite'),
+	'reqd' : ('CodeWarrior.Required', 'Required'),
 }
 
-from Required import *
-from Standard_Suite import *
 from CodeWarrior_suite import *
+from Standard_Suite import *
 from Metrowerks_Shell_Suite import *
+from Required import *
 
 def getbaseclasses(v):
 	if not getattr(v, '_propdict', None):
@@ -48,32 +48,6 @@ import StdSuites
 #
 # Set property and element dictionaries now that all classes have been defined
 #
-getbaseclasses(character)
-getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(line)
-getbaseclasses(selection_2d_object)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
-getbaseclasses(single_class_browser)
-getbaseclasses(project_document)
-getbaseclasses(symbol_browser)
-getbaseclasses(editor_document)
-getbaseclasses(file_compare_document)
-getbaseclasses(class_browser)
-getbaseclasses(subtarget)
-getbaseclasses(message_document)
-getbaseclasses(project_inspector)
-getbaseclasses(text_document)
-getbaseclasses(catalog_document)
-getbaseclasses(class_hierarchy)
-getbaseclasses(target)
-getbaseclasses(build_progress_document)
-getbaseclasses(target_file)
-getbaseclasses(ToolServer_worksheet)
-getbaseclasses(single_class_hierarchy)
 getbaseclasses(File_Mapping)
 getbaseclasses(browser_catalog)
 getbaseclasses(Build_Settings)
@@ -110,37 +84,37 @@ getbaseclasses(Font)
 getbaseclasses(Target_Source_Trees)
 getbaseclasses(Debugger_Display)
 getbaseclasses(class_)
+getbaseclasses(character)
+getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(line)
+getbaseclasses(selection_2d_object)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
+getbaseclasses(single_class_browser)
+getbaseclasses(project_document)
+getbaseclasses(symbol_browser)
+getbaseclasses(editor_document)
+getbaseclasses(file_compare_document)
+getbaseclasses(class_browser)
+getbaseclasses(subtarget)
+getbaseclasses(message_document)
+getbaseclasses(project_inspector)
+getbaseclasses(text_document)
+getbaseclasses(catalog_document)
+getbaseclasses(class_hierarchy)
+getbaseclasses(target)
+getbaseclasses(build_progress_document)
+getbaseclasses(target_file)
+getbaseclasses(ToolServer_worksheet)
+getbaseclasses(single_class_hierarchy)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cha ' : character,
-	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'clin' : line,
-	'csel' : selection_2d_object,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
-	'1BRW' : single_class_browser,
-	'PRJD' : project_document,
-	'SYMB' : symbol_browser,
-	'EDIT' : editor_document,
-	'COMP' : file_compare_document,
-	'BROW' : class_browser,
-	'SBTG' : subtarget,
-	'MSSG' : message_document,
-	'INSP' : project_inspector,
-	'TXTD' : text_document,
-	'CTLG' : catalog_document,
-	'HIER' : class_hierarchy,
-	'TRGT' : target,
-	'PRGS' : build_progress_document,
-	'SRCF' : target_file,
-	'TOOL' : ToolServer_worksheet,
-	'1HIR' : single_class_hierarchy,
 	'FMap' : File_Mapping,
 	'Cata' : browser_catalog,
 	'BSTG' : Build_Settings,
@@ -177,13 +151,39 @@ _classdeclarations = {
 	'TSTs' : Target_Source_Trees,
 	'DbDS' : Debugger_Display,
 	'Clas' : class_,
+	'cha ' : character,
+	'ctxt' : text,
+	'cwin' : window,
+	'file' : file,
+	'clin' : line,
+	'csel' : selection_2d_object,
+	'capp' : application,
+	'cins' : insertion_point,
+	'docu' : document,
+	'1BRW' : single_class_browser,
+	'PRJD' : project_document,
+	'SYMB' : symbol_browser,
+	'EDIT' : editor_document,
+	'COMP' : file_compare_document,
+	'BROW' : class_browser,
+	'SBTG' : subtarget,
+	'MSSG' : message_document,
+	'INSP' : project_inspector,
+	'TXTD' : text_document,
+	'CTLG' : catalog_document,
+	'HIER' : class_hierarchy,
+	'TRGT' : target,
+	'PRGS' : build_progress_document,
+	'SRCF' : target_file,
+	'TOOL' : ToolServer_worksheet,
+	'1HIR' : single_class_hierarchy,
 }
 
 
-class CodeWarrior(Required_Events,
+class CodeWarrior(CodeWarrior_suite_Events,
 		Standard_Suite_Events,
-		CodeWarrior_suite_Events,
 		Metrowerks_Shell_Suite_Events,
+		Required_Events,
 		aetools.TalkTo):
 	_signature = 'CWIE'