Regenerated from new Universal Headers.

16 files changed, 717 insertions, 261 deletions

diff --git a/Mac/Lib/Carbon/Appearance.py b/Mac/Lib/Carbon/Appearance.py
index 33bcfed..d74c5df 100644
--- a/Mac/Lib/Carbon/Appearance.py
+++ b/Mac/Lib/Carbon/Appearance.py
@@ -5,7 +5,7 @@ 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')
@@ -58,6 +58,9 @@ kThemeBrushBevelActiveDark = 45
 kThemeBrushBevelInactiveLight = 46
 kThemeBrushBevelInactiveDark = 47
 kThemeBrushNotificationWindowBackground = 48
+kThemeBrushMovableModalBackground = 49
+kThemeBrushSheetBackground = 50
+kThemeBrushDrawerBackground = 51
 kThemeBrushBlack = -1
 kThemeBrushWhite = -2
 kThemeTextColorDialogActive = 1
@@ -114,9 +117,10 @@ kThemeStateActive = 1
 kThemeStatePressed = 2
 kThemeStateRollover = 6
 kThemeStateUnavailable = 7
+kThemeStateUnavailableInactive = 8
 kThemeStateDisabled = 0
 kThemeStatePressedUp = 2
-kThemeStatePressedDown = 3                             
+kThemeStatePressedDown = 3     
 kThemeArrowCursor = 0
 kThemeCopyArrowCursor = 1
 kThemeAliasArrowCursor = 2
@@ -153,14 +157,20 @@ kThemeMenuItemAtTop = 0x0100
 kThemeMenuItemAtBottom = 0x0200
 kThemeMenuItemHierBackground = 0x0400
 kThemeMenuItemPopUpBackground = 0x0800
-kThemeMenuItemHasIcon = 0x8000                        
+kThemeMenuItemHasIcon = 0x8000 
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
 kThemeBackgroundWindowHeader = 3
 kThemeBackgroundListViewWindowHeader = 4
+kThemeBackgroundSecondaryGroupBox = 5
 kThemeNameTag = FOUR_CHAR_CODE('name')
-kThemeAppearanceFileNameTag = FOUR_CHAR_CODE('thme')
 kThemeVariantNameTag = FOUR_CHAR_CODE('varn')
+kThemeHighlightColorTag = FOUR_CHAR_CODE('hcol')
+kThemeScrollBarArrowStyleTag = FOUR_CHAR_CODE('sbar')
+kThemeScrollBarThumbStyleTag = FOUR_CHAR_CODE('sbth')
+kThemeSoundsEnabledTag = FOUR_CHAR_CODE('snds')
+kThemeDblClickCollapseTag = FOUR_CHAR_CODE('coll') 
+kThemeAppearanceFileNameTag = FOUR_CHAR_CODE('thme')
 kThemeSystemFontTag = FOUR_CHAR_CODE('lgsf')
 kThemeSmallSystemFontTag = FOUR_CHAR_CODE('smsf')
 kThemeViewsFontTag = FOUR_CHAR_CODE('vfnt')
@@ -171,32 +181,41 @@ kThemeDesktopPictureNameTag = FOUR_CHAR_CODE('dpnm')
 kThemeDesktopPictureAliasTag = FOUR_CHAR_CODE('dpal')
 kThemeDesktopPictureAlignmentTag = FOUR_CHAR_CODE('dpan')
 kThemeHighlightColorNameTag = FOUR_CHAR_CODE('hcnm')
-kThemeHighlightColorTag = FOUR_CHAR_CODE('hcol')
 kThemeExamplePictureIDTag = FOUR_CHAR_CODE('epic')
-kThemeSoundsEnabledTag = FOUR_CHAR_CODE('snds')
 kThemeSoundTrackNameTag = FOUR_CHAR_CODE('sndt')
 kThemeSoundMaskTag = FOUR_CHAR_CODE('smsk')
 kThemeUserDefinedTag = FOUR_CHAR_CODE('user')
-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')        
+kThemeSmoothFontMinSizeTag = FOUR_CHAR_CODE('smos') 
 kThemeCheckBoxClassicX = 0
-kThemeCheckBoxCheckMark = 1                             
+kThemeCheckBoxCheckMark = 1     
 kThemeScrollBarArrowsSingle = 0
-kThemeScrollBarArrowsLowerRight = 1                         
+kThemeScrollBarArrowsLowerRight = 1   
 kThemeScrollBarThumbNormal = 0
-kThemeScrollBarThumbProportional = 1                        
+kThemeScrollBarThumbProportional = 1  
 kThemeSystemFont = 0
 kThemeSmallSystemFont = 1
 kThemeSmallEmphasizedSystemFont = 2
 kThemeViewsFont = 3
+kThemeEmphasizedSystemFont = 4
+kThemeApplicationFont = 5
+kThemeLabelFont = 6
+kThemeMenuTitleFont = 100
+kThemeMenuItemFont = 101
+kThemeMenuItemMarkFont = 102
+kThemeMenuItemCmdKeyFont = 103
+kThemeWindowTitleFont = 104
+kThemePushButtonFont = 105
+kThemeUtilityWindowTitleFont = 106
+kThemeAlertHeaderFont = 107
+kThemeCurrentPortFont = 200
 kThemeTabNonFront = 0
 kThemeTabNonFrontPressed = 1
 kThemeTabNonFrontInactive = 2
 kThemeTabFront = 3
 kThemeTabFrontInactive = 4
+kThemeTabNonFrontUnavailable = 5
+kThemeTabFrontUnavailable = 6
 kThemeTabNorth = 0
 kThemeTabSouth = 1
 kThemeTabEast = 2
@@ -205,12 +224,16 @@ kThemeSmallTabHeight = 16
 kThemeLargeTabHeight = 21
 kThemeTabPaneOverlap = 3
 kThemeSmallTabHeightMax = 19
-kThemeLargeTabHeightMax = 24                            
-kThemeScrollBar = 0
+kThemeLargeTabHeightMax = 24    
+kThemeMediumScrollBar = 0
 kThemeSmallScrollBar = 1
-kThemeSlider = 2
-kThemeProgressBar = 3
-kThemeIndeterminateBar = 4
+kThemeMediumSlider = 2
+kThemeMediumProgressBar = 3
+kThemeMediumIndeterminateBar = 4
+kThemeRelevanceBar = 5
+kThemeSmallSlider = 6
+kThemeLargeProgressBar = 7
+kThemeLargeIndeterminateBar = 8
 kThemeTrackActive = 0
 kThemeTrackDisabled = 1
 kThemeTrackNothingToScroll = 2
@@ -234,7 +257,8 @@ kThemeThumbDownward = 2
 kThemeTrackHorizontal = (1 << 0)
 kThemeTrackRightToLeft = (1 << 1)
 kThemeTrackShowThumb = (1 << 2)
-kThemeTrackThumbRgnIsNotGhost = (1 << 3)                    
+kThemeTrackThumbRgnIsNotGhost = (1 << 3)
+kThemeTrackNoScrollBarArrows = (1 << 4) 
 kThemeWindowHasGrow = (1 << 0)
 kThemeWindowHasHorizontalZoom = (1 << 3)
 kThemeWindowHasVerticalZoom = (1 << 4)
@@ -243,8 +267,7 @@ kThemeWindowHasCloseBox = (1 << 5)
 kThemeWindowHasCollapseBox = (1 << 6)
 kThemeWindowHasTitleText = (1 << 7)
 kThemeWindowIsCollapsed = (1 << 8)
-kThemeWindowHasA = (1 << 9)
-kThemeWindowHasB = (1 << 10)
+kThemeWindowHasDirty = (1 << 9)
 kThemeDocumentWindow = 0
 kThemeDialogWindow = 1
 kThemeMovableDialogWindow = 2
@@ -255,12 +278,11 @@ kThemeShadowDialogWindow = 6
 kThemePopupWindow = 7
 kThemeUtilityWindow = 8
 kThemeUtilitySideWindow = 9
+kThemeSheetWindow = 10
 kThemeWidgetCloseBox = 0
 kThemeWidgetZoomBox = 1
 kThemeWidgetCollapseBox = 2
-kThemeWidgetABox = 3
-kThemeWidgetBBox = 4
-kThemeWidgetBOffBox = 5
+kThemeWidgetDirtyCloseBox = 6
 kThemeArrowLeft = 0
 kThemeArrowDown = 1
 kThemeArrowRight = 2
@@ -272,7 +294,7 @@ kThemeArrow9pt = 3
 kThemeGrowLeft = (1 << 0)
 kThemeGrowRight = (1 << 1)
 kThemeGrowUp = (1 << 2)
-kThemeGrowDown = (1 << 3)                      
+kThemeGrowDown = (1 << 3) 
 kThemePushButton = 0
 kThemeCheckBox = 1
 kThemeRadioButton = 2
@@ -283,7 +305,15 @@ kThemeDisclosureButton = 6
 kThemeIncDecButton = 7
 kThemeSmallBevelButton = 8
 kThemeMediumBevelButton = 3
-kThemeLargeBevelButton = 9                             
+kThemeLargeBevelButton = 9
+kThemeListHeaderButton = 10
+kThemeRoundButton = 11
+kThemeLargeRoundButton = 12
+kThemeSmallCheckBox = 13
+kThemeSmallRadioButton = 14
+kThemeRoundedBevelButton = 15
+kThemeNormalCheckBox = kThemeCheckBox
+kThemeNormalRadioButton = kThemeRadioButton
 kThemeButtonOff = 0
 kThemeButtonOn = 1
 kThemeButtonMixed = 2
@@ -294,7 +324,19 @@ kThemeAdornmentNone = 0
 kThemeAdornmentDefault = (1 << 0)
 kThemeAdornmentFocus = (1 << 2)
 kThemeAdornmentRightToLeft = (1 << 4)
-kThemeAdornmentDrawIndicatorOnly = (1 << 5)                 
+kThemeAdornmentDrawIndicatorOnly = (1 << 5)
+kThemeAdornmentHeaderButtonLeftNeighborSelected = (1 << 6)
+kThemeAdornmentHeaderButtonRightNeighborSelected = (1 << 7)
+kThemeAdornmentHeaderButtonSortUp = (1 << 8)
+kThemeAdornmentHeaderMenuButton = (1 << 9)
+kThemeAdornmentHeaderButtonNoShadow = (1 << 10)
+kThemeAdornmentHeaderButtonShadowOnly = (1 << 11)
+kThemeAdornmentNoShadow = kThemeAdornmentHeaderButtonNoShadow
+kThemeAdornmentShadowOnly = kThemeAdornmentHeaderButtonShadowOnly
+kThemeAdornmentArrowLeftArrow = (1 << 6)
+kThemeAdornmentArrowDownArrow = (1 << 7)
+kThemeAdornmentArrowDoubleArrow = (1 << 8)
+kThemeAdornmentArrowUpArrow = (1 << 9) 
 kThemeNoSounds = 0
 kThemeWindowSoundsMask = (1 << 0)
 kThemeMenuSoundsMask = (1 << 1)
@@ -437,8 +479,67 @@ kThemePopupTabCenterOnWindow = 1
 kThemePopupTabCenterOnOffset = 2
 kThemeMetricScrollBarWidth = 0
 kThemeMetricSmallScrollBarWidth = 1
