Regenerated from Universal Headers 3.3.2

18 files changed, 847 insertions, 405 deletions

diff --git a/Mac/Lib/lib-toolbox/Appearance.py b/Mac/Lib/lib-toolbox/Appearance.py
index 818c003..361b6b2 100644
--- a/Mac/Lib/lib-toolbox/Appearance.py
+++ b/Mac/Lib/lib-toolbox/Appearance.py
@@ -1,28 +1,15 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Appearance.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Appearance.h'
 
 def FOUR_CHAR_CODE(x): return x
-_AppearanceDispatch = 0xAA74
-gestaltAppearanceAttr = FOUR_CHAR_CODE('appr')
-gestaltAppearanceExists = 0
-gestaltAppearanceCompatMode = 1
-gestaltAppearanceVersion = FOUR_CHAR_CODE('apvr')
 kAppearanceEventClass = FOUR_CHAR_CODE('appr')
 kAEAppearanceChanged = FOUR_CHAR_CODE('thme')
 kAESystemFontChanged = FOUR_CHAR_CODE('sysf')
 kAESmallSystemFontChanged = FOUR_CHAR_CODE('ssfn')
-kAEViewsFontChanged = FOUR_CHAR_CODE('vfnt')
+kAEViewsFontChanged = FOUR_CHAR_CODE('vfnt')        
 kThemeDataFileType = FOUR_CHAR_CODE('thme')
 kThemePlatinumFileType = FOUR_CHAR_CODE('pltn')
 kThemeCustomThemesFileType = FOUR_CHAR_CODE('scen')
 kThemeSoundTrackFileType = FOUR_CHAR_CODE('tsnd')
-themeInvalidBrushErr = -30560
-themeProcessRegisteredErr = -30561
-themeProcessNotRegisteredErr = -30562
-themeBadTextColorErr = -30563
-themeHasNoAccentsErr = -30564
-themeBadCursorIndexErr = -30565
-themeScriptFontNotFoundErr = -30566
-themeMonitorDepthNotSupportedErr = -30567
 kThemeBrushDialogBackgroundActive = 1
 kThemeBrushDialogBackgroundInactive = 2
 kThemeBrushAlertBackgroundActive = 3
@@ -70,6 +57,7 @@ kThemeBrushBevelActiveLight = 44
 kThemeBrushBevelActiveDark = 45
 kThemeBrushBevelInactiveLight = 46
 kThemeBrushBevelInactiveDark = 47
+kThemeBrushNotificationWindowBackground = 48
 kThemeBrushBlack = -1
 kThemeBrushWhite = -2
 kThemeTextColorDialogActive = 1
@@ -118,14 +106,17 @@ kThemeTextColorTabNonFrontInactive = 43
 kThemeTextColorIconLabelSelected = 44
 kThemeTextColorBevelButtonStickyActive = 45
 kThemeTextColorBevelButtonStickyInactive = 46
+kThemeTextColorNotification = 47
 kThemeTextColorBlack = -1
 kThemeTextColorWhite = -2
 kThemeStateInactive = 0
 kThemeStateActive = 1
 kThemeStatePressed = 2
+kThemeStateRollover = 6
+kThemeStateUnavailable = 7
 kThemeStateDisabled = 0
 kThemeStatePressedUp = 2
-kThemeStatePressedDown = 3
+kThemeStatePressedDown = 3                             
 kThemeArrowCursor = 0
 kThemeCopyArrowCursor = 1
 kThemeAliasArrowCursor = 2
@@ -149,7 +140,6 @@ kThemeMenuBarSelected = 1
 kThemeMenuSquareMenuBar = (1 << 0)
 kThemeMenuActive = 0
 kThemeMenuSelected = 1
-kThemeMenuInactive = 3
 kThemeMenuDisabled = 3
 kThemeMenuTypePullDown = 0
 kThemeMenuTypePopUp = 1
@@ -163,7 +153,7 @@ kThemeMenuItemAtTop = 0x0100
 kThemeMenuItemAtBottom = 0x0200
 kThemeMenuItemHierBackground = 0x0400
 kThemeMenuItemPopUpBackground = 0x0800
-kThemeMenuItemHasIcon = 0x8000
+kThemeMenuItemHasIcon = 0x8000                        
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
 kThemeBackgroundWindowHeader = 3
@@ -191,13 +181,13 @@ kThemeScrollBarArrowStyleTag = FOUR_CHAR_CODE('sbar')
 kThemeScrollBarThumbStyleTag = FOUR_CHAR_CODE('sbth')
 kThemeSmoothFontEnabledTag = FOUR_CHAR_CODE('smoo')
 kThemeSmoothFontMinSizeTag = FOUR_CHAR_CODE('smos')
-kThemeDblClickCollapseTag = FOUR_CHAR_CODE('coll')
+kThemeDblClickCollapseTag = FOUR_CHAR_CODE('coll')        
 kThemeCheckBoxClassicX = 0
-kThemeCheckBoxCheckMark = 1
+kThemeCheckBoxCheckMark = 1                             
 kThemeScrollBarArrowsSingle = 0
-kThemeScrollBarArrowsLowerRight = 1
+kThemeScrollBarArrowsLowerRight = 1                         
 kThemeScrollBarThumbNormal = 0
-kThemeScrollBarThumbProportional = 1
+kThemeScrollBarThumbProportional = 1                        
 kThemeSystemFont = 0
 kThemeSmallSystemFont = 1
 kThemeSmallEmphasizedSystemFont = 2
@@ -215,7 +205,7 @@ kThemeSmallTabHeight = 16
 kThemeLargeTabHeight = 21
 kThemeTabPaneOverlap = 3
 kThemeSmallTabHeightMax = 19
-kThemeLargeTabHeightMax = 24
+kThemeLargeTabHeightMax = 24                            
 kThemeScrollBar = 0
 kThemeSmallScrollBar = 1
 kThemeSlider = 2
@@ -224,6 +214,7 @@ kThemeIndeterminateBar = 4
 kThemeTrackActive = 0
 kThemeTrackDisabled = 1
 kThemeTrackNothingToScroll = 2
+kThemeTrackInactive = 3
 kThemeLeftOutsideArrowPressed = 0x01
 kThemeLeftInsideArrowPressed = 0x02
 kThemeLeftTrackPressed = 0x04
@@ -243,6 +234,7 @@ kThemeThumbDownward = 2
 kThemeTrackHorizontal = (1 << 0)
 kThemeTrackRightToLeft = (1 << 1)
 kThemeTrackShowThumb = (1 << 2)
+kThemeTrackThumbRgnIsNotGhost = (1 << 3)                    
 kThemeWindowHasGrow = (1 << 0)
 kThemeWindowHasHorizontalZoom = (1 << 3)
 kThemeWindowHasVerticalZoom = (1 << 4)
@@ -251,6 +243,8 @@ kThemeWindowHasCloseBox = (1 << 5)
 kThemeWindowHasCollapseBox = (1 << 6)
 kThemeWindowHasTitleText = (1 << 7)
 kThemeWindowIsCollapsed = (1 << 8)
+kThemeWindowHasA = (1 << 9)
+kThemeWindowHasB = (1 << 10)
 kThemeDocumentWindow = 0
 kThemeDialogWindow = 1
 kThemeMovableDialogWindow = 2
@@ -264,6 +258,9 @@ kThemeUtilitySideWindow = 9
 kThemeWidgetCloseBox = 0
 kThemeWidgetZoomBox = 1
 kThemeWidgetCollapseBox = 2
+kThemeWidgetABox = 3
+kThemeWidgetBBox = 4
+kThemeWidgetBOffBox = 5
 kThemeArrowLeft = 0
 kThemeArrowDown = 1
 kThemeArrowRight = 2
@@ -275,7 +272,7 @@ kThemeArrow9pt = 3
 kThemeGrowLeft = (1 << 0)
 kThemeGrowRight = (1 << 1)
 kThemeGrowUp = (1 << 2)
-kThemeGrowDown = (1 << 3)
+kThemeGrowDown = (1 << 3)                      
 kThemePushButton = 0
 kThemeCheckBox = 1
 kThemeRadioButton = 2
@@ -286,7 +283,7 @@ kThemeDisclosureButton = 6
 kThemeIncDecButton = 7
 kThemeSmallBevelButton = 8
 kThemeMediumBevelButton = 3
-kThemeLargeBevelButton = 9
+kThemeLargeBevelButton = 9                             
 kThemeButtonOff = 0
 kThemeButtonOn = 1
 kThemeButtonMixed = 2
@@ -297,7 +294,7 @@ kThemeAdornmentNone = 0
 kThemeAdornmentDefault = (1 << 0)
 kThemeAdornmentFocus = (1 << 2)
 kThemeAdornmentRightToLeft = (1 << 4)
-kThemeAdornmentDrawIndicatorOnly = (1 << 5)
+kThemeAdornmentDrawIndicatorOnly = (1 << 5)                 
 kThemeNoSounds = 0
 kThemeWindowSoundsMask = (1 << 0)
 kThemeMenuSoundsMask = (1 << 1)
@@ -438,6 +435,10 @@ kThemeSoundFinderDragOffIcon = FOUR_CHAR_CODE('fdof')
 kThemePopupTabNormalPosition = 0
 kThemePopupTabCenterOnWindow = 1
 kThemePopupTabCenterOnOffset = 2
+kThemeMetricScrollBarWidth = 0
+kThemeMetricSmallScrollBarWidth = 1
+kThemeMetricCheckBoxGlyphHeight = 2
+kThemeMetricRadioButtonGlyphHeight = 3
 appearanceBadBrushIndexErr = themeInvalidBrushErr
 appearanceProcessRegisteredErr = themeProcessRegisteredErr
 appearanceProcessNotRegisteredErr = themeProcessNotRegisteredErr
@@ -505,7 +506,7 @@ kThemeSelectedMenuItemTextColor = kThemeTextColorMenuItemSelected
 kThemeDisabledMenuItemTextColor = kThemeTextColorMenuItemDisabled
 kThemeActivePopupLabelTextColor = kThemeTextColorPopupLabelActive
 kThemeInactivePopupLabelTextColor = kThemeTextColorPopupLabelInactive
-kAEThemeSwitch = kAEAppearanceChanged
+kAEThemeSwitch = kAEAppearanceChanged          
 kThemeNoAdornment = kThemeAdornmentNone
 kThemeDefaultAdornment = kThemeAdornmentDefault
 kThemeFocusAdornment = kThemeAdornmentFocus
diff --git a/Mac/Lib/lib-toolbox/Balloons.py b/Mac/Lib/lib-toolbox/Balloons.py
index e5c16c0..6a80f1c 100644
--- a/Mac/Lib/lib-toolbox/Balloons.py
+++ b/Mac/Lib/lib-toolbox/Balloons.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Balloons.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Balloons.h'
 
 def FOUR_CHAR_CODE(x): return x
 kTopLeftTipPointsLeftVariant = 0
@@ -10,19 +10,19 @@ kBottomRightTipPointsDownVariant = 5
 kBottomLeftTipPointsDownVariant = 6
 kBottomLeftTipPointsLeftVariant = 7
 kBalloonVariantCount = 8
-hmBalloonHelpVersion = 0x0002
+hmBalloonHelpVersion = 0x0002                        
 kHMHelpMenuID = -16490
 kHMAboutHelpItem = 1
-kHMShowBalloonsItem = 3
+kHMShowBalloonsItem = 3                             
 kHMHelpID = -5696
-kBalloonWDEFID = 126
-helpItem = 1
+kBalloonWDEFID = 126                           
+helpItem = 1                             
 hmDefaultOptions = 0
 hmUseSubID = 1
-hmAbsoluteCoords = 2
+hmAbsoluteCoords = 2                             
 hmSaveBitsNoWindow = 4
 hmSaveBitsWindow = 8
-hmMatchInTitle = 16
+hmMatchInTitle = 16                            
 kHMStringItem = 1
 kHMPictItem = 2
 kHMStringResItem = 3
@@ -31,7 +31,7 @@ kHMSTRResItem = 7
 kHMSkipItem = 256
 kHMCompareItem = 512
 kHMNamedResourceItem = 1024
-kHMTrackCntlItem = 2048
+kHMTrackCntlItem = 2048                          
 khmmString = 1
 khmmPict = 2
 khmmStringRes = 3
@@ -39,18 +39,18 @@ khmmTEHandle = 4
 khmmPictHandle = 5
 khmmTERes = 6
 khmmSTRRes = 7
-kHMEnabledItem = 0
+kHMEnabledItem = 0                             
 kHMTETextResType = FOUR_CHAR_CODE('TEXT')
-kHMTEStyleResType = FOUR_CHAR_CODE('styl')
+kHMTEStyleResType = FOUR_CHAR_CODE('styl')        
 kHMDisabledItem = 1
 kHMCheckedItem = 2
 kHMOtherItem = 3
 kHMRegularWindow = 0
 kHMSaveBitsNoWindow = 1
-kHMSaveBitsWindow = 2
+kHMSaveBitsWindow = 2                             
 kHMMenuResType = FOUR_CHAR_CODE('hmnu')
 kHMDialogResType = FOUR_CHAR_CODE('hdlg')
 kHMWindListResType = FOUR_CHAR_CODE('hwin')
 kHMRectListResType = FOUR_CHAR_CODE('hrct')
 kHMOverrideResType = FOUR_CHAR_CODE('hovr')
-kHMFinderApplResType = FOUR_CHAR_CODE('hfdr')
+kHMFinderApplResType = FOUR_CHAR_CODE('hfdr')        
diff --git a/Mac/Lib/lib-toolbox/Components.py b/Mac/Lib/lib-toolbox/Components.py
index 8a82d01..4fb9a53 100644
--- a/Mac/Lib/lib-toolbox/Components.py
+++ b/Mac/Lib/lib-toolbox/Components.py
@@ -1,13 +1,14 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Components.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Components.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAppleManufacturer = FOUR_CHAR_CODE('appl')
 kComponentResourceType = FOUR_CHAR_CODE('thng')
-kComponentAliasResourceType = FOUR_CHAR_CODE('thga')
+kComponentAliasResourceType = FOUR_CHAR_CODE('thga')        
 kAnyComponentType = 0
 kAnyComponentSubType = 0
 kAnyComponentManufacturer = 0
 kAnyComponentFlagsMask = 0
+cmpIsMissing = 1L << 29
 cmpWantsRegisterMessage = 1L << 31
 kComponentOpenSelect = -1
 kComponentCloseSelect = -2
@@ -17,6 +18,8 @@ kComponentRegisterSelect = -5
 kComponentTargetSelect = -6
 kComponentUnregisterSelect = -7
 kComponentGetMPWorkFunctionSelect = -8
+kComponentExecuteWiredActionSelect = -9
+kComponentGetPublicResourceSelect = -10                     
 componentDoAutoVersion = (1 << 0)
 componentWantsUnregister = (1 << 1)
 componentAutoVersionIncludeFlags = (1 << 2)
@@ -36,12 +39,15 @@ platform68k = 1
 platformPowerPC = 2
 platformInterpreted = 3
 platformWin32 = 4
+platformPowerPCNativeEntryPoint = 5
 mpWorkFlagDoWork = (1 << 0)
 mpWorkFlagDoCompletion = (1 << 1)
 mpWorkFlagCopyWorkBlock = (1 << 2)
 mpWorkFlagDontBlock = (1 << 3)
 mpWorkFlagGetProcessorCount = (1 << 4)
 mpWorkFlagGetIsRunning = (1 << 6)
+cmpAliasNoFlags = 0
+cmpAliasOnlyThisFile = 1
 uppComponentFunctionImplementedProcInfo = 0x000002F0
 uppGetComponentVersionProcInfo = 0x000000F0
 uppComponentSetTargetProcInfo = 0x000003F0
@@ -53,3 +59,4 @@ uppCallComponentRegisterProcInfo = 0x000000F0
 uppCallComponentTargetProcInfo = 0x000003F0
 uppCallComponentUnregisterProcInfo = 0x000000F0
 uppCallComponentGetMPWorkFunctionProcInfo = 0x00000FF0
+uppCallComponentGetPublicResourceProcInfo = 0x00003BF0
diff --git a/Mac/Lib/lib-toolbox/Controls.py b/Mac/Lib/lib-toolbox/Controls.py
index 3d16b02..588f39b 100644
--- a/Mac/Lib/lib-toolbox/Controls.py
+++ b/Mac/Lib/lib-toolbox/Controls.py
@@ -1,72 +1,71 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Controls.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Controls.h'
 
 def FOUR_CHAR_CODE(x): return x
 from TextEdit import *
 from QuickDraw import *
+from Dragconst import *
 
-_ControlDispatch = 0xAA73
-gestaltControlMgrAttr = FOUR_CHAR_CODE('cntl')
-gestaltControlMgrPresent = (1L << 0)
 kControlDefProcType = FOUR_CHAR_CODE('CDEF')
 kControlTemplateResourceType = FOUR_CHAR_CODE('CNTL')
 kControlColorTableResourceType = FOUR_CHAR_CODE('cctb')
 kControlDefProcResourceType = FOUR_CHAR_CODE('CDEF')
-kControlTabListResType = FOUR_CHAR_CODE('tab#')
-kControlListDescResType = FOUR_CHAR_CODE('ldes')
 controlNotifyNothing = FOUR_CHAR_CODE('nada')
 controlNotifyClick = FOUR_CHAR_CODE('clik')
 controlNotifyFocus = FOUR_CHAR_CODE('focu')
