Finished update to universal header 3.4.2.

Lib/plat-mac/Carbon/Appearance.py

@@ -59,10 +59,17 @@ kThemeBrushBevelInactiveLight = 46
 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
@@ -158,6 +165,7 @@ kThemeMenuItemAtBottom = 0x0200
 kThemeMenuItemHierBackground = 0x0400
 kThemeMenuItemPopUpBackground = 0x0800
 kThemeMenuItemHasIcon = 0x8000
+kThemeMenuItemNoBackground = 0x4000 
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
 kThemeBackgroundWindowHeader = 3
@@ -165,6 +173,7 @@ kThemeBackgroundListViewWindowHeader = 4
 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 @@ kThemeSoundMaskTag = FOUR_CHAR_CODE('smsk')
 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
@@ -279,6 +293,7 @@ kThemePopupWindow = 7
 kThemeUtilityWindow = 8
 kThemeUtilitySideWindow = 9
 kThemeSheetWindow = 10
+kThemeDrawerWindow = 11
 kThemeWidgetCloseBox = 0
 kThemeWidgetZoomBox = 1
 kThemeWidgetCollapseBox = 2
@@ -540,6 +555,13 @@ kThemeMetricProgressBarShadowOutset = 59
 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

Lib/plat-mac/Carbon/AppleEvents.py

@@ -35,6 +35,7 @@ typeAppParameters = FOUR_CHAR_CODE('appa')
 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 @@ keyAEMoveView = FOUR_CHAR_CODE('mvvw')
 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')

Lib/plat-mac/Carbon/Controls.py

@@ -54,7 +54,6 @@ kControlCollectionTagIDSignature = FOUR_CHAR_CODE('idsi')
 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 @@ kControlBevelButtonTextPlaceTag = FOUR_CHAR_CODE('tplc')
 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') 
 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)
@@ -422,6 +421,7 @@ kControlEditTextValidationProcTag = FOUR_CHAR_CODE('vali')
 kControlEditTextInlinePreUpdateProcTag = FOUR_CHAR_CODE('prup')
 kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup') 
 kControlEditTextCFStringTag = FOUR_CHAR_CODE('cfst')
+kControlEditTextPasswordCFStringTag = FOUR_CHAR_CODE('pwcf') 
 kControlStaticTextProc = 288
 kControlKindStaticText = FOUR_CHAR_CODE('stxt')
 kControlStaticTextStyleTag = kControlFontStyleTag
@@ -502,7 +502,7 @@ kControlDisclosureButtonDisclosed = 1
 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 @@ kDataBrowserListViewAppendColumn = kDataBrowserTableViewLastColumn
 kControlEditUnicodeTextPostUpdateProcTag = FOUR_CHAR_CODE('upup')
 kControlEditUnicodeTextProc = 912
 kControlEditUnicodeTextPasswordProc = 914
+kControlKindEditUnicodeText = FOUR_CHAR_CODE('eutx')
 kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
 kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue
 kControlCheckboxMixedValue = kControlCheckBoxMixedValue

Lib/plat-mac/Carbon/CoreGraphics.py

@@ -22,3 +22,7 @@ kCGTextFillStrokeClip = 6
 kCGTextClip = 7
 kCGEncodingFontSpecific = 0
 kCGEncodingMacRoman = 1
+kCGInterpolationDefault = 0
+kCGInterpolationNone = 1
+kCGInterpolationLow = 2
+kCGInterpolationHigh = 3     

Lib/plat-mac/Carbon/Dialogs.py

@@ -74,3 +74,6 @@ kDialogFontUseThemeFontIDMask = 0x0080
 kHICommandOther = FOUR_CHAR_CODE('othr') 
 kStdCFStringAlertVersionOne = 1     
 kStdAlertDoNotDisposeSheet = 1 << 0
+kStdAlertDoNotAnimateOnDefault = 1 << 1
+kStdAlertDoNotAnimateOnCancel = 1 << 2
+kStdAlertDoNotAnimateOnOther = 1 << 3

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)
@@ -35,6 +36,7 @@ flavorSenderOnly = (1 << 0)
 flavorSenderTranslated = (1 << 1)
 flavorNotSaved = (1 << 2)
 flavorSystemTranslated = (1 << 8)
+flavorDataPromised = (1 << 9) 
 kDragFlavorTypeHFS = FOUR_CHAR_CODE('hfs ')
 kDragFlavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
 flavorTypeHFS = kDragFlavorTypeHFS
@@ -54,6 +56,14 @@ kDragTrackingEnterWindow = 2
 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 

Lib/plat-mac/Carbon/Events.py