-kThemeMetricCheckBoxGlyphHeight = 2
-kThemeMetricRadioButtonGlyphHeight = 3
+kThemeMetricCheckBoxHeight = 2
+kThemeMetricRadioButtonHeight = 3
+kThemeMetricEditTextWhitespace = 4
+kThemeMetricEditTextFrameOutset = 5
+kThemeMetricListBoxFrameOutset = 6
+kThemeMetricFocusRectOutset = 7
+kThemeMetricImageWellThickness = 8
+kThemeMetricScrollBarOverlap = 9
+kThemeMetricLargeTabHeight = 10
+kThemeMetricLargeTabCapsWidth = 11
+kThemeMetricTabFrameOverlap = 12
+kThemeMetricTabIndentOrStyle = 13
+kThemeMetricTabOverlap = 14
+kThemeMetricSmallTabHeight = 15
+kThemeMetricSmallTabCapsWidth = 16
+kThemeMetricDisclosureButtonHeight = 17
+kThemeMetricRoundButtonSize = 18
+kThemeMetricPushButtonHeight = 19
+kThemeMetricListHeaderHeight = 20
+kThemeMetricSmallCheckBoxHeight = 21
+kThemeMetricDisclosureButtonWidth = 22
+kThemeMetricSmallDisclosureButtonHeight = 23
+kThemeMetricSmallDisclosureButtonWidth = 24
+kThemeMetricDisclosureTriangleHeight = 25
+kThemeMetricDisclosureTriangleWidth = 26
+kThemeMetricLittleArrowsHeight = 27
+kThemeMetricLittleArrowsWidth = 28
+kThemeMetricPaneSplitterHeight = 29
+kThemeMetricPopupButtonHeight = 30
+kThemeMetricSmallPopupButtonHeight = 31
+kThemeMetricLargeProgressBarThickness = 32
+kThemeMetricPullDownHeight = 33
+kThemeMetricSmallPullDownHeight = 34
+kThemeMetricSmallPushButtonHeight = 35
+kThemeMetricSmallRadioButtonHeight = 36
+kThemeMetricRelevanceIndicatorHeight = 37
+kThemeMetricResizeControlHeight = 38
+kThemeMetricSmallResizeControlHeight = 39
+kThemeMetricLargeRoundButtonSize = 40
+kThemeMetricHSliderHeight = 41
+kThemeMetricHSliderTickHeight = 42
+kThemeMetricSmallHSliderHeight = 43
+kThemeMetricSmallHSliderTickHeight = 44
+kThemeMetricVSliderWidth = 45
+kThemeMetricVSliderTickWidth = 46
+kThemeMetricSmallVSliderWidth = 47
+kThemeMetricSmallVSliderTickWidth = 48
+kThemeMetricTitleBarControlsHeight = 49
+kThemeMetricCheckBoxWidth = 50
+kThemeMetricSmallCheckBoxWidth = 51
+kThemeMetricRadioButtonWidth = 52
+kThemeMetricSmallRadioButtonWidth = 53
+kThemeMetricSmallHSliderMinThumbWidth = 54
+kThemeMetricSmallVSliderMinThumbHeight = 55
+kThemeMetricSmallHSliderTickOffset = 56
+kThemeMetricSmallVSliderTickOffset = 57
+kThemeMetricNormalProgressBarThickness = 58
+kThemeMetricProgressBarShadowOutset = 59
+kThemeMetricSmallProgressBarShadowOutset = 60
+kThemeMetricPrimaryGroupBoxContentInset = 61
+kThemeMetricSecondaryGroupBoxContentInset = 62
 # appearanceBadBrushIndexErr = themeInvalidBrushErr
 # appearanceProcessRegisteredErr = themeProcessRegisteredErr
 # appearanceProcessNotRegisteredErr = themeProcessNotRegisteredErr
@@ -506,10 +607,20 @@ kThemeSelectedMenuItemTextColor = kThemeTextColorMenuItemSelected
 kThemeDisabledMenuItemTextColor = kThemeTextColorMenuItemDisabled
 kThemeActivePopupLabelTextColor = kThemeTextColorPopupLabelActive
 kThemeInactivePopupLabelTextColor = kThemeTextColorPopupLabelInactive
-kAEThemeSwitch = kAEAppearanceChanged          
+kAEThemeSwitch = kAEAppearanceChanged 
 kThemeNoAdornment = kThemeAdornmentNone
 kThemeDefaultAdornment = kThemeAdornmentDefault
 kThemeFocusAdornment = kThemeAdornmentFocus
 kThemeRightToLeftAdornment = kThemeAdornmentRightToLeft
 kThemeDrawIndicatorOnly = kThemeAdornmentDrawIndicatorOnly
 kThemeBrushPassiveAreaFill = kThemeBrushStaticAreaFill
+kThemeMetricCheckBoxGlyphHeight = kThemeMetricCheckBoxHeight
+kThemeMetricRadioButtonGlyphHeight = kThemeMetricRadioButtonHeight
+kThemeMetricDisclosureButtonSize = kThemeMetricDisclosureButtonHeight
+kThemeMetricBestListHeaderHeight = kThemeMetricListHeaderHeight
+kThemeMetricSmallProgressBarThickness = kThemeMetricNormalProgressBarThickness
+kThemeMetricProgressBarThickness = kThemeMetricLargeProgressBarThickness 
+kThemeScrollBar = kThemeMediumScrollBar
+kThemeSlider = kThemeMediumSlider
+kThemeProgressBar = kThemeMediumProgressBar
+kThemeIndeterminateBar = kThemeMediumIndeterminateBar
diff --git a/Mac/Lib/Carbon/AppleEvents.py b/Mac/Lib/Carbon/AppleEvents.py
index 605a3e0..e887ea0 100644
--- a/Mac/Lib/Carbon/AppleEvents.py
+++ b/Mac/Lib/Carbon/AppleEvents.py
@@ -34,18 +34,19 @@ typeType = FOUR_CHAR_CODE('type')
 typeAppParameters = FOUR_CHAR_CODE('appa')
 typeProperty = FOUR_CHAR_CODE('prop')
 typeFSS = FOUR_CHAR_CODE('fss ')
+typeFSRef = FOUR_CHAR_CODE('fsrf')
 typeKeyword = FOUR_CHAR_CODE('keyw')
 typeSectionH = FOUR_CHAR_CODE('sect')
 typeWildCard = FOUR_CHAR_CODE('****')
 typeApplSignature = FOUR_CHAR_CODE('sign')
 typeQDRectangle = FOUR_CHAR_CODE('qdrt')
 typeFixed = FOUR_CHAR_CODE('fixd')
+typeProcessSerialNumber = FOUR_CHAR_CODE('psn ')
+typeApplicationURL = FOUR_CHAR_CODE('aprl')
+typeNull = FOUR_CHAR_CODE('null') 
 typeSessionID = FOUR_CHAR_CODE('ssid')
 typeTargetID = FOUR_CHAR_CODE('targ')
-typeProcessSerialNumber = FOUR_CHAR_CODE('psn ')
-typeKernelProcessID = FOUR_CHAR_CODE('kpid')
 typeDispatcherID = FOUR_CHAR_CODE('dspt')
-typeNull = FOUR_CHAR_CODE('null')        
 keyTransactionIDAttr = FOUR_CHAR_CODE('tran')
 keyReturnIDAttr = FOUR_CHAR_CODE('rtid')
 keyEventClassAttr = FOUR_CHAR_CODE('evcl')
@@ -56,17 +57,46 @@ keyTimeoutAttr = FOUR_CHAR_CODE('timo')
 keyInteractLevelAttr = FOUR_CHAR_CODE('inte')
 keyEventSourceAttr = FOUR_CHAR_CODE('esrc')
 keyMissedKeywordAttr = FOUR_CHAR_CODE('miss')
-keyOriginalAddressAttr = FOUR_CHAR_CODE('from')        
+keyOriginalAddressAttr = FOUR_CHAR_CODE('from')
+keyAcceptTimeoutAttr = FOUR_CHAR_CODE('actm') 
 kAEDescListFactorNone = 0
 kAEDescListFactorType = 4
 kAEDescListFactorTypeAndSize = 8
 kAutoGenerateReturnID = -1
-kAnyTransactionID = 0                             
+kAnyTransactionID = 0     
 kAEDataArray = 0
 kAEPackedArray = 1
 kAEDescArray = 3
 kAEKeyDescArray = 4
 kAEHandleArray = 2
+kAENormalPriority = 0x00000000
+kAEHighPriority = 0x00000001 
+kAENoReply = 0x00000001
+kAEQueueReply = 0x00000002
+kAEWaitReply = 0x00000003
+kAEDontReconnect = 0x00000080
+kAEWantReceipt = 0x00000200
+kAENeverInteract = 0x00000010
+kAECanInteract = 0x00000020
+kAEAlwaysInteract = 0x00000030
+kAECanSwitchLayer = 0x00000040
+kAEDontRecord = 0x00001000
+kAEDontExecute = 0x00002000
+kAEProcessNonReplyEvents = 0x00008000 
+kAEDefaultTimeout = -1
+kNoTimeOut = -2    
+kAEInteractWithSelf = 0
+kAEInteractWithLocal = 1
+kAEInteractWithAll = 2
+kAEDoNotIgnoreHandler = 0x00000000
+kAEIgnoreAppPhacHandler = 0x00000001
+kAEIgnoreAppEventHandler = 0x00000002
+kAEIgnoreSysPhacHandler = 0x00000004
+kAEIgnoreSysEventHandler = 0x00000008
+kAEIngoreBuiltInEventHandler = 0x00000010
+# kAEDontDisposeOnResume = (long)0x80000000 
+kAENoDispatch = 0
+# kAEUseStandardDispatch = (long)0xFFFFFFFF 
 keyDirectObject = FOUR_CHAR_CODE('----')
 keyErrorNumber = FOUR_CHAR_CODE('errn')
 keyErrorString = FOUR_CHAR_CODE('errs')
@@ -74,7 +104,7 @@ keyProcessSerialNumber = FOUR_CHAR_CODE('psn ')
 keyPreDispatch = FOUR_CHAR_CODE('phac')
 keySelectProc = FOUR_CHAR_CODE('selh')
 keyAERecorderCount = FOUR_CHAR_CODE('recr')
-keyAEVersion = FOUR_CHAR_CODE('vers')        
+keyAEVersion = FOUR_CHAR_CODE('vers') 
 kCoreEventClass = FOUR_CHAR_CODE('aevt')
 kAEOpenApplication = FOUR_CHAR_CODE('oapp')
 kAEOpenDocuments = FOUR_CHAR_CODE('odoc')
@@ -82,44 +112,17 @@ kAEPrintDocuments = FOUR_CHAR_CODE('pdoc')
 kAEQuitApplication = FOUR_CHAR_CODE('quit')
 kAEAnswer = FOUR_CHAR_CODE('ansr')
 kAEApplicationDied = FOUR_CHAR_CODE('obit')
+kAEShowPreferences = FOUR_CHAR_CODE('pref') 
 kAEStartRecording = FOUR_CHAR_CODE('reca')
 kAEStopRecording = FOUR_CHAR_CODE('recc')
 kAENotifyStartRecording = FOUR_CHAR_CODE('rec1')
 kAENotifyStopRecording = FOUR_CHAR_CODE('rec0')
-kAENotifyRecording = FOUR_CHAR_CODE('recr')        
-kAENeverInteract = 0x00000010
-kAECanInteract = 0x00000020
-kAEAlwaysInteract = 0x00000030
-kAECanSwitchLayer = 0x00000040
-kAEDontRecord = 0x00001000
-kAEDontExecute = 0x00002000
-kAEProcessNonReplyEvents = 0x00008000                    
-kAENoReply = 0x00000001
-kAEQueueReply = 0x00000002
-kAEWaitReply = 0x00000003
-kAEDontReconnect = 0x00000080
-kAEWantReceipt = 0x00000200                    
-kAEDefaultTimeout = -1
-kNoTimeOut = -2                            
-kAENormalPriority = 0x00000000
-kAEHighPriority = 0x00000001                    
+kAENotifyRecording = FOUR_CHAR_CODE('recr') 
 kAEUnknownSource = 0
 kAEDirectCall = 1
 kAESameProcess = 2
 kAELocalProcess = 3
 kAERemoteProcess = 4
-kAEInteractWithSelf = 0
-kAEInteractWithLocal = 1
-kAEInteractWithAll = 2
-kAEDoNotIgnoreHandler = 0x00000000
-kAEIgnoreAppPhacHandler = 0x00000001
-kAEIgnoreAppEventHandler = 0x00000002
-kAEIgnoreSysPhacHandler = 0x00000004
-kAEIgnoreSysEventHandler = 0x00000008
-kAEIngoreBuiltInEventHandler = 0x00000010
-# kAEDontDisposeOnResume = (long)0x80000000              
-kAENoDispatch = 0
-# kAEUseStandardDispatch = (long)0xFFFFFFFF              
 cAEList = FOUR_CHAR_CODE('list')
 cApplication = FOUR_CHAR_CODE('capp')
 cArc = FOUR_CHAR_CODE('carc')
@@ -139,7 +142,7 @@ cGraphicLine = FOUR_CHAR_CODE('glin')
 cGraphicObject = FOUR_CHAR_CODE('cgob')
 cGraphicShape = FOUR_CHAR_CODE('cgsh')
 cGraphicText = FOUR_CHAR_CODE('cgtx')
-cGroupedGraphic = FOUR_CHAR_CODE('cpic')        
+cGroupedGraphic = FOUR_CHAR_CODE('cpic') 
 cInsertionLoc = FOUR_CHAR_CODE('insl')
 cInsertionPoint = FOUR_CHAR_CODE('cins')
 cIntlText = FOUR_CHAR_CODE('itxt')
@@ -159,7 +162,7 @@ cMenuItem = FOUR_CHAR_CODE('cmen')
 cObject = FOUR_CHAR_CODE('cobj')
 cObjectSpecifier = FOUR_CHAR_CODE('obj ')
 cOpenableObject = FOUR_CHAR_CODE('coob')
-cOval = FOUR_CHAR_CODE('covl')        
+cOval = FOUR_CHAR_CODE('covl') 
 cParagraph = FOUR_CHAR_CODE('cpar')
 cPICT = FOUR_CHAR_CODE('PICT')
 cPixel = FOUR_CHAR_CODE('cpxl')
@@ -179,7 +182,7 @@ cTable = FOUR_CHAR_CODE('ctbl')
 cText = FOUR_CHAR_CODE('ctxt')
 cTextFlow = FOUR_CHAR_CODE('cflo')
 cTextStyles = FOUR_CHAR_CODE('tsty')