-controlNotifyKey = FOUR_CHAR_CODE('key ')
-kControlCanAutoInvalidate = 1L << 0
+controlNotifyKey = FOUR_CHAR_CODE('key ')        
+kControlCanAutoInvalidate = 1L << 0                       
 staticTextProc = 256
 editTextProc = 272
 iconProc = 288
 userItemProc = 304
-pictItemProc = 320
+pictItemProc = 320                           
 cFrameColor = 0
 cBodyColor = 1
 cTextColor = 2
 cThumbColor = 3
 kNumberCtlCTabEntries = 4
-errMessageNotSupported = -30580
-errDataNotSupported = -30581
-errControlDoesntSupportFocus = -30582
-errWindowDoesntSupportFocus = -30583
-errUnknownControl = -30584
-errCouldntSetFocus = -30585
-errNoRootControl = -30586
-errRootAlreadyExists = -30587
-errInvalidPartCode = -30588
-errControlsAlreadyExist = -30589
-errControlIsNotEmbedder = -30590
-errDataSizeMismatch = -30591
-errControlHiddenOrDisabled = -30592
-errWindowRegionCodeInvalid = -30593
-errCantEmbedIntoSelf = -30594
-errCantEmbedRoot = -30595
-errItemNotControl = -30596
-controlInvalidDataVersionErr = -30597
-controlPropertyInvalid = -5603
-controlPropertyNotFoundErr = -5604
-controlHandleInvalidErr = -30599
-pushButProc = 0
-checkBoxProc = 1
-radioButProc = 2
-scrollBarProc = 16
-popupMenuProc = 1008
-kControlSupportsNewMessages = FOUR_CHAR_CODE(' ok ')
+kControlNoVariant = 0
+kControlUsesOwningWindowsFontVariant = 1 << 3               
+kControlNoPart = 0
+kControlIndicatorPart = 129
+kControlDisabledPart = 254
+kControlInactivePart = 255
+kControlEntireControl = 0
+kControlStructureMetaPart = -1
+kControlContentMetaPart = -2
 kControlFocusNoPart = 0
 kControlFocusNextPart = -1
-kControlFocusPrevPart = -2
-kControlEntireControl = 0
-kControlKeyFilterBlockKey = 0
-kControlKeyFilterPassKey = 1
+kControlFocusPrevPart = -2                            
+kControlCollectionTagBounds = FOUR_CHAR_CODE('boun')
+kControlCollectionTagValue = FOUR_CHAR_CODE('valu')
+kControlCollectionTagMinimum = FOUR_CHAR_CODE('min ')
+kControlCollectionTagMaximum = FOUR_CHAR_CODE('max ')
+kControlCollectionTagViewSize = FOUR_CHAR_CODE('view')
+kControlCollectionTagVisibility = FOUR_CHAR_CODE('visi')
+kControlCollectionTagRefCon = FOUR_CHAR_CODE('refc')
+kControlCollectionTagTitle = FOUR_CHAR_CODE('titl')
+kControlCollectionTagIDSignature = FOUR_CHAR_CODE('idsi')
+kControlCollectionTagIDID = FOUR_CHAR_CODE('idid')
+kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')       
+kControlCollectionTagSubControls = FOUR_CHAR_CODE('subc')   
+kControlContentTextOnly = 0
+kControlNoContent = 0
+kControlContentIconSuiteRes = 1
+kControlContentCIconRes = 2
+kControlContentPictRes = 3
+kControlContentICONRes = 4
+kControlContentIconSuiteHandle = 129
+kControlContentCIconHandle = 130
+kControlContentPictHandle = 131
+kControlContentIconRef = 132
+kControlContentICON = 133
 kControlKeyScriptBehaviorAllowAnyScript = FOUR_CHAR_CODE('any ')
 kControlKeyScriptBehaviorPrefersRoman = FOUR_CHAR_CODE('prmn')
 kControlKeyScriptBehaviorRequiresRoman = FOUR_CHAR_CODE('rrmn') 
 kControlFontBigSystemFont = -1
 kControlFontSmallSystemFont = -2
 kControlFontSmallBoldSystemFont = -3
+kControlFontViewSystemFont = -4                            
 kControlUseFontMask = 0x0001
 kControlUseFaceMask = 0x0002
 kControlUseSizeMask = 0x0004
@@ -76,7 +75,11 @@ kControlUseModeMask = 0x0020
 kControlUseJustMask = 0x0040
 kControlUseAllMask = 0x00FF
 kControlAddFontSizeMask = 0x0100
-kControlAddToMetaFontMask = 0x0200
+kControlAddToMetaFontMask = 0x0200                        
+kDoNotActivateAndIgnoreClick = 0
+kDoNotActivateAndHandleClick = 1
+kActivateAndIgnoreClick = 2
+kActivateAndHandleClick = 3                             
 kControlFontStyleTag = FOUR_CHAR_CODE('font')
 kControlKeyFilterTag = FOUR_CHAR_CODE('fltr')
 kControlSupportsGhosting = 1 << 0
@@ -91,8 +94,25 @@ kControlGetsFocusOnClick = 1 << 8
 kControlSupportsCalcBestRect = 1 << 9
 kControlSupportsLiveFeedback = 1 << 10
 kControlHasRadioBehavior = 1 << 11
+kControlSupportsDragAndDrop = 1 << 12
 kControlAutoToggles = 1 << 14
 kControlSupportsGetRegion = 1 << 17
+kControlSupportsFlattening = 1 << 19
+kControlSupportsSetCursor = 1 << 20
+kControlSupportsContextualMenus = 1 << 21
+kControlSupportsClickActivation = 1 << 22                   
+drawCntl = 0
+testCntl = 1
+calcCRgns = 2
+initCntl = 3
+dispCntl = 4
+posCntl = 5
+thumbCntl = 6
+dragCntl = 7
+autoTrack = 8
+calcCntlRgn = 10
+calcThumbRgn = 11
+drawThumbOutline = 12
 kControlMsgDrawGhost = 13
 kControlMsgCalcBestRect = 14
 kControlMsgHandleTracking = 15
@@ -111,9 +131,107 @@ kControlMsgSubControlAdded = 28
 kControlMsgSubControlRemoved = 29
 kControlMsgApplyTextColor = 30
 kControlMsgGetRegion = 31
+kControlMsgFlatten = 32
+kControlMsgSetCursor = 33
+kControlMsgDragEnter = 38
+kControlMsgDragLeave = 39
+kControlMsgDragWithin = 40
+kControlMsgDragReceive = 41
+kControlMsgDisplayDebugInfo = 46
+kControlMsgContextualMenuClick = 47
+kControlMsgGetClickActivation = 48                          
+kDrawControlEntireControl = 0
+kDrawControlIndicatorOnly = 129
+kDragControlEntireControl = 0
+kDragControlIndicator = 1
+kControlSupportsNewMessages = FOUR_CHAR_CODE(' ok ')
+kControlKeyFilterBlockKey = 0
+kControlKeyFilterPassKey = 1
+noConstraint = kNoConstraint
+hAxisOnly = 1
+vAxisOnly = 2
+kControlDefProcPtr = 0                             
+kControlPropertyPersistent = 0x00000001                    
+kDragTrackingEnterControl = kDragTrackingEnterWindow
+kDragTrackingInControl = kDragTrackingInWindow
+kDragTrackingLeaveControl = kDragTrackingLeaveWindow
+useWFont = kControlUsesOwningWindowsFontVariant
+inThumb = kControlIndicatorPart
+kNoHiliteControlPart = kControlNoPart
+kInIndicatorControlPart = kControlIndicatorPart
+kReservedControlPart = kControlDisabledPart
+kControlInactiveControlPart = kControlInactivePart
+kControlTabListResType = FOUR_CHAR_CODE('tab#')
+kControlListDescResType = FOUR_CHAR_CODE('ldes')        
+kControlCheckBoxUncheckedValue = 0
+kControlCheckBoxCheckedValue = 1
+kControlCheckBoxMixedValue = 2
+kControlRadioButtonUncheckedValue = 0
+kControlRadioButtonCheckedValue = 1
+kControlRadioButtonMixedValue = 2
+popupFixedWidth = 1 << 0
+popupVariableWidth = 1 << 1
+popupUseAddResMenu = 1 << 2
+popupUseWFont = 1 << 3
+popupTitleBold = 1 << 8
+popupTitleItalic = 1 << 9
+popupTitleUnderline = 1 << 10
+popupTitleOutline = 1 << 11
+popupTitleShadow = 1 << 12
+popupTitleCondense = 1 << 13
+popupTitleExtend = 1 << 14
+popupTitleNoStyle = 1 << 15
+popupTitleLeftJust = 0x00000000
+popupTitleCenterJust = 0x00000001
+popupTitleRightJust = 0x000000FF
+pushButProc = 0
+checkBoxProc = 1
+radioButProc = 2
+scrollBarProc = 16
+popupMenuProc = 1008
+kControlLabelPart = 1
+kControlMenuPart = 2
+kControlTrianglePart = 4
+kControlEditTextPart = 5
+kControlPicturePart = 6
+kControlIconPart = 7
+kControlClockPart = 8
+kControlListBoxPart = 24
+kControlListBoxDoubleClickPart = 25
+kControlImageWellPart = 26
+kControlRadioGroupPart = 27
+kControlButtonPart = 10
+kControlCheckBoxPart = 11
+kControlRadioButtonPart = 11
+kControlUpButtonPart = 20
+kControlDownButtonPart = 21
+kControlPageUpPart = 22
+kControlPageDownPart = 23
+kControlClockHourDayPart = 9
+kControlClockMinuteMonthPart = 10
+kControlClockSecondYearPart = 11
+kControlClockAMPMPart = 12
+kControlDataBrowserPart = 24
+kControlDataBrowserDraggedPart = 25                         
 kControlBevelButtonSmallBevelProc = 32
 kControlBevelButtonNormalBevelProc = 33
 kControlBevelButtonLargeBevelProc = 34
+kControlBevelButtonSmallBevelVariant = 0
+kControlBevelButtonNormalBevelVariant = (1 << 0)
+kControlBevelButtonLargeBevelVariant = (1 << 1)
+kControlBevelButtonMenuOnRightVariant = (1 << 2)
+kControlBevelButtonSmallBevel = 0
+kControlBevelButtonNormalBevel = 1
+kControlBevelButtonLargeBevel = 2
+kControlBehaviorPushbutton = 0
+kControlBehaviorToggles = 0x0100
+kControlBehaviorSticky = 0x0200
+kControlBehaviorSingleValueMenu = 0
+kControlBehaviorMultiValueMenu = 0x4000
+kControlBehaviorOffsetContents = 0x8000
+kControlBehaviorCommandMenu = 0x2000                        
+kControlBevelButtonMenuOnBottom = 0
+kControlBevelButtonMenuOnRight = (1 << 2)
 kControlBevelButtonAlignSysDirection = -1
 kControlBevelButtonAlignCenter = 0
 kControlBevelButtonAlignLeft = 1
@@ -134,24 +252,6 @@ kControlBevelButtonPlaceToRightOfGraphic = 1
 kControlBevelButtonPlaceToLeftOfGraphic = 2
 kControlBevelButtonPlaceBelowGraphic = 3
 kControlBevelButtonPlaceAboveGraphic = 4
-kControlBevelButtonSmallBevelVariant = 0
-kControlBevelButtonNormalBevelVariant = (1 << 0)
-kControlBevelButtonLargeBevelVariant = (1 << 1)
-kControlBevelButtonMenuOnRight = (1 << 2)
-kControlBehaviorPushbutton = 0
-kControlBehaviorToggles = 0x0100
-kControlBehaviorSticky = 0x0200
-kControlBehaviorMultiValueMenu = 0x4000
-kControlBehaviorOffsetContents = 0x8000
-kControlBehaviorCommandMenu = 0x2000
-kControlContentTextOnly = 0
-kControlContentIconSuiteRes = 1
-kControlContentCIconRes = 2
-kControlContentPictRes = 3
-kControlContentIconSuiteHandle = 129
-kControlContentCIconHandle = 130
-kControlContentPictHandle = 131
-kControlContentIconRef = 132
 kControlBevelButtonContentTag = FOUR_CHAR_CODE('cont')
 kControlBevelButtonTransformTag = FOUR_CHAR_CODE('tran')
 kControlBevelButtonTextAlignTag = FOUR_CHAR_CODE('tali')
@@ -163,8 +263,8 @@ kControlBevelButtonMenuValueTag = FOUR_CHAR_CODE('mval')
 kControlBevelButtonMenuHandleTag = FOUR_CHAR_CODE('mhnd')
 # kControlBevelButtonCenterPopupGlyphTag = FOUR_CHAR_CODE('pglc') 
 kControlBevelButtonLastMenuTag = FOUR_CHAR_CODE('lmnu')
-kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly')
-kControlBevelButtonScaleIconTag = FOUR_CHAR_CODE('scal')
+kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly')    
+kControlBevelButtonScaleIconTag = FOUR_CHAR_CODE('scal')    
 kControlSliderProc = 48
 kControlSliderLiveFeedback = (1 << 0)
 kControlSliderHasTickMarks = (1 << 1)
@@ -174,7 +274,7 @@ kControlTriangleProc = 64
 kControlTriangleLeftFacingProc = 65
 kControlTriangleAutoToggleProc = 66
 kControlTriangleLeftFacingAutoToggleProc = 67
-kControlTriangleLastValueTag = FOUR_CHAR_CODE('last')
+kControlTriangleLastValueTag = FOUR_CHAR_CODE('last')       
 kControlProgressBarProc = 80
 # kControlProgressBarIndeterminateTag = FOUR_CHAR_CODE('inde') 
 kControlLittleArrowsProc = 96
@@ -188,11 +288,11 @@ kControlTabSmallSouthProc = 131
 kControlTabLargeEastProc = 132
 kControlTabSmallEastProc = 133
 kControlTabLargeWestProc = 134
-kControlTabSmallWestProc = 135
+kControlTabSmallWestProc = 135                           
 kControlTabContentRectTag = FOUR_CHAR_CODE('rect')
 kControlTabEnabledFlagTag = FOUR_CHAR_CODE('enab')
-kControlTabFontStyleTag = kControlFontStyleTag
-kControlTabInfoTag = FOUR_CHAR_CODE('tabi')
+kControlTabFontStyleTag = kControlFontStyleTag          
+kControlTabInfoTag = FOUR_CHAR_CODE('tabi')        
 kControlTabInfoVersionZero = 0
 kControlSeparatorLineProc = 144
 kControlGroupBoxTextTitleProc = 160
@@ -202,11 +302,11 @@ kControlGroupBoxSecondaryTextTitleProc = 164
 kControlGroupBoxSecondaryCheckBoxProc = 165
 kControlGroupBoxSecondaryPopupButtonProc = 166
 kControlGroupBoxMenuHandleTag = FOUR_CHAR_CODE('mhan')
-kControlGroupBoxFontStyleTag = kControlFontStyleTag
-kControlGroupBoxTitleRectTag = FOUR_CHAR_CODE('trec')
+kControlGroupBoxFontStyleTag = kControlFontStyleTag         
+kControlGroupBoxTitleRectTag = FOUR_CHAR_CODE('trec')       
 kControlImageWellProc = 176
 kControlImageWellContentTag = FOUR_CHAR_CODE('cont')
-kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')
+kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')      
 kControlPopupArrowEastProc = 192
 kControlPopupArrowWestProc = 193
 kControlPopupArrowNorthProc = 194
@@ -215,16 +315,27 @@ kControlPopupArrowSmallEastProc = 196
 kControlPopupArrowSmallWestProc = 197
 kControlPopupArrowSmallNorthProc = 198
 kControlPopupArrowSmallSouthProc = 199
+kControlPopupArrowOrientationEast = 0
+kControlPopupArrowOrientationWest = 1
+kControlPopupArrowOrientationNorth = 2
+kControlPopupArrowOrientationSouth = 3
 kControlPlacardProc = 224
 kControlClockTimeProc = 240
 kControlClockTimeSecondsProc = 241
 kControlClockDateProc = 242
 kControlClockMonthYearProc = 243
+kControlClockTypeHourMinute = 0
+kControlClockTypeHourMinuteSecond = 1
+kControlClockTypeMonthDay = 2
+kControlClockTypeMonthDayYear = 3
+kControlClockFlagStandard = 0
 kControlClockNoFlags = 0
+kControlClockFlagDisplayOnly = 1
 kControlClockIsDisplayOnly = 1
+kControlClockFlagLive = 2
 kControlClockIsLive = 2
 kControlClockLongDateTag = FOUR_CHAR_CODE('date')
-kControlClockFontStyleTag = kControlFontStyleTag
+kControlClockFontStyleTag = kControlFontStyleTag          
 kControlUserPaneProc = 256
 kControlUserItemDrawProcTag = FOUR_CHAR_CODE('uidp')
 kControlUserPaneDrawProcTag = FOUR_CHAR_CODE('draw')
@@ -234,16 +345,16 @@ kControlUserPaneIdleProcTag = FOUR_CHAR_CODE('idle')
 kControlUserPaneKeyDownProcTag = FOUR_CHAR_CODE('keyd')
 kControlUserPaneActivateProcTag = FOUR_CHAR_CODE('acti')
 kControlUserPaneFocusProcTag = FOUR_CHAR_CODE('foci')
-kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back')
+kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back')  
 kControlEditTextProc = 272
 kControlEditTextPasswordProc = 274
-kControlEditTextInlineInputProc = 276
+kControlEditTextInlineInputProc = 276                       
 kControlEditTextStyleTag = kControlFontStyleTag
 kControlEditTextTextTag = FOUR_CHAR_CODE('text')
 kControlEditTextTEHandleTag = FOUR_CHAR_CODE('than')
 kControlEditTextKeyFilterTag = kControlKeyFilterTag
 kControlEditTextSelectionTag = FOUR_CHAR_CODE('sele')
-kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass')
+kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass')        
 kControlEditTextKeyScriptBehaviorTag = FOUR_CHAR_CODE('kscr')
 kControlEditTextLockedTag = FOUR_CHAR_CODE('lock')
 kControlEditTextFixedTextTag = FOUR_CHAR_CODE('ftxt')
@@ -253,126 +364,56 @@ kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup')
 kControlStaticTextProc = 288
 kControlStaticTextStyleTag = kControlFontStyleTag
 kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
-kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei')
-kControlStaticTextTruncTag = FOUR_CHAR_CODE('trun')
+kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei')    
+kControlStaticTextTruncTag = FOUR_CHAR_CODE('trun')        
 kControlPictureProc = 304
-kControlPictureNoTrackProc = 305
+kControlPictureNoTrackProc = 305                           
+kControlPictureHandleTag = FOUR_CHAR_CODE('pich')        
 kControlIconProc = 320
 kControlIconNoTrackProc = 321
 kControlIconSuiteProc = 322
-kControlIconSuiteNoTrackProc = 323
+kControlIconSuiteNoTrackProc = 323                          
 kControlIconRefProc = 324
-kControlIconRefNoTrackProc = 325
+kControlIconRefNoTrackProc = 325                           
 kControlIconTransformTag = FOUR_CHAR_CODE('trfm')
-kControlIconAlignmentTag = FOUR_CHAR_CODE('algn')
+kControlIconAlignmentTag = FOUR_CHAR_CODE('algn')        
 kControlIconResourceIDTag = FOUR_CHAR_CODE('ires')
-kControlIconContentTag = FOUR_CHAR_CODE('cont')
+kControlIconContentTag = FOUR_CHAR_CODE('cont')        
 kControlWindowHeaderProc = 336
-kControlWindowListViewHeaderProc = 337
+kControlWindowListViewHeaderProc = 337                      
 kControlListBoxProc = 352
 kControlListBoxAutoSizeProc = 353
 kControlListBoxListHandleTag = FOUR_CHAR_CODE('lhan')
 kControlListBoxKeyFilterTag = kControlKeyFilterTag
-kControlListBoxFontStyleTag = kControlFontStyleTag
+kControlListBoxFontStyleTag = kControlFontStyleTag          
 kControlListBoxDoubleClickTag = FOUR_CHAR_CODE('dblc')
-kControlListBoxLDEFTag = FOUR_CHAR_CODE('ldef')
+kControlListBoxLDEFTag = FOUR_CHAR_CODE('ldef')        
 kControlPushButtonProc = 368
 kControlCheckBoxProc = 369
 kControlRadioButtonProc = 370
 kControlPushButLeftIconProc = 374
-kControlPushButRightIconProc = 375
+kControlPushButRightIconProc = 375                          
 kControlCheckBoxAutoToggleProc = 371
 kControlRadioButtonAutoToggleProc = 372
 kControlPushButtonDefaultTag = FOUR_CHAR_CODE('dflt')
-kControlPushButtonCancelTag = FOUR_CHAR_CODE('cncl')
+kControlPushButtonCancelTag = FOUR_CHAR_CODE('cncl')        
 kControlScrollBarProc = 384
-kControlScrollBarLiveProc = 386
+kControlScrollBarLiveProc = 386                           
 kControlPopupButtonProc = 400
 kControlPopupFixedWidthVariant = 1 << 0
 kControlPopupVariableWidthVariant = 1 << 1
 kControlPopupUseAddResMenuVariant = 1 << 2
-kControlPopupUseWFontVariant = 1 << 3
+kControlPopupUseWFontVariant = kControlUsesOwningWindowsFontVariant
 kControlPopupButtonMenuHandleTag = FOUR_CHAR_CODE('mhan')
-kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid')
-kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
+kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid')       
+kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')  
 kControlRadioGroupProc = 416
 kControlScrollTextBoxProc = 432
 kControlScrollTextBoxAutoScrollProc = 433
 kControlScrollTextBoxDelayBeforeAutoScrollTag = FOUR_CHAR_CODE('stdl')
 kControlScrollTextBoxDelayBetweenAutoScrollTag = FOUR_CHAR_CODE('scdl')
 kControlScrollTextBoxAutoScrollAmountTag = FOUR_CHAR_CODE('samt')
-kControlScrollTextBoxContentsTag = FOUR_CHAR_CODE('tres')
-kControlNoVariant = 0
-kControlUsesOwningWindowsFontVariant = 1 << 3
-kControlNoPart = 0
-kControlLabelPart = 1
-kControlMenuPart = 2
-kControlTrianglePart = 4
-kControlEditTextPart = 5
-kControlPicturePart = 6
-kControlIconPart = 7
-kControlClockPart = 8
-kControlListBoxPart = 24
-kControlListBoxDoubleClickPart = 25
-kControlImageWellPart = 26
-kControlRadioGroupPart = 27
-kControlButtonPart = 10
-kControlCheckBoxPart = 11
-kControlRadioButtonPart = 11
-kControlUpButtonPart = 20
-kControlDownButtonPart = 21
-kControlPageUpPart = 22
-kControlPageDownPart = 23
-kControlIndicatorPart = 129
-kControlDisabledPart = 254
-kControlInactivePart = 255
-kControlClockHourDayPart = 9
-kControlClockMinuteMonthPart = 10
-kControlClockSecondYearPart = 11
-kControlClockAMPMPart = 12
-kControlStructureMetaPart = -1
-kControlContentMetaPart = -2
-kControlCheckBoxUncheckedValue = 0
-kControlCheckBoxCheckedValue = 1
-kControlCheckBoxMixedValue = 2
-kControlRadioButtonUncheckedValue = 0
-kControlRadioButtonCheckedValue = 1
-kControlRadioButtonMixedValue = 2
-popupFixedWidth = 1 << 0
-popupVariableWidth = 1 << 1
-popupUseAddResMenu = 1 << 2
-popupUseWFont = 1 << 3
-popupTitleBold = 1 << 8
-popupTitleItalic = 1 << 9
-popupTitleUnderline = 1 << 10
-popupTitleOutline = 1 << 11
-popupTitleShadow = 1 << 12
-popupTitleCondense = 1 << 13
-popupTitleExtend = 1 << 14
-popupTitleNoStyle = 1 << 15
-popupTitleLeftJust = 0x00000000
-popupTitleCenterJust = 0x00000001
-popupTitleRightJust = 0x000000FF
-noConstraint = kNoConstraint
-hAxisOnly = 1
-vAxisOnly = 2
-drawCntl = 0
-testCntl = 1
-calcCRgns = 2
-initCntl = 3
-dispCntl = 4
-posCntl = 5
-thumbCntl = 6
-dragCntl = 7
-autoTrack = 8
-calcCntlRgn = 10
-calcThumbRgn = 11
-drawThumbOutline = 12
-kDrawControlEntireControl = 0
-kDrawControlIndicatorOnly = 129
-kDragControlEntireControl = 0
-kDragControlIndicator = 1
-useWFont = popupUseWFont
+kControlScrollTextBoxContentsTag = FOUR_CHAR_CODE('tres')   
 kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
 kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue
 kControlCheckboxMixedValue = kControlCheckBoxMixedValue
@@ -385,8 +426,6 @@ inUpButton = kControlUpButtonPart
 inDownButton = kControlDownButtonPart
 inPageUp = kControlPageUpPart
 inPageDown = kControlPageDownPart
-inThumb = kControlIndicatorPart
-kNoHiliteControlPart = kControlNoPart
 kInLabelControlPart = kControlLabelPart
 kInMenuControlPart = kControlMenuPart
 kInTriangleControlPart = kControlTrianglePart
@@ -396,6 +435,3 @@ kInUpButtonControlPart = kControlUpButtonPart
 kInDownButtonControlPart = kControlDownButtonPart
 kInPageUpControlPart = kControlPageUpPart
 kInPageDownControlPart = kControlPageDownPart
-kInIndicatorControlPart = kControlIndicatorPart
-kReservedControlPart = kControlDisabledPart
-kControlInactiveControlPart = kControlInactivePart
diff --git a/Mac/Lib/lib-toolbox/Dialogs.py b/Mac/Lib/lib-toolbox/Dialogs.py
index 5c7f6eb..2f1c80b 100644
--- a/Mac/Lib/lib-toolbox/Dialogs.py
+++ b/Mac/Lib/lib-toolbox/Dialogs.py
@@ -1,9 +1,6 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Dialogs.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Dialogs.h'
 
 def FOUR_CHAR_CODE(x): return x
-gestaltDialogMgrAttr = FOUR_CHAR_CODE('dlog')
-gestaltDialogMgrPresent = (1L << 0)
-dialogNoTimeoutErr = -5640
 kControlDialogItem = 4
 kButtonDialogItem = kControlDialogItem | 0
 kCheckBoxDialogItem = kControlDialogItem | 1
@@ -14,6 +11,7 @@ kEditTextDialogItem = 16
 kIconDialogItem = 32
 kPictureDialogItem = 64
 kUserDialogItem = 0
+kHelpDialogItem = 1
 kItemDisableBit = 128
 ctrlItem = 4
 btnCtrl = 0
@@ -47,7 +45,7 @@ kAlertCautionAlert = 2
 kAlertPlainAlert = 3
 kAlertDefaultOKText = -1
 kAlertDefaultCancelText = -1
-kAlertDefaultOtherText = -1
+kAlertDefaultOtherText = -1                            
 kAlertStdAlertOKButton = 1
 kAlertStdAlertCancelButton = 2
 kAlertStdAlertOtherButton = 3
diff --git a/Mac/Lib/lib-toolbox/Dragconst.py b/Mac/Lib/lib-toolbox/Dragconst.py
index 4d672dc..1e4e83b 100644
--- a/Mac/Lib/lib-toolbox/Dragconst.py
+++ b/Mac/Lib/lib-toolbox/Dragconst.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Drag.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Drag.h'
 
 def FOUR_CHAR_CODE(x): return x
 from TextEdit import *
@@ -15,27 +15,36 @@ flavorNotSaved				= (1 << 2)
 flavorSystemTranslated		= (1 << 8)
 kDragHasLeftSenderWindow = (1L << 0)
 kDragInsideSenderApplication = (1L << 1)
-kDragInsideSenderWindow = (1L << 2)
-kDragRegionAndImage = (1L << 4)
+kDragInsideSenderWindow = (1L << 2)                     
+kDragBehaviorNone = 0
+kDragBehaviorZoomBackAnimation = (1L << 0)                  
+kDragRegionAndImage = (1L << 4)                     
 kDragStandardTranslucency = 0L
 kDragDarkTranslucency = 1L
 kDragDarkerTranslucency = 2L
-kDragOpaqueTranslucency = 3L
+kDragOpaqueTranslucency = 3L                            
 kDragRegionBegin = 1
 kDragRegionDraw = 2
 kDragRegionHide = 3
 kDragRegionIdle = 4
-kDragRegionEnd = 5
+kDragRegionEnd = 5                             
 kZoomNoAcceleration = 0
 kZoomAccelerate = 1
-kZoomDecelerate = 2
+kZoomDecelerate = 2                             
 flavorSenderOnly = (1 << 0)
 flavorSenderTranslated = (1 << 1)
 flavorNotSaved = (1 << 2)
-flavorSystemTranslated = (1 << 8)
-flavorTypeHFS = FOUR_CHAR_CODE('hfs ')
-flavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
-flavorTypeDirectory = FOUR_CHAR_CODE('diry')
+flavorSystemTranslated = (1 << 8)                      
+kDragFlavorTypeHFS = FOUR_CHAR_CODE('hfs ')
+kDragFlavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
+flavorTypeHFS = kDragFlavorTypeHFS
+flavorTypePromiseHFS = kDragFlavorTypePromiseHFS     
+kDragPromisedFlavorFindFile = FOUR_CHAR_CODE('rWm1')
+kDragPromisedFlavor = FOUR_CHAR_CODE('fssP')        
+kDragPseudoCreatorVolumeOrDirectory = FOUR_CHAR_CODE('MACS')
+kDragPseudoFileTypeVolume = FOUR_CHAR_CODE('disk')
+kDragPseudoFileTypeDirectory = FOUR_CHAR_CODE('fold')       
+flavorTypeDirectory = FOUR_CHAR_CODE('diry')        
 kFlavorTypeClippingName = FOUR_CHAR_CODE('clnm')
 kFlavorTypeClippingFilename = FOUR_CHAR_CODE('clfn')
 kFlavorTypeDragToTrashOnly = FOUR_CHAR_CODE('fdtt')
@@ -44,24 +53,24 @@ kDragTrackingEnterHandler = 1
 kDragTrackingEnterWindow = 2
 kDragTrackingInWindow = 3
 kDragTrackingLeaveWindow = 4
-kDragTrackingLeaveHandler = 5
+kDragTrackingLeaveHandler = 5                             
 dragHasLeftSenderWindow = kDragHasLeftSenderWindow
 dragInsideSenderApplication = kDragInsideSenderApplication
-dragInsideSenderWindow = kDragInsideSenderWindow
+dragInsideSenderWindow = kDragInsideSenderWindow       
 dragTrackingEnterHandler = kDragTrackingEnterHandler
 dragTrackingEnterWindow = kDragTrackingEnterWindow
 dragTrackingInWindow = kDragTrackingInWindow
 dragTrackingLeaveWindow = kDragTrackingLeaveWindow
-dragTrackingLeaveHandler = kDragTrackingLeaveHandler
+dragTrackingLeaveHandler = kDragTrackingLeaveHandler     
 dragRegionBegin = kDragRegionBegin
 dragRegionDraw = kDragRegionDraw
 dragRegionHide = kDragRegionHide
 dragRegionIdle = kDragRegionIdle
-dragRegionEnd = kDragRegionEnd
+dragRegionEnd = kDragRegionEnd                
 zoomNoAcceleration = kZoomNoAcceleration
 zoomAccelerate = kZoomAccelerate
-zoomDecelerate = kZoomDecelerate
+zoomDecelerate = kZoomDecelerate               
 kDragStandardImage = kDragStandardTranslucency
 kDragDarkImage = kDragDarkTranslucency
 kDragDarkerImage = kDragDarkerTranslucency
-kDragOpaqueImage = kDragOpaqueTranslucency
+kDragOpaqueImage = kDragOpaqueTranslucency       
diff --git a/Mac/Lib/lib-toolbox/Events.py b/Mac/Lib/lib-toolbox/Events.py
index 7564173..514cee5 100644
--- a/Mac/Lib/lib-toolbox/Events.py
+++ b/Mac/Lib/lib-toolbox/Events.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:CodeWarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Events.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Events.h'
 
 nullEvent = 0
 mouseDown = 1
@@ -21,15 +21,15 @@ diskMask = 1 << diskEvt
 activMask = 1 << activateEvt
 highLevelEventMask = 0x0400
 osMask = 1 << osEvt
-everyEvent = 0xFFFF
+everyEvent = 0xFFFF                        
 charCodeMask = 0x000000FF
 keyCodeMask = 0x0000FF00
 adbAddrMask = 0x00FF0000
-# osEvtMessageMask = (long)0xFF000000
+# osEvtMessageMask = (unsigned long)0xFF000000
 mouseMovedMessage = 0x00FA
 suspendResumeMessage = 0x0001
 resumeFlag = 1
-convertClipboardFlag = 2
+convertClipboardFlag = 2                             
 activeFlagBit = 0
 btnStateBit = 7
 cmdKeyBit = 8
@@ -39,7 +39,7 @@ optionKeyBit = 11
 controlKeyBit = 12
 rightShiftKeyBit = 13
 rightOptionKeyBit = 14
-rightControlKeyBit = 15
+rightControlKeyBit = 15                            
 activeFlag = 1 << activeFlagBit
 btnState = 1 << btnStateBit
 cmdKey = 1 << cmdKeyBit
diff --git a/Mac/Lib/lib-toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
index 5bd62b1..217c3f5 100644
--- a/Mac/Lib/lib-toolbox/Fonts.py
+++ b/Mac/Lib/lib-toolbox/Fonts.py
@@ -1,9 +1,36 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
 
 systemFont = 0
 applFont = 1
 kPlatformDefaultGuiFontID = applFont
 kPlatformDefaultGuiFontID = -1