@@ -65,14 +65,29 @@ kFormFeedCharCode = 12
 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

Lib/plat-mac/Carbon/Files.py

@@ -77,6 +77,7 @@ bNoVNEdit = 28
 bNoLclSync = 27
 bTrshOffLine = 26
 bNoSwitchTo = 25
+bDontShareIt = 21
 bNoDeskItems = 20
 bNoBootBlks = 19
 bAccessCntl = 18
@@ -271,6 +272,7 @@ kFSCatInfoDataSizes = 0x00004000
 kFSCatInfoRsrcSizes = 0x00008000
 kFSCatInfoSharingFlags = 0x00010000
 kFSCatInfoUserPrivs = 0x00020000
+kFSCatInfoUserAccess = 0x00080000
 kFSCatInfoAllDates = 0x000003E0
 kFSCatInfoGettableInfo = 0x0003FFFF
 kFSCatInfoSettableInfo = 0x00001FE3
@@ -338,6 +340,7 @@ kFSVolFlagHardwareLockedMask = 0x0080
 kFSVolFlagSoftwareLockedBit = 15
 kFSVolFlagSoftwareLockedMask = 0x8000
 kFNDirectoryModifiedMessage = 1
+kFNNoImplicitAllSubscription = (1 << 0)
 rAliasType = FOUR_CHAR_CODE('alis') 
 kARMMountVol = 0x00000001
 kARMNoUI = 0x00000002

Lib/plat-mac/Carbon/Folders.py

@@ -123,6 +123,11 @@ kAudioComponentsFolderType = FOUR_CHAR_CODE('acmp')
 kKernelExtensionsFolderType = FOUR_CHAR_CODE('kext')
 kDirectoryServicesFolderType = FOUR_CHAR_CODE('dsrv')
 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')

Lib/plat-mac/Carbon/Fonts.py

@@ -4,6 +4,13 @@ def FOUR_CHAR_CODE(x): return x
 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 @@ fxdFntH = 45057L
 fxdFntW = 45058L
 fxdFntHW = 45059L
 fontWid = 44208L
+kFMUseGlobalScopeOption = 0x00000001
 kFontIDNewYork = 2
 kFontIDGeneva = 3
 kFontIDMonaco = 4

Lib/plat-mac/Carbon/Icons.py

 # 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 @@ kGenericRAMDiskIcon = FOUR_CHAR_CODE('ramd')
 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 @@ kTrueTypeFontIcon = FOUR_CHAR_CODE('tfil')
 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 @@ kGuestUserIcon = FOUR_CHAR_CODE('gusr')
 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 @@ kFontsFolderIcon = FOUR_CHAR_CODE('font')
 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 @@ kStartupItemsFolderIcon = FOUR_CHAR_CODE('strt')
 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 @@ kFTPServerIcon = FOUR_CHAR_CODE('ftps')
 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 @@ kSortAscendingIcon = FOUR_CHAR_CODE('asnd')
 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')

Lib/plat-mac/Carbon/LaunchServices.py

 # 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
@@ -16,13 +18,17 @@ kLSNotRegisteredErr = -10819
 kLSAppDoesNotClaimTypeErr = -10820
 kLSAppDoesNotSupportSchemeWarning = -10821
 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
@@ -37,6 +43,7 @@ kLSItemInfoAppPrefersNative = 0x00000200
 kLSItemInfoAppPrefersClassic = 0x00000400
 kLSItemInfoAppIsScriptable = 0x00000800
 kLSItemInfoIsVolume = 0x00001000
+kLSItemInfoExtensionIsHidden = 0x00100000 
 kLSRolesNone = 0x00000001
 kLSRolesViewer = 0x00000002
 kLSRolesEditor = 0x00000004

Lib/plat-mac/Carbon/MacTextEditor.py

@@ -14,8 +14,11 @@ kTXNEndOffset = 0x7FFFFFFF
 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 @@ kTXNDontDrawCaretWhenInactiveBit = 12
 kTXNDontDrawSelectionWhenInactiveBit = 13
 kTXNSingleLineOnlyBit = 14
 kTXNDisableDragAndDropBit = 15
+kTXNUseQDforImagingBit = 16
 kTXNDrawGrowIconMask = 1L << kTXNDrawGrowIconBit
 kTXNShowWindowMask = 1L << kTXNShowWindowBit
 kTXNWantHScrollBarMask = 1L << kTXNWantHScrollBarBit
@@ -58,6 +62,7 @@ kTXNDontDrawCaretWhenInactiveMask = 1L << kTXNDontDrawCaretWhenInactiveBit
 kTXNDontDrawSelectionWhenInactiveMask = 1L << kTXNDontDrawSelectionWhenInactiveBit
 kTXNSingleLineOnlyMask = 1L << kTXNSingleLineOnlyBit
 kTXNDisableDragAndDropMask = 1L << kTXNDisableDragAndDropBit