-cType = FOUR_CHAR_CODE('type')        
+cType = FOUR_CHAR_CODE('type') 
 cVersion = FOUR_CHAR_CODE('vers')
 cWindow = FOUR_CHAR_CODE('cwin')
 cWord = FOUR_CHAR_CODE('cwor')
@@ -199,7 +202,7 @@ kAEAliasSelection = FOUR_CHAR_CODE('sali')
 kAEAllCaps = FOUR_CHAR_CODE('alcp')
 kAEArrowAtEnd = FOUR_CHAR_CODE('aren')
 kAEArrowAtStart = FOUR_CHAR_CODE('arst')
-kAEArrowBothEnds = FOUR_CHAR_CODE('arbo')        
+kAEArrowBothEnds = FOUR_CHAR_CODE('arbo') 
 kAEAsk = FOUR_CHAR_CODE('ask ')
 kAEBefore = FOUR_CHAR_CODE('befo')
 kAEBeginning = FOUR_CHAR_CODE('bgng')
@@ -219,7 +222,7 @@ kAECountElements = FOUR_CHAR_CODE('cnte')
 kAECreateElement = FOUR_CHAR_CODE('crel')
 kAECreatePublisher = FOUR_CHAR_CODE('cpub')
 kAECut = FOUR_CHAR_CODE('cut ')
-kAEDelete = FOUR_CHAR_CODE('delo')        
+kAEDelete = FOUR_CHAR_CODE('delo') 
 kAEDoObjectsExist = FOUR_CHAR_CODE('doex')
 kAEDoScript = FOUR_CHAR_CODE('dosc')
 kAEDrag = FOUR_CHAR_CODE('drag')
@@ -239,7 +242,7 @@ kAEGetClassInfo = FOUR_CHAR_CODE('qobj')
 kAEGetData = FOUR_CHAR_CODE('getd')
 kAEGetDataSize = FOUR_CHAR_CODE('dsiz')
 kAEGetEventInfo = FOUR_CHAR_CODE('gtei')
-kAEGetInfoSelection = FOUR_CHAR_CODE('sinf')        
+kAEGetInfoSelection = FOUR_CHAR_CODE('sinf') 
 kAEGetPrivilegeSelection = FOUR_CHAR_CODE('sprv')
 kAEGetSuiteInfo = FOUR_CHAR_CODE('gtsi')
 kAEGreaterThan = FOUR_CHAR_CODE('>   ')
@@ -259,7 +262,7 @@ kAEMiscStandards = FOUR_CHAR_CODE('misc')
 kAEModifiable = FOUR_CHAR_CODE('modf')
 kAEMove = FOUR_CHAR_CODE('move')
 kAENo = FOUR_CHAR_CODE('no  ')
-kAENoArrow = FOUR_CHAR_CODE('arno')        
+kAENoArrow = FOUR_CHAR_CODE('arno') 
 kAENonmodifiable = FOUR_CHAR_CODE('nmod')
 kAEOpen = FOUR_CHAR_CODE('odoc')
 kAEOpenSelection = FOUR_CHAR_CODE('sope')
@@ -279,7 +282,7 @@ kAEQDBic = FOUR_CHAR_CODE('bic ')
 kAEQDBlend = FOUR_CHAR_CODE('blnd')
 kAEQDCopy = FOUR_CHAR_CODE('cpy ')
 kAEQDNotBic = FOUR_CHAR_CODE('nbic')
-kAEQDNotCopy = FOUR_CHAR_CODE('ncpy')        
+kAEQDNotCopy = FOUR_CHAR_CODE('ncpy') 
 kAEQDNotOr = FOUR_CHAR_CODE('ntor')
 kAEQDNotXor = FOUR_CHAR_CODE('nxor')
 kAEQDOr = FOUR_CHAR_CODE('or  ')
@@ -300,7 +303,7 @@ kAERevert = FOUR_CHAR_CODE('rvrt')
 kAERightJustified = FOUR_CHAR_CODE('rght')
 kAESave = FOUR_CHAR_CODE('save')
 kAESelect = FOUR_CHAR_CODE('slct')
-kAESetData = FOUR_CHAR_CODE('setd')        
+kAESetData = FOUR_CHAR_CODE('setd') 
 kAESetPosition = FOUR_CHAR_CODE('posn')
 kAEShadow = FOUR_CHAR_CODE('shad')
 kAEShowClipboard = FOUR_CHAR_CODE('shcl')
@@ -318,7 +321,7 @@ kAEUnderline = FOUR_CHAR_CODE('undl')
 kAEUndo = FOUR_CHAR_CODE('undo')
 kAEWholeWordEquals = FOUR_CHAR_CODE('wweq')
 kAEYes = FOUR_CHAR_CODE('yes ')
-kAEZoom = FOUR_CHAR_CODE('zoom')        
+kAEZoom = FOUR_CHAR_CODE('zoom') 
 kAEMouseClass = FOUR_CHAR_CODE('mous')
 kAEDown = FOUR_CHAR_CODE('down')
 kAEUp = FOUR_CHAR_CODE('up  ')
@@ -343,7 +346,7 @@ kAEWakeUpEvent = FOUR_CHAR_CODE('wake')
 kAEScrapEvent = FOUR_CHAR_CODE('scrp')
 kAEHighLevel = FOUR_CHAR_CODE('high')
 keyAEAngle = FOUR_CHAR_CODE('kang')
-keyAEArcAngle = FOUR_CHAR_CODE('parc')        
+keyAEArcAngle = FOUR_CHAR_CODE('parc') 
 keyAEBaseAddr = FOUR_CHAR_CODE('badd')
 keyAEBestType = FOUR_CHAR_CODE('pbst')
 keyAEBgndColor = FOUR_CHAR_CODE('kbcl')
@@ -363,7 +366,7 @@ keyAEDescType = FOUR_CHAR_CODE('dstp')
 keyAEDestination = FOUR_CHAR_CODE('dest')
 keyAEDoAntiAlias = FOUR_CHAR_CODE('anta')
 keyAEDoDithered = FOUR_CHAR_CODE('gdit')
-keyAEDoRotate = FOUR_CHAR_CODE('kdrt')        
+keyAEDoRotate = FOUR_CHAR_CODE('kdrt') 
 keyAEDoScale = FOUR_CHAR_CODE('ksca')
 keyAEDoTranslate = FOUR_CHAR_CODE('ktra')
 keyAEEditionFileLoc = FOUR_CHAR_CODE('eloc')
@@ -383,7 +386,7 @@ keyAEGraphicObjects = FOUR_CHAR_CODE('gobs')
 keyAEID = FOUR_CHAR_CODE('ID  ')
 keyAEImageQuality = FOUR_CHAR_CODE('gqua')
 keyAEInsertHere = FOUR_CHAR_CODE('insh')
-keyAEKeyForms = FOUR_CHAR_CODE('keyf')        
+keyAEKeyForms = FOUR_CHAR_CODE('keyf') 
 keyAEKeyword = FOUR_CHAR_CODE('kywd')
 keyAELevel = FOUR_CHAR_CODE('levl')
 keyAELineArrow = FOUR_CHAR_CODE('arro')
@@ -403,7 +406,7 @@ keyAEPixMapMinus = FOUR_CHAR_CODE('kpmm')
 keyAEPMTable = FOUR_CHAR_CODE('kpmt')
 keyAEPointList = FOUR_CHAR_CODE('ptlt')
 keyAEPointSize = FOUR_CHAR_CODE('ptsz')
-keyAEPosition = FOUR_CHAR_CODE('kpos')        
+keyAEPosition = FOUR_CHAR_CODE('kpos') 
 keyAEPropData = FOUR_CHAR_CODE('prdt')
 keyAEProperties = FOUR_CHAR_CODE('qpro')
 keyAEProperty = FOUR_CHAR_CODE('kprp')
@@ -423,7 +426,7 @@ keyAEScriptTag = FOUR_CHAR_CODE('psct')
 keyAEShowWhere = FOUR_CHAR_CODE('show')
 keyAEStartAngle = FOUR_CHAR_CODE('pang')
 keyAEStartPoint = FOUR_CHAR_CODE('pstp')
-keyAEStyles = FOUR_CHAR_CODE('ksty')        
+keyAEStyles = FOUR_CHAR_CODE('ksty') 
 keyAESuiteID = FOUR_CHAR_CODE('suit')
 keyAEText = FOUR_CHAR_CODE('ktxt')
 keyAETextColor = FOUR_CHAR_CODE('ptxc')
@@ -440,7 +443,7 @@ keyAEUniformStyles = FOUR_CHAR_CODE('ustl')
 keyAEUpdateOn = FOUR_CHAR_CODE('pupd')
 keyAEUserTerm = FOUR_CHAR_CODE('utrm')
 keyAEWindow = FOUR_CHAR_CODE('wndw')
-keyAEWritingCode = FOUR_CHAR_CODE('wrcd')        
+keyAEWritingCode = FOUR_CHAR_CODE('wrcd') 
 keyMiscellaneous = FOUR_CHAR_CODE('fmsc')
 keySelection = FOUR_CHAR_CODE('fsel')
 keyWindow = FOUR_CHAR_CODE('kwnd')
@@ -473,7 +476,7 @@ pEnabled = FOUR_CHAR_CODE('enbl')
 pEndPoint = FOUR_CHAR_CODE('pend')
 pFillColor = FOUR_CHAR_CODE('flcl')
 pFillPattern = FOUR_CHAR_CODE('flpt')
-pFont = FOUR_CHAR_CODE('font')        
+pFont = FOUR_CHAR_CODE('font') 
 pFormula = FOUR_CHAR_CODE('pfor')
 pGraphicObjects = FOUR_CHAR_CODE('gobs')
 pHasCloseBox = FOUR_CHAR_CODE('hclb')
@@ -493,7 +496,7 @@ pItemNumber = FOUR_CHAR_CODE('itmn')
 pJustification = FOUR_CHAR_CODE('pjst')
 pLineArrow = FOUR_CHAR_CODE('arro')
 pMenuID = FOUR_CHAR_CODE('mnid')
-pName = FOUR_CHAR_CODE('pnam')        
+pName = FOUR_CHAR_CODE('pnam') 
 pNewElementLoc = FOUR_CHAR_CODE('pnel')
 pPenColor = FOUR_CHAR_CODE('ppcl')
 pPenPattern = FOUR_CHAR_CODE('pppa')
@@ -513,7 +516,7 @@ pStartPoint = FOUR_CHAR_CODE('pstp')
 pTextColor = FOUR_CHAR_CODE('ptxc')
 pTextFont = FOUR_CHAR_CODE('ptxf')
 pTextItemDelimiters = FOUR_CHAR_CODE('txdl')
-pTextPointSize = FOUR_CHAR_CODE('ptps')        
+pTextPointSize = FOUR_CHAR_CODE('ptps') 
 pTextStyles = FOUR_CHAR_CODE('txst')
 pTransferMode = FOUR_CHAR_CODE('pptm')
 pTranslation = FOUR_CHAR_CODE('ptrs')
@@ -521,7 +524,7 @@ pUniformStyles = FOUR_CHAR_CODE('ustl')
 pUpdateOn = FOUR_CHAR_CODE('pupd')
 pUserSelection = FOUR_CHAR_CODE('pusl')
 pVersion = FOUR_CHAR_CODE('vers')
-pVisible = FOUR_CHAR_CODE('pvis')        
+pVisible = FOUR_CHAR_CODE('pvis') 
 typeAEText = FOUR_CHAR_CODE('tTXT')
 typeArc = FOUR_CHAR_CODE('carc')
 typeBest = FOUR_CHAR_CODE('best')
@@ -535,7 +538,7 @@ typeDrawingArea = FOUR_CHAR_CODE('cdrw')
 typeElemInfo = FOUR_CHAR_CODE('elin')
 typeEnumeration = FOUR_CHAR_CODE('enum')
 typeEPS = FOUR_CHAR_CODE('EPS ')
-typeEventInfo = FOUR_CHAR_CODE('evin')        
+typeEventInfo = FOUR_CHAR_CODE('evin') 
 typeFinderWindow = FOUR_CHAR_CODE('fwin')
 typeFixedPoint = FOUR_CHAR_CODE('fpnt')
 typeFixedRectangle = FOUR_CHAR_CODE('frct')
@@ -554,11 +557,12 @@ typeLongRectangle = FOUR_CHAR_CODE('lrct')
 typeMachineLoc = FOUR_CHAR_CODE('mLoc')
 typeOval = FOUR_CHAR_CODE('covl')
 typeParamInfo = FOUR_CHAR_CODE('pmin')
-typePict = FOUR_CHAR_CODE('PICT')        
+typePict = FOUR_CHAR_CODE('PICT') 
 typePixelMap = FOUR_CHAR_CODE('cpix')
 typePixMapMinus = FOUR_CHAR_CODE('tpmm')
 typePolygon = FOUR_CHAR_CODE('cpgn')
 typePropInfo = FOUR_CHAR_CODE('pinf')