+commandMark = 17
+checkMark = 18
+diamondMark = 19
+appleMark = 20
+propFont = 36864L
+prpFntH = 36865L
+prpFntW = 36866L
+prpFntHW = 36867L
+fixedFont = 45056L
+fxdFntH = 45057L
+fxdFntW = 45058L
+fxdFntHW = 45059L
+fontWid = 44208L
+kInvalidGeneration = 0L
+kInvalidFontFamily = -1
+kInvalidFont = 0L
+kFMCurrentFilterFormat = 0L
+kFMDefaultOptions = kNilOptions
+kFMUseGlobalScopeOption = 0x00000001
+kFMInvalidFilterSelector = 0L
+kFMFontTechnologyFilterSelector = 1L
+kFMFontContainerFilterSelector = 2L
+kFMGenerationFilterSelector = 3L
+kFMFontFamilyCallbackFilterSelector = 4L
+kFMFontCallbackFilterSelector = 5L
+kFMTrueTypeFontTechnology = FOUR_CHAR_CODE('true')
+kFMPostScriptFontTechnology = FOUR_CHAR_CODE('typ1')
 kFontIDNewYork = 2
 kFontIDGeneva = 3
 kFontIDMonaco = 4
@@ -34,16 +61,3 @@ helvetica = kFontIDHelvetica
 courier = kFontIDCourier
 symbol = kFontIDSymbol
 mobile = kFontIDMobile
-commandMark = 17
-checkMark = 18
-diamondMark = 19
-appleMark = 20
-propFont = 36864L
-prpFntH = 36865L
-prpFntW = 36866L
-prpFntHW = 36867L
-fixedFont = 45056L
-fxdFntH = 45057L
-fxdFntW = 45058L
-fxdFntHW = 45059L
-fontWid = 44208L
diff --git a/Mac/Lib/lib-toolbox/Icons.py b/Mac/Lib/lib-toolbox/Icons.py
index d5bc265..1b02a4a 100644
--- a/Mac/Lib/lib-toolbox/Icons.py
+++ b/Mac/Lib/lib-toolbox/Icons.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
 
 def FOUR_CHAR_CODE(x): return x
 kGenericDocumentIconResource = -4000
@@ -68,6 +68,8 @@ preferencesFolderIconResource = kPreferencesFolderIconResource
 extensionsFolderIconResource = kExtensionsFolderIconResource
 fontsFolderIconResource = kFontsFolderIconResource
 fullTrashIconResource = kFullTrashIconResource
+kThumbnail32BitData = FOUR_CHAR_CODE('it32')
+kThumbnail8BitMask = FOUR_CHAR_CODE('t8mk')
 kHuge1BitMask = FOUR_CHAR_CODE('ich#')
 kHuge4BitData = FOUR_CHAR_CODE('ich4')
 kHuge8BitData = FOUR_CHAR_CODE('ich8')
@@ -86,6 +88,11 @@ kSmall8BitMask = FOUR_CHAR_CODE('s8mk')
 kMini1BitMask = FOUR_CHAR_CODE('icm#')
 kMini4BitData = FOUR_CHAR_CODE('icm4')
 kMini8BitData = FOUR_CHAR_CODE('icm8')
+kTileIconVariant = FOUR_CHAR_CODE('tile')
+kRolloverIconVariant = FOUR_CHAR_CODE('over')
+kDropIconVariant = FOUR_CHAR_CODE('drop')
+kOpenIconVariant = FOUR_CHAR_CODE('open')
+kOpenDropIconVariant = FOUR_CHAR_CODE('odrp')
 large1BitMask = kLarge1BitMask
 large4BitData = kLarge4BitData
 large8BitData = kLarge8BitData
@@ -201,6 +208,7 @@ svAll4BitData = kSelectorAll4BitData
 svAll8BitData = kSelectorAll8BitData
 # svAllAvailableData = kSelectorAllAvailableData
 kSystemIconsCreator = FOUR_CHAR_CODE('macs')
