Finished update to universal header 3.4.2.
diff --git a/Lib/plat-mac/Carbon/Appearance.py b/Lib/plat-mac/Carbon/Appearance.py
index d74c5df..e42e531 100644
--- a/Lib/plat-mac/Carbon/Appearance.py
+++ b/Lib/plat-mac/Carbon/Appearance.py
@@ -59,10 +59,17 @@
kThemeBrushBevelInactiveDark = 47
kThemeBrushNotificationWindowBackground = 48
kThemeBrushMovableModalBackground = 49
-kThemeBrushSheetBackground = 50
+kThemeBrushSheetBackgroundOpaque = 50
kThemeBrushDrawerBackground = 51
+kThemeBrushToolbarBackground = 52
+kThemeBrushSheetBackgroundTransparent = 53
+kThemeBrushMenuBackground = 54
+kThemeBrushMenuBackgroundSelected = 55
+kThemeBrushSheetBackground = kThemeBrushSheetBackgroundOpaque
kThemeBrushBlack = -1
kThemeBrushWhite = -2
+kThemeBrushPrimaryHighlightColor = -3
+kThemeBrushSecondaryHighlightColor = -4
kThemeTextColorDialogActive = 1
kThemeTextColorDialogInactive = 2
kThemeTextColorAlertActive = 3
@@ -157,7 +164,8 @@
kThemeMenuItemAtBottom = 0x0200
kThemeMenuItemHierBackground = 0x0400
kThemeMenuItemPopUpBackground = 0x0800
-kThemeMenuItemHasIcon = 0x8000
+kThemeMenuItemHasIcon = 0x8000
+kThemeMenuItemNoBackground = 0x4000
kThemeBackgroundTabPane = 1
kThemeBackgroundPlacard = 2
kThemeBackgroundWindowHeader = 3
@@ -165,6 +173,7 @@
kThemeBackgroundSecondaryGroupBox = 5
kThemeNameTag = FOUR_CHAR_CODE('name')
kThemeVariantNameTag = FOUR_CHAR_CODE('varn')
+kThemeVariantBaseTintTag = FOUR_CHAR_CODE('tint')
kThemeHighlightColorTag = FOUR_CHAR_CODE('hcol')
kThemeScrollBarArrowStyleTag = FOUR_CHAR_CODE('sbar')
kThemeScrollBarThumbStyleTag = FOUR_CHAR_CODE('sbth')
@@ -187,6 +196,11 @@
kThemeUserDefinedTag = FOUR_CHAR_CODE('user')
kThemeSmoothFontEnabledTag = FOUR_CHAR_CODE('smoo')
kThemeSmoothFontMinSizeTag = FOUR_CHAR_CODE('smos')
+kTiledOnScreen = 1
+kCenterOnScreen = 2
+kFitToScreen = 3
+kFillScreen = 4
+kUseBestGuess = 5
kThemeCheckBoxClassicX = 0
kThemeCheckBoxCheckMark = 1
kThemeScrollBarArrowsSingle = 0
@@ -258,7 +272,7 @@
kThemeTrackRightToLeft = (1 << 1)
kThemeTrackShowThumb = (1 << 2)
kThemeTrackThumbRgnIsNotGhost = (1 << 3)
-kThemeTrackNoScrollBarArrows = (1 << 4)
+kThemeTrackNoScrollBarArrows = (1 << 4)
kThemeWindowHasGrow = (1 << 0)
kThemeWindowHasHorizontalZoom = (1 << 3)
kThemeWindowHasVerticalZoom = (1 << 4)
@@ -279,6 +293,7 @@
kThemeUtilityWindow = 8
kThemeUtilitySideWindow = 9
kThemeSheetWindow = 10
+kThemeDrawerWindow = 11
kThemeWidgetCloseBox = 0
kThemeWidgetZoomBox = 1
kThemeWidgetCollapseBox = 2
@@ -540,6 +555,13 @@
kThemeMetricSmallProgressBarShadowOutset = 60
kThemeMetricPrimaryGroupBoxContentInset = 61
kThemeMetricSecondaryGroupBoxContentInset = 62
+kThemeMetricMenuMarkColumnWidth = 63
+kThemeMetricMenuExcludedMarkColumnWidth = 64
+kThemeMetricMenuMarkIndent = 65
+kThemeMetricMenuTextLeadingEdgeMargin = 66
+kThemeMetricMenuTextTrailingEdgeMargin = 67
+kThemeMetricMenuIndentWidth = 68
+kThemeMetricMenuIconTrailingEdgeMargin = 69
# appearanceBadBrushIndexErr = themeInvalidBrushErr
# appearanceProcessRegisteredErr = themeProcessRegisteredErr
# appearanceProcessNotRegisteredErr = themeProcessNotRegisteredErr
diff --git a/Lib/plat-mac/Carbon/AppleEvents.py b/Lib/plat-mac/Carbon/AppleEvents.py
index 68dfc79..7253a3e 100644
--- a/Lib/plat-mac/Carbon/AppleEvents.py
+++ b/Lib/plat-mac/Carbon/AppleEvents.py
@@ -35,6 +35,7 @@
typeProperty = FOUR_CHAR_CODE('prop')
typeFSS = FOUR_CHAR_CODE('fss ')
typeFSRef = FOUR_CHAR_CODE('fsrf')
+typeFileURL = FOUR_CHAR_CODE('furl')
typeKeyword = FOUR_CHAR_CODE('keyw')
typeSectionH = FOUR_CHAR_CODE('sect')
typeWildCard = FOUR_CHAR_CODE('****')
@@ -627,6 +628,7 @@
keyAENextBody = FOUR_CHAR_CODE('nxbd')
keyAETSMScriptTag = FOUR_CHAR_CODE('sclg')
keyAETSMTextFont = FOUR_CHAR_CODE('ktxf')
+keyAETSMTextFMFont = FOUR_CHAR_CODE('ktxm')
keyAETSMTextPointSize = FOUR_CHAR_CODE('ktps')
keyAETSMEventRecord = FOUR_CHAR_CODE('tevt')
keyAETSMEventRef = FOUR_CHAR_CODE('tevr')
diff --git a/Lib/plat-mac/Carbon/CarbonEvents.py b/Lib/plat-mac/Carbon/CarbonEvents.py
index 8dde8de..ff4f69c 100755
--- a/Lib/plat-mac/Carbon/CarbonEvents.py
+++ b/Lib/plat-mac/Carbon/CarbonEvents.py
@@ -7,6 +7,7 @@
keyAEEventClass = FOUR_CHAR_CODE('evcl')
keyAEEventID = FOUR_CHAR_CODE('evti')
eventAlreadyPostedErr = -9860
+eventTargetBusyErr = -9861
eventClassInvalidErr = -9862
eventClassIncorrectErr = -9864
eventHandlerAlreadyInstalledErr = -9866
@@ -25,14 +26,15 @@
kEventLeaveInQueue = false
kEventRemoveFromQueue = true
kTrackMouseLocationOptionDontConsumeMouseUp = (1 << 0)
-kMouseTrackingMousePressed = 1
-kMouseTrackingMouseReleased = 2
+kMouseTrackingMouseDown = 1
+kMouseTrackingMouseUp = 2
kMouseTrackingMouseExited = 3
kMouseTrackingMouseEntered = 4
-kMouseTrackingMouseMoved = 5
+kMouseTrackingMouseDragged = 5
kMouseTrackingKeyModifiersChanged = 6
kMouseTrackingUserCancelled = 7
kMouseTrackingTimedOut = 8
+kMouseTrackingMouseMoved = 9
kEventAttributeNone = 0
kEventAttributeUserEvent = (1 << 0)
kEventClassMouse = FOUR_CHAR_CODE('mous')
@@ -46,6 +48,8 @@
kEventClassCommand = FOUR_CHAR_CODE('cmds')
kEventClassTablet = FOUR_CHAR_CODE('tblt')
kEventClassVolume = FOUR_CHAR_CODE('vol ')
+kEventClassAppearance = FOUR_CHAR_CODE('appm')
+kEventClassService = FOUR_CHAR_CODE('serv')
kEventMouseDown = 1
kEventMouseUp = 2
kEventMouseMoved = 5
@@ -78,7 +82,8 @@
kEventAppLaunchNotification = 4
kEventAppLaunched = 5
kEventAppTerminated = 6
-kEventAppFrontSwitched = 7
+kEventAppFrontSwitched = 7
+kEventAppGetDockTileMenu = 20
kEventAppleEvent = 1
kEventWindowUpdate = 1
kEventWindowDrawContent = 2
@@ -89,16 +94,23 @@
kEventWindowHiding = 23
kEventWindowShown = 24
kEventWindowHidden = 25
+kEventWindowCollapsing = 86
+kEventWindowCollapsed = 67
+kEventWindowExpanding = 87
+kEventWindowExpanded = 70
+kEventWindowZoomed = 76
kEventWindowBoundsChanging = 26
kEventWindowBoundsChanged = 27
kEventWindowResizeStarted = 28
kEventWindowResizeCompleted = 29
kEventWindowDragStarted = 30
kEventWindowDragCompleted = 31
+kEventWindowClosed = 73
kWindowBoundsChangeUserDrag = (1 << 0)
kWindowBoundsChangeUserResize = (1 << 1)
kWindowBoundsChangeSizeChanged = (1 << 2)
kWindowBoundsChangeOriginChanged = (1 << 3)
+kWindowBoundsChangeZoom = (1 << 4)
kEventWindowClickDragRgn = 32
kEventWindowClickResizeRgn = 33
kEventWindowClickCollapseRgn = 34
@@ -106,18 +118,16 @@
kEventWindowClickZoomRgn = 36
kEventWindowClickContentRgn = 37
kEventWindowClickProxyIconRgn = 38
+kEventWindowClickToolbarButtonRgn = 41
+kEventWindowClickStructureRgn = 42
kEventWindowCursorChange = 40
kEventWindowCollapse = 66
-kEventWindowCollapsed = 67
kEventWindowCollapseAll = 68
kEventWindowExpand = 69
-kEventWindowExpanded = 70
kEventWindowExpandAll = 71
kEventWindowClose = 72
-kEventWindowClosed = 73
kEventWindowCloseAll = 74
kEventWindowZoom = 75
-kEventWindowZoomed = 76
kEventWindowZoomAll = 77
kEventWindowContextualMenuSelect = 78
kEventWindowPathSelect = 79
@@ -128,6 +138,13 @@
kEventWindowHandleContentClick = 85
kEventWindowProxyBeginDrag = 128
kEventWindowProxyEndDrag = 129
+kEventWindowToolbarSwitchMode = 150
+kDockChangedUser = 1
+kDockChangedOrientation = 2
+kDockChangedAutohide = 3
+kDockChangedDisplay = 4
+kDockChangedItems = 5
+kDockChangedUnknown = 6
kEventWindowFocusAcquired = 200
kEventWindowFocusRelinquish = 201
kEventWindowDrawFrame = 1000
@@ -152,7 +169,21 @@
kEventMenuTargetItem = 6
kEventMenuMatchKey = 7
kEventMenuEnableItems = 8
+kEventMenuPopulate = 9
+kEventMenuMeasureItemWidth = 100
+kEventMenuMeasureItemHeight = 101
+kEventMenuDrawItem = 102
+kEventMenuDrawItemContent = 103
kEventMenuDispose = 1001
+kMenuContextMenuBar = 1 << 0
+kMenuContextPullDown = 1 << 8
+kMenuContextPopUp = 1 << 9
+kMenuContextSubmenu = 1 << 10
+kMenuContextMenuBarTracking = 1 << 16
+kMenuContextPopUpTracking = 1 << 17
+kMenuContextKeyMatching = 1 << 18
+kMenuContextMenuEnabling = 1 << 19
+kMenuContextCommandIDSearch = 1 << 20
kEventProcessCommand = 1
kEventCommandProcess = 1
kEventCommandUpdateStatus = 2
@@ -167,12 +198,32 @@
kHICommandClear = FOUR_CHAR_CODE('clea')
kHICommandSelectAll = FOUR_CHAR_CODE('sall')
kHICommandHide = FOUR_CHAR_CODE('hide')
+kHICommandHideOthers = FOUR_CHAR_CODE('hido')
+kHICommandShowAll = FOUR_CHAR_CODE('shal')
kHICommandPreferences = FOUR_CHAR_CODE('pref')
kHICommandZoomWindow = FOUR_CHAR_CODE('zoom')
kHICommandMinimizeWindow = FOUR_CHAR_CODE('mini')
+kHICommandMinimizeAll = FOUR_CHAR_CODE('mina')
+kHICommandMaximizeWindow = FOUR_CHAR_CODE('maxi')
+kHICommandMaximizeAll = FOUR_CHAR_CODE('maxa')
kHICommandArrangeInFront = FOUR_CHAR_CODE('frnt')
+kHICommandBringAllToFront = FOUR_CHAR_CODE('bfrt')
+kHICommandWindowListSeparator = FOUR_CHAR_CODE('wldv')
+kHICommandWindowListTerminator = FOUR_CHAR_CODE('wlst')
+kHICommandSelectWindow = FOUR_CHAR_CODE('swin')
kHICommandAbout = FOUR_CHAR_CODE('abou')
+kHICommandNew = FOUR_CHAR_CODE('new ')
+kHICommandOpen = FOUR_CHAR_CODE('open')
+kHICommandClose = FOUR_CHAR_CODE('clos')
+kHICommandSave = FOUR_CHAR_CODE('save')
+kHICommandSaveAs = FOUR_CHAR_CODE('svas')
+kHICommandRevert = FOUR_CHAR_CODE('rvrt')
+kHICommandPrint = FOUR_CHAR_CODE('prnt')
+kHICommandPageSetup = FOUR_CHAR_CODE('page')
+kHICommandAppHelp = FOUR_CHAR_CODE('ahlp')
kHICommandFromMenu = (1L << 0)
+kHICommandFromControl = (1L << 1)
+kHICommandFromWindow = (1L << 2)
kEventControlInitialize = 1000
kEventControlDispose = 1001
kEventControlGetOptimalBounds = 1003
@@ -209,12 +260,20 @@
kEventControlArbitraryMessage = 201
kControlBoundsChangeSizeChanged = (1 << 2)
kControlBoundsChangePositionChanged = (1 << 3)
-kEventTabletPointer = 1
+kEventTabletPoint = 1
kEventTabletProximity = 2
+kEventTabletPointer = 1
kEventVolumeMounted = 1
kEventVolumeUnmounted = 2
typeFSVolumeRefNum = FOUR_CHAR_CODE('voln')
+kEventAppearanceScrollBarVariantChanged = 1
+kEventServiceCopy = 1
+kEventServicePaste = 2
+kEventServiceGetTypes = 3
+kEventServicePerform = 4
kEventParamDirectObject = FOUR_CHAR_CODE('----')
+kEventParamPostTarget = FOUR_CHAR_CODE('ptrg')
+typeEventTargetRef = FOUR_CHAR_CODE('etrg')
kEventParamWindowRef = FOUR_CHAR_CODE('wind')
kEventParamGrafPort = FOUR_CHAR_CODE('graf')
kEventParamDragRef = FOUR_CHAR_CODE('drag')
@@ -228,6 +287,8 @@
kEventParamAEEventID = keyAEEventID
kEventParamAEEventClass = keyAEEventClass
kEventParamCGContextRef = FOUR_CHAR_CODE('cntx')
+kEventParamDeviceDepth = FOUR_CHAR_CODE('devd')
+kEventParamDeviceColor = FOUR_CHAR_CODE('devc')
typeWindowRef = FOUR_CHAR_CODE('wind')
typeGrafPtr = FOUR_CHAR_CODE('graf')
typeGWorldPtr = FOUR_CHAR_CODE('gwld')
@@ -237,7 +298,13 @@
typeCollection = FOUR_CHAR_CODE('cltn')
typeQDRgnHandle = FOUR_CHAR_CODE('rgnh')
typeOSStatus = FOUR_CHAR_CODE('osst')
-typeCGContextRef = FOUR_CHAR_CODE('cntx')
+typeCFStringRef = FOUR_CHAR_CODE('cfst')
+typeCFIndex = FOUR_CHAR_CODE('cfix')
+typeCFTypeRef = FOUR_CHAR_CODE('cfty')
+typeCGContextRef = FOUR_CHAR_CODE('cntx')
+typeHIPoint = FOUR_CHAR_CODE('hipt')
+typeHISize = FOUR_CHAR_CODE('hisz')
+typeHIRect = FOUR_CHAR_CODE('hirc')
kEventParamMouseLocation = FOUR_CHAR_CODE('mloc')
kEventParamMouseButton = FOUR_CHAR_CODE('mbtn')
kEventParamClickCount = FOUR_CHAR_CODE('ccnt')
@@ -245,12 +312,14 @@
kEventParamMouseWheelDelta = FOUR_CHAR_CODE('mwdl')
kEventParamMouseDelta = FOUR_CHAR_CODE('mdta')
kEventParamMouseChord = FOUR_CHAR_CODE('chor')
+kEventParamTabletEventType = FOUR_CHAR_CODE('tblt')
typeMouseButton = FOUR_CHAR_CODE('mbtn')
typeMouseWheelAxis = FOUR_CHAR_CODE('mwax')
kEventParamKeyCode = FOUR_CHAR_CODE('kcod')
kEventParamKeyMacCharCodes = FOUR_CHAR_CODE('kchr')
kEventParamKeyModifiers = FOUR_CHAR_CODE('kmod')
kEventParamKeyUnicodes = FOUR_CHAR_CODE('kuni')
+kEventParamKeyboardType = FOUR_CHAR_CODE('kbdt')
typeEventHotKeyID = FOUR_CHAR_CODE('hkid')
kEventParamTextInputSendRefCon = FOUR_CHAR_CODE('tsrc')
kEventParamTextInputSendComponentInstance = FOUR_CHAR_CODE('tsci')
@@ -272,6 +341,7 @@
kEventParamTextInputSendDraggingMode = FOUR_CHAR_CODE('tsdm')
kEventParamTextInputReplyPoint = FOUR_CHAR_CODE('trpt')
kEventParamTextInputReplyFont = FOUR_CHAR_CODE('trft')
+kEventParamTextInputReplyFMFont = FOUR_CHAR_CODE('trfm')
kEventParamTextInputReplyPointSize = FOUR_CHAR_CODE('trpz')
kEventParamTextInputReplyLineHeight = FOUR_CHAR_CODE('trlh')
kEventParamTextInputReplyLineAscent = FOUR_CHAR_CODE('trla')
@@ -300,6 +370,9 @@
kEventParamWindowTitleTextWidth = FOUR_CHAR_CODE('wttw')
kEventParamWindowGrowRect = FOUR_CHAR_CODE('grct')
kEventParamAttributes = FOUR_CHAR_CODE('attr')
+kEventParamDockChangedReason = FOUR_CHAR_CODE('dcrs')
+kEventParamPreviousDockRect = FOUR_CHAR_CODE('pdrc')
+kEventParamCurrentDockRect = FOUR_CHAR_CODE('cdrc')
typeWindowRegionCode = FOUR_CHAR_CODE('wshp')
typeWindowDefPartCode = FOUR_CHAR_CODE('wdpt')
typeClickActivationResult = FOUR_CHAR_CODE('clac')
@@ -337,16 +410,42 @@
kEventParamMenuCommand = FOUR_CHAR_CODE('mcmd')
kEventParamEnableMenuForKeyEvent = FOUR_CHAR_CODE('fork')
kEventParamMenuEventOptions = FOUR_CHAR_CODE('meop')
+kEventParamMenuContext = FOUR_CHAR_CODE('mctx')
+kEventParamMenuItemBounds = FOUR_CHAR_CODE('mitb')
+kEventParamMenuMarkBounds = FOUR_CHAR_CODE('mmkb')
+kEventParamMenuIconBounds = FOUR_CHAR_CODE('micb')
+kEventParamMenuTextBounds = FOUR_CHAR_CODE('mtxb')
+kEventParamMenuTextBaseline = FOUR_CHAR_CODE('mtbl')
+kEventParamMenuCommandKeyBounds = FOUR_CHAR_CODE('mcmb')
+kEventParamMenuVirtualTop = FOUR_CHAR_CODE('mvrt')
+kEventParamMenuVirtualBottom = FOUR_CHAR_CODE('mvrb')
+kEventParamMenuDrawState = FOUR_CHAR_CODE('mdrs')
+kEventParamMenuItemType = FOUR_CHAR_CODE('mitp')
+kEventParamMenuItemWidth = FOUR_CHAR_CODE('mitw')
+kEventParamMenuItemHeight = FOUR_CHAR_CODE('mith')
typeMenuItemIndex = FOUR_CHAR_CODE('midx')
typeMenuCommand = FOUR_CHAR_CODE('mcmd')
typeMenuTrackingMode = FOUR_CHAR_CODE('mtmd')
-typeMenuEventOptions = FOUR_CHAR_CODE('meop')
+typeMenuEventOptions = FOUR_CHAR_CODE('meop')
+typeThemeMenuState = FOUR_CHAR_CODE('tmns')
+typeThemeMenuItemType = FOUR_CHAR_CODE('tmit')
kEventParamProcessID = FOUR_CHAR_CODE('psn ')
kEventParamLaunchRefCon = FOUR_CHAR_CODE('lref')
kEventParamLaunchErr = FOUR_CHAR_CODE('err ')
-kEventParamTabletPointerRec = FOUR_CHAR_CODE('tbrc')
+kEventParamTabletPointRec = FOUR_CHAR_CODE('tbrc')
kEventParamTabletProximityRec = FOUR_CHAR_CODE('tbpx')
-typeTabletPointerRec = FOUR_CHAR_CODE('tbrc')
-typeTabletProximityRec = FOUR_CHAR_CODE('tbpx')
+typeTabletPointRec = FOUR_CHAR_CODE('tbrc')
+typeTabletProximityRec = FOUR_CHAR_CODE('tbpx')
+kEventParamTabletPointerRec = FOUR_CHAR_CODE('tbrc')
+typeTabletPointerRec = FOUR_CHAR_CODE('tbrc')
+kEventParamNewScrollBarVariant = FOUR_CHAR_CODE('nsbv')
+kEventParamScrapRef = FOUR_CHAR_CODE('scrp')
+kEventParamServiceCopyTypes = FOUR_CHAR_CODE('svsd')
+kEventParamServicePasteTypes = FOUR_CHAR_CODE('svpt')
+kEventParamServiceMessageName = FOUR_CHAR_CODE('svmg')
+kEventParamServiceUserData = FOUR_CHAR_CODE('svud')
+typeScrapRef = FOUR_CHAR_CODE('scrp')
+typeCFMutableArrayRef = FOUR_CHAR_CODE('cfma')
# sHandler = NewEventHandlerUPP( x )
-kUserFocusAuto = -1
+kMouseTrackingMousePressed = kMouseTrackingMouseDown
+kMouseTrackingMouseReleased = kMouseTrackingMouseUp
diff --git a/Lib/plat-mac/Carbon/Controls.py b/Lib/plat-mac/Carbon/Controls.py
index 23a2b9e..d4bbda3 100644
--- a/Lib/plat-mac/Carbon/Controls.py
+++ b/Lib/plat-mac/Carbon/Controls.py
@@ -54,7 +54,6 @@
kControlCollectionTagIDID = FOUR_CHAR_CODE('idid')
kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')
kControlCollectionTagVarCode = FOUR_CHAR_CODE('varc')
-kControlCollectionTagSubControls = FOUR_CHAR_CODE('subc')
kControlContentTextOnly = 0
kControlNoContent = 0
kControlContentIconSuiteRes = 1
@@ -280,12 +279,12 @@
kControlBevelButtonMenuValueTag = FOUR_CHAR_CODE('mval')
kControlBevelButtonMenuHandleTag = FOUR_CHAR_CODE('mhnd')
kControlBevelButtonMenuRefTag = FOUR_CHAR_CODE('mhnd')
-kControlBevelButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
-# kControlBevelButtonCenterPopupGlyphTag = FOUR_CHAR_CODE('pglc')
-kControlBevelButtonKindTag = FOUR_CHAR_CODE('bebk')
+# kControlBevelButtonCenterPopupGlyphTag = FOUR_CHAR_CODE('pglc')
kControlBevelButtonLastMenuTag = FOUR_CHAR_CODE('lmnu')
kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly')
kControlBevelButtonScaleIconTag = FOUR_CHAR_CODE('scal')
+kControlBevelButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
+kControlBevelButtonKindTag = FOUR_CHAR_CODE('bebk')
kControlSliderProc = 48
kControlSliderLiveFeedback = (1 << 0)
kControlSliderHasTickMarks = (1 << 1)
@@ -421,7 +420,8 @@
kControlEditTextValidationProcTag = FOUR_CHAR_CODE('vali')
kControlEditTextInlinePreUpdateProcTag = FOUR_CHAR_CODE('prup')
kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup')
-kControlEditTextCFStringTag = FOUR_CHAR_CODE('cfst')
+kControlEditTextCFStringTag = FOUR_CHAR_CODE('cfst')
+kControlEditTextPasswordCFStringTag = FOUR_CHAR_CODE('pwcf')
kControlStaticTextProc = 288
kControlKindStaticText = FOUR_CHAR_CODE('stxt')
kControlStaticTextStyleTag = kControlFontStyleTag
@@ -484,7 +484,7 @@
kControlPopupButtonMenuRefTag = FOUR_CHAR_CODE('mhan')
kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid')
kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
-kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
+kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
kControlPopupButtonCheckCurrentTag = FOUR_CHAR_CODE('chck')
kControlRadioGroupProc = 416
kControlKindRadioGroup = FOUR_CHAR_CODE('rgrp')
@@ -502,7 +502,7 @@
kControlRoundButtonNormalSize = kControlSizeNormal
kControlRoundButtonLargeSize = kControlSizeLarge
kControlRoundButtonContentTag = FOUR_CHAR_CODE('cont')
-kControlRoundButtonSizeTag = FOUR_CHAR_CODE('size')
+kControlRoundButtonSizeTag = kControlSizeTag
kControlKindRoundButton = FOUR_CHAR_CODE('rndb')
kControlKindDataBrowser = FOUR_CHAR_CODE('datb')
errDataBrowserNotConfigured = -4970
@@ -644,6 +644,7 @@
kControlEditUnicodeTextPostUpdateProcTag = FOUR_CHAR_CODE('upup')
kControlEditUnicodeTextProc = 912
kControlEditUnicodeTextPasswordProc = 914
+kControlKindEditUnicodeText = FOUR_CHAR_CODE('eutx')
kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue
kControlCheckboxMixedValue = kControlCheckBoxMixedValue
diff --git a/Lib/plat-mac/Carbon/CoreGraphics.py b/Lib/plat-mac/Carbon/CoreGraphics.py
index bd90980..d7a6f02 100755
--- a/Lib/plat-mac/Carbon/CoreGraphics.py
+++ b/Lib/plat-mac/Carbon/CoreGraphics.py
@@ -22,3 +22,7 @@
kCGTextClip = 7
kCGEncodingFontSpecific = 0
kCGEncodingMacRoman = 1
+kCGInterpolationDefault = 0
+kCGInterpolationNone = 1
+kCGInterpolationLow = 2
+kCGInterpolationHigh = 3
diff --git a/Lib/plat-mac/Carbon/Dialogs.py b/Lib/plat-mac/Carbon/Dialogs.py
index dbb69dc..9d2fa8f 100644
--- a/Lib/plat-mac/Carbon/Dialogs.py
+++ b/Lib/plat-mac/Carbon/Dialogs.py
@@ -73,4 +73,7 @@
kDialogFontUseThemeFontIDMask = 0x0080
kHICommandOther = FOUR_CHAR_CODE('othr')
kStdCFStringAlertVersionOne = 1
-kStdAlertDoNotDisposeSheet = 1 << 0
+kStdAlertDoNotDisposeSheet = 1 << 0
+kStdAlertDoNotAnimateOnDefault = 1 << 1
+kStdAlertDoNotAnimateOnCancel = 1 << 2
+kStdAlertDoNotAnimateOnOther = 1 << 3
diff --git a/Lib/plat-mac/Carbon/Dragconst.py b/Lib/plat-mac/Carbon/Dragconst.py
index f08f478..e5c8b89 100644
--- a/Lib/plat-mac/Carbon/Dragconst.py
+++ b/Lib/plat-mac/Carbon/Dragconst.py
@@ -3,6 +3,7 @@
def FOUR_CHAR_CODE(x): return x
from Carbon.TextEdit import *
from Carbon.QuickDraw import *
+fkDragActionAll = -1
kDragHasLeftSenderWindow = (1 << 0)
@@ -34,7 +35,8 @@
flavorSenderOnly = (1 << 0)
flavorSenderTranslated = (1 << 1)
flavorNotSaved = (1 << 2)
-flavorSystemTranslated = (1 << 8)
+flavorSystemTranslated = (1 << 8)
+flavorDataPromised = (1 << 9)
kDragFlavorTypeHFS = FOUR_CHAR_CODE('hfs ')
kDragFlavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
flavorTypeHFS = kDragFlavorTypeHFS
@@ -54,6 +56,14 @@
kDragTrackingInWindow = 3
kDragTrackingLeaveWindow = 4
kDragTrackingLeaveHandler = 5
+kDragActionNothing = 0L
+kDragActionCopy = 1L
+kDragActionAlias = (1L << 1)
+kDragActionGeneric = (1L << 2)
+kDragActionPrivate = (1L << 3)
+kDragActionMove = (1L << 4)
+kDragActionDelete = (1L << 5)
+# kDragActionAll = (long)0xFFFFFFFF
dragHasLeftSenderWindow = kDragHasLeftSenderWindow
dragInsideSenderApplication = kDragInsideSenderApplication
dragInsideSenderWindow = kDragInsideSenderWindow
diff --git a/Lib/plat-mac/Carbon/Events.py b/Lib/plat-mac/Carbon/Events.py
index c8c920a..4853469 100644
--- a/Lib/plat-mac/Carbon/Events.py
+++ b/Lib/plat-mac/Carbon/Events.py
@@ -65,14 +65,29 @@
kPageDownCharCode = 12
kReturnCharCode = 13
kFunctionKeyCharCode = 16
+kCommandCharCode = 17
+kCheckCharCode = 18
+kDiamondCharCode = 19
+kAppleLogoCharCode = 20
kEscapeCharCode = 27
kClearCharCode = 27
kLeftArrowCharCode = 28
kRightArrowCharCode = 29
kUpArrowCharCode = 30
kDownArrowCharCode = 31
+kSpaceCharCode = 32
kDeleteCharCode = 127
+kBulletCharCode = 165
kNonBreakingSpaceCharCode = 202
+kShiftUnicode = 0x21E7
+kControlUnicode = 0x2303
+kOptionUnicode = 0x2325
+kCommandUnicode = 0x2318
+kPencilUnicode = 0x270E
+kCheckUnicode = 0x2713
+kDiamondUnicode = 0x25C6
+kBulletUnicode = 0x2022
+kAppleLogoUnicode = 0xF8FF
networkEvt = 10
driverEvt = 11
app1Evt = 12
diff --git a/Lib/plat-mac/Carbon/Files.py b/Lib/plat-mac/Carbon/Files.py
index f36689d..54fe4b8 100644
--- a/Lib/plat-mac/Carbon/Files.py
+++ b/Lib/plat-mac/Carbon/Files.py
@@ -77,6 +77,7 @@
bNoLclSync = 27
bTrshOffLine = 26
bNoSwitchTo = 25
+bDontShareIt = 21
bNoDeskItems = 20
bNoBootBlks = 19
bAccessCntl = 18
@@ -271,6 +272,7 @@
kFSCatInfoRsrcSizes = 0x00008000
kFSCatInfoSharingFlags = 0x00010000
kFSCatInfoUserPrivs = 0x00020000
+kFSCatInfoUserAccess = 0x00080000
kFSCatInfoAllDates = 0x000003E0
kFSCatInfoGettableInfo = 0x0003FFFF
kFSCatInfoSettableInfo = 0x00001FE3
@@ -338,6 +340,7 @@
kFSVolFlagSoftwareLockedBit = 15
kFSVolFlagSoftwareLockedMask = 0x8000
kFNDirectoryModifiedMessage = 1
+kFNNoImplicitAllSubscription = (1 << 0)
rAliasType = FOUR_CHAR_CODE('alis')
kARMMountVol = 0x00000001
kARMNoUI = 0x00000002
diff --git a/Lib/plat-mac/Carbon/Folders.py b/Lib/plat-mac/Carbon/Folders.py
index 7a69ca4..f22b2ba 100644
--- a/Lib/plat-mac/Carbon/Folders.py
+++ b/Lib/plat-mac/Carbon/Folders.py
@@ -122,7 +122,12 @@
kAudioComponentsFolderType = FOUR_CHAR_CODE('acmp')
kKernelExtensionsFolderType = FOUR_CHAR_CODE('kext')
kDirectoryServicesFolderType = FOUR_CHAR_CODE('dsrv')
-kDirectoryServicesPlugInsFolderType = FOUR_CHAR_CODE('dplg')
+kDirectoryServicesPlugInsFolderType = FOUR_CHAR_CODE('dplg')
+kInstallerReceiptsFolderType = FOUR_CHAR_CODE('rcpt')
+kFileSystemSupportFolderType = FOUR_CHAR_CODE('fsys')
+kAppleShareSupportFolderType = FOUR_CHAR_CODE('shar')
+kAppleShareAuthenticationFolderType = FOUR_CHAR_CODE('auth')
+kMIDIDriversFolderType = FOUR_CHAR_CODE('midi')
kLocalesFolderType = FOUR_CHAR_CODE('\xc4loc')
kFindByContentPluginsFolderType = FOUR_CHAR_CODE('fbcp')
kUsersFolderType = FOUR_CHAR_CODE('usrs')
diff --git a/Lib/plat-mac/Carbon/Fonts.py b/Lib/plat-mac/Carbon/Fonts.py
index 0b54249..8be7e7a 100644
--- a/Lib/plat-mac/Carbon/Fonts.py
+++ b/Lib/plat-mac/Carbon/Fonts.py
@@ -4,6 +4,13 @@
kNilOptions = 0
systemFont = 0
applFont = 1
+kFMDefaultOptions = kNilOptions
+kFMDefaultActivationContext = kFMDefaultOptions
+kFMGlobalActivationContext = 0x00000001
+kFMLocalActivationContext = kFMDefaultActivationContext
+kFMDefaultIterationScope = kFMDefaultOptions
+kFMGlobalIterationScope = 0x00000001
+kFMLocalIterationScope = kFMDefaultIterationScope
kPlatformDefaultGuiFontID = applFont
kPlatformDefaultGuiFontID = -1
commandMark = 17
@@ -19,6 +26,7 @@
fxdFntW = 45058L
fxdFntHW = 45059L
fontWid = 44208L
+kFMUseGlobalScopeOption = 0x00000001
kFontIDNewYork = 2
kFontIDGeneva = 3
kFontIDMonaco = 4
diff --git a/Lib/plat-mac/Carbon/Icons.py b/Lib/plat-mac/Carbon/Icons.py
index 5a03dac..1ed8d50 100644
--- a/Lib/plat-mac/Carbon/Icons.py
+++ b/Lib/plat-mac/Carbon/Icons.py
@@ -1,6 +1,7 @@
# Generated from 'Icons.h'
def FOUR_CHAR_CODE(x): return x
+from Carbon.Files import *
kGenericDocumentIconResource = -4000
kGenericStationeryIconResource = -3985
kGenericEditionFileIconResource = -3989
@@ -242,8 +243,9 @@
kGenericSharedLibaryIcon = FOUR_CHAR_CODE('shlb')
kGenericStationeryIcon = FOUR_CHAR_CODE('sdoc')
kGenericSuitcaseIcon = FOUR_CHAR_CODE('suit')
+kGenericURLIcon = FOUR_CHAR_CODE('gurl')
kGenericWORMIcon = FOUR_CHAR_CODE('worm')
-kInternationResourcesIcon = FOUR_CHAR_CODE('ifil')
+kInternationalResourcesIcon = FOUR_CHAR_CODE('ifil')
kKeyboardLayoutIcon = FOUR_CHAR_CODE('kfil')
kSoundFileIcon = FOUR_CHAR_CODE('sfil')
kSystemSuitcaseIcon = FOUR_CHAR_CODE('zsys')
@@ -252,6 +254,7 @@
kTrueTypeFlatFontIcon = FOUR_CHAR_CODE('sfnt')
kTrueTypeMultiFlatFontIcon = FOUR_CHAR_CODE('ttcf')
kUserIDiskIcon = FOUR_CHAR_CODE('udsk')
+kInternationResourcesIcon = kInternationalResourcesIcon
kInternetLocationHTTPIcon = FOUR_CHAR_CODE('ilht')
kInternetLocationFTPIcon = FOUR_CHAR_CODE('ilft')
kInternetLocationAppleShareIcon = FOUR_CHAR_CODE('ilaf')
@@ -279,11 +282,13 @@
kUserIcon = FOUR_CHAR_CODE('user')
kOwnerIcon = FOUR_CHAR_CODE('susr')
kGroupIcon = FOUR_CHAR_CODE('grup')
+kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aex\xc4')
kAppleMenuFolderIcon = FOUR_CHAR_CODE('amnu')
kApplicationsFolderIcon = FOUR_CHAR_CODE('apps')
kApplicationSupportFolderIcon = FOUR_CHAR_CODE('asup')
kAssistantsFolderIcon = FOUR_CHAR_CODE('ast\xc4')
+kColorSyncFolderIcon = FOUR_CHAR_CODE('prof')
kContextualMenuItemsFolderIcon = FOUR_CHAR_CODE('cmnu')
kControlPanelDisabledFolderIcon = FOUR_CHAR_CODE('ctrD')
kControlPanelFolderIcon = FOUR_CHAR_CODE('ctrl')
@@ -296,8 +301,10 @@
kHelpFolderIcon = FOUR_CHAR_CODE('\xc4hlp')
kInternetFolderIcon = FOUR_CHAR_CODE('int\xc4')
kInternetPlugInFolderIcon = FOUR_CHAR_CODE('\xc4net')
+kInternetSearchSitesFolderIcon = FOUR_CHAR_CODE('issf')
kLocalesFolderIcon = FOUR_CHAR_CODE('\xc4loc')
kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('mor\xc4')
+kPublicFolderIcon = FOUR_CHAR_CODE('pubf')
kPreferencesFolderIcon = FOUR_CHAR_CODE('prf\xc4')
kPrinterDescriptionFolderIcon = FOUR_CHAR_CODE('ppdf')
kPrinterDriverFolderIcon = FOUR_CHAR_CODE('\xc4prd')
@@ -316,17 +323,16 @@
kSystemExtensionDisabledFolderIcon = FOUR_CHAR_CODE('macD')
kSystemFolderIcon = FOUR_CHAR_CODE('macs')
kTextEncodingsFolderIcon = FOUR_CHAR_CODE('\xc4tex')
-kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
+kUsersFolderIcon = FOUR_CHAR_CODE('usr\xc4')
kUtilitiesFolderIcon = FOUR_CHAR_CODE('uti\xc4')
kVoicesFolderIcon = FOUR_CHAR_CODE('fvoc')
-kColorSyncFolderIcon = FOUR_CHAR_CODE('prof')
-kInternetSearchSitesFolderIcon = FOUR_CHAR_CODE('issf')
-kUsersFolderIcon = FOUR_CHAR_CODE('usr\xc4')
+kSystemFolderXIcon = FOUR_CHAR_CODE('macx')
kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
kMountedBadgeIcon = FOUR_CHAR_CODE('mbdg')
kSharedBadgeIcon = FOUR_CHAR_CODE('sbdg')
kAliasBadgeIcon = FOUR_CHAR_CODE('abdg')
+kAlertCautionBadgeIcon = FOUR_CHAR_CODE('cbdg')
kAlertNoteIcon = FOUR_CHAR_CODE('note')
kAlertCautionIcon = FOUR_CHAR_CODE('caut')
kAlertStopIcon = FOUR_CHAR_CODE('stop')
@@ -337,6 +343,10 @@
kHTTPServerIcon = FOUR_CHAR_CODE('htps')
kGenericNetworkIcon = FOUR_CHAR_CODE('gnet')
kIPFileServerIcon = FOUR_CHAR_CODE('isrv')
+kToolbarCustomizeIcon = FOUR_CHAR_CODE('tcus')
+kToolbarDeleteIcon = FOUR_CHAR_CODE('tdel')
+kToolbarFavoritesIcon = FOUR_CHAR_CODE('tfav')
+kToolbarHomeIcon = FOUR_CHAR_CODE('thom')
kAppleLogoIcon = FOUR_CHAR_CODE('capl')
kAppleMenuIcon = FOUR_CHAR_CODE('sapl')
kBackwardArrowIcon = FOUR_CHAR_CODE('baro')
@@ -357,5 +367,15 @@
kSortDescendingIcon = FOUR_CHAR_CODE('dsnd')
kUnlockedIcon = FOUR_CHAR_CODE('ulck')
kConnectToIcon = FOUR_CHAR_CODE('cnct')
+kGenericWindowIcon = FOUR_CHAR_CODE('gwin')
+kQuestionMarkIcon = FOUR_CHAR_CODE('ques')
+kDeleteAliasIcon = FOUR_CHAR_CODE('dali')
+kEjectMediaIcon = FOUR_CHAR_CODE('ejec')
+kBurningIcon = FOUR_CHAR_CODE('burn')
+kRightContainerArrowIcon = FOUR_CHAR_CODE('rcar')
kIconServicesNormalUsageFlag = 0
+kIconServicesCatalogInfoMask = (kFSCatInfoNodeID | kFSCatInfoParentDirID | kFSCatInfoVolume | kFSCatInfoNodeFlags | kFSCatInfoFinderInfo | kFSCatInfoFinderXInfo | kFSCatInfoUserAccess)
+kPlotIconRefNormalFlags = 0L
+kPlotIconRefNoImage = (1 << 1)
+kPlotIconRefNoMask = (1 << 2)
kIconFamilyType = FOUR_CHAR_CODE('icns')
diff --git a/Lib/plat-mac/Carbon/LaunchServices.py b/Lib/plat-mac/Carbon/LaunchServices.py
index 7131d09..2be67c3 100644
--- a/Lib/plat-mac/Carbon/LaunchServices.py
+++ b/Lib/plat-mac/Carbon/LaunchServices.py
@@ -1,8 +1,10 @@
# Generated from 'LaunchServices.h'
def FOUR_CHAR_CODE(x): return x
+from Carbon.Files import *
kLSRequestAllInfo = -1
kLSRolesAll = -1
+kLSInvalidExtensionIndex = -1
kLSUnknownErr = -10810
kLSNotAnApplicationErr = -10811
kLSNotInitializedErr = -10812
@@ -15,14 +17,18 @@
kLSNotRegisteredErr = -10819
kLSAppDoesNotClaimTypeErr = -10820
kLSAppDoesNotSupportSchemeWarning = -10821
-kLSServerCommunicationErr = -10822
+kLSServerCommunicationErr = -10822
+kLSCannotSetInfoErr = -10823
kLSInitializeDefaults = 0x00000001
+kLSMinCatInfoBitmap = (kFSCatInfoNodeFlags | kFSCatInfoParentDirID | kFSCatInfoFinderInfo | kFSCatInfoFinderXInfo)
+# kLSInvalidExtensionIndex = (unsigned long)0xFFFFFFFF
kLSRequestExtension = 0x00000001
kLSRequestTypeCreator = 0x00000002
kLSRequestBasicFlagsOnly = 0x00000004
kLSRequestAppTypeFlags = 0x00000008
kLSRequestAllFlags = 0x00000010
kLSRequestIconAndKind = 0x00000020
+kLSRequestExtensionFlagsOnly = 0x00000040
# kLSRequestAllInfo = (unsigned long)0xFFFFFFFF
kLSItemInfoIsPlainFile = 0x00000001
kLSItemInfoIsPackage = 0x00000002
@@ -36,16 +42,17 @@
kLSItemInfoAppPrefersNative = 0x00000200
kLSItemInfoAppPrefersClassic = 0x00000400
kLSItemInfoAppIsScriptable = 0x00000800
-kLSItemInfoIsVolume = 0x00001000
+kLSItemInfoIsVolume = 0x00001000
+kLSItemInfoExtensionIsHidden = 0x00100000
kLSRolesNone = 0x00000001
kLSRolesViewer = 0x00000002
kLSRolesEditor = 0x00000004
-# kLSRolesAll = (unsigned long)0xFFFFFFFF
+# kLSRolesAll = (unsigned long)0xFFFFFFFF
kLSUnknownKindID = 0
kLSUnknownType = 0
kLSUnknownCreator = 0
kLSAcceptDefault = 0x00000001
-kLSAcceptAllowLoginUI = 0x00000002
+kLSAcceptAllowLoginUI = 0x00000002
kLSLaunchDefaults = 0x00000001
kLSLaunchAndPrint = 0x00000002
kLSLaunchReserved2 = 0x00000004
diff --git a/Lib/plat-mac/Carbon/MacTextEditor.py b/Lib/plat-mac/Carbon/MacTextEditor.py
index bf3ebe5..fcc6fd2 100644
--- a/Lib/plat-mac/Carbon/MacTextEditor.py
+++ b/Lib/plat-mac/Carbon/MacTextEditor.py
@@ -14,8 +14,11 @@
MovieFileType = FOUR_CHAR_CODE('moov')
kTXNUseEncodingWordRulesMask = 0x80000000
kTXNFontSizeAttributeSize = 4
+normal = 0
kTXNWillDefaultToATSUIBit = 0
+kTXNWillDefaultToCarbonEventBit = 1
kTXNWillDefaultToATSUIMask = 1L << kTXNWillDefaultToATSUIBit
+kTXNWillDefaultToCarbonEventMask = 1L << kTXNWillDefaultToCarbonEventBit
kTXNWantMoviesBit = 0
kTXNWantSoundBit = 1
kTXNWantGraphicsBit = 2
@@ -42,6 +45,7 @@
kTXNDontDrawSelectionWhenInactiveBit = 13
kTXNSingleLineOnlyBit = 14
kTXNDisableDragAndDropBit = 15
+kTXNUseQDforImagingBit = 16
kTXNDrawGrowIconMask = 1L << kTXNDrawGrowIconBit
kTXNShowWindowMask = 1L << kTXNShowWindowBit
kTXNWantHScrollBarMask = 1L << kTXNWantHScrollBarBit
@@ -58,6 +62,7 @@
kTXNDontDrawSelectionWhenInactiveMask = 1L << kTXNDontDrawSelectionWhenInactiveBit
kTXNSingleLineOnlyMask = 1L << kTXNSingleLineOnlyBit
kTXNDisableDragAndDropMask = 1L << kTXNDisableDragAndDropBit
+kTXNUseQDforImagingMask = 1L << kTXNUseQDforImagingBit
kTXNSetFlushnessBit = 0
kTXNSetJustificationBit = 1
kTXNUseFontFallBackBit = 2
@@ -65,6 +70,9 @@
kTXNUseVerticalTextBit = 4
kTXNDontUpdateBoxRectBit = 5
kTXNDontDrawTextBit = 6
+kTXNUseCGContextRefBit = 7
+kTXNImageWithQDBit = 8
+kTXNDontWrapTextBit = 9
kTXNSetFlushnessMask = 1L << kTXNSetFlushnessBit
kTXNSetJustificationMask = 1L << kTXNSetJustificationBit
kTXNUseFontFallBackMask = 1L << kTXNUseFontFallBackBit
@@ -72,6 +80,9 @@
kTXNUseVerticalTextMask = 1L << kTXNUseVerticalTextBit
kTXNDontUpdateBoxRectMask = 1L << kTXNDontUpdateBoxRectBit
kTXNDontDrawTextMask = 1L << kTXNDontDrawTextBit
+kTXNUseCGContextRefMask = 1L << kTXNUseCGContextRefBit
+kTXNImageWithQDMask = 1L << kTXNImageWithQDBit
+kTXNDontWrapTextMask = 1L << kTXNDontWrapTextBit
kTXNFontContinuousBit = 0
kTXNSizeContinuousBit = 1
kTXNStyleContinuousBit = 2
@@ -174,13 +185,16 @@
# kTXNDecrementTypeSize = (long)0x80000000
kTXNUseScriptDefaultValue = -1
kTXNNoFontVariations = 0x7FFF
-# kTXNUseCurrentSelection = 0xFFFFFFFFUL
-# kTXNStartOffset = 0UL
-# kTXNEndOffset = 0x7FFFFFFFUL
+# kTXNUseCurrentSelection = (unsigned long)0xFFFFFFFF
+# kTXNStartOffset = 0
+# kTXNEndOffset = 0x7FFFFFFF
kTXNSingleStylePerTextDocumentResType = FOUR_CHAR_CODE('MPSR')
kTXNMultipleStylesPerTextDocumentResType = FOUR_CHAR_CODE('styl')
kTXNShowStart = false
kTXNShowEnd = true
+kTXNDefaultFontName = 0
+kTXNDefaultFontSize = 0x000C0000
+kTXNDefaultFontStyle = normal
kTXNQDFontNameAttribute = FOUR_CHAR_CODE('fntn')
kTXNQDFontFamilyIDAttribute = FOUR_CHAR_CODE('font')
kTXNQDFontSizeAttribute = FOUR_CHAR_CODE('size')
@@ -210,4 +224,3 @@
kTXNNoAppleEventHandlersMask = 1 << kTXNNoAppleEventHandlersBit
kTXNRestartAppleEventHandlersMask = 1 << kTXNRestartAppleEventHandlersBit
# status = TXNInitTextension( &defaults
-# justification = LMTESysJust
diff --git a/Lib/plat-mac/Carbon/Menus.py b/Lib/plat-mac/Carbon/Menus.py
index a0e3432..abdde79 100644
--- a/Lib/plat-mac/Carbon/Menus.py
+++ b/Lib/plat-mac/Carbon/Menus.py
@@ -41,7 +41,9 @@
kMenuColorIconType = 4
kMenuIconSuiteType = 5
kMenuIconRefType = 6
-kMenuCGImageRefType = 7
+kMenuCGImageRefType = 7
+kMenuSystemIconSelectorType = 8
+kMenuIconResourceType = 9
kMenuNullGlyph = 0x00
kMenuTabRightGlyph = 0x02
kMenuTabLeftGlyph = 0x03
@@ -103,6 +105,7 @@
kMenuAttrExcludesMarkColumn = (1 << 0)
kMenuAttrAutoDisable = (1 << 2)
kMenuAttrUsePencilGlyph = (1 << 3)
+kMenuAttrHidden = (1 << 4)
kMenuItemAttrDisabled = (1 << 0)
kMenuItemAttrIconDisabled = (1 << 1)
kMenuItemAttrSubmenuParentChoosable = (1 << 2)
@@ -114,6 +117,8 @@
kMenuItemAttrIgnoreMeta = (1 << 8)
kMenuItemAttrAutoRepeat = (1 << 9)
kMenuItemAttrUseVirtualKey = (1 << 10)
+kMenuItemAttrCustomDraw = (1 << 11)
+kMenuItemAttrIncludeInCmdKeyMatching = (1 << 12)
kMenuTrackingModeMouse = 1
kMenuTrackingModeKeyboard = 2
kMenuEventIncludeDisabledItems = 0x0001
@@ -148,9 +153,17 @@
gestaltContextualMenuAttr = FOUR_CHAR_CODE('cmnu')
gestaltContextualMenuUnusedBit = 0
gestaltContextualMenuTrapAvailable = 1
+gestaltContextualMenuHasAttributeAndModifierKeys = 2
+gestaltContextualMenuHasUnicodeSupport = 3
kCMHelpItemNoHelp = 0
kCMHelpItemAppleGuide = 1
kCMHelpItemOtherHelp = 2
+kCMHelpItemRemoveHelp = 3
kCMNothingSelected = 0
kCMMenuItemSelected = 1
kCMShowHelpSelected = 3
+keyContextualMenuName = FOUR_CHAR_CODE('pnam')
+keyContextualMenuCommandID = FOUR_CHAR_CODE('cmcd')
+keyContextualMenuSubmenu = FOUR_CHAR_CODE('cmsb')
+keyContextualMenuAttributes = FOUR_CHAR_CODE('cmat')
+keyContextualMenuModifiers = FOUR_CHAR_CODE('cmmd')
diff --git a/Lib/plat-mac/Carbon/OSAconst.py b/Lib/plat-mac/Carbon/OSAconst.py
index c6d4851..ccce00a 100644
--- a/Lib/plat-mac/Carbon/OSAconst.py
+++ b/Lib/plat-mac/Carbon/OSAconst.py
@@ -81,6 +81,7 @@
kOSADebuggerSetVariable = 0x0909
kOSADebuggerGetPreviousCallFrame = 0x090A
kOSADebuggerDisposeCallFrame = 0x090B
+kOSADebuggerCountVariables = 0x090C
kOSASelectComponentSpecificStart = 0x1001
kOSAModePreventGetSource = 0x00000001
kOSAModeNeverInteract = kAENeverInteract
@@ -120,6 +121,9 @@
eStepIn = 1
eStepOut = 2
eRun = 3
+eLocal = 0
+eGlobal = 1
+eProperties = 2
keyProgramState = FOUR_CHAR_CODE('dsps')
typeStatementRange = FOUR_CHAR_CODE('srng')
keyProcedureName = FOUR_CHAR_CODE('dfnm')
diff --git a/Lib/plat-mac/Carbon/QuickDraw.py b/Lib/plat-mac/Carbon/QuickDraw.py
index 38d8451..9209a35 100644
--- a/Lib/plat-mac/Carbon/QuickDraw.py
+++ b/Lib/plat-mac/Carbon/QuickDraw.py
@@ -70,6 +70,7 @@
directType = 2
gdDevType = 0
interlacedDevice = 2
+hwMirroredDevice = 4
roundedDevice = 5
hasAuxMenuBar = 6
burstDevice = 7
diff --git a/Lib/plat-mac/Carbon/QuickTime.py b/Lib/plat-mac/Carbon/QuickTime.py
index a6284ec..399b9ab 100644
--- a/Lib/plat-mac/Carbon/QuickTime.py
+++ b/Lib/plat-mac/Carbon/QuickTime.py
@@ -25,6 +25,7 @@
MovieMediaType = FOUR_CHAR_CODE('moov')
TweenMediaType = FOUR_CHAR_CODE('twen')
ThreeDeeMediaType = FOUR_CHAR_CODE('qd3d')
+SkinMediaType = FOUR_CHAR_CODE('skin')
HandleDataHandlerSubType = FOUR_CHAR_CODE('hndl')
PointerDataHandlerSubType = FOUR_CHAR_CODE('ptr ')
NullDataHandlerSubType = FOUR_CHAR_CODE('null')
@@ -38,6 +39,8 @@
kCharacteristicNonLinear = FOUR_CHAR_CODE('nonl')
kCharacteristicCanStep = FOUR_CHAR_CODE('step')
kCharacteristicHasNoDuration = FOUR_CHAR_CODE('noti')
+kCharacteristicHasSkinData = FOUR_CHAR_CODE('skin')
+kCharacteristicProvidesKeyFocus = FOUR_CHAR_CODE('keyf')
kUserDataMovieControllerType = FOUR_CHAR_CODE('ctyp')
kUserDataName = FOUR_CHAR_CODE('name')
kUserDataTextAlbum = FOUR_CHAR_CODE('\xa9alb')
@@ -161,6 +164,12 @@
kActionMovieSetLanguage = 1036
kActionMovieChanged = 1037
kActionMovieRestartAtTime = 1038
+kActionMovieGotoNextChapter = 1039
+kActionMovieGotoPreviousChapter = 1040
+kActionMovieGotoFirstChapter = 1041
+kActionMovieGotoLastChapter = 1042
+kActionMovieGotoChapterByIndex = 1043
+kActionMovieSetScale = 1044
kActionTrackSetVolume = 2048
kActionTrackSetBalance = 2049
kActionTrackSetEnabled = 2050
@@ -182,6 +191,7 @@
kActionSpriteScale = 3081
kActionSpriteRotate = 3082
kActionSpriteStretch = 3083
+kActionSpriteSetCanBeHitTested = 3094
kActionQTVRSetPanAngle = 4096
kActionQTVRSetTiltAngle = 4097
kActionQTVRSetFieldOfView = 4098
@@ -190,6 +200,7 @@
kActionQTVREnableHotSpot = 4101
kActionQTVRShowHotSpots = 4102
kActionQTVRTranslateObject = 4103
+kActionQTVRSetViewState = 4109
kActionMusicPlayNote = 5120
kActionMusicSetController = 5121
kActionCase = 6144
@@ -212,6 +223,7 @@
kActionLoadComponent = 6161
kActionSetFocus = 6162
kActionDontPassKeyEvent = 6163
+kActionSetRandomSeed = 6164
kActionSpriteTrackSetVariable = 7168
kActionSpriteTrackNewSprite = 7169
kActionSpriteTrackDisposeSprite = 7170
@@ -219,6 +231,9 @@
kActionSpriteTrackConcatVariables = 7172
kActionSpriteTrackSetVariableToMovieURL = 7173
kActionSpriteTrackSetVariableToMovieBaseURL = 7174
+kActionSpriteTrackSetAllSpritesHitTestingMode = 7181
+kActionSpriteTrackNewImage = 7182
+kActionSpriteTrackDisposeImage = 7183
kActionApplicationNumberAndString = 8192
kActionQD3DNamedObjectTranslateTo = 9216
kActionQD3DNamedObjectScaleTo = 9217
@@ -306,6 +321,14 @@
kOperandMovieIsActive = 1035
kOperandMovieName = 1036
kOperandMovieID = 1037
+kOperandMovieChapterCount = 1038
+kOperandMovieChapterIndex = 1039
+kOperandMovieChapterName = 1040
+kOperandMovieChapterNameByIndex = 1041
+kOperandMovieChapterIndexByName = 1042
+kOperandMovieAnnotation = 1043
+kOperandMovieConnectionFlags = 1044
+kOperandMovieConnectionString = 1045
kOperandTrackVolume = 2048
kOperandTrackBalance = 2049
kOperandTrackEnabled = 2050
@@ -342,6 +365,10 @@
kOperandSpriteImageRegistrationPointY = 3093
kOperandSpriteTrackSpriteIDAtPoint = 3094
kOperandSpriteName = 3095
+kOperandSpriteCanBeHitTested = 3105
+kOperandSpriteTrackAllSpritesHitTestingMode = 3106
+kOperandSpriteTrackImageIDByIndex = 3107
+kOperandSpriteTrackImageIndexByID = 3108
kOperandQTVRPanAngle = 4096
kOperandQTVRTiltAngle = 4097
kOperandQTVRFieldOfView = 4098
@@ -349,6 +376,8 @@
kOperandQTVRHotSpotsVisible = 4100
kOperandQTVRViewCenterH = 4101
kOperandQTVRViewCenterV = 4102
+kOperandQTVRViewStateCount = 4103
+kOperandQTVRViewState = 4104
kOperandMouseLocalHLoc = 5120
kOperandMouseLocalVLoc = 5121
kOperandKeyIsDown = 5122
@@ -384,19 +413,19 @@
kOperandStringSubString = 10242
kOperandStringConcat = 10243
kFirstMovieAction = kActionMovieSetVolume
-kLastMovieAction = kActionMovieRestartAtTime
+kLastMovieAction = kActionMovieSetScale
kFirstTrackAction = kActionTrackSetVolume
kLastTrackAction = kActionTrackSetBassTreble
kFirstSpriteAction = kActionSpriteSetMatrix
-kLastSpriteAction = kActionSpriteStretch
+kLastSpriteAction = kActionSpriteSetCanBeHitTested
kFirstQTVRAction = kActionQTVRSetPanAngle
-kLastQTVRAction = kActionQTVRTranslateObject
+kLastQTVRAction = kActionQTVRSetViewState
kFirstMusicAction = kActionMusicPlayNote
kLastMusicAction = kActionMusicSetController
kFirstSystemAction = kActionCase
-kLastSystemAction = kActionDontPassKeyEvent
+kLastSystemAction = kActionSetRandomSeed
kFirstSpriteTrackAction = kActionSpriteTrackSetVariable
-kLastSpriteTrackAction = kActionSpriteTrackSetVariableToMovieBaseURL
+kLastSpriteTrackAction = kActionSpriteTrackDisposeImage
kFirstApplicationAction = kActionApplicationNumberAndString
kLastApplicationAction = kActionApplicationNumberAndString
kFirstQD3DNamedObjectAction = kActionQD3DNamedObjectTranslateTo
@@ -460,6 +489,7 @@
kQTEventMovieLoaded = FOUR_CHAR_CODE('load')
kQTEventRequestToModifyMovie = FOUR_CHAR_CODE('reqm')
kQTEventListReceived = FOUR_CHAR_CODE('list')
+kQTEventKeyUp = FOUR_CHAR_CODE('keyU')
kActionFlagActionIsDelta = 1L << 1
kActionFlagParameterWrapsAround = 1L << 2
kActionFlagActionIsToggle = 1L << 3
@@ -539,6 +569,7 @@
newMovieDontAutoUpdateClock = 1 << 5
newMovieAsyncOK = 1 << 8
newMovieIdleImportOK = 1 << 10
+newMovieDontInteractWithUser = 1 << 11
trackUsageInMovie = 1 << 1
trackUsageInPreview = 1 << 2
trackUsageInPoster = 1 << 3
@@ -594,10 +625,21 @@
hintsAllowDynamicResize = 1 << 19
hintsSingleField = 1 << 20
hintsNoRenderingTimeOut = 1 << 21
+hintsFlushVideoInsteadOfDirtying = 1 << 22
+hintsEnableSubPixelPositioning = 1L << 23
mediaHandlerFlagBaseClient = 1
movieTrackMediaType = 1 << 0
movieTrackCharacteristic = 1 << 1
movieTrackEnabledOnly = 1 << 2
+kMovieControlOptionHideController = (1L << 0)
+kMovieControlOptionLocateTopLeft = (1L << 1)
+kMovieControlOptionEnableEditing = (1L << 2)
+kMovieControlOptionHandleEditingHI = (1L << 3)
+kMovieControlOptionSetKeysEnabled = (1L << 4)
+kMovieControlOptionManuallyIdled = (1L << 5)
+kMovieControlDataMovieController = FOUR_CHAR_CODE('mc ')
+kMovieControlDataMovie = FOUR_CHAR_CODE('moov')
+kMovieControlDataManualIdling = FOUR_CHAR_CODE('manu')
movieDrawingCallWhenChanged = 0
movieDrawingCallAlways = 1
kQTCloneShareSamples = 1 << 0
@@ -609,6 +651,8 @@
kGetMovieImporterAutoImportOnly = 1L << 10
kQTGetMIMETypeInfoIsQuickTimeMovieType = FOUR_CHAR_CODE('moov')
kQTGetMIMETypeInfoIsUnhelpfulType = FOUR_CHAR_CODE('dumb')
+kQTCopyUserDataReplace = FOUR_CHAR_CODE('rplc')
+kQTCopyUserDataMerge = FOUR_CHAR_CODE('merg')
kMovieLoadStateError = -1L
kMovieLoadStateLoading = 1000
kMovieLoadStateLoaded = 2000
@@ -627,6 +671,16 @@
fullScreenDontChangeMenuBar = 1L << 2
fullScreenPreflightSize = 1L << 3
movieExecuteWiredActionDontExecute = 1L << 0
+kRefConNavigationNext = 0
+kRefConNavigationPrevious = 1
+kRefConPropertyCanHaveFocus = 1
+kRefConPropertyHasFocus = 2
+kTrackFocusCanEditFlag = FOUR_CHAR_CODE('kedt')
+kTrackDefaultFocusFlags = FOUR_CHAR_CODE('kfoc')
+kTrackFocusDefaultRefcon = FOUR_CHAR_CODE('kref')
+kTrackFocusOn = 1
+kTrackHandlesTabs = 2
+kFlashTrackPropertyAcceptAllClicks = FOUR_CHAR_CODE('clik')
kBackgroundSpriteLayerNum = 32767
kSpritePropertyMatrix = 1
kSpritePropertyImageDescription = 2
@@ -636,6 +690,7 @@
kSpritePropertyGraphicsMode = 6
kSpritePropertyImageDataSize = 7
kSpritePropertyActionHandlingSpriteID = 8
+kSpritePropertyCanBeHitTested = 9
kSpritePropertyImageIndex = 100
kSpriteTrackPropertyBackgroundColor = 101
kSpriteTrackPropertyOffscreenBitDepth = 102
@@ -644,9 +699,18 @@
kSpriteTrackPropertyHasActions = 105
kSpriteTrackPropertyVisible = 106
kSpriteTrackPropertyQTIdleEventsFrequency = 107
+kSpriteTrackPropertyAllSpritesHitTestingMode = 108
+kSpriteTrackPropertyPreferredDepthInterpretationMode = 109
kSpriteImagePropertyRegistrationPoint = 1000
kSpriteImagePropertyGroupID = 1001
+kSpriteTrackPreferredDepthCompatibilityMode = 0
+kSpriteTrackPreferredDepthModernMode = 1
+kSpriteHitTestUseSpritesOwnPropertiesMode = 0
+kSpriteHitTestTreatAllSpritesAsHitTestableMode = 1
+kSpriteHitTestTreatAllSpritesAsNotHitTestableMode = 2
kNoQTIdleEvents = -1
+kGetSpriteWorldInvalidRegionAndLeaveIntact = -1L
+kGetSpriteWorldInvalidRegionAndThenSetEmpty = -2L
kOnlyDrawToSpriteWorld = 1L << 0
kSpriteWorldPreflight = 1L << 1
kSpriteWorldDidDraw = 1L << 0
@@ -657,7 +721,10 @@
kSpriteWorldHighQuality = 1L << 2
kSpriteWorldDontAutoInvalidate = 1L << 3
kSpriteWorldInvisible = 1L << 4
+kSpriteWorldDirtyInsteadOfFlush = 1L << 5
kParentAtomIsContainer = 0
+kTweenRecordNoFlags = 0
+kTweenRecordIsAtInterruptTime = 0x00000001
kEffectNameAtom = FOUR_CHAR_CODE('name')
kEffectTypeAtom = FOUR_CHAR_CODE('type')
kEffectManufacturerAtom = FOUR_CHAR_CODE('manu')
@@ -673,11 +740,41 @@
pdActionActivateSubPanel = 10
pdActionConductStopAlert = 11
pdActionModelessCallback = 12
-pdActionFetchPreview = 13
+pdActionFetchPreview = 13
+pdActionSetDialogSettings = 14
+pdActionGetDialogSettings = 15
+pdActionGetNextSample = 16
+pdActionGetPreviousSample = 17
+pdActionCompactSample = 18
+pdActionSetEditCallout = 19
+pdActionSetSampleTime = 20
+pdActionDoEditCommand = 21
+pdActionGetSubPanelMenuValue = 22
+pdActionCustomNewControl = 23
+pdActionCustomDisposeControl = 24
+pdActionCustomPositionControl = 25
+pdActionCustomShowHideControl = 26
+pdActionCustomHandleEvent = 27
+pdActionCustomSetFocus = 28
+pdActionCustomSetEditMenu = 29
+pdActionCustomSetPreviewPicture = 30
+pdActionCustomSetEditCallout = 31
+pdActionCustomGetEnableValue = 32
+pdActionCustomSetSampleTime = 33
+pdActionCustomGetValue = 34
+pdActionCustomDoEditCommand = 35
+pdSampleTimeDisplayOptionsNone = 0x00000000
+pdActionFocusOff = 0
+pdActionFocusFirst = 1
+pdActionFocusLast = 2
+pdActionFocusForward = 3
+pdActionFocusBackward = 4
elOptionsIncludeNoneInList = 0x00000001
pdOptionsCollectOneValue = 0x00000001
pdOptionsAllowOptionalInterpolations = 0x00000002
-pdOptionsModalDialogBox = 0x00000004
+pdOptionsModalDialogBox = 0x00000004
+pdOptionsEditCurrentEffectOnly = 0x00000008
+pdOptionsHidePreview = 0x00000010
effectIsRealtime = 0
kAccessKeyAtomType = FOUR_CHAR_CODE('acky')
kAccessKeySystemFlag = 1L << 0
@@ -738,6 +835,7 @@
kTrackModifierTiltAngle = FOUR_CHAR_CODE('tilt')
kTrackModifierVerticalFieldOfViewAngle = FOUR_CHAR_CODE('fov ')
kTrackModifierObjectQTEventSend = FOUR_CHAR_CODE('evnt')
+kTrackModifierObjectCanBeHitTested = 15
kTweenTypeShort = 1
kTweenTypeLong = 2
kTweenTypeFixed = 3
@@ -792,6 +890,18 @@
kInitialRotationAtom = FOUR_CHAR_CODE('inro')
kNonLinearTweenHeader = FOUR_CHAR_CODE('nlth')
kTweenReturnDelta = 1L << 0
+kQTRestrictionClassSave = FOUR_CHAR_CODE('save')
+kQTRestrictionSaveDontAddMovieResource = (1L << 0)
+kQTRestrictionSaveDontFlatten = (1L << 1)
+kQTRestrictionSaveDontExport = (1L << 2)
+kQTRestrictionSaveDontExtract = (1L << 3)
+kQTRestrictionClassEdit = FOUR_CHAR_CODE('edit')
+kQTRestrictionEditDontCopy = (1L << 0)
+kQTRestrictionEditDontCut = (1L << 1)
+kQTRestrictionEditDontPaste = (1L << 2)
+kQTRestrictionEditDontClear = (1L << 3)
+kQTRestrictionEditDontModify = (1L << 4)
+kQTRestrictionEditDontExtract = (1L << 5)
videoFlagDontLeanAhead = 1L << 0
txtProcDefaultDisplay = 0
txtProcDontDisplay = 1
@@ -807,7 +917,8 @@
spriteHitTestImage = 1L << 1
spriteHitTestInvisibleSprites = 1L << 2
spriteHitTestIsClick = 1L << 3
-spriteHitTestLocInDisplayCoordinates = 1L << 4
+spriteHitTestLocInDisplayCoordinates = 1L << 4
+spriteHitTestTreatAllSpritesAsHitTestable = 1L << 5
kSpriteAtomType = FOUR_CHAR_CODE('sprt')
kSpriteImagesContainerAtomType = FOUR_CHAR_CODE('imct')
kSpriteImageAtomType = FOUR_CHAR_CODE('imag')
@@ -1009,6 +1120,7 @@
kQTCursorDownArrow = -19178
kQTCursorUpArrow = -19177
kQTCursorIBeam = -19176
+kControllerUnderstandsIdleManagers = 1 << 0
kVideoMediaResetStatisticsSelect = 0x0105
kVideoMediaGetStatisticsSelect = 0x0106
kVideoMediaGetStallCountSelect = 0x010E
@@ -1049,6 +1161,10 @@
kSpriteMediaDisposeSpriteSelect = 0x0115
kSpriteMediaSetActionVariableToStringSelect = 0x0116
kSpriteMediaGetActionVariableAsStringSelect = 0x0117
+kSpriteMediaNewImageSelect = 0x011B
+kSpriteMediaDisposeImageSelect = 0x011C
+kSpriteMediaImageIndexToIDSelect = 0x011D
+kSpriteMediaImageIDToIndexSelect = 0x011E
kFlashMediaSetPanSelect = 0x0101
kFlashMediaSetZoomSelect = 0x0102
kFlashMediaSetZoomRectSelect = 0x0103
@@ -1131,4 +1247,6 @@
kMCGetDoActionsProcSelect = 0x0032
kMCAddMovieSegmentSelect = 0x0033
kMCTrimMovieSegmentSelect = 0x0034
+kMCSetIdleManagerSelect = 0x0035
+kMCSetControllerCapabilitiesSelect = 0x0036
kMusicMediaGetIndexedTunePlayerSelect = 0x0101
diff --git a/Lib/plat-mac/Carbon/Windows.py b/Lib/plat-mac/Carbon/Windows.py
index 71685df..af8eaf2 100644
--- a/Lib/plat-mac/Carbon/Windows.py
+++ b/Lib/plat-mac/Carbon/Windows.py
@@ -3,21 +3,23 @@
def FOUR_CHAR_CODE(x): return x
false = 0
true = 1
-kAlertWindowClass = 1L
-kMovableAlertWindowClass = 2L
-kModalWindowClass = 3L
-kMovableModalWindowClass = 4L
-kFloatingWindowClass = 5L
-kDocumentWindowClass = 6L
-kUtilityWindowClass = 8L
-kHelpWindowClass = 10L
-kSheetWindowClass = 11L
-kToolbarWindowClass = 12L
-kPlainWindowClass = 13L
-kOverlayWindowClass = 14L
-kSheetAlertWindowClass = 15L
-kAltPlainWindowClass = 16L
-# kAllWindowClasses = (unsigned long)0xFFFFFFFF
+kWindowNoConstrainAttribute = 0x80000000
+kAlertWindowClass = 1
+kMovableAlertWindowClass = 2
+kModalWindowClass = 3
+kMovableModalWindowClass = 4
+kFloatingWindowClass = 5
+kDocumentWindowClass = 6
+kUtilityWindowClass = 8
+kHelpWindowClass = 10
+kSheetWindowClass = 11
+kToolbarWindowClass = 12
+kPlainWindowClass = 13
+kOverlayWindowClass = 14
+kSheetAlertWindowClass = 15
+kAltPlainWindowClass = 16
+kDrawerWindowClass = 20
+# kAllWindowClasses = (unsigned long)0xFFFFFFFF
kWindowNoAttributes = 0L
kWindowCloseBoxAttribute = (1L << 0)
kWindowHorizontalZoomAttribute = (1L << 1)
@@ -26,6 +28,7 @@
kWindowCollapseBoxAttribute = (1L << 3)
kWindowResizableAttribute = (1L << 4)
kWindowSideTitlebarAttribute = (1L << 5)
+kWindowToolbarButtonAttribute = (1L << 6)
kWindowNoUpdatesAttribute = (1L << 16)
kWindowNoActivatesAttribute = (1L << 17)
kWindowOpaqueForEventsAttribute = (1L << 18)
@@ -35,6 +38,7 @@
kWindowHideOnFullScreenAttribute = (1L << 26)
kWindowInWindowMenuAttribute = (1L << 27)
kWindowLiveResizeAttribute = (1L << 28)
+# kWindowNoConstrainAttribute = (unsigned long)((1L << 31))
kWindowStandardDocumentAttributes = (kWindowCloseBoxAttribute | kWindowFullZoomAttribute | kWindowCollapseBoxAttribute | kWindowResizableAttribute)
kWindowStandardFloatingAttributes = (kWindowCloseBoxAttribute | kWindowCollapseBoxAttribute)
kWindowDefProcType = FOUR_CHAR_CODE('WDEF')
@@ -119,15 +123,16 @@
kWindowCenterParentWindowScreen = 0x680A
kWindowAlertPositionParentWindowScreen = 0x700A
kWindowStaggerParentWindowScreen = 0x780A
-kWindowCenterOnMainScreen = 0x00000001
-kWindowCenterOnParentWindow = 0x00000002
-kWindowCenterOnParentWindowScreen = 0x00000003
-kWindowCascadeOnMainScreen = 0x00000004
-kWindowCascadeOnParentWindow = 0x00000005
-kWindowCascadeOnParentWindowScreen = 0x00000006
-kWindowAlertPositionOnMainScreen = 0x00000007
-kWindowAlertPositionOnParentWindow = 0x00000008
-kWindowAlertPositionOnParentWindowScreen = 0x00000009
+kWindowCenterOnMainScreen = 1
+kWindowCenterOnParentWindow = 2
+kWindowCenterOnParentWindowScreen = 3
+kWindowCascadeOnMainScreen = 4
+kWindowCascadeOnParentWindow = 5
+kWindowCascadeOnParentWindowScreen = 6
+kWindowCascadeStartAtParentWindowScreen = 10
+kWindowAlertPositionOnMainScreen = 7
+kWindowAlertPositionOnParentWindow = 8
+kWindowAlertPositionOnParentWindowScreen = 9
kWindowTitleBarRgn = 0
kWindowTitleTextRgn = 1
kWindowCloseBoxRgn = 2
@@ -156,7 +161,9 @@
inZoomIn = 7
inZoomOut = 8
inCollapseBox = 11
-inProxyIcon = 12
+inProxyIcon = 12
+inToolbarButton = 13
+inStructure = 15
wNoHit = 0
wInContent = 1
wInDrag = 2
@@ -165,7 +172,9 @@
wInZoomIn = 5
wInZoomOut = 6
wInCollapseBox = 9
-wInProxyIcon = 10
+wInProxyIcon = 10
+wInToolbarButton = 11
+wInStructure = 13
kWindowMsgDraw = 0
kWindowMsgHitTest = 1
kWindowMsgCalculateShape = 2
@@ -227,7 +236,6 @@
kWindowModalitySystemModal = 1
kWindowModalityAppModal = 2
kWindowModalityWindowModal = 3
-windowGroupInvalidErr = -5616
kWindowGroupAttrSelectAsLayer = 1 << 0
kWindowGroupAttrMoveTogether = 1 << 1
kWindowGroupAttrLayerTogether = 1 << 2
@@ -245,18 +253,26 @@
kScrollWindowNoOptions = 0
kScrollWindowInvalidate = (1L << 0)
kScrollWindowEraseToPortBackground = (1L << 1)
+kWindowMenuIncludeRotate = 1 << 0
kWindowZoomTransitionEffect = 1
kWindowSheetTransitionEffect = 2
-kWindowSlideTransitionEffect = 3
+kWindowSlideTransitionEffect = 3
kWindowShowTransitionAction = 1
kWindowHideTransitionAction = 2
kWindowMoveTransitionAction = 3
-kWindowResizeTransitionAction = 4
+kWindowResizeTransitionAction = 4
kWindowConstrainMayResize = (1L << 0)
kWindowConstrainMoveRegardlessOfFit = (1L << 1)
kWindowConstrainAllowPartial = (1L << 2)
kWindowConstrainCalcOnly = (1L << 3)
+kWindowConstrainUseTransitionWindow = (1L << 4)
kWindowConstrainStandardOptions = kWindowConstrainMoveRegardlessOfFit
+kWindowLatentVisibleFloater = 1 << 0
+kWindowLatentVisibleSuspend = 1 << 1
+kWindowLatentVisibleFullScreen = 1 << 2
+kWindowLatentVisibleAppHidden = 1 << 3
+kWindowLatentVisibleCollapsedOwner = 1 << 4
+kWindowLatentVisibleCollapsedGroup = 1 << 5
kWindowPropertyPersistent = 0x00000001
kWindowGroupAttrSelectable = kWindowGroupAttrSelectAsLayer
kWindowGroupAttrPositionFixed = kWindowGroupAttrMoveTogether