+typePtr = FOUR_CHAR_CODE('ptr ')
 typeQDPoint = FOUR_CHAR_CODE('QDpt')
 typeQDRegion = FOUR_CHAR_CODE('Qrgn')
 typeRectangle = FOUR_CHAR_CODE('crec')
@@ -573,9 +577,9 @@ typeScript = FOUR_CHAR_CODE('scpt')
 typeStyledText = FOUR_CHAR_CODE('STXT')
 typeSuiteInfo = FOUR_CHAR_CODE('suin')
 typeTable = FOUR_CHAR_CODE('ctbl')
-typeTextStyles = FOUR_CHAR_CODE('tsty')        
+typeTextStyles = FOUR_CHAR_CODE('tsty') 
 typeTIFF = FOUR_CHAR_CODE('TIFF')
-typeVersion = FOUR_CHAR_CODE('vers')        
+typeVersion = FOUR_CHAR_CODE('vers') 
 kAEMenuClass = FOUR_CHAR_CODE('menu')
 kAEMenuSelect = FOUR_CHAR_CODE('mhit')
 kAEMouseDown = FOUR_CHAR_CODE('mdwn')
@@ -625,6 +629,7 @@ keyAETSMScriptTag = FOUR_CHAR_CODE('sclg')
 keyAETSMTextFont = FOUR_CHAR_CODE('ktxf')
 keyAETSMTextPointSize = FOUR_CHAR_CODE('ktps')
 keyAETSMEventRecord = FOUR_CHAR_CODE('tevt')
+keyAETSMEventRef = FOUR_CHAR_CODE('tevr')
 keyAETextServiceEncoding = FOUR_CHAR_CODE('tsen')
 keyAETextServiceMacEncoding = FOUR_CHAR_CODE('tmen')
 typeTextRange = FOUR_CHAR_CODE('txrn')
@@ -632,7 +637,8 @@ typeComponentInstance = FOUR_CHAR_CODE('cmpi')
 typeOffsetArray = FOUR_CHAR_CODE('ofay')
 typeTextRangeArray = FOUR_CHAR_CODE('tray')
 typeLowLevelEventRecord = FOUR_CHAR_CODE('evtr')
-typeText = typeChar                      
+typeEventRef = FOUR_CHAR_CODE('evrf')
+typeText = typeChar 
 kTSMOutsideOfBody = 1
 kTSMInsideOfBody = 2
 kTSMInsideOfActiveInputArea = 3
@@ -645,7 +651,7 @@ kConvertedText = 4
 kSelectedConvertedText = 5
 kBlockFillText = 6
 kOutlineText = 7
-kSelectedText = 8                             
+kSelectedText = 8     
 keyAEHiliteRange = FOUR_CHAR_CODE('hrng')
 keyAEPinRange = FOUR_CHAR_CODE('pnrg')
 keyAEClauseOffsets = FOUR_CHAR_CODE('clau')
@@ -653,7 +659,7 @@ keyAEOffset = FOUR_CHAR_CODE('ofst')
 keyAEPoint = FOUR_CHAR_CODE('gpos')
 keyAELeftSide = FOUR_CHAR_CODE('klef')
 keyAERegionClass = FOUR_CHAR_CODE('rgnc')
-keyAEDragging = FOUR_CHAR_CODE('bool')        
+keyAEDragging = FOUR_CHAR_CODE('bool') 
 keyAELeadingEdge = keyAELeftSide
 typeUnicodeText = FOUR_CHAR_CODE('utxt')
 typeStyledUnicodeText = FOUR_CHAR_CODE('sutx')
@@ -702,7 +708,7 @@ kFAAttachCommand = FOUR_CHAR_CODE('atfa')
 kFARemoveCommand = FOUR_CHAR_CODE('rmfa')
 kFAEditCommand = FOUR_CHAR_CODE('edfa')
 kFAFileParam = FOUR_CHAR_CODE('faal')
-kFAIndexParam = FOUR_CHAR_CODE('indx')        
+kFAIndexParam = FOUR_CHAR_CODE('indx') 
 kAEInternetSuite = FOUR_CHAR_CODE('gurl')
 kAEISWebStarSuite = FOUR_CHAR_CODE('WWW½')
 kAEISGetURL = FOUR_CHAR_CODE('gurl')
@@ -909,7 +915,7 @@ keyAEObject2 = FOUR_CHAR_CODE('obj2')
 keyAEDesiredClass = FOUR_CHAR_CODE('want')
 keyAEContainer = FOUR_CHAR_CODE('from')
 keyAEKeyForm = FOUR_CHAR_CODE('form')
-keyAEKeyData = FOUR_CHAR_CODE('seld')        
+keyAEKeyData = FOUR_CHAR_CODE('seld') 
 keyAERangeStart = FOUR_CHAR_CODE('star')
 keyAERangeStop = FOUR_CHAR_CODE('stop')
 keyDisposeTokenProc = FOUR_CHAR_CODE('xtok')
@@ -918,7 +924,7 @@ keyAECountProc = FOUR_CHAR_CODE('cont')
 keyAEMarkTokenProc = FOUR_CHAR_CODE('mkid')
 keyAEMarkProc = FOUR_CHAR_CODE('mark')
 keyAEAdjustMarksProc = FOUR_CHAR_CODE('adjm')
-keyAEGetErrDescProc = FOUR_CHAR_CODE('indc')        
+keyAEGetErrDescProc = FOUR_CHAR_CODE('indc') 
 formAbsolutePosition = FOUR_CHAR_CODE('indx')
 formRelativePosition = FOUR_CHAR_CODE('rele')
 formTest = FOUR_CHAR_CODE('test')
@@ -935,7 +941,7 @@ typeIndexDescriptor = FOUR_CHAR_CODE('inde')
 typeRangeDescriptor = FOUR_CHAR_CODE('rang')
 typeLogicalDescriptor = FOUR_CHAR_CODE('logi')
 typeCompDescriptor = FOUR_CHAR_CODE('cmpd')
-typeOSLTokenList = FOUR_CHAR_CODE('ostl')        
+typeOSLTokenList = FOUR_CHAR_CODE('ostl') 
 kAEIDoMinimum = 0x0000
 kAEIDoWhose = 0x0001
 kAEIDoMarking = 0x0004
@@ -949,4 +955,4 @@ typeWhoseRange = FOUR_CHAR_CODE('wrng')
 keyAEWhoseRangeStart = FOUR_CHAR_CODE('wstr')
 keyAEWhoseRangeStop = FOUR_CHAR_CODE('wstp')
 keyAEIndex = FOUR_CHAR_CODE('kidx')
-keyAETest = FOUR_CHAR_CODE('ktst')        
+keyAETest = FOUR_CHAR_CODE('ktst') 
diff --git a/Mac/Lib/Carbon/Balloons.py b/Mac/Lib/Carbon/Balloons.py
index 976be87..3106181 100644
--- a/Mac/Lib/Carbon/Balloons.py
+++ b/Mac/Lib/Carbon/Balloons.py
@@ -10,19 +10,29 @@ 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                             
-hmSaveBitsNoWindow = 4
-hmSaveBitsWindow = 8
-hmMatchInTitle = 16                            
+hmUseSubIDBit = 0
+hmAbsoluteCoordsBit = 1
+hmSaveBitsNoWindowBit = 2
+hmSaveBitsWindowBit = 3
+hmMatchInTitleBit = 4
+hmUseSubIDMask = (1 << hmUseSubIDBit)
+hmAbsoluteCoordsMask = (1 << hmAbsoluteCoordsBit)
+hmSaveBitsNoWindowMask = (1 << hmSaveBitsNoWindowBit)
+hmSaveBitsWindowMask = (1 << hmSaveBitsWindowBit)
+hmMatchInTitleMask = (1 << hmMatchInTitleBit) 
+hmUseSubID = hmUseSubIDMask
+hmAbsoluteCoords = hmAbsoluteCoordsMask
+hmSaveBitsNoWindow = hmSaveBitsNoWindowMask
+hmSaveBitsWindow = hmSaveBitsWindowMask
+hmMatchInTitle = hmMatchInTitleMask
 kHMStringItem = 1
 kHMPictItem = 2
 kHMStringResItem = 3
@@ -31,7 +41,7 @@ kHMSTRResItem = 7
 kHMSkipItem = 256
 kHMCompareItem = 512
 kHMNamedResourceItem = 1024
-kHMTrackCntlItem = 2048                          
+kHMTrackCntlItem = 2048  
 khmmString = 1
 khmmPict = 2
 khmmStringRes = 3
@@ -39,18 +49,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/Carbon/Components.py b/Mac/Lib/Carbon/Components.py
index 671d3d2..3fbca02 100644
--- a/Mac/Lib/Carbon/Components.py
+++ b/Mac/Lib/Carbon/Components.py
@@ -3,7 +3,7 @@
 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
@@ -19,7 +19,7 @@ kComponentTargetSelect = -6
 kComponentUnregisterSelect = -7
 kComponentGetMPWorkFunctionSelect = -8
 kComponentExecuteWiredActionSelect = -9
-kComponentGetPublicResourceSelect = -10                     
+kComponentGetPublicResourceSelect = -10 
 componentDoAutoVersion = (1 << 0)
 componentWantsUnregister = (1 << 1)
 componentAutoVersionIncludeFlags = (1 << 2)
diff --git a/Mac/Lib/Carbon/Dialogs.py b/Mac/Lib/Carbon/Dialogs.py
index 9ba542a..dbb69dc 100644
--- a/Mac/Lib/Carbon/Dialogs.py
+++ b/Mac/Lib/Carbon/Dialogs.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Dialogs.h'
+# Generated from 'Dialogs.h'
 
 def FOUR_CHAR_CODE(x): return x
 kControlDialogItem = 4
@@ -45,7 +45,7 @@ kAlertCautionAlert = 2
 kAlertPlainAlert = 3
 kAlertDefaultOKText = -1
 kAlertDefaultCancelText = -1
-kAlertDefaultOtherText = -1                            
+kAlertDefaultOtherText = -1    
 kAlertStdAlertOKButton = 1
 kAlertStdAlertCancelButton = 2
 kAlertStdAlertOtherButton = 3
@@ -70,3 +70,7 @@ kDialogFontUseAllMask = 0x00FF
 kDialogFontAddFontSizeMask = 0x0100
 kDialogFontUseFontNameMask = 0x0200
 kDialogFontAddToMetaFontMask = 0x0400
+kDialogFontUseThemeFontIDMask = 0x0080
+kHICommandOther = FOUR_CHAR_CODE('othr') 
+kStdCFStringAlertVersionOne = 1     
+kStdAlertDoNotDisposeSheet = 1 << 0 
diff --git a/Mac/Lib/Carbon/Dragconst.py b/Mac/Lib/Carbon/Dragconst.py
index 5919560..ae2d616 100644
--- a/Mac/Lib/Carbon/Dragconst.py
+++ b/Mac/Lib/Carbon/Dragconst.py
@@ -15,36 +15,36 @@ flavorNotSaved				= (1 << 2)
 flavorSystemTranslated		= (1 << 8)
 kDragHasLeftSenderWindow = (1L << 0)
 kDragInsideSenderApplication = (1L << 1)
-kDragInsideSenderWindow = (1L << 2)                     
+kDragInsideSenderWindow = (1L << 2) 
 kDragBehaviorNone = 0
-kDragBehaviorZoomBackAnimation = (1L << 0)                  
-kDragRegionAndImage = (1L << 4)                     
+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)                      
+flavorSystemTranslated = (1 << 8) 
 kDragFlavorTypeHFS = FOUR_CHAR_CODE('hfs ')
 kDragFlavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
 flavorTypeHFS = kDragFlavorTypeHFS
-flavorTypePromiseHFS = kDragFlavorTypePromiseHFS     
+flavorTypePromiseHFS = kDragFlavorTypePromiseHFS 
 kDragPromisedFlavorFindFile = FOUR_CHAR_CODE('rWm1')
-kDragPromisedFlavor = FOUR_CHAR_CODE('fssP')        
+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')        
+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')
@@ -53,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/Carbon/Events.py b/Mac/Lib/Carbon/Events.py
index 21b05c4..c8c920a 100644
--- a/Mac/Lib/Carbon/Events.py
+++ b/Mac/Lib/Carbon/Events.py
@@ -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 = (unsigned long)0xFF000000
 mouseMovedMessage = 0x00FA
 suspendResumeMessage = 0x0001
-resumeFlag = 1
-convertClipboardFlag = 2                             
+resumeFlag = 1     
+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/Carbon/Fonts.py b/Mac/Lib/Carbon/Fonts.py
index 713db0e..0b54249 100644
--- a/Mac/Lib/Carbon/Fonts.py
+++ b/Mac/Lib/Carbon/Fonts.py
@@ -19,20 +19,6 @@ 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
diff --git a/Mac/Lib/Carbon/Icons.py b/Mac/Lib/Carbon/Icons.py
index 56dde47..e47e733 100644
--- a/Mac/Lib/Carbon/Icons.py
+++ b/Mac/Lib/Carbon/Icons.py
@@ -232,6 +232,7 @@ kGenericFontIcon = FOUR_CHAR_CODE('ffil')
 kGenericFontScalerIcon = FOUR_CHAR_CODE('sclr')
 kGenericFloppyIcon = FOUR_CHAR_CODE('flpy')
 kGenericHardDiskIcon = FOUR_CHAR_CODE('hdsk')