+err = GetIconRef(kOnSystemDisk
 kClipboardIcon = FOUR_CHAR_CODE('CLIP')
 kClippingUnknownTypeIcon = FOUR_CHAR_CODE('clpu')
 kClippingPictureTypeIcon = FOUR_CHAR_CODE('clpp')
@@ -249,6 +257,7 @@ kInternetLocationAppleTalkZoneIcon = FOUR_CHAR_CODE('ilat')
 kInternetLocationFileIcon = FOUR_CHAR_CODE('ilfi')
 kInternetLocationMailIcon = FOUR_CHAR_CODE('ilma')
 kInternetLocationNewsIcon = FOUR_CHAR_CODE('ilnw')
+kInternetLocationNSLNeighborhoodIcon = FOUR_CHAR_CODE('ilns')
 kInternetLocationGenericIcon = FOUR_CHAR_CODE('ilge')
 kGenericFolderIcon = FOUR_CHAR_CODE('fldr')
 kDropFolderIcon = FOUR_CHAR_CODE('dbox')
@@ -268,34 +277,35 @@ kGuestUserIcon = FOUR_CHAR_CODE('gusr')
 kUserIcon = FOUR_CHAR_CODE('user')
 kOwnerIcon = FOUR_CHAR_CODE('susr')
 kGroupIcon = FOUR_CHAR_CODE('grup')
-kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aexŸ')
+kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aexÄ')
 kAppleMenuFolderIcon = FOUR_CHAR_CODE('amnu')
 kApplicationsFolderIcon = FOUR_CHAR_CODE('apps')
 kApplicationSupportFolderIcon = FOUR_CHAR_CODE('asup')
-kAssistantsFolderIcon = FOUR_CHAR_CODE('astŸ')
+kAssistantsFolderIcon = FOUR_CHAR_CODE('astÄ')
 kContextualMenuItemsFolderIcon = FOUR_CHAR_CODE('cmnu')
 kControlPanelDisabledFolderIcon = FOUR_CHAR_CODE('ctrD')
 kControlPanelFolderIcon = FOUR_CHAR_CODE('ctrl')
-kControlStripModulesFolderIcon = FOUR_CHAR_CODE('sdvŸ')
+kControlStripModulesFolderIcon = FOUR_CHAR_CODE('sdvÄ')
 kDocumentsFolderIcon = FOUR_CHAR_CODE('docs')
 kExtensionsDisabledFolderIcon = FOUR_CHAR_CODE('extD')
 kExtensionsFolderIcon = FOUR_CHAR_CODE('extn')
 kFavoritesFolderIcon = FOUR_CHAR_CODE('favs')
 kFontsFolderIcon = FOUR_CHAR_CODE('font')
-kHelpFolderIcon = FOUR_CHAR_CODE('Ÿhlp')
-kInternetFolderIcon = FOUR_CHAR_CODE('intŸ')
-kInternetPlugInFolderIcon = FOUR_CHAR_CODE('Ÿnet')
-kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('morŸ')
-kPreferencesFolderIcon = FOUR_CHAR_CODE('prfŸ')
+kHelpFolderIcon = FOUR_CHAR_CODE('Ählp')
+kInternetFolderIcon = FOUR_CHAR_CODE('intÄ')
+kInternetPlugInFolderIcon = FOUR_CHAR_CODE('Änet')
+kLocalesFolderIcon = FOUR_CHAR_CODE('Äloc')
+kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('morÄ')
+kPreferencesFolderIcon = FOUR_CHAR_CODE('prfÄ')
 kPrinterDescriptionFolderIcon = FOUR_CHAR_CODE('ppdf')
-kPrinterDriverFolderIcon = FOUR_CHAR_CODE('Ÿprd')
+kPrinterDriverFolderIcon = FOUR_CHAR_CODE('Äprd')
 kPrintMonitorFolderIcon = FOUR_CHAR_CODE('prnt')
 kRecentApplicationsFolderIcon = FOUR_CHAR_CODE('rapp')
 kRecentDocumentsFolderIcon = FOUR_CHAR_CODE('rdoc')
 kRecentServersFolderIcon = FOUR_CHAR_CODE('rsrv')
-kScriptingAdditionsFolderIcon = FOUR_CHAR_CODE('Ÿscr')
-kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('Ÿlib')
-kScriptsFolderIcon = FOUR_CHAR_CODE('scrŸ')
+kScriptingAdditionsFolderIcon = FOUR_CHAR_CODE('Äscr')
+kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('Älib')
+kScriptsFolderIcon = FOUR_CHAR_CODE('scrÄ')
 kShutdownItemsDisabledFolderIcon = FOUR_CHAR_CODE('shdD')
 kShutdownItemsFolderIcon = FOUR_CHAR_CODE('shdf')
 kSpeakableItemsFolder = FOUR_CHAR_CODE('spki')
@@ -303,12 +313,13 @@ kStartupItemsDisabledFolderIcon = FOUR_CHAR_CODE('strD')
 kStartupItemsFolderIcon = FOUR_CHAR_CODE('strt')
 kSystemExtensionDisabledFolderIcon = FOUR_CHAR_CODE('macD')
 kSystemFolderIcon = FOUR_CHAR_CODE('macs')
-kTextEncodingsFolderIcon = FOUR_CHAR_CODE('Ÿtex')
+kTextEncodingsFolderIcon = FOUR_CHAR_CODE('Ätex')
 kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
-kUtilitiesFolderIcon = FOUR_CHAR_CODE('utiŸ')
+kUtilitiesFolderIcon = FOUR_CHAR_CODE('utiÄ')
 kVoicesFolderIcon = FOUR_CHAR_CODE('fvoc')
 kColorSyncFolderIcon = FOUR_CHAR_CODE('prof')
 kInternetSearchSitesFolderIcon = FOUR_CHAR_CODE('issf')
+kUsersFolderIcon = FOUR_CHAR_CODE('usrÄ')
 kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
 kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
 kMountedBadgeIcon = FOUR_CHAR_CODE('mbdg')
@@ -321,6 +332,8 @@ kAppleTalkIcon = FOUR_CHAR_CODE('atlk')
 kAppleTalkZoneIcon = FOUR_CHAR_CODE('atzn')
 kAFPServerIcon = FOUR_CHAR_CODE('afps')
 kFTPServerIcon = FOUR_CHAR_CODE('ftps')
+kHTTPServerIcon = FOUR_CHAR_CODE('htps')
+kGenericNetworkIcon = FOUR_CHAR_CODE('gnet')
 kIPFileServerIcon = FOUR_CHAR_CODE('isrv')
 kAppleLogoIcon = FOUR_CHAR_CODE('capl')
 kAppleMenuIcon = FOUR_CHAR_CODE('sapl')
@@ -342,8 +355,5 @@ kSortAscendingIcon = FOUR_CHAR_CODE('asnd')
 kSortDescendingIcon = FOUR_CHAR_CODE('dsnd')
 kUnlockedIcon = FOUR_CHAR_CODE('ulck')
 kConnectToIcon = FOUR_CHAR_CODE('cnct')
-invalidIconRefErr = -2580
-noSuchIconErr = -2581
-noIconDataAvailableErr = -2582
 kIconServicesNormalUsageFlag = 0
 kIconFamilyType = FOUR_CHAR_CODE('icns')
diff --git a/Mac/Lib/lib-toolbox/Lists.py b/Mac/Lib/lib-toolbox/Lists.py
index 12acf60..84de760 100644
--- a/Mac/Lib/lib-toolbox/Lists.py
+++ b/Mac/Lib/lib-toolbox/Lists.py
@@ -1,10 +1,10 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Lists.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Lists.h'
 
 def FOUR_CHAR_CODE(x): return x
 listNotifyNothing = FOUR_CHAR_CODE('nada')
 listNotifyClick = FOUR_CHAR_CODE('clik')
 listNotifyDoubleClick = FOUR_CHAR_CODE('dblc')
-listNotifyPreClick = FOUR_CHAR_CODE('pclk')
+listNotifyPreClick = FOUR_CHAR_CODE('pclk')        
 lDoVAutoscrollBit = 1
 lDoHAutoscrollBit = 0
 lDoVAutoscroll = 2
@@ -27,3 +27,6 @@ lInitMsg = 0
 lDrawMsg = 1
 lHiliteMsg = 2
 lCloseMsg = 3
+kListDefUserProcType = 0
+kListDefStandardTextType = 1
+kListDefStandardIconType = 2
diff --git a/Mac/Lib/lib-toolbox/Menus.py b/Mac/Lib/lib-toolbox/Menus.py
index a89abac..5f7eff2 100644
--- a/Mac/Lib/lib-toolbox/Menus.py
+++ b/Mac/Lib/lib-toolbox/Menus.py
@@ -1,43 +1,53 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Menus.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Menus.h'
 
 def FOUR_CHAR_CODE(x): return x
-gestaltMenuMgrAttr = FOUR_CHAR_CODE('menu')
-gestaltMenuMgrPresent = 1
-menuPropertyInvalid = -5603
-menuPropertyNotFoundErr = -5604
-noMark = 0
+noMark = 0                             
 kMenuDrawMsg = 0
-kMenuChooseMsg = 1
 kMenuSizeMsg = 2
-kMenuDrawItemMsg = 4
+kMenuPopUpMsg = 3
 kMenuCalcItemMsg = 5
 kMenuThemeSavvyMsg = 7
 mDrawMsg = 0
-mChooseMsg = 1
 mSizeMsg = 2
-mDrawItemMsg = 4
+mPopUpMsg = 3
 mCalcItemMsg = 5
+mChooseMsg = 1
+mDrawItemMsg = 4
+kMenuChooseMsg = 1
+kMenuDrawItemMsg = 4
 kThemeSavvyMenuResponse = 0x7473
+kMenuInitMsg = 8
+kMenuDisposeMsg = 9
+kMenuFindItemMsg = 10
+kMenuHiliteItemMsg = 11
 textMenuProc = 0
 hMenuCmd = 27
 hierMenu = -1
-mPopUpMsg = 3
+kInsertHierarchicalMenu = -1
 mctAllItems = -98
-mctLastIDIndic = -99
+mctLastIDIndic = -99                           
 kMenuStdMenuProc = 63
 kMenuStdMenuBarProc = 63
 kMenuNoModifiers = 0
 kMenuShiftModifier = (1 << 0)
 kMenuOptionModifier = (1 << 1)
 kMenuControlModifier = (1 << 2)
-kMenuNoCommandModifier = (1 << 3)
+kMenuNoCommandModifier = (1 << 3)                      
 kMenuNoIcon = 0
 kMenuIconType = 1
 kMenuShrinkIconType = 2
 kMenuSmallIconType = 3
 kMenuColorIconType = 4
 kMenuIconSuiteType = 5
-kMenuIconRefType = 6
+kMenuIconRefType = 6                             
+kMenuAttrExcludesMarkColumn = (1 << 0)
+kMenuAttrAutoDisable = (1 << 2)                      
+kMenuItemAttrSubmenuParentChoosable = (1 << 2)              
+kMenuTrackingModeMouse = 1
+kMenuTrackingModeKeyboard = 2                             
+kMenuDefProcPtr = 0                             
+kMenuPropertyPersistent = 0x00000001                    
+kHierarchicalFontMenuOption = 0x00000001
 gestaltContextualMenuAttr = FOUR_CHAR_CODE('cmnu')
 gestaltContextualMenuUnusedBit = 0
 gestaltContextualMenuTrapAvailable = 1
diff --git a/Mac/Lib/lib-toolbox/QDOffscreen.py b/Mac/Lib/lib-toolbox/QDOffscreen.py
index b604542..ab11384 100644
--- a/Mac/Lib/lib-toolbox/QDOffscreen.py
+++ b/Mac/Lib/lib-toolbox/QDOffscreen.py
@@ -1,10 +1,12 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QDOffscreen.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QDOffscreen.h'
 
 def FOUR_CHAR_CODE(x): return x
 pixPurgeBit = 0
 noNewDeviceBit = 1
 useTempMemBit = 2
 keepLocalBit = 3
+useDistantHdwrMemBit = 4
+useLocalHdwrMemBit = 5
 pixelsPurgeableBit = 6
 pixelsLockedBit = 7
 mapPixBit = 16
@@ -20,6 +22,8 @@ pixPurge = 1L << pixPurgeBit
 noNewDevice = 1L << noNewDeviceBit
 useTempMem = 1L << useTempMemBit
 keepLocal = 1L << keepLocalBit
+useDistantHdwrMem = 1L << useDistantHdwrMemBit
+useLocalHdwrMem = 1L << useLocalHdwrMemBit
 pixelsPurgeable = 1L << pixelsPurgeableBit
 pixelsLocked = 1L << pixelsLockedBit
 kAllocDirectDrawSurface = 1L << 14
diff --git a/Mac/Lib/lib-toolbox/QuickDraw.py b/Mac/Lib/lib-toolbox/QuickDraw.py
index a8ce68c..2cd5a54 100644
--- a/Mac/Lib/lib-toolbox/QuickDraw.py
+++ b/Mac/Lib/lib-toolbox/QuickDraw.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDraw.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDraw.h'
 
 
 def FOUR_CHAR_CODE(x): return x
@@ -10,7 +10,7 @@ outline						= 8
 shadow						= 0x10
 condense					= 0x20
 extend						= 0x40
-invalColReq = -1
+invalColReq = -1                            
 srcCopy = 0
 srcOr = 1
 srcXor = 2
@@ -68,7 +68,7 @@ picRParen = 1
 clutType = 0
 fixedType = 1
 directType = 2
-gdDevType = 0
+gdDevType = 0                             
 interlacedDevice = 2
 roundedDevice = 5
 hasAuxMenuBar = 6
@@ -84,7 +84,7 @@ hiliteBit = 7
 pHiliteBit = 0
 defQDColors = 127
 RGBDirect = 16
-baseAddr32 = 4
+baseAddr32 = 4                             
 sysPatListID = 0
 iBeamCursor = 1
 crossCursor = 2
@@ -124,8 +124,9 @@ k32ARGBPixelFormat = 0x00000020
 k1IndexedGrayPixelFormat = 0x00000021
 k2IndexedGrayPixelFormat = 0x00000022
 k4IndexedGrayPixelFormat = 0x00000024
-k8IndexedGrayPixelFormat = 0x00000028
+k8IndexedGrayPixelFormat = 0x00000028                    
 k16LE555PixelFormat = FOUR_CHAR_CODE('L555')
+k16LE5551PixelFormat = FOUR_CHAR_CODE('5551')
 k16BE565PixelFormat = FOUR_CHAR_CODE('B565')
 k16LE565PixelFormat = FOUR_CHAR_CODE('L565')
 k24BGRPixelFormat = FOUR_CHAR_CODE('24BG')
@@ -138,10 +139,41 @@ kYVU9PixelFormat = FOUR_CHAR_CODE('YVU9')
 kYUV411PixelFormat = FOUR_CHAR_CODE('Y411')
 kYVYU422PixelFormat = FOUR_CHAR_CODE('YVYU')
 kUYVY422PixelFormat = FOUR_CHAR_CODE('UYVY')
-kYUV211PixelFormat = FOUR_CHAR_CODE('Y211')
+kYUV211PixelFormat = FOUR_CHAR_CODE('Y211')        
 kCursorImageMajorVersion = 0x0001
 kCursorImageMinorVersion = 0x0000
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDrawText.h'
+kQDParseRegionFromTop = (1 << 0)
+kQDParseRegionFromBottom = (1 << 1)
+kQDParseRegionFromLeft = (1 << 2)
+kQDParseRegionFromRight = (1 << 3)
+kQDParseRegionFromTopLeft = kQDParseRegionFromTop | kQDParseRegionFromLeft
+kQDParseRegionFromBottomRight = kQDParseRegionFromBottom | kQDParseRegionFromRight
+kQDRegionToRectsMsgInit = 1
+kQDRegionToRectsMsgParse = 2
+kQDRegionToRectsMsgTerminate = 3
+colorXorXFer = 52
+noiseXFer = 53
+customXFer = 54
+kXFer1PixelAtATime = 0x00000001
+kXFerConvertPixelToRGB32 = 0x00000002                    
+kCursorComponentsVersion = 0x00010001
+kCursorComponentType = FOUR_CHAR_CODE('curs')
+cursorDoesAnimate = 1L << 0
+cursorDoesHardware = 1L << 1
+cursorDoesUnreadableScreenBits = 1L << 2
+kRenderCursorInHardware = 1L << 0
+kRenderCursorInSoftware = 1L << 1
+kCursorComponentInit = 0x0001
+kCursorComponentGetInfo = 0x0002
+kCursorComponentSetOutputMode = 0x0003
+kCursorComponentSetData = 0x0004
+kCursorComponentReconfigure = 0x0005
+kCursorComponentDraw = 0x0006
+kCursorComponentErase = 0x0007
+kCursorComponentMove = 0x0008
+kCursorComponentAnimate = 0x0009
+kCursorComponentLastReserved = 0x0050
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:QuickDrawText.h'
 
 
 def FOUR_CHAR_CODE(x): return x
@@ -155,10 +187,10 @@ condense					= 0x20
 extend						= 0x40
 leftCaret = 0
 rightCaret = -1
-kHilite = 1
+kHilite = 1                             
 smLeftCaret = 0
 smRightCaret = -1
-smHilite = 1
+smHilite = 1                             
 onlyStyleRun = 0
 leftStyleRun = 1
 rightStyleRun = 2
@@ -166,4 +198,6 @@ middleStyleRun = 3
 smOnlyStyleRun = 0
 smLeftStyleRun = 1
 smRightStyleRun = 2
-smMiddleStyleRun = 3
+smMiddleStyleRun = 3                             
+tfAntiAlias = 1 << 0
+tfUnicode = 1 << 1
diff --git a/Mac/Lib/lib-toolbox/QuickTime.py b/Mac/Lib/lib-toolbox/QuickTime.py
index 9c24231..2db29a8 100644
--- a/Mac/Lib/lib-toolbox/QuickTime.py
+++ b/Mac/Lib/lib-toolbox/QuickTime.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Movies.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Movies.h'
 
 def FOUR_CHAR_CODE(x): return x
 MovieFileType = FOUR_CHAR_CODE('MooV')
@@ -10,6 +10,7 @@ MovieResourceAtomType = FOUR_CHAR_CODE('moov')
 MovieDataAtomType = FOUR_CHAR_CODE('mdat')
 FreeAtomType = FOUR_CHAR_CODE('free')
 SkipAtomType = FOUR_CHAR_CODE('skip')
+WideAtomPlaceholderType = FOUR_CHAR_CODE('wide')
 MediaHandlerType = FOUR_CHAR_CODE('mhlr')
 DataHandlerType = FOUR_CHAR_CODE('dhlr')
 VideoMediaType = FOUR_CHAR_CODE('vide')
@@ -20,21 +21,48 @@ MPEGMediaType = FOUR_CHAR_CODE('MPEG')
 MusicMediaType = FOUR_CHAR_CODE('musi')
 TimeCodeMediaType = FOUR_CHAR_CODE('tmcd')
 SpriteMediaType = FOUR_CHAR_CODE('sprt')
+FlashMediaType = FOUR_CHAR_CODE('flsh')
+MovieMediaType = FOUR_CHAR_CODE('moov')
 TweenMediaType = FOUR_CHAR_CODE('twen')
 ThreeDeeMediaType = FOUR_CHAR_CODE('qd3d')
 HandleDataHandlerSubType = FOUR_CHAR_CODE('hndl')
 ResourceDataHandlerSubType = FOUR_CHAR_CODE('rsrc')
 URLDataHandlerSubType = FOUR_CHAR_CODE('url ')
+WiredActionHandlerType = FOUR_CHAR_CODE('wire')
 VisualMediaCharacteristic = FOUR_CHAR_CODE('eyes')
 AudioMediaCharacteristic = FOUR_CHAR_CODE('ears')
 kCharacteristicCanSendVideo = FOUR_CHAR_CODE('vsnd')
 kCharacteristicProvidesActions = FOUR_CHAR_CODE('actn')
 kCharacteristicNonLinear = FOUR_CHAR_CODE('nonl')
+kCharacteristicCanStep = FOUR_CHAR_CODE('step')
+kCharacteristicHasNoDuration = FOUR_CHAR_CODE('noti')
 kUserDataMovieControllerType = FOUR_CHAR_CODE('ctyp')
 kUserDataName = FOUR_CHAR_CODE('name')
-kUserDataTextFullName = FOUR_CHAR_CODE('©nam')
+kUserDataTextAuthor = FOUR_CHAR_CODE('©aut')
+kUserDataTextComment = FOUR_CHAR_CODE('©cmt')
 kUserDataTextCopyright = FOUR_CHAR_CODE('©cpy')
+kUserDataTextCreationDate = FOUR_CHAR_CODE('©day')
+kUserDataTextDescription = FOUR_CHAR_CODE('©des')
+kUserDataTextDirector = FOUR_CHAR_CODE('©dir')
+kUserDataTextDisclaimer = FOUR_CHAR_CODE('©dis')
+kUserDataTextFullName = FOUR_CHAR_CODE('©nam')
+kUserDataTextHostComputer = FOUR_CHAR_CODE('©hst')
 kUserDataTextInformation = FOUR_CHAR_CODE('©inf')
+kUserDataTextKeywords = FOUR_CHAR_CODE('©key')
+kUserDataTextMake = FOUR_CHAR_CODE('©mak')
+kUserDataTextModel = FOUR_CHAR_CODE('©mod')
+kUserDataTextOriginalFormat = FOUR_CHAR_CODE('©fmt')
+kUserDataTextOriginalSource = FOUR_CHAR_CODE('©src')
+kUserDataTextPerformers = FOUR_CHAR_CODE('©prf')
+kUserDataTextProducer = FOUR_CHAR_CODE('©prd')
+kUserDataTextProduct = FOUR_CHAR_CODE('©PRD')
+kUserDataTextSoftware = FOUR_CHAR_CODE('©swr')
+kUserDataTextSpecialPlaybackRequirements = FOUR_CHAR_CODE('©req')
+kUserDataTextWarning = FOUR_CHAR_CODE('©wrn')
+kUserDataTextWriter = FOUR_CHAR_CODE('©wrt')
+kUserDataTextEditDate1 = FOUR_CHAR_CODE('©ed1')
+kUserDataTextChapter = FOUR_CHAR_CODE('©chp')
+kUserDataUnicodeBit = 1L << 7
 DoTheRightThing = 0
 kMusicFlagDontPlay2Soft = 1L << 0
 kMusicFlagDontSlaveToMovie = 1L << 1
@@ -54,11 +82,25 @@ dfDropShadow = 1 << 12
 dfAntiAlias = 1 << 13
 dfKeyedText = 1 << 14
 dfInverseHilite = 1 << 15
-dfTextColorHilite = 1 << 16
+dfTextColorHilite = 1 << 16                       
 searchTextDontGoToFoundTime = 1L << 16
 searchTextDontHiliteFoundText = 1L << 17
 searchTextOneTrackOnly = 1L << 18
 searchTextEnabledTracksOnly = 1L << 19
+kTextTextHandle = 1
+kTextTextPtr = 2
+kTextTEStyle = 3
+kTextSetSelection = 4
+kTextBackColor = 5
+kTextForeColor = 6
+kTextFace = 7
+kTextFont = 8
+kTextSize = 9
+kTextAlignment = 10
+kTextHilite = 11
+kTextDropShadow = 12
+kTextDisplayFlags = 13
+kTextScroll = 14
 k3DMediaRendererEntry = FOUR_CHAR_CODE('rend')
 k3DMediaRendererName = FOUR_CHAR_CODE('name')
 k3DMediaRendererCode = FOUR_CHAR_CODE('rcod')
@@ -95,12 +137,15 @@ kActionMovieSetSelectionByName = 1034
 kActionMoviePlaySelection = 1035
 kActionMovieSetLanguage = 1036
 kActionMovieChanged = 1037
+kActionMovieRestartAtTime = 1038
 kActionTrackSetVolume = 2048
 kActionTrackSetBalance = 2049
 kActionTrackSetEnabled = 2050
 kActionTrackSetMatrix = 2051
 kActionTrackSetLayer = 2052
 kActionTrackSetClip = 2053
+kActionTrackSetCursor = 2054
+kActionTrackSetGraphicsMode = 2055
 kActionSpriteSetMatrix = 3072
 kActionSpriteSetImageIndex = 3073
 kActionSpriteSetVisible = 3074
@@ -128,10 +173,55 @@ kActionPushCurrentTime = 6149
 kActionPushCurrentTimeWithLabel = 6150
 kActionPopAndGotoTopTime = 6151
 kActionPopAndGotoLabeledTime = 6152
+kActionStatusString = 6153
+kActionSendQTEventToTrackObject = 6154
+kActionAddChannelSubscription = 6155
+kActionRemoveChannelSubscription = 6156
+kActionOpenCustomActionHandler = 6157
+kActionDoScript = 6158
 kActionSpriteTrackSetVariable = 7168
+kActionSpriteTrackNewSprite = 7169
+kActionSpriteTrackDisposeSprite = 7170
+kActionSpriteTrackSetVariableToString = 7171
+kActionSpriteTrackConcatVariables = 7172
+kActionSpriteTrackSetVariableToMovieURL = 7173
+kActionSpriteTrackSetVariableToMovieBaseURL = 7174
 kActionApplicationNumberAndString = 8192
+kActionQD3DNamedObjectTranslateTo = 9216
+kActionQD3DNamedObjectScaleTo = 9217
+kActionQD3DNamedObjectRotateTo = 9218
+kActionFlashTrackSetPan = 10240
+kActionFlashTrackSetZoom = 10241
+kActionFlashTrackSetZoomRect = 10242
+kActionFlashTrackGotoFrameNumber = 10243
+kActionFlashTrackGotoFrameLabel = 10244
+kActionMovieTrackAddChildMovie = 11264
+kActionMovieTrackLoadChildMovie = 11265                     
 kOperandExpression = 1
 kOperandConstant = 2
+kOperandSubscribedToChannel = 3
+kOperandUniqueCustomActionHandlerID = 4
+kOperandCustomActionHandlerIDIsOpen = 5
+kOperandConnectionSpeed = 6
+kOperandGMTDay = 7
+kOperandGMTMonth = 8
+kOperandGMTYear = 9
+kOperandGMTHours = 10
+kOperandGMTMinutes = 11
+kOperandGMTSeconds = 12
+kOperandLocalDay = 13
+kOperandLocalMonth = 14
+kOperandLocalYear = 15
+kOperandLocalHours = 16
+kOperandLocalMinutes = 17
+kOperandLocalSeconds = 18
+kOperandRegisteredForQuickTimePro = 19
+kOperandPlatformRunningOn = 20
+kOperandQuickTimeVersion = 21
+kOperandComponentVersion = 22
+kOperandOriginalHandlerRefcon = 23
+kOperandTicks = 24
+kOperandMaxLoadedTimeInMovie = 25
 kOperandMovieVolume = 1024
 kOperandMovieRate = 1025
 kOperandMovieIsLooping = 1026
@@ -172,11 +262,11 @@ kOperandQTVRNodeID = 4099
 kOperandMouseLocalHLoc = 5120
 kOperandMouseLocalVLoc = 5121
 kOperandKeyIsDown = 5122
-kOperandRandom = 5123
+kOperandRandom = 5123                          
 kFirstMovieAction = kActionMovieSetVolume
-kLastMovieAction = kActionMovieChanged
+kLastMovieAction = kActionMovieRestartAtTime
 kFirstTrackAction = kActionTrackSetVolume
-kLastTrackAction = kActionTrackSetClip
+kLastTrackAction = kActionTrackSetGraphicsMode
 kFirstSpriteAction = kActionSpriteSetMatrix
 kLastSpriteAction = kActionSpriteStretch
 kFirstQTVRAction = kActionQTVRSetPanAngle
@@ -184,14 +274,29 @@ kLastQTVRAction = kActionQTVRGoToNodeID
 kFirstMusicAction = kActionMusicPlayNote
 kLastMusicAction = kActionMusicSetController
 kFirstSystemAction = kActionCase
-kLastSystemAction = kActionPopAndGotoLabeledTime
+kLastSystemAction = kActionDoScript
 kFirstSpriteTrackAction = kActionSpriteTrackSetVariable
-kLastSpriteTrackAction = kActionSpriteTrackSetVariable
+kLastSpriteTrackAction = kActionSpriteTrackSetVariableToMovieBaseURL
 kFirstApplicationAction = kActionApplicationNumberAndString
 kLastApplicationAction = kActionApplicationNumberAndString
+kFirstQD3DNamedObjectAction = kActionQD3DNamedObjectTranslateTo
+kLastQD3DNamedObjectAction = kActionQD3DNamedObjectRotateTo
+kFirstFlashTrackAction = kActionFlashTrackSetPan
+kLastFlashTrackAction = kActionFlashTrackGotoFrameLabel
+kFirstMovieTrackAction = kActionMovieTrackAddChildMovie
+kLastMovieTrackAction = kActionMovieTrackLoadChildMovie
 kFirstAction = kFirstMovieAction
-kLastAction = kActionApplicationNumberAndString
+kLastAction = kActionMovieTrackLoadChildMovie
 kTargetMovie = FOUR_CHAR_CODE('moov')
+kTargetMovieName = FOUR_CHAR_CODE('mona')
+kTargetMovieID = FOUR_CHAR_CODE('moid')
+kTargetRootMovie = FOUR_CHAR_CODE('moro')
+kTargetParentMovie = FOUR_CHAR_CODE('mopa')
+kTargetChildMovieTrackName = FOUR_CHAR_CODE('motn')
+kTargetChildMovieTrackID = FOUR_CHAR_CODE('moti')
+kTargetChildMovieTrackIndex = FOUR_CHAR_CODE('motx')
+kTargetChildMovieMovieName = FOUR_CHAR_CODE('momn')
+kTargetChildMovieMovieID = FOUR_CHAR_CODE('momi')
 kTargetTrackName = FOUR_CHAR_CODE('trna')
 kTargetTrackID = FOUR_CHAR_CODE('trid')
 kTargetTrackType = FOUR_CHAR_CODE('trty')
@@ -199,6 +304,7 @@ kTargetTrackIndex = FOUR_CHAR_CODE('trin')
 kTargetSpriteName = FOUR_CHAR_CODE('spna')
 kTargetSpriteID = FOUR_CHAR_CODE('spid')
 kTargetSpriteIndex = FOUR_CHAR_CODE('spin')
+kTargetQD3DNamedObjectName = FOUR_CHAR_CODE('nana')        
 kQTEventType = FOUR_CHAR_CODE('evnt')
 kAction = FOUR_CHAR_CODE('actn')
 kWhichAction = FOUR_CHAR_CODE('whic')
@@ -213,17 +319,36 @@ kConditionalAtomType = FOUR_CHAR_CODE('test')
 kOperatorAtomType = FOUR_CHAR_CODE('oper')
 kOperandAtomType = FOUR_CHAR_CODE('oprn')
 kCommentAtomType = FOUR_CHAR_CODE('why ')
+kCustomActionHandler = FOUR_CHAR_CODE('cust')
+kCustomHandlerID = FOUR_CHAR_CODE('id  ')
+kCustomHandlerDesc = FOUR_CHAR_CODE('desc')
+kQTEventRecordAtomType = FOUR_CHAR_CODE('erec')
 kQTEventMouseClick = FOUR_CHAR_CODE('clik')
 kQTEventMouseClickEnd = FOUR_CHAR_CODE('cend')
 kQTEventMouseClickEndTriggerButton = FOUR_CHAR_CODE('trig')
 kQTEventMouseEnter = FOUR_CHAR_CODE('entr')
 kQTEventMouseExit = FOUR_CHAR_CODE('exit')
+kQTEventMouseMoved = FOUR_CHAR_CODE('move')
 kQTEventFrameLoaded = FOUR_CHAR_CODE('fram')
 kQTEventIdle = FOUR_CHAR_CODE('idle')
+kQTEventKey = FOUR_CHAR_CODE('key ')
+kQTEventMovieLoaded = FOUR_CHAR_CODE('load')
 kQTEventRequestToModifyMovie = FOUR_CHAR_CODE('reqm')
 kActionFlagActionIsDelta = 1L << 1
 kActionFlagParameterWrapsAround = 1L << 2
 kActionFlagActionIsToggle = 1L << 3
+kStatusStringIsURLLink = 1L << 1
+kStatusStringIsStreamingStatus = 1L << 2
+kStatusHasCodeNumber = 1L << 3
+kStatusIsError = 1L << 4
+kScriptIsUnknownType = 1L << 0
+kScriptIsJavaScript = 1L << 1
+kScriptIsLingoEvent = 1L << 2
+kScriptIsVBEvent = 1L << 3
+kScriptIsProjectorCommand = 1L << 4
+kQTRegistrationDialogTimeOutFlag = 1 << 0
+kQTRegistrationDialogShowDialog = 1 << 1
+kQTRegistrationDialogForceDialog = 1 << 2
 kOperatorAdd = FOUR_CHAR_CODE('add ')
 kOperatorSubtract = FOUR_CHAR_CODE('sub ')
 kOperatorMultiply = FOUR_CHAR_CODE('mult')
@@ -241,6 +366,8 @@ kOperatorModulo = FOUR_CHAR_CODE('mod ')
 kOperatorIntegerDivide = FOUR_CHAR_CODE('idiv')
 kOperatorAbsoluteValue = FOUR_CHAR_CODE('abs ')
 kOperatorNegate = FOUR_CHAR_CODE('neg ')
+kPlatformMacintosh = 1
+kPlatformWindows = 2
 kMediaPropertyNonLinearAtomType = FOUR_CHAR_CODE('nonl')
 kMediaPropertyHasActions = 105
 loopTimeBase = 1
@@ -264,26 +391,30 @@ callBackAtTime = 1
 callBackAtRate = 2
 callBackAtTimeJump = 3
 callBackAtExtremes = 4
+callBackAtTimeBaseDisposed = 5
 callBackAtInterrupt = 0x8000
 callBackAtDeferredTask = 0x4000
 qtcbNeedsRateChanges = 1
 qtcbNeedsTimeChanges = 2
-qtcbNeedsStartStopChanges = 4
+qtcbNeedsStartStopChanges = 4                             
 keepInRam = 1 << 0
 unkeepInRam = 1 << 1
 flushFromRam = 1 << 2
 loadForwardTrackEdits = 1 << 3
-loadBackwardTrackEdits = 1 << 4
+loadBackwardTrackEdits = 1 << 4                        
 newMovieActive = 1 << 0
 newMovieDontResolveDataRefs = 1 << 1
 newMovieDontAskUnresolvedDataRefs = 1 << 2
 newMovieDontAutoAlternates = 1 << 3
 newMovieDontUpdateForeBackPointers = 1 << 4
+newMovieDontAutoUpdateClock = 1 << 5
+newMovieAsyncOK = 1 << 8
+newMovieIdleImportOK = 1 << 10
 trackUsageInMovie = 1 << 1
 trackUsageInPreview = 1 << 2
 trackUsageInPoster = 1 << 3
 mediaSampleNotSync = 1 << 0
-mediaSampleShadowSync = 1 << 1
+mediaSampleShadowSync = 1 << 1                        
 pasteInParallel = 1 << 0
 showUserSettingsDialog = 1 << 1
 movieToFileOnlyExport = 1 << 2
@@ -305,16 +436,17 @@ flattenDontInterleaveFlatten = 1L << 3
 flattenFSSpecPtrIsDataRefRecordPtr = 1L << 4
 flattenCompressMovieResource = 1L << 5
 flattenForceMovieResourceBeforeMovieData = 1L << 6
-movieInDataForkResID = -1
+movieInDataForkResID = -1                            
 mcTopLeftMovie = 1 << 0
 mcScaleMovieToFit = 1 << 1
 mcWithBadge = 1 << 2
 mcNotVisible = 1 << 3
-mcWithFrame = 1 << 4
+mcWithFrame = 1 << 4                        
 movieScrapDontZeroScrap = 1 << 0
 movieScrapOnlyPutMovie = 1 << 1
 dataRefSelfReference = 1 << 0
 dataRefWasNotResolved = 1 << 1
+kMovieAnchorDataRefIsDefault = 1 << 0                       
 hintsScrubMode = 1 << 0
 hintsLoop = 1 << 1
 hintsDontPurge = 1 << 2
@@ -327,6 +459,11 @@ hintsInactive = 1 << 11
 hintsOffscreen = 1 << 12
 hintsDontDraw = 1 << 13
 hintsAllowBlacklining = 1 << 14
+hintsDontUseVideoOverlaySurface = 1 << 16
+hintsIgnoreBandwidthRestrictions = 1 << 17
+hintsPlayingEveryFrame = 1 << 18
+hintsAllowDynamicResize = 1 << 19
+hintsSingleField = 1 << 20
 mediaHandlerFlagBaseClient = 1
 movieTrackMediaType = 1 << 0
 movieTrackCharacteristic = 1 << 1
@@ -336,12 +473,18 @@ movieDrawingCallAlways = 1
 kGetMovieImporterValidateToFind = 1L << 0
 kGetMovieImporterAllowNewFile = 1L << 1
 kGetMovieImporterDontConsiderGraphicsImporters = 1L << 2
+kGetMovieImporterDontConsiderFileOnlyImporters = 1L << 6
+kMovieLoadStateError = -1L
+kMovieLoadStateLoading = 1000
+kMovieLoadStatePlayable = 10000
+kMovieLoadStateComplete = 100000L
 preloadAlways = 1L << 0
 preloadOnlyIfEnabled = 1L << 1
 fullScreenHideCursor = 1L << 0
 fullScreenAllowEvents = 1L << 1
 fullScreenDontChangeMenuBar = 1L << 2
 fullScreenPreflightSize = 1L << 3
+movieExecuteWiredActionDontExecute = 1L << 0
 kBackgroundSpriteLayerNum = 32767
 kSpritePropertyMatrix = 1
 kSpritePropertyImageDescription = 2
@@ -350,6 +493,7 @@ kSpritePropertyVisible = 4
 kSpritePropertyLayer = 5
 kSpritePropertyGraphicsMode = 6
 kSpritePropertyImageDataSize = 7
+kSpritePropertyActionHandlingSpriteID = 8
 kSpritePropertyImageIndex = 100
 kSpriteTrackPropertyBackgroundColor = 101
 kSpriteTrackPropertyOffscreenBitDepth = 102
@@ -374,7 +518,7 @@ kSpriteWorldInvisible = 1L << 4
 kParentAtomIsContainer = 0
 kEffectNameAtom = FOUR_CHAR_CODE('name')
 kEffectTypeAtom = FOUR_CHAR_CODE('type')
-kEffectManufacturerAtom = FOUR_CHAR_CODE('manu')
+kEffectManufacturerAtom = FOUR_CHAR_CODE('manu')        
 pdActionConfirmDialog = 1
 pdActionSetAppleMenu = 2
 pdActionSetEditMenu = 3
@@ -387,17 +531,41 @@ pdActionGetSubPanelMenu = 9
 pdActionActivateSubPanel = 10
 pdActionConductStopAlert = 11
 pdActionModelessCallback = 12
-elOptionsIncludeNoneInList = 0x00000001
+pdActionFetchPreview = 13                            
+elOptionsIncludeNoneInList = 0x00000001                    
 pdOptionsCollectOneValue = 0x00000001
 pdOptionsAllowOptionalInterpolations = 0x00000002
-pdOptionsModalDialogBox = 0x00000004
-effectIsRealtime = 0
+pdOptionsModalDialogBox = 0x00000004                    
+effectIsRealtime = 0                             
 kAccessKeyAtomType = FOUR_CHAR_CODE('acky')
 kAccessKeySystemFlag = 1L << 0
+ConnectionSpeedPrefsType = FOUR_CHAR_CODE('cspd')
+BandwidthManagementPrefsType = FOUR_CHAR_CODE('bwmg')
+kQTIdlePriority = 10
+kQTNonRealTimePriority = 20
+kQTRealTimeSharedPriority = 25
+kQTRealTimePriority = 30
+kQTBandwidthNotifyNeedToStop = 1L << 0
+kQTBandwidthNotifyGoodToGo = 1L << 1
+kQTBandwidthChangeRequest = 1L << 2
+kQTBandwidthQueueRequest = 1L << 3
+kQTBandwidthScheduledRequest = 1L << 4
+kQTBandwidthVoluntaryRelease = 1L << 5
 kITextRemoveEverythingBut = 0 << 1
 kITextRemoveLeaveSuggestedAlternate = 1 << 1
 kITextAtomType = FOUR_CHAR_CODE('itxt')
 kITextStringAtomType = FOUR_CHAR_CODE('text')
+kQTParseTextHREFText = FOUR_CHAR_CODE('text')
+kQTParseTextHREFBaseURL = FOUR_CHAR_CODE('burl')
+kQTParseTextHREFClickPoint = FOUR_CHAR_CODE('clik')
+kQTParseTextHREFUseAltDelim = FOUR_CHAR_CODE('altd')
+kQTParseTextHREFDelimiter = FOUR_CHAR_CODE('delm')
+kQTParseTextHREFRecomposeHREF = FOUR_CHAR_CODE('rhrf')      
+kQTParseTextHREFURL = FOUR_CHAR_CODE('url ')
+kQTParseTextHREFTarget = FOUR_CHAR_CODE('targ')
+kQTParseTextHREFIsAutoHREF = FOUR_CHAR_CODE('auto')
+kQTParseTextHREFIsServerMap = FOUR_CHAR_CODE('smap')
+kQTParseTextHREFHREF = FOUR_CHAR_CODE('href')        
 kTrackReferenceChapterList = FOUR_CHAR_CODE('chap')
 kTrackReferenceTimeCode = FOUR_CHAR_CODE('tmcd')
 kTrackReferenceModifier = FOUR_CHAR_CODE('ssrc')
@@ -421,6 +589,7 @@ kTrackModifierSoundLocalizationData = 10
 kTrackModifierObjectImageIndex = 11
 kTrackModifierObjectLayer = 12
 kTrackModifierObjectVisible = 13
+kTrackModifierAngleAspectCamera = 14
 kTrackModifierPanAngle = FOUR_CHAR_CODE('pan ')
 kTrackModifierTiltAngle = FOUR_CHAR_CODE('tilt')
 kTrackModifierVerticalFieldOfViewAngle = FOUR_CHAR_CODE('fov ')
@@ -446,6 +615,7 @@ kTweenType3dRotateAboutVector = FOUR_CHAR_CODE('3rvc')
 kTweenType3dQuaternion = FOUR_CHAR_CODE('3qua')
 kTweenType3dMatrix = FOUR_CHAR_CODE('3mat')
 kTweenType3dCameraData = FOUR_CHAR_CODE('3cam')
+kTweenType3dAngleAspectCameraData = FOUR_CHAR_CODE('3caa')
 kTweenType3dSoundLocalizationData = FOUR_CHAR_CODE('3slc')
 kTweenTypePathToMatrixTranslation = FOUR_CHAR_CODE('gxmt')
 kTweenTypePathToMatrixRotation = FOUR_CHAR_CODE('gxpr')
@@ -478,47 +648,78 @@ kNameAtom = FOUR_CHAR_CODE('name')
 kInitialRotationAtom = FOUR_CHAR_CODE('inro')
 kNonLinearTweenHeader = FOUR_CHAR_CODE('nlth')
 kTweenReturnDelta = 1L << 0
-pathTooLongErr = -2110
-emptyPathErr = -2111
-noPathMappingErr = -2112
-pathNotVerifiedErr = -2113
-unknownFormatErr = -2114
-wackBadFileErr = -2115
-wackForkNotFoundErr = -2116
-wackBadMetaDataErr = -2117
-qfcbNotFoundErr = -2118
-qfcbNotCreatedErr = -2119
-AAPNotCreatedErr = -2120
-AAPNotFoundErr = -2121
-ASDBadHeaderErr = -2122
-ASDBadForkErr = -2123
-ASDEntryNotFoundErr = -2124
 videoFlagDontLeanAhead = 1L << 0
 txtProcDefaultDisplay = 0
 txtProcDontDisplay = 1
-txtProcDoDisplay = 2
+txtProcDoDisplay = 2                             
 findTextEdgeOK = 1 << 0
 findTextCaseSensitive = 1 << 1
 findTextReverseSearch = 1 << 2
 findTextWrapAround = 1 << 3
-findTextUseOffset = 1 << 4
+findTextUseOffset = 1 << 4                        
 dropShadowOffsetType = FOUR_CHAR_CODE('drpo')
 dropShadowTranslucencyType = FOUR_CHAR_CODE('drpt')
 spriteHitTestBounds = 1L << 0
 spriteHitTestImage = 1L << 1
 spriteHitTestInvisibleSprites = 1L << 2
 spriteHitTestIsClick = 1L << 3
-spriteHitTestLocInDisplayCoordinates = 1L << 4
+spriteHitTestLocInDisplayCoordinates = 1L << 4              
 kSpriteAtomType = FOUR_CHAR_CODE('sprt')
 kSpriteImagesContainerAtomType = FOUR_CHAR_CODE('imct')
 kSpriteImageAtomType = FOUR_CHAR_CODE('imag')
 kSpriteImageDataAtomType = FOUR_CHAR_CODE('imda')
+kSpriteImageDataRefAtomType = FOUR_CHAR_CODE('imre')
+kSpriteImageDataRefTypeAtomType = FOUR_CHAR_CODE('imrt')
 kSpriteImageGroupIDAtomType = FOUR_CHAR_CODE('imgr')
 kSpriteImageRegistrationAtomType = FOUR_CHAR_CODE('imrg')
+kSpriteImageDefaultImageIndexAtomType = FOUR_CHAR_CODE('defi')
 kSpriteSharedDataAtomType = FOUR_CHAR_CODE('dflt')
 kSpriteNameAtomType = FOUR_CHAR_CODE('name')
 kSpriteImageNameAtomType = FOUR_CHAR_CODE('name')
 kSpriteUsesImageIDsAtomType = FOUR_CHAR_CODE('uses')
+kSpriteBehaviorsAtomType = FOUR_CHAR_CODE('beha')
+kSpriteImageBehaviorAtomType = FOUR_CHAR_CODE('imag')
+kSpriteCursorBehaviorAtomType = FOUR_CHAR_CODE('crsr')
+kSpriteStatusStringsBehaviorAtomType = FOUR_CHAR_CODE('sstr')
+kSpriteVariablesContainerAtomType = FOUR_CHAR_CODE('vars')
+kSpriteStringVariableAtomType = FOUR_CHAR_CODE('strv')
+kSpriteFloatingPointVariableAtomType = FOUR_CHAR_CODE('flov')
+kMovieMediaDataReference = FOUR_CHAR_CODE('mmdr')
+kMovieMediaDefaultDataReferenceID = FOUR_CHAR_CODE('ddri')
+kMovieMediaSlaveTime = FOUR_CHAR_CODE('slti')
+kMovieMediaSlaveAudio = FOUR_CHAR_CODE('slau')
+kMovieMediaSlaveGraphicsMode = FOUR_CHAR_CODE('slgr')
+kMovieMediaAutoPlay = FOUR_CHAR_CODE('play')
+kMovieMediaLoop = FOUR_CHAR_CODE('loop')
+kMovieMediaUseMIMEType = FOUR_CHAR_CODE('mime')
+kMovieMediaTitle = FOUR_CHAR_CODE('titl')
+kMovieMediaAltText = FOUR_CHAR_CODE('altt')
+kMovieMediaClipBegin = FOUR_CHAR_CODE('clpb')
+kMovieMediaClipDuration = FOUR_CHAR_CODE('clpd')
+kMovieMediaRegionAtom = FOUR_CHAR_CODE('regi')
+kMovieMediaSlaveTrackDuration = FOUR_CHAR_CODE('sltr')
+kMovieMediaEnableFrameStepping = FOUR_CHAR_CODE('enfs')
+kMovieMediaBackgroundColor = FOUR_CHAR_CODE('bkcl')        
+kMovieMediaFitNone = 0
+kMovieMediaFitScroll = FOUR_CHAR_CODE('scro')
+kMovieMediaFitClipIfNecessary = FOUR_CHAR_CODE('hidd')
+kMovieMediaFitFill = FOUR_CHAR_CODE('fill')
+kMovieMediaFitMeet = FOUR_CHAR_CODE('meet')
+kMovieMediaFitSlice = FOUR_CHAR_CODE('slic')
+kMovieMediaSpatialAdjustment = FOUR_CHAR_CODE('fit ')
+kMovieMediaRectangleAtom = FOUR_CHAR_CODE('rect')
+kMovieMediaTop = FOUR_CHAR_CODE('top ')
+kMovieMediaLeft = FOUR_CHAR_CODE('left')
+kMovieMediaWidth = FOUR_CHAR_CODE('wd  ')
+kMovieMediaHeight = FOUR_CHAR_CODE('ht  ')
+kMoviePropertyDuration = FOUR_CHAR_CODE('dura')
+kMoviePropertyTimeScale = FOUR_CHAR_CODE('tims')
+kMoviePropertyTime = FOUR_CHAR_CODE('timv')
+kMoviePropertyNaturalBounds = FOUR_CHAR_CODE('natb')
+kMoviePropertyMatrix = FOUR_CHAR_CODE('mtrx')
+kMoviePropertyTrackList = FOUR_CHAR_CODE('tlst')        
+kTrackPropertyMediaType = FOUR_CHAR_CODE('mtyp')
+kTrackPropertyInstantiation = FOUR_CHAR_CODE('inst')        
 MovieControllerComponentType = FOUR_CHAR_CODE('play')
 kMovieControllerQTVRFlag = 1 << 0
 kMovieControllerDontDisplayToUser = 1 << 1
@@ -578,6 +779,19 @@ mcActionAdjustCursor = 65
 mcActionUseTrackForTimeTable = 66
 mcActionClickAndHoldPoint = 67
 mcActionShowMessageString = 68
+mcActionShowStatusString = 69
+mcActionGetExternalMovie = 70
+mcActionGetChapterTime = 71
+mcActionPerformActionList = 72
+mcActionEvaluateExpression = 73
+mcActionFetchParameterAs = 74
+mcActionGetCursorByID = 75
+mcActionGetNextURL = 76
+mcActionMovieChanged = 77
+mcActionDoScript = 78
+mcActionRestartAtTime = 79
+mcActionGetIndChapter = 80
+mcActionLinkToURLExtended = 81                            
 mcFlagSuppressMovieFrame = 1 << 0
 mcFlagSuppressStepButtons = 1 << 1
 mcFlagSuppressSpeakerButton = 1 << 2
@@ -613,13 +827,43 @@ mcMenuCut = 3
 mcMenuCopy = 4
 mcMenuPaste = 5
 mcMenuClear = 6
+kFetchAsBooleanPtr = 1
+kFetchAsShortPtr = 2
+kFetchAsLongPtr = 3
+kFetchAsMatrixRecordPtr = 4
+kFetchAsModifierTrackGraphicsModeRecord = 5
+kFetchAsHandle = 6
+kFetchAsStr255 = 7
+kFetchAsFloatPtr = 8
+kFetchAsPointPtr = 9
+kFetchAsNewAtomContainer = 10
+kFetchAsQTEventRecordPtr = 11
+kFetchAsFixedPtr = 12
+kFetchAsSetControllerValuePtr = 13
+kFetchAsRgnHandle = 14
+kFetchAsComponentDescriptionPtr = 15
+kFetchAsCString = 16
+kQTCursorOpenHand = -19183
+kQTCursorClosedHand = -19182
+kQTCursorPointingHand = -19181
+kQTCursorRightArrow = -19180
+kQTCursorLeftArrow = -19179
+kQTCursorDownArrow = -19178
+kQTCursorUpArrow = -19177
+kQTCursorIBeam = -19176
 kVideoMediaResetStatisticsSelect = 0x0105
 kVideoMediaGetStatisticsSelect = 0x0106
 kVideoMediaGetStallCountSelect = 0x010E
+kVideoMediaSetCodecParameterSelect = 0x010F
+kVideoMediaGetCodecParameterSelect = 0x0110
 kTextMediaSetTextProcSelect = 0x0101
 kTextMediaAddTextSampleSelect = 0x0102
 kTextMediaAddTESampleSelect = 0x0103
 kTextMediaAddHiliteSampleSelect = 0x0104
+kTextMediaDrawRawSelect = 0x0109
+kTextMediaSetTextPropertySelect = 0x010A
+kTextMediaRawSetupSelect = 0x010B
+kTextMediaRawIdleSelect = 0x010C
 kTextMediaFindNextTextSelect = 0x0105
 kTextMediaHiliteTextSampleSelect = 0x0106
 kTextMediaSetTextSampleDataSelect = 0x0107
@@ -642,8 +886,39 @@ kSpriteMediaGetSpriteActionsForQTEventSelect = 0x0110
 kSpriteMediaSetActionVariableSelect = 0x0111
 kSpriteMediaGetActionVariableSelect = 0x0112
 kSpriteMediaGetIndImagePropertySelect = 0x0113
+kSpriteMediaNewSpriteSelect = 0x0114
+kSpriteMediaDisposeSpriteSelect = 0x0115
+kSpriteMediaSetActionVariableToStringSelect = 0x0116
+kSpriteMediaGetActionVariableAsStringSelect = 0x0117
+kFlashMediaSetPanSelect = 0x0101
+kFlashMediaSetZoomSelect = 0x0102
+kFlashMediaSetZoomRectSelect = 0x0103
+kFlashMediaGetRefConBoundsSelect = 0x0104
+kFlashMediaGetRefConIDSelect = 0x0105
+kFlashMediaIDToRefConSelect = 0x0106
+kFlashMediaGetDisplayedFrameNumberSelect = 0x0107
+kFlashMediaFrameNumberToMovieTimeSelect = 0x0108
+kFlashMediaFrameLabelToMovieTimeSelect = 0x0109
+kMovieMediaGetChildDoMCActionCallbackSelect = 0x0102
+kMovieMediaGetDoMCActionCallbackSelect = 0x0103
+kMovieMediaGetCurrentMoviePropertySelect = 0x0104
+kMovieMediaGetCurrentTrackPropertySelect = 0x0105
+kMovieMediaGetChildMovieDataReferenceSelect = 0x0106
+kMovieMediaSetChildMovieDataReferenceSelect = 0x0107
+kMovieMediaLoadChildMovieFromDataReferenceSelect = 0x0108
 kMedia3DGetNamedObjectListSelect = 0x0101
 kMedia3DGetRendererListSelect = 0x0102
+kMedia3DGetCurrentGroupSelect = 0x0103
+kMedia3DTranslateNamedObjectToSelect = 0x0104
+kMedia3DScaleNamedObjectToSelect = 0x0105
+kMedia3DRotateNamedObjectToSelect = 0x0106
+kMedia3DSetCameraDataSelect = 0x0107
+kMedia3DGetCameraDataSelect = 0x0108
+kMedia3DSetCameraAngleAspectSelect = 0x0109
+kMedia3DGetCameraAngleAspectSelect = 0x010A
+kMedia3DSetCameraRangeSelect = 0x010D
+kMedia3DGetCameraRangeSelect = 0x010E
+kMedia3DGetViewObjectSelect = 0x010F
 kMCSetMovieSelect = 0x0002
 kMCGetIndMovieSelect = 0x0005
 kMCRemoveAllMoviesSelect = 0x0006
@@ -690,4 +965,5 @@ kMCPtInControllerSelect = 0x002E
 kMCInvalidateSelect = 0x002F
 kMCAdjustCursorSelect = 0x0030
 kMCGetInterfaceElementSelect = 0x0031
+kMCGetDoActionsProcSelect = 0x0032
 kMusicMediaGetIndexedTunePlayerSelect = 0x0101
diff --git a/Mac/Lib/lib-toolbox/Resources.py b/Mac/Lib/lib-toolbox/Resources.py
index 922fe71..ccbe773 100644
--- a/Mac/Lib/lib-toolbox/Resources.py
+++ b/Mac/Lib/lib-toolbox/Resources.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Resources.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Resources.h'
 
 resSysHeap = 64
 resPurgeable = 32
@@ -8,7 +8,7 @@ resPreload = 4
 resChanged = 2
 mapReadOnly = 128
 mapCompact = 64
-mapChanged = 32
+mapChanged = 32                            
 resSysRefBit = 7
 resSysHeapBit = 6
 resPurgeableBit = 5
@@ -18,6 +18,10 @@ resPreloadBit = 2
 resChangedBit = 1
 mapReadOnlyBit = 7
 mapCompactBit = 6
-mapChangedBit = 5
+mapChangedBit = 5                             
 kResFileNotOpened = -1
-kSystemResFile = 0
+kSystemResFile = 0                             
+kRsrcChainBelowSystemMap = 0
+kRsrcChainBelowApplicationMap = 1
+kRsrcChainAboveApplicationMap = 2
+kRsrcChainAboveAllMaps = 4                             
diff --git a/Mac/Lib/lib-toolbox/Sound.py b/Mac/Lib/lib-toolbox/Sound.py
index fed7e44..0bc8944 100644
--- a/Mac/Lib/lib-toolbox/Sound.py
+++ b/Mac/Lib/lib-toolbox/Sound.py
@@ -1,28 +1,31 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
 
 def FOUR_CHAR_CODE(x): return x
-soundListRsrc = FOUR_CHAR_CODE('snd ')
-kSimpleBeepID = 1
+soundListRsrc = FOUR_CHAR_CODE('snd ')        
+kSimpleBeepID = 1                             
 # rate48khz = (long)0xBB800000
 # rate44khz = (long)0xAC440000
+rate32khz = 0x7D000000
 rate22050hz = 0x56220000
 rate22khz = 0x56EE8BA3
+rate16khz = 0x3E800000
 rate11khz = 0x2B7745D1
 rate11025hz = 0x2B110000
+rate8khz = 0x1F400000                    
+sampledSynth = 5                             
 squareWaveSynth = 1
 waveTableSynth = 3
-sampledSynth = 5
 MACE3snthID = 11
 MACE6snthID = 13
-kMiddleC = 60
+kMiddleC = 60                            
 kNoVolume = 0
-kFullVolume = 0x0100
+kFullVolume = 0x0100                        
 stdQLength = 128
 dataOffsetFlag = 0x8000
-kUseOptionalOutputDevice = -1
+kUseOptionalOutputDevice = -1                            
 notCompressed = 0
 fixedCompression = -1
-variableCompression = -2
+variableCompression = -2                            
 twoToOne = 1
 eightToThree = 2
 threeToOne = 3
@@ -32,20 +35,18 @@ threeToOnePacketSize = 16
 stateBlockSize = 64
 leftOverBlockSize = 32
 firstSoundFormat = 0x0001
-secondSoundFormat = 0x0002
+secondSoundFormat = 0x0002                        
 dbBufferReady = 0x00000001
-dbLastBuffer = 0x00000004
+dbLastBuffer = 0x00000004                    
 sysBeepDisable = 0x0000
 sysBeepEnable = (1 << 0)
-sysBeepSynchronous = (1 << 1)
+sysBeepSynchronous = (1 << 1)                      
 unitTypeNoSelection = 0xFFFF
 unitTypeSeconds = 0x0000
 stdSH = 0x00
 extSH = 0xFF
-cmpSH = 0xFE
+cmpSH = 0xFE                          
 nullCmd = 0
-initCmd = 1
-freeCmd = 2
 quietCmd = 3
 flushCmd = 4
 reInitCmd = 5
@@ -56,6 +57,18 @@ callBackCmd = 13
 syncCmd = 14
 availableCmd = 24
 versionCmd = 25
+volumeCmd = 46
+getVolumeCmd = 47
+clockComponentCmd = 50
+getClockComponentCmd = 51
+scheduledSoundCmd = 52
+linkSoundComponentsCmd = 53
+soundCmd = 80
+bufferCmd = 81
+rateMultiplierCmd = 86
+getRateMultiplierCmd = 87
+initCmd = 1
+freeCmd = 2
 totalLoadCmd = 26
 loadCmd = 27
 freqDurationCmd = 40
@@ -64,24 +77,14 @@ freqCmd = 42
 ampCmd = 43
 timbreCmd = 44
 getAmpCmd = 45
-volumeCmd = 46
-getVolumeCmd = 47
-clockComponentCmd = 50
-getClockComponentCmd = 51
-scheduledSoundCmd = 52
-linkSoundComponentsCmd = 53
 waveTableCmd = 60
 phaseCmd = 61
-soundCmd = 80
-bufferCmd = 81
 rateCmd = 82
 continueCmd = 83
 doubleBufferCmd = 84
 getRateCmd = 85
-rateMultiplierCmd = 86
-getRateMultiplierCmd = 87
 sizeCmd = 90
-convertCmd = 91
+convertCmd = 91                            
 waveInitChannelMask = 0x07
 waveInitChannel0 = 0x04
 waveInitChannel1 = 0x05
@@ -90,7 +93,7 @@ waveInitChannel3 = 0x07
 initChan0 = waveInitChannel0
 initChan1 = waveInitChannel1
 initChan2 = waveInitChannel2
-initChan3 = waveInitChannel3
+initChan3 = waveInitChannel3              
 outsideCmpSH = 0
 insideCmpSH = 1
 aceSuccess = 0
@@ -99,7 +102,7 @@ aceNilBlock = 2
 aceBadComp = 3
 aceBadEncode = 4
 aceBadDest = 5
-aceBadCmd = 6
+aceBadCmd = 6                             
 initChanLeft = 0x0002
 initChanRight = 0x0003
 initNoInterp = 0x0004
@@ -111,7 +114,7 @@ initMACE6 = 0x0400
 initPanMask = 0x0003
 initSRateMask = 0x0030
 initStereoMask = 0x00C0
-initCompMask = 0xFF00
+initCompMask = 0xFF00                        
 siActiveChannels = FOUR_CHAR_CODE('chac')
 siActiveLevels = FOUR_CHAR_CODE('lmac')
 siAGCOnOff = FOUR_CHAR_CODE('agc ')
@@ -132,6 +135,11 @@ siDeviceBufferInfo = FOUR_CHAR_CODE('dbin')
 siDeviceConnected = FOUR_CHAR_CODE('dcon')
 siDeviceIcon = FOUR_CHAR_CODE('icon')
 siDeviceName = FOUR_CHAR_CODE('name')
+siEQSpectrumBands = FOUR_CHAR_CODE('eqsb')
+siEQSpectrumLevels = FOUR_CHAR_CODE('eqlv')
+siEQSpectrumOnOff = FOUR_CHAR_CODE('eqlo')
+siEQToneControlGain = FOUR_CHAR_CODE('eqtg')
+siEQToneControlOnOff = FOUR_CHAR_CODE('eqtc')
 siHardwareBalance = FOUR_CHAR_CODE('hbal')
 siHardwareBalanceSteps = FOUR_CHAR_CODE('hbls')
 siHardwareBass = FOUR_CHAR_CODE('hbas')
@@ -139,6 +147,7 @@ siHardwareBassSteps = FOUR_CHAR_CODE('hbst')
 siHardwareBusy = FOUR_CHAR_CODE('hwbs')
 siHardwareFormat = FOUR_CHAR_CODE('hwfm')
 siHardwareMute = FOUR_CHAR_CODE('hmut')
+siHardwareMuteNoPrefs = FOUR_CHAR_CODE('hmnp')
 siHardwareTreble = FOUR_CHAR_CODE('htrb')
 siHardwareTrebleSteps = FOUR_CHAR_CODE('hwts')
 siHardwareVolume = FOUR_CHAR_CODE('hvol')
@@ -158,6 +167,7 @@ siNumberChannels = FOUR_CHAR_CODE('chan')
 siOptionsDialog = FOUR_CHAR_CODE('optd')
 siOSTypeInputSource = FOUR_CHAR_CODE('inpt')
 siOSTypeInputAvailable = FOUR_CHAR_CODE('inav')
+siOutputDeviceName = FOUR_CHAR_CODE('onam')
 siPlayThruOnOff = FOUR_CHAR_CODE('plth')
 siPostMixerSoundComponent = FOUR_CHAR_CODE('psmx')
 siPreMixerSoundComponent = FOUR_CHAR_CODE('prmx')
@@ -185,10 +195,11 @@ siVolume = FOUR_CHAR_CODE('volu')
 siVoxRecordInfo = FOUR_CHAR_CODE('voxr')
 siVoxStopInfo = FOUR_CHAR_CODE('voxs')
 siWideStereo = FOUR_CHAR_CODE('wide')
+siSupportedExtendedFlags = FOUR_CHAR_CODE('exfl')        
 siCloseDriver = FOUR_CHAR_CODE('clos')
 siInitializeDriver = FOUR_CHAR_CODE('init')
 siPauseRecording = FOUR_CHAR_CODE('paus')
-siUserInterruptProc = FOUR_CHAR_CODE('user')
+siUserInterruptProc = FOUR_CHAR_CODE('user')        
 # kInvalidSource = (long)0xFFFFFFFF
 kNoSource = FOUR_CHAR_CODE('none')
 kCDSource = FOUR_CHAR_CODE('cd  ')
@@ -202,7 +213,7 @@ kMediaBaySource = FOUR_CHAR_CODE('mbay')
 kModemSource = FOUR_CHAR_CODE('modm')
 kPCCardSource = FOUR_CHAR_CODE('pcm ')
 kZoomVideoSource = FOUR_CHAR_CODE('zvpc')
-kDVDSource = FOUR_CHAR_CODE('dvda')
+kDVDSource = FOUR_CHAR_CODE('dvda')        
 kNoSoundComponentType = FOUR_CHAR_CODE('****')
 kSoundComponentType = FOUR_CHAR_CODE('sift')
 kSoundComponentPPCType = FOUR_CHAR_CODE('nift')
@@ -215,6 +226,7 @@ kMixer8SubType = FOUR_CHAR_CODE('mixb')
 kMixer16SubType = FOUR_CHAR_CODE('mixw')
 kSoundInputDeviceType = FOUR_CHAR_CODE('sinp')
 kWaveInSubType = FOUR_CHAR_CODE('wavi')
+kWaveInSnifferSubType = FOUR_CHAR_CODE('wisn')
 kSoundOutputDeviceType = FOUR_CHAR_CODE('sdev')
 kClassicSubType = FOUR_CHAR_CODE('clas')
 kASCSubType = FOUR_CHAR_CODE('asc ')
@@ -226,8 +238,12 @@ kSinger2SubType = FOUR_CHAR_CODE('sng2')
 kWhitSubType = FOUR_CHAR_CODE('whit')
 kSoundBlasterSubType = FOUR_CHAR_CODE('sbls')
 kWaveOutSubType = FOUR_CHAR_CODE('wavo')
+kWaveOutSnifferSubType = FOUR_CHAR_CODE('wosn')
 kDirectSoundSubType = FOUR_CHAR_CODE('dsnd')
+kDirectSoundSnifferSubType = FOUR_CHAR_CODE('dssn')
 kUNIXsdevSubType = FOUR_CHAR_CODE('un1x')
+kUSBSubType = FOUR_CHAR_CODE('usb ')
+kBlueBoxSubType = FOUR_CHAR_CODE('bsnd')
 kSoundCompressor = FOUR_CHAR_CODE('scom')
 kSoundDecompressor = FOUR_CHAR_CODE('sdec')
 kAudioComponentType = FOUR_CHAR_CODE('adio')
@@ -237,6 +253,7 @@ kAudioVisionHeadphoneSubType = FOUR_CHAR_CODE('telh')
 kPhilipsFaderSubType = FOUR_CHAR_CODE('tvav')
 kSGSToneSubType = FOUR_CHAR_CODE('sgs0')
 kSoundEffectsType = FOUR_CHAR_CODE('snfx')
+kEqualizerSubType = FOUR_CHAR_CODE('eqal')
 kSSpLocalizationSubType = FOUR_CHAR_CODE('snd3')
 kSoundNotCompressed = FOUR_CHAR_CODE('NONE')
 k8BitOffsetBinaryFormat = FOUR_CHAR_CODE('raw ')
@@ -246,6 +263,7 @@ kFloat32Format = FOUR_CHAR_CODE('fl32')
 kFloat64Format = FOUR_CHAR_CODE('fl64')
 k24BitFormat = FOUR_CHAR_CODE('in24')
 k32BitFormat = FOUR_CHAR_CODE('in32')
+k32BitLittleEndianFormat = FOUR_CHAR_CODE('23ni')
 kMACE3Compression = FOUR_CHAR_CODE('MAC3')
 kMACE6Compression = FOUR_CHAR_CODE('MAC6')
 kCDXA4Compression = FOUR_CHAR_CODE('cdx4')
@@ -261,6 +279,8 @@ kQUALCOMMCompression = FOUR_CHAR_CODE('Qclp')
 kOffsetBinary = k8BitOffsetBinaryFormat
 kTwosComplement = k16BitBigEndianFormat
 kLittleEndianFormat = k16BitLittleEndianFormat
+kMPEGLayer3Format = 0x6D730055
+kFullMPEGLay3Format = FOUR_CHAR_CODE('.mp3')        
 k16BitNativeEndianFormat = k16BitLittleEndianFormat
 k16BitNonNativeEndianFormat = k16BitBigEndianFormat
 k16BitNativeEndianFormat = k16BitBigEndianFormat
@@ -276,6 +296,7 @@ kStereoOut = (1 << 11)
 kReverse = (1L << 16)
 kRateConvert = (1L << 17)
 kCreateSoundSource = (1L << 18)
+kVMAwareness = (1L << 21)
 kHighQuality = (1L << 22)
 kNonRealTime = (1L << 23)
 kSourcePaused = (1 << 0)
@@ -290,7 +311,13 @@ kNoDecompression = (1 << 5)
 kNoVolumeConversion = (1 << 6)
 kNoRealtimeProcessing = (1 << 7)
 kScheduledSource = (1 << 8)
-kBestQuality = (1 << 0)
+kNonInterleavedBuffer = (1 << 9)
+kNonPagingMixer = (1 << 10)
+kSoundConverterMixer = (1 << 11)
+kPagingMixer = (1 << 12)
+kVMAwareMixer = (1 << 13)
+kExtendedSoundData = (1 << 14)                     
+kBestQuality = (1 << 0)                      
 kInputMask = 0x000000FF
 kOutputMask = 0x0000FF00
 kOutputShift = 8
@@ -298,11 +325,12 @@ kActionMask = 0x00FF0000
 kSoundComponentBits = 0x00FFFFFF
 kAudioFormatAtomType = FOUR_CHAR_CODE('frma')
 kAudioEndianAtomType = FOUR_CHAR_CODE('enda')
+kAudioVBRAtomType = FOUR_CHAR_CODE('vbra')
 kAudioTerminatorAtomType = 0
 kAVDisplayHeadphoneRemove = 0
 kAVDisplayHeadphoneInsert = 1
 kAVDisplayPlainTalkRemove = 2
-kAVDisplayPlainTalkInsert = 3
+kAVDisplayPlainTalkInsert = 3                             
 audioAllChannels = 0
 audioLeftChannel = 1
 audioRightChannel = 2
@@ -310,19 +338,24 @@ audioUnmuted = 0
 audioMuted = 1
 audioDoesMono = (1L << 0)
 audioDoesStereo = (1L << 1)
-audioDoesIndependentChannels = (1L << 2)
+audioDoesIndependentChannels = (1L << 2)                    
 siCDQuality = FOUR_CHAR_CODE('cd  ')
 siBestQuality = FOUR_CHAR_CODE('best')
 siBetterQuality = FOUR_CHAR_CODE('betr')
 siGoodQuality = FOUR_CHAR_CODE('good')
-siNoneQuality = FOUR_CHAR_CODE('none')
+siNoneQuality = FOUR_CHAR_CODE('none')        
 siDeviceIsConnected = 1
 siDeviceNotConnected = 0
 siDontKnowIfConnected = -1
 siReadPermission = 0
-siWritePermission = 1
+siWritePermission = 1                             
+kSoundConverterDidntFillBuffer = (1 << 0)
+kSoundConverterHasLeftOverData = (1 << 1)                   
+kExtendedSoundSampleCountNotValid = 1L << 0
+kExtendedSoundBufferSizeValid = 1L << 1                     
 kScheduledSoundDoScheduled = 1 << 0
 kScheduledSoundDoCallBack = 1 << 1
+kScheduledSoundExtendedHdr = 1 << 2
 kSoundComponentInitOutputDeviceSelect = 0x0001
 kSoundComponentSetSourceSelect = 0x0002
 kSoundComponentGetSourceSelect = 0x0003
diff --git a/Mac/Lib/lib-toolbox/TextEdit.py b/Mac/Lib/lib-toolbox/TextEdit.py
index 315452a..0c8d625 100644
--- a/Mac/Lib/lib-toolbox/TextEdit.py
+++ b/Mac/Lib/lib-toolbox/TextEdit.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:TextEdit.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:TextEdit.h'
 
 teJustLeft = 0
 teJustCenter = 1
@@ -7,26 +7,26 @@ teForceLeft = -2
 teFlushDefault = 0
 teCenter = 1
 teFlushRight = -1
-teFlushLeft = -2
+teFlushLeft = -2                            
 fontBit = 0
 faceBit = 1
 sizeBit = 2
 clrBit = 3
 addSizeBit = 4
-toggleBit = 5
+toggleBit = 5                             
 doFont = 1
 doFace = 2
 doSize = 4
 doColor = 8
 doAll = 15
 addSize = 16
-doToggle = 32
+doToggle = 32                            
 EOLHook = 0
 DRAWHook = 4
 WIDTHHook = 8
 HITTESTHook = 12
 nWIDTHHook = 24
-TextWidthHook = 28
+TextWidthHook = 28                            
 intEOLHook = 0
 intDrawHook = 1
 intWidthHook = 2
@@ -34,23 +34,23 @@ intHitTestHook = 3
 intNWidthHook = 6
 intTextWidthHook = 7
 intInlineInputTSMTEPreUpdateHook = 8
-intInlineInputTSMTEPostUpdateHook = 9
+intInlineInputTSMTEPostUpdateHook = 9                       
 teFAutoScroll = 0
 teFTextBuffering = 1
 teFOutlineHilite = 2
 teFInlineInput = 3
 teFUseWhiteBackground = 4
 teFUseInlineInput = 5
-teFInlineInputAutoScroll = 6
+teFInlineInputAutoScroll = 6                             
 teBitClear = 0
 teBitSet = 1
-teBitTest = -1
+teBitTest = -1                            
 teWordSelect = 4
 teWordDrag = 8
 teFromFind = 12
-teFromRecal = 16
+teFromRecal = 16                            
 teFind = 0
 teHighlight = 1
 teDraw = -1
-teCaret = -2
-teFUseTextServices = 4
+teCaret = -2                            
+teFUseTextServices = 4                             
diff --git a/Mac/Lib/lib-toolbox/Windows.py b/Mac/Lib/lib-toolbox/Windows.py
index 7d4fa7a..ff56808 100644
--- a/Mac/Lib/lib-toolbox/Windows.py
+++ b/Mac/Lib/lib-toolbox/Windows.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:MacWindows.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:MacWindows.h'
 
 def FOUR_CHAR_CODE(x): return x
 kAlertWindowClass = 1L
@@ -7,6 +7,8 @@ kModalWindowClass = 3L
 kMovableModalWindowClass = 4L
 kFloatingWindowClass = 5L
 kDocumentWindowClass = 6L
+kDesktopWindowClass = 7L
+# kAllWindowClasses = (unsigned long)0xFFFFFFFF     
 kWindowNoAttributes = 0L
 kWindowCloseBoxAttribute = (1L << 0)
 kWindowHorizontalZoomAttribute = (1L << 1)
@@ -17,24 +19,15 @@ kWindowResizableAttribute = (1L << 4)
 kWindowSideTitlebarAttribute = (1L << 5)
 kWindowNoUpdatesAttribute = (1L << 16)
 kWindowNoActivatesAttribute = (1L << 17)
+kWindowNoBufferingAttribute = (1L << 20)
+kWindowHideOnSuspendAttribute = (1L << 24)
+kWindowStandardHandlerAttribute = (1L << 25)
 kWindowStandardDocumentAttributes = (kWindowCloseBoxAttribute | kWindowFullZoomAttribute | kWindowCollapseBoxAttribute | kWindowResizableAttribute)
 kWindowStandardFloatingAttributes = (kWindowCloseBoxAttribute | kWindowCollapseBoxAttribute)
-gestaltWindowMgrAttr = FOUR_CHAR_CODE('wind')
-gestaltWindowMgrPresent = (1L << 0)
-errInvalidWindowPtr = -5600
-errUnsupportedWindowAttributesForClass = -5601
-errWindowDoesNotHaveProxy = -5602
-errInvalidWindowProperty = -5603
-errWindowPropertyNotFound = -5604
-errUnrecognizedWindowClass = -5605
-errCorruptWindowDescription = -5606
-errUserWantsToDragWindow = -5607
-errWindowsAlreadyInitialized = -5608
-errFloatingWindowsNotInitialized = -5609
 kWindowDefProcType = FOUR_CHAR_CODE('WDEF')
 kStandardWindowDefinition = 0
 kRoundWindowDefinition = 1
-kFloatingWindowDefinition = 124
+kFloatingWindowDefinition = 124                           
 kDocumentWindowVariantCode = 0
 kModalDialogVariantCode = 1
 kPlainDialogVariantCode = 2
@@ -51,7 +44,6 @@ noGrowDocProc = 4
 movableDBoxProc = 5
 zoomDocProc = 8
 zoomNoGrow = 12
-rDocProc = 16
 floatProc = 1985
 floatGrowProc = 1987
 floatZoomProc = 1989
@@ -60,6 +52,7 @@ floatSideProc = 1993
 floatSideGrowProc = 1995
 floatSideZoomProc = 1997
 floatSideZoomGrowProc = 1999
+rDocProc = 16
 kWindowDocumentDefProcResID = 64
 kWindowDialogDefProcResID = 65
 kWindowUtilityDefProcResID = 66
@@ -111,7 +104,7 @@ kWindowCenterOnParentWindow = 0x00000002
 kWindowCenterOnParentWindowScreen = 0x00000003
 kWindowCascadeOnMainScreen = 0x00000004
 kWindowCascadeOnParentWindow = 0x00000005
-kWIndowCascadeOnParentWindowScreen = 0x00000006
+kWindowCascadeOnParentWindowScreen = 0x00000006
 kWindowAlertPositionOnMainScreen = 0x00000007
 kWindowAlertPositionOnParentWindow = 0x00000008
 kWindowAlertPositionOnParentWindowScreen = 0x00000009
@@ -125,6 +118,8 @@ kWindowCollapseBoxRgn = 7
 kWindowTitleProxyIconRgn = 8
 kWindowStructureRgn = 32
 kWindowContentRgn = 33
+kWindowUpdateRgn = 34
+kWindowGlobalPortRgn = 40                            
 dialogKind = 2
 userKind = 8
 kDialogWindowKind = 2
@@ -140,7 +135,7 @@ inGoAway = 6
 inZoomIn = 7
 inZoomOut = 8
 inCollapseBox = 11
-inProxyIcon = 12
+inProxyIcon = 12                            
 wNoHit = 0
 wInContent = 1
 wInDrag = 2
@@ -149,7 +144,7 @@ wInGoAway = 4
 wInZoomIn = 5
 wInZoomOut = 6
 wInCollapseBox = 9
-wInProxyIcon = 10
+wInProxyIcon = 10                            
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
 kWindowMsgCalculateShape = 2
@@ -164,7 +159,8 @@ kWindowMsgModified = 10
 kWindowMsgDrawInCurrentPort = 11
 kWindowMsgSetupProxyDragImage = 12
 kWindowMsgStateChanged = 13
-kWindowMsgMeasureTitle = 14
+kWindowMsgMeasureTitle = 14                            
+kWindowMsgGetGrowImageRegion = 19                           
 wDraw = 0
 wHit = 1
 wCalcRgns = 2
@@ -173,12 +169,10 @@ wDispose = 4
 wGrow = 5
 wDrawGIcon = 6
 kWindowStateTitleChanged = (1 << 0)
-kWindowStateSizeChanged = (1 << 1)
-kWindowStatePositionChanged = (1 << 2)
-kWindowStateZOrderChanged = (1 << 3)
-kWindowStateVisibilityChanged = (1 << 4)
-kWindowStateHiliteChanged = (1 << 5)
-kWindowStateCollapseChanged = (1 << 6)
+kWindowGrowSideTop = 0x01
+kWindowGrowSideLeft = 0x02
+kWindowGrowSideBottom = 0x04
+kWindowGrowSideRight = 0x08
 kWindowCanGrow = (1 << 0)
 kWindowCanZoom = (1 << 1)
 kWindowCanCollapse = (1 << 2)
@@ -192,6 +186,8 @@ kWindowCanDrawInCurrentPort = (1 << 9)
 kWindowCanSetupProxyDragImage = (1 << 10)
 kWindowCanMeasureTitle = (1 << 11)
 kWindowWantsDisposeAtProcessDeath = (1 << 12)
+kWindowSupportsSetGrowImageRegion = (1 << 13)
+kWindowDefSupportsColorGrafPort = 0x40000002                
 deskPatID = 16
 wContentColor = 0
 wFrameColor = 1
@@ -204,7 +200,14 @@ kWindowDefinitionVersionTwo = 2
 kWindowIsCollapsedState = (1 << 0L)
 kStoredWindowSystemTag = FOUR_CHAR_CODE('appl')
 kStoredBasicWindowDescriptionID = FOUR_CHAR_CODE('sbas')
-kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255')
-kWindowZoomTransitionEffect = 1
+kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255')        
+kWindowDefProcPtr = 0
+kWindowDefObjectClass = 1                             
+kWindowPaintProcOptionsNone = 0
+kScrollWindowNoOptions = 0
+kScrollWindowInvalidate = (1L << 0)
+kScrollWindowEraseToPortBackground = (1L << 1)              
+kWindowZoomTransitionEffect = 1                             
 kWindowShowTransitionAction = 1
-kWindowHideTransitionAction = 2
+kWindowHideTransitionAction = 2                             
+kWindowPropertyPersistent = 0x00000001