+kTXNUseQDforImagingMask = 1L << kTXNUseQDforImagingBit
 kTXNSetFlushnessBit = 0
 kTXNSetJustificationBit = 1
 kTXNUseFontFallBackBit = 2
@@ -65,6 +70,9 @@ kTXNRotateTextBit = 3
 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 @@ kTXNRotateTextMask = 1L << kTXNRotateTextBit
 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 @@ kTXNIncrementTypeSize = 0x00000001
 # 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 @@ kTXNRestartAppleEventHandlersBit = 1
 kTXNNoAppleEventHandlersMask = 1 << kTXNNoAppleEventHandlersBit
 kTXNRestartAppleEventHandlersMask = 1 << kTXNRestartAppleEventHandlersBit
 # status = TXNInitTextension( &defaults
-# justification = LMTESysJust

Lib/plat-mac/Carbon/Menus.py

@@ -42,6 +42,8 @@ kMenuColorIconType = 4
 kMenuIconSuiteType = 5
 kMenuIconRefType = 6
 kMenuCGImageRefType = 7
+kMenuSystemIconSelectorType = 8
+kMenuIconResourceType = 9     
 kMenuNullGlyph = 0x00
 kMenuTabRightGlyph = 0x02
 kMenuTabLeftGlyph = 0x03
@@ -103,6 +105,7 @@ kMenuControlISOGlyph = 0x8A
 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 @@ kMenuItemAttrSectionHeader = (1 << 7)
 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 @@ kHierarchicalFontMenuOption = 0x00000001
 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')

Lib/plat-mac/Carbon/OSAconst.py

@@ -81,6 +81,7 @@ kOSADebuggerGetVariable = 0x0908
 kOSADebuggerSetVariable = 0x0909
 kOSADebuggerGetPreviousCallFrame = 0x090A
 kOSADebuggerDisposeCallFrame = 0x090B
+kOSADebuggerCountVariables = 0x090C
 kOSASelectComponentSpecificStart = 0x1001
 kOSAModePreventGetSource = 0x00000001
 kOSAModeNeverInteract = kAENeverInteract
@@ -120,6 +121,9 @@ eStepOver = 0
 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')

Lib/plat-mac/Carbon/QuickDraw.py

@@ -70,6 +70,7 @@ fixedType = 1
 directType = 2
 gdDevType = 0     
 interlacedDevice = 2
+hwMirroredDevice = 4
 roundedDevice = 5
 hasAuxMenuBar = 6
 burstDevice = 7

Lib/plat-mac/Carbon/Windows.py

@@ -3,20 +3,22 @@
 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
+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)
@@ -26,6 +28,7 @@ kWindowFullZoomAttribute = (kWindowVerticalZoomAttribute | kWindowHorizontalZoom
 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 @@ kWindowStandardHandlerAttribute = (1L << 25)
 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 @@ kWindowStaggerParentWindow = 0xB80A
 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
@@ -157,6 +162,8 @@ inZoomIn = 7
 inZoomOut = 8
 inCollapseBox = 11
 inProxyIcon = 12
+inToolbarButton = 13
+inStructure = 15    
 wNoHit = 0
 wInContent = 1
 wInDrag = 2
@@ -166,6 +173,8 @@ wInZoomIn = 5
 wInZoomOut = 6
 wInCollapseBox = 9
 wInProxyIcon = 10
+wInToolbarButton = 11
+wInStructure = 13    
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
 kWindowMsgCalculateShape = 2
@@ -227,7 +236,6 @@ kWindowModalityNone = 0
 kWindowModalitySystemModal = 1
 kWindowModalityAppModal = 2
 kWindowModalityWindowModal = 3
-windowGroupInvalidErr = -5616 
 kWindowGroupAttrSelectAsLayer = 1 << 0
 kWindowGroupAttrMoveTogether = 1 << 1
 kWindowGroupAttrLayerTogether = 1 << 2
@@ -245,6 +253,7 @@ kWindowPaintProcOptionsNone = 0
 kScrollWindowNoOptions = 0
 kScrollWindowInvalidate = (1L << 0)
 kScrollWindowEraseToPortBackground = (1L << 1) 
+kWindowMenuIncludeRotate = 1 << 0
 kWindowZoomTransitionEffect = 1
 kWindowSheetTransitionEffect = 2
 kWindowSlideTransitionEffect = 3
@@ -256,7 +265,14 @@ 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