+kGenericIDiskIcon = FOUR_CHAR_CODE('idsk')
 kGenericRemovableMediaIcon = FOUR_CHAR_CODE('rmov')
 kGenericMoverObjectIcon = FOUR_CHAR_CODE('movr')
 kGenericPCCardIcon = FOUR_CHAR_CODE('pcmc')
@@ -250,6 +251,7 @@ kTrashIcon = FOUR_CHAR_CODE('trsh')
 kTrueTypeFontIcon = FOUR_CHAR_CODE('tfil')
 kTrueTypeFlatFontIcon = FOUR_CHAR_CODE('sfnt')
 kTrueTypeMultiFlatFontIcon = FOUR_CHAR_CODE('ttcf')
+kUserIDiskIcon = FOUR_CHAR_CODE('udsk')
 kInternetLocationHTTPIcon = FOUR_CHAR_CODE('ilht')
 kInternetLocationFTPIcon = FOUR_CHAR_CODE('ilft')
 kInternetLocationAppleShareIcon = FOUR_CHAR_CODE('ilaf')
diff --git a/Mac/Lib/Carbon/Lists.py b/Mac/Lib/Carbon/Lists.py
index e56ec77..76518ba 100644
--- a/Mac/Lib/Carbon/Lists.py
+++ b/Mac/Lib/Carbon/Lists.py
@@ -4,9 +4,11 @@ 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') 
+lDrawingModeOffBit = 3
 lDoVAutoscrollBit = 1
 lDoHAutoscrollBit = 0
+lDrawingModeOff = 8
 lDoVAutoscroll = 2
 lDoHAutoscroll = 1
 lOnlyOneBit = 7
@@ -27,6 +29,7 @@ lInitMsg = 0
 lDrawMsg = 1
 lHiliteMsg = 2
 lCloseMsg = 3
-kListDefUserProcType = 0
+kListDefProcPtr = 0
+kListDefUserProcType = kListDefProcPtr
 kListDefStandardTextType = 1
 kListDefStandardIconType = 2
diff --git a/Mac/Lib/Carbon/Menus.py b/Mac/Lib/Carbon/Menus.py
index d892734..a0e3432 100644
--- a/Mac/Lib/Carbon/Menus.py
+++ b/Mac/Lib/Carbon/Menus.py
@@ -1,7 +1,7 @@
 # Generated from 'Menus.h'
 
 def FOUR_CHAR_CODE(x): return x
-noMark = 0                             
+noMark = 0     
 kMenuDrawMsg = 0
 kMenuSizeMsg = 2
 kMenuPopUpMsg = 3
@@ -15,38 +15,135 @@ mChooseMsg = 1
 mDrawItemMsg = 4
 kMenuChooseMsg = 1
 kMenuDrawItemMsg = 4
-kThemeSavvyMenuResponse = 0x7473
+kThemeSavvyMenuResponse = 0x7473 
 kMenuInitMsg = 8
 kMenuDisposeMsg = 9
 kMenuFindItemMsg = 10
 kMenuHiliteItemMsg = 11
+kMenuDrawItemsMsg = 12
 textMenuProc = 0
 hMenuCmd = 27
 hierMenu = -1
 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
+kMenuCGImageRefType = 7     
+kMenuNullGlyph = 0x00
+kMenuTabRightGlyph = 0x02
+kMenuTabLeftGlyph = 0x03
+kMenuEnterGlyph = 0x04
+kMenuShiftGlyph = 0x05
+kMenuControlGlyph = 0x06
+kMenuOptionGlyph = 0x07
+kMenuSpaceGlyph = 0x09
+kMenuDeleteRightGlyph = 0x0A
+kMenuReturnGlyph = 0x0B
+kMenuReturnR2LGlyph = 0x0C
+kMenuNonmarkingReturnGlyph = 0x0D
+kMenuPencilGlyph = 0x0F
+kMenuDownwardArrowDashedGlyph = 0x10
+kMenuCommandGlyph = 0x11
+kMenuCheckmarkGlyph = 0x12
+kMenuDiamondGlyph = 0x13
+kMenuAppleLogoFilledGlyph = 0x14
+kMenuParagraphKoreanGlyph = 0x15
+kMenuDeleteLeftGlyph = 0x17
+kMenuLeftArrowDashedGlyph = 0x18
+kMenuUpArrowDashedGlyph = 0x19
+kMenuRightArrowDashedGlyph = 0x1A
+kMenuEscapeGlyph = 0x1B
+kMenuClearGlyph = 0x1C
+kMenuLeftDoubleQuotesJapaneseGlyph = 0x1D
+kMenuRightDoubleQuotesJapaneseGlyph = 0x1E
+kMenuTrademarkJapaneseGlyph = 0x1F
+kMenuBlankGlyph = 0x61
+kMenuPageUpGlyph = 0x62
+kMenuCapsLockGlyph = 0x63
+kMenuLeftArrowGlyph = 0x64
+kMenuRightArrowGlyph = 0x65
+kMenuNorthwestArrowGlyph = 0x66
+kMenuHelpGlyph = 0x67
+kMenuUpArrowGlyph = 0x68
+kMenuSoutheastArrowGlyph = 0x69
+kMenuDownArrowGlyph = 0x6A
+kMenuPageDownGlyph = 0x6B
+kMenuAppleLogoOutlineGlyph = 0x6C
+kMenuContextualMenuGlyph = 0x6D
+kMenuPowerGlyph = 0x6E
+kMenuF1Glyph = 0x6F
+kMenuF2Glyph = 0x70
+kMenuF3Glyph = 0x71
+kMenuF4Glyph = 0x72
+kMenuF5Glyph = 0x73
+kMenuF6Glyph = 0x74
+kMenuF7Glyph = 0x75
+kMenuF8Glyph = 0x76
+kMenuF9Glyph = 0x77
+kMenuF10Glyph = 0x78
+kMenuF11Glyph = 0x79
+kMenuF12Glyph = 0x7A
+kMenuF13Glyph = 0x87
+kMenuF14Glyph = 0x88
+kMenuF15Glyph = 0x89
+kMenuControlISOGlyph = 0x8A  
 kMenuAttrExcludesMarkColumn = (1 << 0)
-kMenuAttrAutoDisable = (1 << 2)                      
-kMenuItemAttrSubmenuParentChoosable = (1 << 2)              
+kMenuAttrAutoDisable = (1 << 2)
+kMenuAttrUsePencilGlyph = (1 << 3)
+kMenuItemAttrDisabled = (1 << 0)
+kMenuItemAttrIconDisabled = (1 << 1)
+kMenuItemAttrSubmenuParentChoosable = (1 << 2)
+kMenuItemAttrDynamic = (1 << 3)
+kMenuItemAttrNotPreviousAlternate = (1 << 4)
+kMenuItemAttrHidden = (1 << 5)
+kMenuItemAttrSeparator = (1 << 6)
+kMenuItemAttrSectionHeader = (1 << 7)
+kMenuItemAttrIgnoreMeta = (1 << 8)
+kMenuItemAttrAutoRepeat = (1 << 9)
+kMenuItemAttrUseVirtualKey = (1 << 10)
 kMenuTrackingModeMouse = 1
-kMenuTrackingModeKeyboard = 2                             
-kMenuDefProcPtr = 0                             
-kMenuPropertyPersistent = 0x00000001                    
+kMenuTrackingModeKeyboard = 2
+kMenuEventIncludeDisabledItems = 0x0001
+kMenuEventQueryOnly = 0x0002
+kMenuEventDontCheckSubmenus = 0x0004
+kMenuItemDataText = (1 << 0)
+kMenuItemDataMark = (1 << 1)
+kMenuItemDataCmdKey = (1 << 2)
+kMenuItemDataCmdKeyGlyph = (1 << 3)
+kMenuItemDataCmdKeyModifiers = (1 << 4)
+kMenuItemDataStyle = (1 << 5)
+kMenuItemDataEnabled = (1 << 6)
+kMenuItemDataIconEnabled = (1 << 7)
+kMenuItemDataIconID = (1 << 8)
+kMenuItemDataIconHandle = (1 << 9)
+kMenuItemDataCommandID = (1 << 10)
+kMenuItemDataTextEncoding = (1 << 11)
+kMenuItemDataSubmenuID = (1 << 12)
+kMenuItemDataSubmenuHandle = (1 << 13)
+kMenuItemDataFontID = (1 << 14)
+kMenuItemDataRefcon = (1 << 15)
+kMenuItemDataAttributes = (1 << 16)
+kMenuItemDataCFString = (1 << 17)
+kMenuItemDataProperties = (1 << 18)
+kMenuItemDataIndent = (1 << 19)
+kMenuItemDataCmdVirtualKey = (1 << 20)
+kMenuItemDataAllDataVersionOne = 0x000FFFFF
+kMenuItemDataAllDataVersionTwo = kMenuItemDataAllDataVersionOne | kMenuItemDataCmdVirtualKey
+kMenuDefProcPtr = 0     
+kMenuPropertyPersistent = 0x00000001 
 kHierarchicalFontMenuOption = 0x00000001
 gestaltContextualMenuAttr = FOUR_CHAR_CODE('cmnu')
 gestaltContextualMenuUnusedBit = 0
diff --git a/Mac/Lib/Carbon/QuickDraw.py b/Mac/Lib/Carbon/QuickDraw.py
index 83ead7f..38d8451 100644
--- a/Mac/Lib/Carbon/QuickDraw.py
+++ b/Mac/Lib/Carbon/QuickDraw.py
@@ -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,7 +124,7 @@ 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')
@@ -139,7 +139,8 @@ 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')
+k2vuyPixelFormat = FOUR_CHAR_CODE('2vuy') 
 kCursorImageMajorVersion = 0x0001
 kCursorImageMinorVersion = 0x0000
 kQDParseRegionFromTop = (1 << 0)
@@ -155,7 +156,7 @@ colorXorXFer = 52
 noiseXFer = 53
 customXFer = 54
 kXFer1PixelAtATime = 0x00000001
-kXFerConvertPixelToRGB32 = 0x00000002                    
+kXFerConvertPixelToRGB32 = 0x00000002 
 kCursorComponentsVersion = 0x00010001
 kCursorComponentType = FOUR_CHAR_CODE('curs')
 cursorDoesAnimate = 1L << 0
@@ -187,10 +188,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
@@ -198,6 +199,19 @@ middleStyleRun = 3
 smOnlyStyleRun = 0
 smLeftStyleRun = 1
 smRightStyleRun = 2
-smMiddleStyleRun = 3                             
+smMiddleStyleRun = 3     
+truncEnd = 0
+truncMiddle = 0x4000
+smTruncEnd = 0
+smTruncMiddle = 0x4000 
+notTruncated = 0
+truncated = 1
+truncErr = -1
+smNotTruncated = 0
+smTruncated = 1
+smTruncErr = -1    
+smBreakWord = 0
+smBreakChar = 1
+smBreakOverflow = 2
 tfAntiAlias = 1 << 0
 tfUnicode = 1 << 1
diff --git a/Mac/Lib/Carbon/QuickTime.py b/Mac/Lib/Carbon/QuickTime.py
index 94acc10..6757b0b 100644
--- a/Mac/Lib/Carbon/QuickTime.py
+++ b/Mac/Lib/Carbon/QuickTime.py
@@ -26,6 +26,8 @@ MovieMediaType = FOUR_CHAR_CODE('moov')
 TweenMediaType = FOUR_CHAR_CODE('twen')
 ThreeDeeMediaType = FOUR_CHAR_CODE('qd3d')
 HandleDataHandlerSubType = FOUR_CHAR_CODE('hndl')
+PointerDataHandlerSubType = FOUR_CHAR_CODE('ptr ')
+NullDataHandlerSubType = FOUR_CHAR_CODE('null')
 ResourceDataHandlerSubType = FOUR_CHAR_CODE('rsrc')
 URLDataHandlerSubType = FOUR_CHAR_CODE('url ')
 WiredActionHandlerType = FOUR_CHAR_CODE('wire')
@@ -38,19 +40,26 @@ kCharacteristicCanStep = FOUR_CHAR_CODE('step')
 kCharacteristicHasNoDuration = FOUR_CHAR_CODE('noti')
 kUserDataMovieControllerType = FOUR_CHAR_CODE('ctyp')
 kUserDataName = FOUR_CHAR_CODE('name')
+kUserDataTextAlbum = FOUR_CHAR_CODE('©alb')
+kUserDataTextArtist = FOUR_CHAR_CODE('©ART')
 kUserDataTextAuthor = FOUR_CHAR_CODE('©aut')
+kUserDataTextChapter = FOUR_CHAR_CODE('©chp')
 kUserDataTextComment = FOUR_CHAR_CODE('©cmt')
+kUserDataTextComposer = FOUR_CHAR_CODE('©com')
 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')
+kUserDataTextEncodedBy = FOUR_CHAR_CODE('©enc')
 kUserDataTextFullName = FOUR_CHAR_CODE('©nam')
+kUserDataTextGenre = FOUR_CHAR_CODE('©gen')
 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')
+kUserDataTextOriginalArtist = FOUR_CHAR_CODE('©ope')
 kUserDataTextOriginalFormat = FOUR_CHAR_CODE('©fmt')
 kUserDataTextOriginalSource = FOUR_CHAR_CODE('©src')
 kUserDataTextPerformers = FOUR_CHAR_CODE('©prf')
@@ -58,12 +67,17 @@ kUserDataTextProducer = FOUR_CHAR_CODE('©prd')
 kUserDataTextProduct = FOUR_CHAR_CODE('©PRD')
 kUserDataTextSoftware = FOUR_CHAR_CODE('©swr')
 kUserDataTextSpecialPlaybackRequirements = FOUR_CHAR_CODE('©req')
+kUserDataTextTrack = FOUR_CHAR_CODE('©trk')
 kUserDataTextWarning = FOUR_CHAR_CODE('©wrn')
 kUserDataTextWriter = FOUR_CHAR_CODE('©wrt')
+kUserDataTextURLLink = FOUR_CHAR_CODE('©url')
 kUserDataTextEditDate1 = FOUR_CHAR_CODE('©ed1')
-kUserDataTextChapter = FOUR_CHAR_CODE('©chp')
 kUserDataUnicodeBit = 1L << 7
 DoTheRightThing = 0
+kQTNetworkStatusNoNetwork = -2
+kQTNetworkStatusUncertain = -1
+kQTNetworkStatusNotConnected = 0
+kQTNetworkStatusConnected = 1
 kMusicFlagDontPlay2Soft = 1L << 0
 kMusicFlagDontSlaveToMovie = 1L << 1
 dfDontDisplay = 1 << 0
@@ -82,7 +96,7 @@ 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
@@ -90,7 +104,7 @@ searchTextEnabledTracksOnly = 1L << 19
 kTextTextHandle = 1
 kTextTextPtr = 2
 kTextTEStyle = 3
-kTextSetSelection = 4
+kTextSelection = 4
 kTextBackColor = 5
 kTextForeColor = 6
 kTextFace = 7
@@ -101,6 +115,14 @@ kTextHilite = 11
 kTextDropShadow = 12
 kTextDisplayFlags = 13
 kTextScroll = 14
+kTextRelativeScroll = 15
+kTextHyperTextFace = 16
+kTextHyperTextColor = 17
+kTextKeyEntry = 18
+kTextMouseDown = 19
+kTextTextBox = 20
+kTextEditState = 21
+kTextLength = 22    
 k3DMediaRendererEntry = FOUR_CHAR_CODE('rend')
 k3DMediaRendererName = FOUR_CHAR_CODE('name')
 k3DMediaRendererCode = FOUR_CHAR_CODE('rcod')
@@ -123,6 +145,7 @@ mediaQualityDraft = 0x0000
 mediaQualityNormal = 0x0040
 mediaQualityBetter = 0x0080
 mediaQualityBest = 0x00C0
+kQTEventPayloadIsQTList = 1L << 0
 kActionMovieSetVolume = 1024
 kActionMovieSetRate = 1025
 kActionMovieSetLoopingFlags = 1026
@@ -146,6 +169,8 @@ kActionTrackSetLayer = 2052
 kActionTrackSetClip = 2053
 kActionTrackSetCursor = 2054
 kActionTrackSetGraphicsMode = 2055
+kActionTrackSetIdleFrequency = 2056
+kActionTrackSetBassTreble = 2057
 kActionSpriteSetMatrix = 3072
 kActionSpriteSetImageIndex = 3073
 kActionSpriteSetVisible = 3074
@@ -162,6 +187,9 @@ kActionQTVRSetTiltAngle = 4097
 kActionQTVRSetFieldOfView = 4098
 kActionQTVRShowDefaultView = 4099
 kActionQTVRGoToNodeID = 4100
+kActionQTVREnableHotSpot = 4101
+kActionQTVRShowHotSpots = 4102
+kActionQTVRTranslateObject = 4103
 kActionMusicPlayNote = 5120
 kActionMusicSetController = 5121
 kActionCase = 6144
@@ -179,6 +207,11 @@ kActionAddChannelSubscription = 6155
 kActionRemoveChannelSubscription = 6156
 kActionOpenCustomActionHandler = 6157
 kActionDoScript = 6158
+kActionDoCompressedActions = 6159
+kActionSendAppMessage = 6160
+kActionLoadComponent = 6161
+kActionSetFocus = 6162
+kActionDontPassKeyEvent = 6163
 kActionSpriteTrackSetVariable = 7168
 kActionSpriteTrackNewSprite = 7169
 kActionSpriteTrackDisposeSprite = 7170
@@ -195,8 +228,40 @@ kActionFlashTrackSetZoom = 10241
 kActionFlashTrackSetZoomRect = 10242
 kActionFlashTrackGotoFrameNumber = 10243
 kActionFlashTrackGotoFrameLabel = 10244
+kActionFlashTrackSetFlashVariable = 10245
+kActionFlashTrackDoButtonActions = 10246
 kActionMovieTrackAddChildMovie = 11264
-kActionMovieTrackLoadChildMovie = 11265                     
+kActionMovieTrackLoadChildMovie = 11265
+kActionMovieTrackLoadChildMovieWithQTListParams = 11266
+kActionTextTrackPasteText = 12288
+kActionTextTrackSetTextBox = 12291
+kActionTextTrackSetTextStyle = 12292
+kActionTextTrackSetSelection = 12293
+kActionTextTrackSetBackgroundColor = 12294
+kActionTextTrackSetForegroundColor = 12295
+kActionTextTrackSetFace = 12296
+kActionTextTrackSetFont = 12297
+kActionTextTrackSetSize = 12298
+kActionTextTrackSetAlignment = 12299
+kActionTextTrackSetHilite = 12300
+kActionTextTrackSetDropShadow = 12301
+kActionTextTrackSetDisplayFlags = 12302
+kActionTextTrackSetScroll = 12303
+kActionTextTrackRelativeScroll = 12304
+kActionTextTrackFindText = 12305
+kActionTextTrackSetHyperTextFace = 12306
+kActionTextTrackSetHyperTextColor = 12307
+kActionTextTrackKeyEntry = 12308
+kActionTextTrackMouseDown = 12309
+kActionTextTrackSetEditable = 12310
+kActionListAddElement = 13312
+kActionListRemoveElements = 13313
+kActionListSetElementValue = 13314
+kActionListPasteFromXML = 13315
+kActionListSetMatchingFromXML = 13316
+kActionListSetFromURL = 13317
+kActionListExchangeLists = 13318
+kActionListServerQuery = 13319 
 kOperandExpression = 1
 kOperandConstant = 2
 kOperandSubscribedToChannel = 3
@@ -222,17 +287,37 @@ kOperandComponentVersion = 22
 kOperandOriginalHandlerRefcon = 23
 kOperandTicks = 24
 kOperandMaxLoadedTimeInMovie = 25
+kOperandEventParameter = 26
+kOperandFreeMemory = 27
+kOperandNetworkStatus = 28
+kOperandQuickTimeVersionRegistered = 29
+kOperandSystemVersion = 30
 kOperandMovieVolume = 1024
 kOperandMovieRate = 1025
 kOperandMovieIsLooping = 1026
 kOperandMovieLoopIsPalindrome = 1027
 kOperandMovieTime = 1028
+kOperandMovieDuration = 1029
+kOperandMovieTimeScale = 1030
+kOperandMovieWidth = 1031
+kOperandMovieHeight = 1032
+kOperandMovieLoadState = 1033
+kOperandMovieTrackCount = 1034
+kOperandMovieIsActive = 1035
+kOperandMovieName = 1036
+kOperandMovieID = 1037
 kOperandTrackVolume = 2048
 kOperandTrackBalance = 2049
 kOperandTrackEnabled = 2050
 kOperandTrackLayer = 2051
 kOperandTrackWidth = 2052
 kOperandTrackHeight = 2053
+kOperandTrackDuration = 2054
+kOperandTrackName = 2055
+kOperandTrackID = 2056
+kOperandTrackIdleFrequency = 2057
+kOperandTrackBass = 2058
+kOperandTrackTreble = 2059
 kOperandSpriteBoundsLeft = 3072
 kOperandSpriteBoundsTop = 3073
 kOperandSpriteBoundsRight = 3074
@@ -255,26 +340,61 @@ kOperandSpriteFourthCornerX = 3090
 kOperandSpriteFourthCornerY = 3091
 kOperandSpriteImageRegistrationPointX = 3092
 kOperandSpriteImageRegistrationPointY = 3093
+kOperandSpriteTrackSpriteIDAtPoint = 3094
+kOperandSpriteName = 3095
 kOperandQTVRPanAngle = 4096
 kOperandQTVRTiltAngle = 4097
 kOperandQTVRFieldOfView = 4098
 kOperandQTVRNodeID = 4099
+kOperandQTVRHotSpotsVisible = 4100
+kOperandQTVRViewCenterH = 4101
+kOperandQTVRViewCenterV = 4102
 kOperandMouseLocalHLoc = 5120
 kOperandMouseLocalVLoc = 5121
 kOperandKeyIsDown = 5122
-kOperandRandom = 5123                          
+kOperandRandom = 5123
+kOperandCanHaveFocus = 5124
+kOperandHasFocus = 5125
+kOperandTextTrackEditable = 6144
+kOperandTextTrackCopyText = 6145
+kOperandTextTrackStartSelection = 6146
+kOperandTextTrackEndSelection = 6147
+kOperandTextTrackTextBoxLeft = 6148
+kOperandTextTrackTextBoxTop = 6149
+kOperandTextTrackTextBoxRight = 6150
+kOperandTextTrackTextBoxBottom = 6151
+kOperandTextTrackTextLength = 6152
+kOperandListCountElements = 7168
+kOperandListGetElementPathByIndex = 7169
+kOperandListGetElementValue = 7170
+kOperandListCopyToXML = 7171
+kOperandSin = 8192
+kOperandCos = 8193
+kOperandTan = 8194
+kOperandATan = 8195
+kOperandATan2 = 8196
+kOperandDegreesToRadians = 8197
+kOperandRadiansToDegrees = 8198
+kOperandSquareRoot = 8199
+kOperandExponent = 8200
+kOperandLog = 8201
+kOperandFlashTrackVariable = 9216
+kOperandStringLength = 10240
+kOperandStringCompare = 10241
+kOperandStringSubString = 10242
+kOperandStringConcat = 10243 
 kFirstMovieAction = kActionMovieSetVolume
 kLastMovieAction = kActionMovieRestartAtTime
 kFirstTrackAction = kActionTrackSetVolume
-kLastTrackAction = kActionTrackSetGraphicsMode
+kLastTrackAction = kActionTrackSetBassTreble
 kFirstSpriteAction = kActionSpriteSetMatrix
 kLastSpriteAction = kActionSpriteStretch
 kFirstQTVRAction = kActionQTVRSetPanAngle
-kLastQTVRAction = kActionQTVRGoToNodeID
+kLastQTVRAction = kActionQTVRTranslateObject
 kFirstMusicAction = kActionMusicPlayNote
 kLastMusicAction = kActionMusicSetController
 kFirstSystemAction = kActionCase
-kLastSystemAction = kActionDoScript
+kLastSystemAction = kActionDontPassKeyEvent
 kFirstSpriteTrackAction = kActionSpriteTrackSetVariable
 kLastSpriteTrackAction = kActionSpriteTrackSetVariableToMovieBaseURL
 kFirstApplicationAction = kActionApplicationNumberAndString
@@ -282,11 +402,15 @@ kLastApplicationAction = kActionApplicationNumberAndString
 kFirstQD3DNamedObjectAction = kActionQD3DNamedObjectTranslateTo
 kLastQD3DNamedObjectAction = kActionQD3DNamedObjectRotateTo
 kFirstFlashTrackAction = kActionFlashTrackSetPan
-kLastFlashTrackAction = kActionFlashTrackGotoFrameLabel
+kLastFlashTrackAction = kActionFlashTrackDoButtonActions
 kFirstMovieTrackAction = kActionMovieTrackAddChildMovie
-kLastMovieTrackAction = kActionMovieTrackLoadChildMovie
+kLastMovieTrackAction = kActionMovieTrackLoadChildMovieWithQTListParams
+kFirstTextTrackAction = kActionTextTrackPasteText
+kLastTextTrackAction = kActionTextTrackSetEditable
+kFirstMultiTargetAction = kActionListAddElement
+kLastMultiTargetAction = kActionListServerQuery
 kFirstAction = kFirstMovieAction
-kLastAction = kActionMovieTrackLoadChildMovie
+kLastAction = kLastMultiTargetAction
 kTargetMovie = FOUR_CHAR_CODE('moov')
 kTargetMovieName = FOUR_CHAR_CODE('mona')
 kTargetMovieID = FOUR_CHAR_CODE('moid')
@@ -304,7 +428,8 @@ 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')        
+kTargetQD3DNamedObjectName = FOUR_CHAR_CODE('nana')
+kTargetCurrentQTEventParams = FOUR_CHAR_CODE('evpa') 
 kQTEventType = FOUR_CHAR_CODE('evnt')
 kAction = FOUR_CHAR_CODE('actn')
 kWhichAction = FOUR_CHAR_CODE('whic')
@@ -334,6 +459,7 @@ kQTEventIdle = FOUR_CHAR_CODE('idle')
 kQTEventKey = FOUR_CHAR_CODE('key ')
 kQTEventMovieLoaded = FOUR_CHAR_CODE('load')
 kQTEventRequestToModifyMovie = FOUR_CHAR_CODE('reqm')
+kQTEventListReceived = FOUR_CHAR_CODE('list')
 kActionFlagActionIsDelta = 1L << 1
 kActionFlagParameterWrapsAround = 1L << 2
 kActionFlagActionIsToggle = 1L << 3
@@ -346,6 +472,7 @@ kScriptIsJavaScript = 1L << 1
 kScriptIsLingoEvent = 1L << 2
 kScriptIsVBEvent = 1L << 3
 kScriptIsProjectorCommand = 1L << 4
+kScriptIsAppleScript = 1L << 5
 kQTRegistrationDialogTimeOutFlag = 1 << 0
 kQTRegistrationDialogShowDialog = 1 << 1
 kQTRegistrationDialogForceDialog = 1 << 2
@@ -368,6 +495,8 @@ kOperatorAbsoluteValue = FOUR_CHAR_CODE('abs ')
 kOperatorNegate = FOUR_CHAR_CODE('neg ')
 kPlatformMacintosh = 1
 kPlatformWindows = 2
+kSystemIsWindows9x = 0x00010000
+kSystemIsWindowsNT = 0x00020000
 kMediaPropertyNonLinearAtomType = FOUR_CHAR_CODE('nonl')
 kMediaPropertyHasActions = 105
 loopTimeBase = 1
@@ -396,12 +525,12 @@ 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
@@ -414,7 +543,7 @@ 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
@@ -436,17 +565,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                       
+kMovieAnchorDataRefIsDefault = 1 << 0 
 hintsScrubMode = 1 << 0
 hintsLoop = 1 << 1
 hintsDontPurge = 1 << 2
@@ -464,20 +593,33 @@ hintsIgnoreBandwidthRestrictions = 1 << 17
 hintsPlayingEveryFrame = 1 << 18
 hintsAllowDynamicResize = 1 << 19
 hintsSingleField = 1 << 20
+hintsNoRenderingTimeOut = 1 << 21
 mediaHandlerFlagBaseClient = 1
 movieTrackMediaType = 1 << 0
 movieTrackCharacteristic = 1 << 1
 movieTrackEnabledOnly = 1 << 2
 movieDrawingCallWhenChanged = 0
 movieDrawingCallAlways = 1
+kQTCloneShareSamples = 1 << 0
+kQTCloneDontCopyEdits = 1 << 1
 kGetMovieImporterValidateToFind = 1L << 0
 kGetMovieImporterAllowNewFile = 1L << 1
 kGetMovieImporterDontConsiderGraphicsImporters = 1L << 2
 kGetMovieImporterDontConsiderFileOnlyImporters = 1L << 6
+kGetMovieImporterAutoImportOnly = 1L << 10 
+kQTGetMIMETypeInfoIsQuickTimeMovieType = FOUR_CHAR_CODE('moov')
+kQTGetMIMETypeInfoIsUnhelpfulType = FOUR_CHAR_CODE('dumb') 
 kMovieLoadStateError = -1L
 kMovieLoadStateLoading = 1000
+kMovieLoadStateLoaded = 2000
 kMovieLoadStatePlayable = 10000
+kMovieLoadStatePlaythroughOK = 20000
 kMovieLoadStateComplete = 100000L
+kQTDontUseDataToFindImporter = 1L << 0
+kQTDontLookForMovieImporterIfGraphicsImporterFound = 1L << 1
+kQTAllowOpeningStillImagesAsMovies = 1L << 2
+kQTAllowImportersThatWouldCreateNewFile = 1L << 3
+kQTAllowAggressiveImporters = 1L << 4 
 preloadAlways = 1L << 0
 preloadOnlyIfEnabled = 1L << 1
 fullScreenHideCursor = 1L << 0
@@ -518,7 +660,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
@@ -531,12 +673,12 @@ pdActionGetSubPanelMenu = 9
 pdActionActivateSubPanel = 10
 pdActionConductStopAlert = 11
 pdActionModelessCallback = 12
-pdActionFetchPreview = 13                            
-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')
@@ -560,12 +702,14 @@ 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')      
+kQTParseTextHREFRecomposeHREF = FOUR_CHAR_CODE('rhrf') 
 kQTParseTextHREFURL = FOUR_CHAR_CODE('url ')
 kQTParseTextHREFTarget = FOUR_CHAR_CODE('targ')
+kQTParseTextHREFChapter = FOUR_CHAR_CODE('chap')
 kQTParseTextHREFIsAutoHREF = FOUR_CHAR_CODE('auto')
 kQTParseTextHREFIsServerMap = FOUR_CHAR_CODE('smap')
-kQTParseTextHREFHREF = FOUR_CHAR_CODE('href')        
+kQTParseTextHREFHREF = FOUR_CHAR_CODE('href')
+kQTParseTextHREFEMBEDArgs = FOUR_CHAR_CODE('mbed') 
 kTrackReferenceChapterList = FOUR_CHAR_CODE('chap')
 kTrackReferenceTimeCode = FOUR_CHAR_CODE('tmcd')
 kTrackReferenceModifier = FOUR_CHAR_CODE('ssrc')
@@ -651,19 +795,19 @@ kTweenReturnDelta = 1L << 0
 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')
@@ -699,7 +843,8 @@ 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')        
+kMovieMediaBackgroundColor = FOUR_CHAR_CODE('bkcl')
+kMovieMediaPrerollTime = FOUR_CHAR_CODE('prer') 
 kMovieMediaFitNone = 0
 kMovieMediaFitScroll = FOUR_CHAR_CODE('scro')
 kMovieMediaFitClipIfNecessary = FOUR_CHAR_CODE('hidd')
@@ -717,9 +862,9 @@ 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')        
+kMoviePropertyTrackList = FOUR_CHAR_CODE('tlst') 
 kTrackPropertyMediaType = FOUR_CHAR_CODE('mtyp')
-kTrackPropertyInstantiation = FOUR_CHAR_CODE('inst')        
+kTrackPropertyInstantiation = FOUR_CHAR_CODE('inst') 
 MovieControllerComponentType = FOUR_CHAR_CODE('play')
 kMovieControllerQTVRFlag = 1 << 0
 kMovieControllerDontDisplayToUser = 1 << 1
@@ -791,7 +936,15 @@ mcActionMovieChanged = 77
 mcActionDoScript = 78
 mcActionRestartAtTime = 79
 mcActionGetIndChapter = 80
-mcActionLinkToURLExtended = 81                            
+mcActionLinkToURLExtended = 81
+mcActionSetVolumeStep = 82
+mcActionAutoPlay = 83
+mcActionPauseToBuffer = 84
+mcActionAppMessageReceived = 85
+mcActionEvaluateExpressionWithType = 89
+mcActionGetMovieName = 90
+mcActionGetMovieID = 91
+mcActionGetMovieActive = 92    
 mcFlagSuppressMovieFrame = 1 << 0
 mcFlagSuppressStepButtons = 1 << 1
 mcFlagSuppressSpeakerButton = 1 << 2
@@ -827,6 +980,11 @@ mcMenuCut = 3
 mcMenuCopy = 4
 mcMenuPaste = 5
 mcMenuClear = 6
+kQTAppMessageSoftwareChanged = 1
+kQTAppMessageWindowCloseRequested = 3
+kQTAppMessageExitFullScreenRequested = 4
+kQTAppMessageDisplayChannels = 5
+kQTAppMessageEnterFullScreenRequested = 6 
 kFetchAsBooleanPtr = 1
 kFetchAsShortPtr = 2
 kFetchAsLongPtr = 3
@@ -864,6 +1022,7 @@ kTextMediaDrawRawSelect = 0x0109
 kTextMediaSetTextPropertySelect = 0x010A
 kTextMediaRawSetupSelect = 0x010B
 kTextMediaRawIdleSelect = 0x010C
+kTextMediaGetTextPropertySelect = 0x010D
 kTextMediaFindNextTextSelect = 0x0105
 kTextMediaHiliteTextSampleSelect = 0x0106
 kTextMediaSetTextSampleDataSelect = 0x0107
@@ -899,6 +1058,10 @@ kFlashMediaIDToRefConSelect = 0x0106
 kFlashMediaGetDisplayedFrameNumberSelect = 0x0107
 kFlashMediaFrameNumberToMovieTimeSelect = 0x0108
 kFlashMediaFrameLabelToMovieTimeSelect = 0x0109
+kFlashMediaGetFlashVariableSelect = 0x010A
+kFlashMediaSetFlashVariableSelect = 0x010B
+kFlashMediaDoButtonActionsSelect = 0x010C
+kFlashMediaGetSupportedSwfVersionSelect = 0x010D
 kMovieMediaGetChildDoMCActionCallbackSelect = 0x0102
 kMovieMediaGetDoMCActionCallbackSelect = 0x0103
 kMovieMediaGetCurrentMoviePropertySelect = 0x0104
@@ -966,4 +1129,6 @@ kMCInvalidateSelect = 0x002F
 kMCAdjustCursorSelect = 0x0030
 kMCGetInterfaceElementSelect = 0x0031
 kMCGetDoActionsProcSelect = 0x0032
+kMCAddMovieSegmentSelect = 0x0033
+kMCTrimMovieSegmentSelect = 0x0034
 kMusicMediaGetIndexedTunePlayerSelect = 0x0101
diff --git a/Mac/Lib/Carbon/Sound.py b/Mac/Lib/Carbon/Sound.py
index 59c3057..ffe9efa 100644
--- a/Mac/Lib/Carbon/Sound.py
+++ b/Mac/Lib/Carbon/Sound.py
@@ -1,8 +1,8 @@
 # Generated from '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
@@ -11,21 +11,21 @@ rate22khz = 0x56EE8BA3
 rate16khz = 0x3E800000
 rate11khz = 0x2B7745D1
 rate11025hz = 0x2B110000
-rate8khz = 0x1F400000                    
-sampledSynth = 5                             
+rate8khz = 0x1F400000 
+sampledSynth = 5     
 squareWaveSynth = 1
 waveTableSynth = 3
 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
@@ -35,17 +35,17 @@ 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
 quietCmd = 3
 flushCmd = 4
@@ -84,7 +84,7 @@ continueCmd = 83
 doubleBufferCmd = 84
 getRateCmd = 85
 sizeCmd = 90
-convertCmd = 91                            
+convertCmd = 91    
 waveInitChannelMask = 0x07
 waveInitChannel0 = 0x04
 waveInitChannel1 = 0x05
@@ -93,7 +93,7 @@ waveInitChannel3 = 0x07
 initChan0 = waveInitChannel0
 initChan1 = waveInitChannel1
 initChan2 = waveInitChannel2
-initChan3 = waveInitChannel3              
+initChan3 = waveInitChannel3 
 outsideCmpSH = 0
 insideCmpSH = 1
 aceSuccess = 0
@@ -102,7 +102,7 @@ aceNilBlock = 2
 aceBadComp = 3
 aceBadEncode = 4
 aceBadDest = 5
-aceBadCmd = 6                             
+aceBadCmd = 6     
 initChanLeft = 0x0002
 initChanRight = 0x0003
 initNoInterp = 0x0004
@@ -114,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 ')
@@ -138,6 +138,7 @@ siDeviceName = FOUR_CHAR_CODE('name')
 siEQSpectrumBands = FOUR_CHAR_CODE('eqsb')
 siEQSpectrumLevels = FOUR_CHAR_CODE('eqlv')
 siEQSpectrumOnOff = FOUR_CHAR_CODE('eqlo')
+siEQSpectrumResolution = FOUR_CHAR_CODE('eqrs')
 siEQToneControlGain = FOUR_CHAR_CODE('eqtg')
 siEQToneControlOnOff = FOUR_CHAR_CODE('eqtc')
 siHardwareBalance = FOUR_CHAR_CODE('hbal')
@@ -190,16 +191,20 @@ siSSpLocalization = FOUR_CHAR_CODE('3dif')
 siSSpSpeakerSetup = FOUR_CHAR_CODE('3dst')
 siStereoInputGain = FOUR_CHAR_CODE('sgai')
 siSubwooferMute = FOUR_CHAR_CODE('bmut')
+siTerminalType = FOUR_CHAR_CODE('ttyp')
 siTwosComplementOnOff = FOUR_CHAR_CODE('twos')
+siVendorProduct = FOUR_CHAR_CODE('vpro')
 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')        
+siSupportedExtendedFlags = FOUR_CHAR_CODE('exfl')
+siRateConverterRollOffSlope = FOUR_CHAR_CODE('rcdb')
+siOutputLatency = FOUR_CHAR_CODE('olte') 
 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  ')
@@ -213,7 +218,8 @@ 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')
+kMicrophoneArray = FOUR_CHAR_CODE('mica') 
 kNoSoundComponentType = FOUR_CHAR_CODE('****')
 kSoundComponentType = FOUR_CHAR_CODE('sift')
 kSoundComponentPPCType = FOUR_CHAR_CODE('nift')
@@ -275,12 +281,13 @@ kMicrosoftADPCMFormat = 0x6D730002
 kDVIIntelIMAFormat = 0x6D730011
 kDVAudioFormat = FOUR_CHAR_CODE('dvca')
 kQDesignCompression = FOUR_CHAR_CODE('QDMC')
+kQDesign2Compression = FOUR_CHAR_CODE('QDM2')
 kQUALCOMMCompression = FOUR_CHAR_CODE('Qclp')
 kOffsetBinary = k8BitOffsetBinaryFormat
 kTwosComplement = k16BitBigEndianFormat
 kLittleEndianFormat = k16BitLittleEndianFormat
 kMPEGLayer3Format = 0x6D730055
-kFullMPEGLay3Format = FOUR_CHAR_CODE('.mp3')        
+kFullMPEGLay3Format = FOUR_CHAR_CODE('.mp3') 
 k16BitNativeEndianFormat = k16BitLittleEndianFormat
 k16BitNonNativeEndianFormat = k16BitBigEndianFormat
 k16BitNativeEndianFormat = k16BitBigEndianFormat
@@ -316,8 +323,8 @@ kNonPagingMixer = (1 << 10)
 kSoundConverterMixer = (1 << 11)
 kPagingMixer = (1 << 12)
 kVMAwareMixer = (1 << 13)
-kExtendedSoundData = (1 << 14)                     
-kBestQuality = (1 << 0)                      
+kExtendedSoundData = (1 << 14) 
+kBestQuality = (1 << 0) 
 kInputMask = 0x000000FF
 kOutputMask = 0x0000FF00
 kOutputShift = 8
@@ -330,7 +337,7 @@ kAudioTerminatorAtomType = 0
 kAVDisplayHeadphoneRemove = 0
 kAVDisplayHeadphoneInsert = 1
 kAVDisplayPlainTalkRemove = 2
-kAVDisplayPlainTalkInsert = 3                             
+kAVDisplayPlainTalkInsert = 3     
 audioAllChannels = 0
 audioLeftChannel = 1
 audioRightChannel = 2
@@ -338,21 +345,21 @@ 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)                   
+kSoundConverterHasLeftOverData = (1 << 1) 
 kExtendedSoundSampleCountNotValid = 1L << 0
-kExtendedSoundBufferSizeValid = 1L << 1                     
+kExtendedSoundBufferSizeValid = 1L << 1 
 kScheduledSoundDoScheduled = 1 << 0
 kScheduledSoundDoCallBack = 1 << 1
 kScheduledSoundExtendedHdr = 1 << 2
diff --git a/Mac/Lib/Carbon/TextEdit.py b/Mac/Lib/Carbon/TextEdit.py
index 22c1e97..eb5fb92 100644
--- a/Mac/Lib/Carbon/TextEdit.py
+++ b/Mac/Lib/Carbon/TextEdit.py
@@ -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,24 @@ 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     
+teFIdleWithEventLoopTimer = 7     
 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/Carbon/Windows.py b/Mac/Lib/Carbon/Windows.py
index 62dcc86..71685df 100644
--- a/Mac/Lib/Carbon/Windows.py
+++ b/Mac/Lib/Carbon/Windows.py
@@ -1,14 +1,23 @@
 # Generated from 'MacWindows.h'
 
 def FOUR_CHAR_CODE(x): return x
+false = 0
+true = 1
 kAlertWindowClass = 1L
 kMovableAlertWindowClass = 2L
 kModalWindowClass = 3L
 kMovableModalWindowClass = 4L
 kFloatingWindowClass = 5L
 kDocumentWindowClass = 6L
-kDesktopWindowClass = 7L
-# kAllWindowClasses = (unsigned long)0xFFFFFFFF     
+kUtilityWindowClass = 8L
+kHelpWindowClass = 10L
+kSheetWindowClass = 11L
+kToolbarWindowClass = 12L
+kPlainWindowClass = 13L
+kOverlayWindowClass = 14L
+kSheetAlertWindowClass = 15L
+kAltPlainWindowClass = 16L
+# kAllWindowClasses = (unsigned long)0xFFFFFFFF 
 kWindowNoAttributes = 0L
 kWindowCloseBoxAttribute = (1L << 0)
 kWindowHorizontalZoomAttribute = (1L << 1)
@@ -19,15 +28,19 @@ kWindowResizableAttribute = (1L << 4)
 kWindowSideTitlebarAttribute = (1L << 5)
 kWindowNoUpdatesAttribute = (1L << 16)
 kWindowNoActivatesAttribute = (1L << 17)
-kWindowNoBufferingAttribute = (1L << 20)
+kWindowOpaqueForEventsAttribute = (1L << 18)
+kWindowNoShadowAttribute = (1L << 21)
 kWindowHideOnSuspendAttribute = (1L << 24)
 kWindowStandardHandlerAttribute = (1L << 25)
+kWindowHideOnFullScreenAttribute = (1L << 26)
+kWindowInWindowMenuAttribute = (1L << 27)
+kWindowLiveResizeAttribute = (1L << 28)
 kWindowStandardDocumentAttributes = (kWindowCloseBoxAttribute | kWindowFullZoomAttribute | kWindowCollapseBoxAttribute | kWindowResizableAttribute)
 kWindowStandardFloatingAttributes = (kWindowCloseBoxAttribute | kWindowCollapseBoxAttribute)
 kWindowDefProcType = FOUR_CHAR_CODE('WDEF')
 kStandardWindowDefinition = 0
 kRoundWindowDefinition = 1
-kFloatingWindowDefinition = 124                           
+kFloatingWindowDefinition = 124   
 kDocumentWindowVariantCode = 0
 kModalDialogVariantCode = 1
 kPlainDialogVariantCode = 2
@@ -57,6 +70,9 @@ kWindowDocumentDefProcResID = 64
 kWindowDialogDefProcResID = 65
 kWindowUtilityDefProcResID = 66
 kWindowUtilitySideTitleDefProcResID = 67
+kWindowSheetDefProcResID = 68
+kWindowSimpleDefProcResID = 69
+kWindowSheetAlertDefProcResID = 70
 kWindowDocumentProc = 1024
 kWindowGrowDocumentProc = 1025
 kWindowVertZoomDocumentProc = 1026
@@ -88,6 +104,10 @@ kWindowFloatSideHorizZoomProc = 1081
 kWindowFloatSideHorizZoomGrowProc = 1083
 kWindowFloatSideFullZoomProc = 1085
 kWindowFloatSideFullZoomGrowProc = 1087
+kWindowSheetProc = 1088
+kWindowSheetAlertProc = 1120  
+kWindowSimpleProc = 1104
+kWindowSimpleFrameProc = 1105
 kWindowNoPosition = 0x0000
 kWindowDefaultPosition = 0x0000
 kWindowCenterMainScreen = 0x280A
@@ -119,7 +139,8 @@ kWindowTitleProxyIconRgn = 8
 kWindowStructureRgn = 32
 kWindowContentRgn = 33
 kWindowUpdateRgn = 34
-kWindowGlobalPortRgn = 40                            
+kWindowOpaqueRgn = 35
+kWindowGlobalPortRgn = 40    
 dialogKind = 2
 userKind = 8
 kDialogWindowKind = 2
@@ -135,7 +156,7 @@ inGoAway = 6
 inZoomIn = 7
 inZoomOut = 8
 inCollapseBox = 11
-inProxyIcon = 12                            
+inProxyIcon = 12    
 wNoHit = 0
 wInContent = 1
 wInDrag = 2
@@ -144,7 +165,7 @@ wInGoAway = 4
 wInZoomIn = 5
 wInZoomOut = 6
 wInCollapseBox = 9
-wInProxyIcon = 10                            
+wInProxyIcon = 10    
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
 kWindowMsgCalculateShape = 2
@@ -159,8 +180,8 @@ kWindowMsgModified = 10
 kWindowMsgDrawInCurrentPort = 11
 kWindowMsgSetupProxyDragImage = 12
 kWindowMsgStateChanged = 13
-kWindowMsgMeasureTitle = 14                            
-kWindowMsgGetGrowImageRegion = 19                           
+kWindowMsgMeasureTitle = 14    
+kWindowMsgGetGrowImageRegion = 19    
 wDraw = 0
 wHit = 1
 wCalcRgns = 2
@@ -169,10 +190,6 @@ wDispose = 4
 wGrow = 5
 wDrawGIcon = 6
 kWindowStateTitleChanged = (1 << 0)
-kWindowGrowSideTop = 0x01
-kWindowGrowSideLeft = 0x02
-kWindowGrowSideBottom = 0x04
-kWindowGrowSideRight = 0x08
 kWindowCanGrow = (1 << 0)
 kWindowCanZoom = (1 << 1)
 kWindowCanCollapse = (1 << 2)
@@ -186,8 +203,10 @@ kWindowCanDrawInCurrentPort = (1 << 9)
 kWindowCanSetupProxyDragImage = (1 << 10)
 kWindowCanMeasureTitle = (1 << 11)
 kWindowWantsDisposeAtProcessDeath = (1 << 12)
+kWindowSupportsGetGrowImageRegion = (1 << 13)
+kWindowDefSupportsColorGrafPort = 0x40000002
+kWindowIsOpaque = (1 << 14) 
 kWindowSupportsSetGrowImageRegion = (1 << 13)
-kWindowDefSupportsColorGrafPort = 0x40000002                
 deskPatID = 16
 wContentColor = 0
 wFrameColor = 1
@@ -200,14 +219,45 @@ kWindowDefinitionVersionTwo = 2
 kWindowIsCollapsedState = (1 << 0L)
 kStoredWindowSystemTag = FOUR_CHAR_CODE('appl')
 kStoredBasicWindowDescriptionID = FOUR_CHAR_CODE('sbas')
-kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255')        
+kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255') 
 kWindowDefProcPtr = 0
-kWindowDefObjectClass = 1                             
+kWindowDefObjectClass = 1
+kWindowDefProcID = 2     
+kWindowModalityNone = 0
+kWindowModalitySystemModal = 1
+kWindowModalityAppModal = 2
+kWindowModalityWindowModal = 3
+windowGroupInvalidErr = -5616 
+kWindowGroupAttrSelectAsLayer = 1 << 0
+kWindowGroupAttrMoveTogether = 1 << 1
+kWindowGroupAttrLayerTogether = 1 << 2
+kWindowGroupAttrSharedActivation = 1 << 3
+kWindowGroupAttrHideOnCollapse = 1 << 4
+kWindowActivationScopeNone = 0
+kWindowActivationScopeIndependent = 1
+kWindowActivationScopeAll = 2
+kNextWindowGroup = true
+kPreviousWindowGroup = false
+kWindowGroupContentsReturnWindows = 1 << 0
+kWindowGroupContentsRecurse = 1 << 1
+kWindowGroupContentsVisible = 1 << 2
 kWindowPaintProcOptionsNone = 0
 kScrollWindowNoOptions = 0
 kScrollWindowInvalidate = (1L << 0)
-kScrollWindowEraseToPortBackground = (1L << 1)              
-kWindowZoomTransitionEffect = 1                             
+kScrollWindowEraseToPortBackground = (1L << 1) 
+kWindowZoomTransitionEffect = 1
+kWindowSheetTransitionEffect = 2
+kWindowSlideTransitionEffect = 3     
 kWindowShowTransitionAction = 1
-kWindowHideTransitionAction = 2                             
-kWindowPropertyPersistent = 0x00000001                    
+kWindowHideTransitionAction = 2
+kWindowMoveTransitionAction = 3
+kWindowResizeTransitionAction = 4     
+kWindowConstrainMayResize = (1L << 0)
+kWindowConstrainMoveRegardlessOfFit = (1L << 1)
+kWindowConstrainAllowPartial = (1L << 2)
+kWindowConstrainCalcOnly = (1L << 3)
+kWindowConstrainStandardOptions = kWindowConstrainMoveRegardlessOfFit
+kWindowPropertyPersistent = 0x00000001 
+kWindowGroupAttrSelectable = kWindowGroupAttrSelectAsLayer
+kWindowGroupAttrPositionFixed = kWindowGroupAttrMoveTogether
+kWindowGroupAttrZOrderFixed = kWindowGroupAttrLayerTogether