[Python-checkins] python/dist/src/Lib/plat-mac/Carbon Appearance.py, 1.1, 1.2 AppleEvents.py, 1.1, 1.2 CarbonEvents.py, 1.1, 1.2 Controls.py, 1.1, 1.2 CoreGraphics.py, 1.1, 1.2 Dialogs.py, 1.1, 1.2 Dragconst.py, 1.1, 1.2 Events.py, 1.1, 1.2 Files.py, 1.1, 1.2 Folders.py, 1.1, 1.2 Fonts.py, 1.1, 1.2 Icons.py, 1.1, 1.2 LaunchServices.py, 1.1, 1.2 MacTextEditor.py, 1.1, 1.2 Menus.py, 1.1, 1.2 OSAconst.py, 1.1, 1.2 QuickDraw.py, 1.1, 1.2 QuickTime.py, 1.1, 1.2 Windows.py, 1.1, 1.2

jackjansen at users.sourceforge.net jackjansen at users.sourceforge.net
Fri Dec 5 18:59:39 EST 2003


Update of /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon
In directory sc8-pr-cvs1:/tmp/cvs-serv1453
Modified Files:
	Appearance.py AppleEvents.py CarbonEvents.py Controls.py 
	CoreGraphics.py Dialogs.py Dragconst.py Events.py Files.py 
	Folders.py Fonts.py Icons.py LaunchServices.py 
	MacTextEditor.py Menus.py OSAconst.py QuickDraw.py 
	QuickTime.py Windows.py 
Log Message:
Finished update to universal header 3.4.2.
Index: Appearance.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Appearance.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Appearance.py	30 Dec 2002 22:04:20 -0000	1.1
--- Appearance.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 60,67 ****
 kThemeBrushNotificationWindowBackground = 48
 kThemeBrushMovableModalBackground = 49
! kThemeBrushSheetBackground = 50
 kThemeBrushDrawerBackground = 51
 kThemeBrushBlack = -1
 kThemeBrushWhite = -2
 kThemeTextColorDialogActive = 1
 kThemeTextColorDialogInactive = 2
--- 60,74 ----
 kThemeBrushNotificationWindowBackground = 48
 kThemeBrushMovableModalBackground = 49
! 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
***************
*** 158,162 ****
 kThemeMenuItemHierBackground = 0x0400
 kThemeMenuItemPopUpBackground = 0x0800
! kThemeMenuItemHasIcon = 0x8000 
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
--- 165,170 ----
 kThemeMenuItemHierBackground = 0x0400
 kThemeMenuItemPopUpBackground = 0x0800
! kThemeMenuItemHasIcon = 0x8000
! kThemeMenuItemNoBackground = 0x4000 
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
***************
*** 166,169 ****
--- 174,178 ----
 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')
***************
*** 188,191 ****
--- 197,205 ----
 kThemeSmoothFontEnabledTag = FOUR_CHAR_CODE('smoo')
 kThemeSmoothFontMinSizeTag = FOUR_CHAR_CODE('smos') 
+ kTiledOnScreen = 1
+ kCenterOnScreen = 2
+ kFitToScreen = 3
+ kFillScreen = 4
+ kUseBestGuess = 5 
 kThemeCheckBoxClassicX = 0
 kThemeCheckBoxCheckMark = 1 
***************
*** 259,263 ****
 kThemeTrackShowThumb = (1 << 2)
 kThemeTrackThumbRgnIsNotGhost = (1 << 3)
! kThemeTrackNoScrollBarArrows = (1 << 4) 
 kThemeWindowHasGrow = (1 << 0)
 kThemeWindowHasHorizontalZoom = (1 << 3)
--- 273,277 ----
 kThemeTrackShowThumb = (1 << 2)
 kThemeTrackThumbRgnIsNotGhost = (1 << 3)
! kThemeTrackNoScrollBarArrows = (1 << 4)
 kThemeWindowHasGrow = (1 << 0)
 kThemeWindowHasHorizontalZoom = (1 << 3)
***************
*** 280,283 ****
--- 294,298 ----
 kThemeUtilitySideWindow = 9
 kThemeSheetWindow = 10
+ kThemeDrawerWindow = 11
 kThemeWidgetCloseBox = 0
 kThemeWidgetZoomBox = 1
***************
*** 541,544 ****
--- 556,566 ----
 kThemeMetricPrimaryGroupBoxContentInset = 61
 kThemeMetricSecondaryGroupBoxContentInset = 62
+ kThemeMetricMenuMarkColumnWidth = 63
+ kThemeMetricMenuExcludedMarkColumnWidth = 64
+ kThemeMetricMenuMarkIndent = 65
+ kThemeMetricMenuTextLeadingEdgeMargin = 66
+ kThemeMetricMenuTextTrailingEdgeMargin = 67
+ kThemeMetricMenuIndentWidth = 68
+ kThemeMetricMenuIconTrailingEdgeMargin = 69
 # appearanceBadBrushIndexErr = themeInvalidBrushErr
 # appearanceProcessRegisteredErr = themeProcessRegisteredErr
Index: AppleEvents.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/AppleEvents.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AppleEvents.py	30 Dec 2002 22:04:20 -0000	1.1
--- AppleEvents.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 36,39 ****
--- 36,40 ----
 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')
***************
*** 628,631 ****
--- 629,633 ----
 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')
Index: CarbonEvents.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/CarbonEvents.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CarbonEvents.py	30 Dec 2002 22:04:21 -0000	1.1
--- CarbonEvents.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
 keyAEEventID = FOUR_CHAR_CODE('evti')
 eventAlreadyPostedErr = -9860
+ eventTargetBusyErr = -9861
 eventClassInvalidErr = -9862
 eventClassIncorrectErr = -9864
***************
*** 26,37 ****
 kEventRemoveFromQueue = true
 kTrackMouseLocationOptionDontConsumeMouseUp = (1 << 0)
! kMouseTrackingMousePressed = 1
! kMouseTrackingMouseReleased = 2
 kMouseTrackingMouseExited = 3
 kMouseTrackingMouseEntered = 4
! kMouseTrackingMouseMoved = 5
 kMouseTrackingKeyModifiersChanged = 6
 kMouseTrackingUserCancelled = 7
 kMouseTrackingTimedOut = 8
 kEventAttributeNone = 0
 kEventAttributeUserEvent = (1 << 0)
--- 27,39 ----
 kEventRemoveFromQueue = true
 kTrackMouseLocationOptionDontConsumeMouseUp = (1 << 0)
! kMouseTrackingMouseDown = 1
! kMouseTrackingMouseUp = 2
 kMouseTrackingMouseExited = 3
 kMouseTrackingMouseEntered = 4
! kMouseTrackingMouseDragged = 5
 kMouseTrackingKeyModifiersChanged = 6
 kMouseTrackingUserCancelled = 7
 kMouseTrackingTimedOut = 8
+ kMouseTrackingMouseMoved = 9
 kEventAttributeNone = 0
 kEventAttributeUserEvent = (1 << 0)
***************
*** 47,50 ****
--- 49,54 ----
 kEventClassTablet = FOUR_CHAR_CODE('tblt')
 kEventClassVolume = FOUR_CHAR_CODE('vol ')
+ kEventClassAppearance = FOUR_CHAR_CODE('appm')
+ kEventClassService = FOUR_CHAR_CODE('serv')
 kEventMouseDown = 1
 kEventMouseUp = 2
***************
*** 79,83 ****
 kEventAppLaunched = 5
 kEventAppTerminated = 6
! kEventAppFrontSwitched = 7 
 kEventAppleEvent = 1
 kEventWindowUpdate = 1
--- 83,88 ----
 kEventAppLaunched = 5
 kEventAppTerminated = 6
! kEventAppFrontSwitched = 7
! kEventAppGetDockTileMenu = 20
 kEventAppleEvent = 1
 kEventWindowUpdate = 1
***************
*** 90,93 ****
--- 95,103 ----
 kEventWindowShown = 24
 kEventWindowHidden = 25
+ kEventWindowCollapsing = 86
+ kEventWindowCollapsed = 67
+ kEventWindowExpanding = 87
+ kEventWindowExpanded = 70
+ kEventWindowZoomed = 76
 kEventWindowBoundsChanging = 26
 kEventWindowBoundsChanged = 27
***************
*** 96,103 ****
--- 106,115 ----
 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
***************
*** 107,122 ****
 kEventWindowClickContentRgn = 37
 kEventWindowClickProxyIconRgn = 38
 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
--- 119,132 ----
 kEventWindowClickContentRgn = 37
 kEventWindowClickProxyIconRgn = 38
+ kEventWindowClickToolbarButtonRgn = 41
+ kEventWindowClickStructureRgn = 42
 kEventWindowCursorChange = 40
 kEventWindowCollapse = 66
 kEventWindowCollapseAll = 68
 kEventWindowExpand = 69
 kEventWindowExpandAll = 71
 kEventWindowClose = 72
 kEventWindowCloseAll = 74
 kEventWindowZoom = 75
 kEventWindowZoomAll = 77
 kEventWindowContextualMenuSelect = 78
***************
*** 129,132 ****
--- 139,149 ----
 kEventWindowProxyBeginDrag = 128
 kEventWindowProxyEndDrag = 129
+ kEventWindowToolbarSwitchMode = 150
+ kDockChangedUser = 1
+ kDockChangedOrientation = 2
+ kDockChangedAutohide = 3
+ kDockChangedDisplay = 4
+ kDockChangedItems = 5
+ kDockChangedUnknown = 6
 kEventWindowFocusAcquired = 200
 kEventWindowFocusRelinquish = 201
***************
*** 153,157 ****
--- 170,188 ----
 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
***************
*** 168,177 ****
--- 199,228 ----
 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
***************
*** 210,219 ****
 kControlBoundsChangeSizeChanged = (1 << 2)
 kControlBoundsChangePositionChanged = (1 << 3)
! kEventTabletPointer = 1
 kEventTabletProximity = 2
 kEventVolumeMounted = 1
 kEventVolumeUnmounted = 2 
 typeFSVolumeRefNum = FOUR_CHAR_CODE('voln') 
 kEventParamDirectObject = FOUR_CHAR_CODE('----') 
 kEventParamWindowRef = FOUR_CHAR_CODE('wind')
 kEventParamGrafPort = FOUR_CHAR_CODE('graf')
--- 261,278 ----
 kControlBoundsChangeSizeChanged = (1 << 2)
 kControlBoundsChangePositionChanged = (1 << 3)
! 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')
***************
*** 229,232 ****
--- 288,293 ----
 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')
***************
*** 238,242 ****
 typeQDRgnHandle = FOUR_CHAR_CODE('rgnh')
 typeOSStatus = FOUR_CHAR_CODE('osst')
! typeCGContextRef = FOUR_CHAR_CODE('cntx') 
 kEventParamMouseLocation = FOUR_CHAR_CODE('mloc')
 kEventParamMouseButton = FOUR_CHAR_CODE('mbtn')
--- 299,309 ----
 typeQDRgnHandle = FOUR_CHAR_CODE('rgnh')
 typeOSStatus = FOUR_CHAR_CODE('osst')
! 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')
***************
*** 246,249 ****
--- 313,317 ----
 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') 
***************
*** 252,255 ****
--- 320,324 ----
 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')
***************
*** 273,276 ****
--- 342,346 ----
 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')
***************
*** 301,304 ****
--- 371,377 ----
 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')
***************
*** 338,352 ****
 kEventParamEnableMenuForKeyEvent = FOUR_CHAR_CODE('fork')
 kEventParamMenuEventOptions = FOUR_CHAR_CODE('meop')
 typeMenuItemIndex = FOUR_CHAR_CODE('midx')
 typeMenuCommand = FOUR_CHAR_CODE('mcmd')
 typeMenuTrackingMode = FOUR_CHAR_CODE('mtmd')
! typeMenuEventOptions = FOUR_CHAR_CODE('meop') 
 kEventParamProcessID = FOUR_CHAR_CODE('psn ')
 kEventParamLaunchRefCon = FOUR_CHAR_CODE('lref')
 kEventParamLaunchErr = FOUR_CHAR_CODE('err ') 
! kEventParamTabletPointerRec = FOUR_CHAR_CODE('tbrc')
 kEventParamTabletProximityRec = FOUR_CHAR_CODE('tbpx')
! typeTabletPointerRec = FOUR_CHAR_CODE('tbrc')
! typeTabletProximityRec = FOUR_CHAR_CODE('tbpx') 
 # sHandler = NewEventHandlerUPP( x )
! kUserFocusAuto = -1
--- 411,451 ----
 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')
! 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 ') 
! kEventParamTabletPointRec = FOUR_CHAR_CODE('tbrc')
 kEventParamTabletProximityRec = 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 )
! kMouseTrackingMousePressed = kMouseTrackingMouseDown
! kMouseTrackingMouseReleased = kMouseTrackingMouseUp
Index: Controls.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Controls.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Controls.py	30 Dec 2002 22:04:21 -0000	1.1
--- Controls.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 55,59 ****
 kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')
 kControlCollectionTagVarCode = FOUR_CHAR_CODE('varc') 
- kControlCollectionTagSubControls = FOUR_CHAR_CODE('subc') 
 kControlContentTextOnly = 0
 kControlNoContent = 0
--- 55,58 ----
***************
*** 281,290 ****
 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') 
 kControlSliderProc = 48
 kControlSliderLiveFeedback = (1 << 0)
--- 280,289 ----
 kControlBevelButtonMenuHandleTag = FOUR_CHAR_CODE('mhnd')
 kControlBevelButtonMenuRefTag = FOUR_CHAR_CODE('mhnd')
! # 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)
***************
*** 422,426 ****
 kControlEditTextInlinePreUpdateProcTag = FOUR_CHAR_CODE('prup')
 kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup') 
! kControlEditTextCFStringTag = FOUR_CHAR_CODE('cfst') 
 kControlStaticTextProc = 288
 kControlKindStaticText = FOUR_CHAR_CODE('stxt')
--- 421,426 ----
 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')
***************
*** 485,489 ****
 kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid') 
 kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
! kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
 kControlPopupButtonCheckCurrentTag = FOUR_CHAR_CODE('chck') 
 kControlRadioGroupProc = 416
--- 485,489 ----
 kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid') 
 kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
! kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf') 
 kControlPopupButtonCheckCurrentTag = FOUR_CHAR_CODE('chck') 
 kControlRadioGroupProc = 416
***************
*** 503,507 ****
 kControlRoundButtonLargeSize = kControlSizeLarge
 kControlRoundButtonContentTag = FOUR_CHAR_CODE('cont')
! kControlRoundButtonSizeTag = FOUR_CHAR_CODE('size') 
 kControlKindRoundButton = FOUR_CHAR_CODE('rndb')
 kControlKindDataBrowser = FOUR_CHAR_CODE('datb')
--- 503,507 ----
 kControlRoundButtonLargeSize = kControlSizeLarge
 kControlRoundButtonContentTag = FOUR_CHAR_CODE('cont')
! kControlRoundButtonSizeTag = kControlSizeTag 
 kControlKindRoundButton = FOUR_CHAR_CODE('rndb')
 kControlKindDataBrowser = FOUR_CHAR_CODE('datb')
***************
*** 645,648 ****
--- 645,649 ----
 kControlEditUnicodeTextProc = 912
 kControlEditUnicodeTextPasswordProc = 914
+ kControlKindEditUnicodeText = FOUR_CHAR_CODE('eutx')
 kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
 kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue
Index: CoreGraphics.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/CoreGraphics.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreGraphics.py	30 Dec 2002 22:04:21 -0000	1.1
--- CoreGraphics.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 23,24 ****
--- 23,28 ----
 kCGEncodingFontSpecific = 0
 kCGEncodingMacRoman = 1
+ kCGInterpolationDefault = 0
+ kCGInterpolationNone = 1
+ kCGInterpolationLow = 2
+ kCGInterpolationHigh = 3 
Index: Dialogs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Dialogs.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dialogs.py	30 Dec 2002 22:04:21 -0000	1.1
--- Dialogs.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 74,76 ****
 kHICommandOther = FOUR_CHAR_CODE('othr') 
 kStdCFStringAlertVersionOne = 1 
! kStdAlertDoNotDisposeSheet = 1 << 0 
--- 74,79 ----
 kHICommandOther = FOUR_CHAR_CODE('othr') 
 kStdCFStringAlertVersionOne = 1 
! kStdAlertDoNotDisposeSheet = 1 << 0
! kStdAlertDoNotAnimateOnDefault = 1 << 1
! kStdAlertDoNotAnimateOnCancel = 1 << 2
! kStdAlertDoNotAnimateOnOther = 1 << 3
Index: Dragconst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Dragconst.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dragconst.py	30 Dec 2002 22:04:21 -0000	1.1
--- Dragconst.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
 from Carbon.TextEdit import *
 from Carbon.QuickDraw import *
+ fkDragActionAll = -1
 
 
***************
*** 35,39 ****
 flavorSenderTranslated = (1 << 1)
 flavorNotSaved = (1 << 2)
! flavorSystemTranslated = (1 << 8) 
 kDragFlavorTypeHFS = FOUR_CHAR_CODE('hfs ')
 kDragFlavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
--- 36,41 ----
 flavorSenderTranslated = (1 << 1)
 flavorNotSaved = (1 << 2)
! flavorSystemTranslated = (1 << 8)
! flavorDataPromised = (1 << 9) 
 kDragFlavorTypeHFS = FOUR_CHAR_CODE('hfs ')
 kDragFlavorTypePromiseHFS = FOUR_CHAR_CODE('phfs')
***************
*** 55,58 ****
--- 57,68 ----
 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
Index: Events.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Events.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Events.py	30 Dec 2002 22:04:21 -0000	1.1
--- Events.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 66,69 ****
--- 66,73 ----
 kReturnCharCode = 13
 kFunctionKeyCharCode = 16
+ kCommandCharCode = 17
+ kCheckCharCode = 18
+ kDiamondCharCode = 19
+ kAppleLogoCharCode = 20
 kEscapeCharCode = 27
 kClearCharCode = 27
***************
*** 72,77 ****
--- 76,92 ----
 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
Index: Files.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Files.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Files.py	30 Dec 2002 22:04:21 -0000	1.1
--- Files.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 78,81 ****
--- 78,82 ----
 bTrshOffLine = 26
 bNoSwitchTo = 25
+ bDontShareIt = 21
 bNoDeskItems = 20
 bNoBootBlks = 19
***************
*** 272,275 ****
--- 273,277 ----
 kFSCatInfoSharingFlags = 0x00010000
 kFSCatInfoUserPrivs = 0x00020000
+ kFSCatInfoUserAccess = 0x00080000
 kFSCatInfoAllDates = 0x000003E0
 kFSCatInfoGettableInfo = 0x0003FFFF
***************
*** 339,342 ****
--- 341,345 ----
 kFSVolFlagSoftwareLockedMask = 0x8000
 kFNDirectoryModifiedMessage = 1
+ kFNNoImplicitAllSubscription = (1 << 0)
 rAliasType = FOUR_CHAR_CODE('alis') 
 kARMMountVol = 0x00000001
Index: Folders.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Folders.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Folders.py	30 Dec 2002 22:04:21 -0000	1.1
--- Folders.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 123,127 ****
 kKernelExtensionsFolderType = FOUR_CHAR_CODE('kext')
 kDirectoryServicesFolderType = FOUR_CHAR_CODE('dsrv')
! kDirectoryServicesPlugInsFolderType = FOUR_CHAR_CODE('dplg') 
 kLocalesFolderType = FOUR_CHAR_CODE('\xc4loc')
 kFindByContentPluginsFolderType = FOUR_CHAR_CODE('fbcp') 
--- 123,132 ----
 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') 
Index: Fonts.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Fonts.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Fonts.py	30 Dec 2002 22:04:21 -0000	1.1
--- Fonts.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 5,8 ****
--- 5,15 ----
 systemFont = 0
 applFont = 1
+ kFMDefaultOptions = kNilOptions
+ kFMDefaultActivationContext = kFMDefaultOptions
+ kFMGlobalActivationContext = 0x00000001
+ kFMLocalActivationContext = kFMDefaultActivationContext
+ kFMDefaultIterationScope = kFMDefaultOptions
+ kFMGlobalIterationScope = 0x00000001
+ kFMLocalIterationScope = kFMDefaultIterationScope
 kPlatformDefaultGuiFontID = applFont
 kPlatformDefaultGuiFontID = -1
***************
*** 20,23 ****
--- 27,31 ----
 fxdFntHW = 45059L
 fontWid = 44208L
+ kFMUseGlobalScopeOption = 0x00000001
 kFontIDNewYork = 2
 kFontIDGeneva = 3
Index: Icons.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Icons.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Icons.py	30 Dec 2002 22:04:21 -0000	1.1
--- Icons.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 2,5 ****
--- 2,6 ----
 
 def FOUR_CHAR_CODE(x): return x
+ from Carbon.Files import *
 kGenericDocumentIconResource = -4000
 kGenericStationeryIconResource = -3985
***************
*** 243,248 ****
 kGenericStationeryIcon = FOUR_CHAR_CODE('sdoc')
 kGenericSuitcaseIcon = FOUR_CHAR_CODE('suit')
 kGenericWORMIcon = FOUR_CHAR_CODE('worm')
! kInternationResourcesIcon = FOUR_CHAR_CODE('ifil')
 kKeyboardLayoutIcon = FOUR_CHAR_CODE('kfil')
 kSoundFileIcon = FOUR_CHAR_CODE('sfil')
--- 244,250 ----
 kGenericStationeryIcon = FOUR_CHAR_CODE('sdoc')
 kGenericSuitcaseIcon = FOUR_CHAR_CODE('suit')
+ kGenericURLIcon = FOUR_CHAR_CODE('gurl')
 kGenericWORMIcon = FOUR_CHAR_CODE('worm')
! kInternationalResourcesIcon = FOUR_CHAR_CODE('ifil')
 kKeyboardLayoutIcon = FOUR_CHAR_CODE('kfil')
 kSoundFileIcon = FOUR_CHAR_CODE('sfil')
***************
*** 253,256 ****
--- 255,259 ----
 kTrueTypeMultiFlatFontIcon = FOUR_CHAR_CODE('ttcf')
 kUserIDiskIcon = FOUR_CHAR_CODE('udsk')
+ kInternationResourcesIcon = kInternationalResourcesIcon 
 kInternetLocationHTTPIcon = FOUR_CHAR_CODE('ilht')
 kInternetLocationFTPIcon = FOUR_CHAR_CODE('ilft')
***************
*** 280,283 ****
--- 283,287 ----
 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')
***************
*** 285,288 ****
--- 289,293 ----
 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')
***************
*** 297,302 ****
--- 302,309 ----
 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')
***************
*** 317,326 ****
 kSystemFolderIcon = FOUR_CHAR_CODE('macs')
 kTextEncodingsFolderIcon = FOUR_CHAR_CODE('\xc4tex')
! kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
 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')
 kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
 kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
--- 324,331 ----
 kSystemFolderIcon = FOUR_CHAR_CODE('macs')
 kTextEncodingsFolderIcon = FOUR_CHAR_CODE('\xc4tex')
! kUsersFolderIcon = FOUR_CHAR_CODE('usr\xc4')
 kUtilitiesFolderIcon = FOUR_CHAR_CODE('uti\xc4')
 kVoicesFolderIcon = FOUR_CHAR_CODE('fvoc')
! kSystemFolderXIcon = FOUR_CHAR_CODE('macx')
 kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
 kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
***************
*** 328,331 ****
--- 333,337 ----
 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')
***************
*** 338,341 ****
--- 344,351 ----
 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')
***************
*** 358,361 ****
--- 368,381 ----
 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')
Index: LaunchServices.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/LaunchServices.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LaunchServices.py	2 Dec 2003 23:01:41 -0000	1.1
--- LaunchServices.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 2,7 ****
--- 2,9 ----
 
 def FOUR_CHAR_CODE(x): return x
+ from Carbon.Files import *
 kLSRequestAllInfo = -1
 kLSRolesAll = -1
+ kLSInvalidExtensionIndex = -1
 kLSUnknownErr = -10810
 kLSNotAnApplicationErr = -10811
***************
*** 16,21 ****
 kLSAppDoesNotClaimTypeErr = -10820
 kLSAppDoesNotSupportSchemeWarning = -10821
! kLSServerCommunicationErr = -10822 
 kLSInitializeDefaults = 0x00000001
 kLSRequestExtension = 0x00000001
 kLSRequestTypeCreator = 0x00000002
--- 18,26 ----
 kLSAppDoesNotClaimTypeErr = -10820
 kLSAppDoesNotSupportSchemeWarning = -10821
! kLSServerCommunicationErr = -10822
! kLSCannotSetInfoErr = -10823 
 kLSInitializeDefaults = 0x00000001
+ kLSMinCatInfoBitmap = (kFSCatInfoNodeFlags | kFSCatInfoParentDirID | kFSCatInfoFinderInfo | kFSCatInfoFinderXInfo) 
+ # kLSInvalidExtensionIndex = (unsigned long)0xFFFFFFFF 
 kLSRequestExtension = 0x00000001
 kLSRequestTypeCreator = 0x00000002
***************
*** 24,27 ****
--- 29,33 ----
 kLSRequestAllFlags = 0x00000010
 kLSRequestIconAndKind = 0x00000020
+ kLSRequestExtensionFlagsOnly = 0x00000040
 # kLSRequestAllInfo = (unsigned long)0xFFFFFFFF 
 kLSItemInfoIsPlainFile = 0x00000001
***************
*** 37,50 ****
 kLSItemInfoAppPrefersClassic = 0x00000400
 kLSItemInfoAppIsScriptable = 0x00000800
! kLSItemInfoIsVolume = 0x00001000 
 kLSRolesNone = 0x00000001
 kLSRolesViewer = 0x00000002
 kLSRolesEditor = 0x00000004
! # kLSRolesAll = (unsigned long)0xFFFFFFFF
 kLSUnknownKindID = 0
 kLSUnknownType = 0
 kLSUnknownCreator = 0
 kLSAcceptDefault = 0x00000001
! kLSAcceptAllowLoginUI = 0x00000002
 kLSLaunchDefaults = 0x00000001
 kLSLaunchAndPrint = 0x00000002
--- 43,57 ----
 kLSItemInfoAppPrefersClassic = 0x00000400
 kLSItemInfoAppIsScriptable = 0x00000800
! kLSItemInfoIsVolume = 0x00001000
! kLSItemInfoExtensionIsHidden = 0x00100000 
 kLSRolesNone = 0x00000001
 kLSRolesViewer = 0x00000002
 kLSRolesEditor = 0x00000004
! # kLSRolesAll = (unsigned long)0xFFFFFFFF 
 kLSUnknownKindID = 0
 kLSUnknownType = 0
 kLSUnknownCreator = 0
 kLSAcceptDefault = 0x00000001
! kLSAcceptAllowLoginUI = 0x00000002 
 kLSLaunchDefaults = 0x00000001
 kLSLaunchAndPrint = 0x00000002
Index: MacTextEditor.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/MacTextEditor.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MacTextEditor.py	30 Dec 2002 22:04:21 -0000	1.1
--- MacTextEditor.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 15,20 ****
--- 15,23 ----
 kTXNUseEncodingWordRulesMask = 0x80000000
 kTXNFontSizeAttributeSize = 4
+ normal = 0
 kTXNWillDefaultToATSUIBit = 0
+ kTXNWillDefaultToCarbonEventBit = 1
 kTXNWillDefaultToATSUIMask = 1L << kTXNWillDefaultToATSUIBit
+ kTXNWillDefaultToCarbonEventMask = 1L << kTXNWillDefaultToCarbonEventBit
 kTXNWantMoviesBit = 0
 kTXNWantSoundBit = 1
***************
*** 43,46 ****
--- 46,50 ----
 kTXNSingleLineOnlyBit = 14
 kTXNDisableDragAndDropBit = 15
+ kTXNUseQDforImagingBit = 16
 kTXNDrawGrowIconMask = 1L << kTXNDrawGrowIconBit
 kTXNShowWindowMask = 1L << kTXNShowWindowBit
***************
*** 59,62 ****
--- 63,67 ----
 kTXNSingleLineOnlyMask = 1L << kTXNSingleLineOnlyBit
 kTXNDisableDragAndDropMask = 1L << kTXNDisableDragAndDropBit
+ kTXNUseQDforImagingMask = 1L << kTXNUseQDforImagingBit
 kTXNSetFlushnessBit = 0
 kTXNSetJustificationBit = 1
***************
*** 66,69 ****
--- 71,77 ----
 kTXNDontUpdateBoxRectBit = 5
 kTXNDontDrawTextBit = 6
+ kTXNUseCGContextRefBit = 7
+ kTXNImageWithQDBit = 8
+ kTXNDontWrapTextBit = 9
 kTXNSetFlushnessMask = 1L << kTXNSetFlushnessBit
 kTXNSetJustificationMask = 1L << kTXNSetJustificationBit
***************
*** 73,76 ****
--- 81,87 ----
 kTXNDontUpdateBoxRectMask = 1L << kTXNDontUpdateBoxRectBit
 kTXNDontDrawTextMask = 1L << kTXNDontDrawTextBit
+ kTXNUseCGContextRefMask = 1L << kTXNUseCGContextRefBit
+ kTXNImageWithQDMask = 1L << kTXNImageWithQDBit
+ kTXNDontWrapTextMask = 1L << kTXNDontWrapTextBit
 kTXNFontContinuousBit = 0
 kTXNSizeContinuousBit = 1
***************
*** 175,185 ****
 kTXNUseScriptDefaultValue = -1
 kTXNNoFontVariations = 0x7FFF
! # kTXNUseCurrentSelection = 0xFFFFFFFFUL
! # kTXNStartOffset = 0UL
! # kTXNEndOffset = 0x7FFFFFFFUL
 kTXNSingleStylePerTextDocumentResType = FOUR_CHAR_CODE('MPSR')
 kTXNMultipleStylesPerTextDocumentResType = FOUR_CHAR_CODE('styl')
 kTXNShowStart = false
 kTXNShowEnd = true
 kTXNQDFontNameAttribute = FOUR_CHAR_CODE('fntn')
 kTXNQDFontFamilyIDAttribute = FOUR_CHAR_CODE('font')
--- 186,199 ----
 kTXNUseScriptDefaultValue = -1
 kTXNNoFontVariations = 0x7FFF
! # 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')
***************
*** 211,213 ****
 kTXNRestartAppleEventHandlersMask = 1 << kTXNRestartAppleEventHandlersBit
 # status = TXNInitTextension( &defaults
- # justification = LMTESysJust
--- 225,226 ----
Index: Menus.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Menus.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Menus.py	30 Dec 2002 22:04:21 -0000	1.1
--- Menus.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 42,46 ****
 kMenuIconSuiteType = 5
 kMenuIconRefType = 6
! kMenuCGImageRefType = 7 
 kMenuNullGlyph = 0x00
 kMenuTabRightGlyph = 0x02
--- 42,48 ----
 kMenuIconSuiteType = 5
 kMenuIconRefType = 6
! kMenuCGImageRefType = 7
! kMenuSystemIconSelectorType = 8
! kMenuIconResourceType = 9 
 kMenuNullGlyph = 0x00
 kMenuTabRightGlyph = 0x02
***************
*** 104,107 ****
--- 106,110 ----
 kMenuAttrAutoDisable = (1 << 2)
 kMenuAttrUsePencilGlyph = (1 << 3)
+ kMenuAttrHidden = (1 << 4)
 kMenuItemAttrDisabled = (1 << 0)
 kMenuItemAttrIconDisabled = (1 << 1)
***************
*** 115,118 ****
--- 118,123 ----
 kMenuItemAttrAutoRepeat = (1 << 9)
 kMenuItemAttrUseVirtualKey = (1 << 10)
+ kMenuItemAttrCustomDraw = (1 << 11)
+ kMenuItemAttrIncludeInCmdKeyMatching = (1 << 12)
 kMenuTrackingModeMouse = 1
 kMenuTrackingModeKeyboard = 2
***************
*** 149,156 ****
--- 154,169 ----
 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')
Index: OSAconst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/OSAconst.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OSAconst.py	3 Dec 2003 22:34:19 -0000	1.1
--- OSAconst.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 82,85 ****
--- 82,86 ----
 kOSADebuggerGetPreviousCallFrame = 0x090A
 kOSADebuggerDisposeCallFrame = 0x090B
+ kOSADebuggerCountVariables = 0x090C
 kOSASelectComponentSpecificStart = 0x1001
 kOSAModePreventGetSource = 0x00000001
***************
*** 121,124 ****
--- 122,128 ----
 eStepOut = 2
 eRun = 3
+ eLocal = 0
+ eGlobal = 1
+ eProperties = 2
 keyProgramState = FOUR_CHAR_CODE('dsps')
 typeStatementRange = FOUR_CHAR_CODE('srng')
Index: QuickDraw.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/QuickDraw.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QuickDraw.py	30 Dec 2002 22:04:21 -0000	1.1
--- QuickDraw.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 71,74 ****
--- 71,75 ----
 gdDevType = 0 
 interlacedDevice = 2
+ hwMirroredDevice = 4
 roundedDevice = 5
 hasAuxMenuBar = 6
Index: QuickTime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/QuickTime.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QuickTime.py	30 Dec 2002 22:04:21 -0000	1.1
--- QuickTime.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
 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 ')
***************
*** 39,42 ****
--- 40,45 ----
 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')
***************
*** 162,165 ****
--- 165,174 ----
 kActionMovieChanged = 1037
 kActionMovieRestartAtTime = 1038
+ kActionMovieGotoNextChapter = 1039
+ kActionMovieGotoPreviousChapter = 1040
+ kActionMovieGotoFirstChapter = 1041
+ kActionMovieGotoLastChapter = 1042
+ kActionMovieGotoChapterByIndex = 1043
+ kActionMovieSetScale = 1044
 kActionTrackSetVolume = 2048
 kActionTrackSetBalance = 2049
***************
*** 183,186 ****
--- 192,196 ----
 kActionSpriteRotate = 3082
 kActionSpriteStretch = 3083
+ kActionSpriteSetCanBeHitTested = 3094
 kActionQTVRSetPanAngle = 4096
 kActionQTVRSetTiltAngle = 4097
***************
*** 191,194 ****
--- 201,205 ----
 kActionQTVRShowHotSpots = 4102
 kActionQTVRTranslateObject = 4103
+ kActionQTVRSetViewState = 4109
 kActionMusicPlayNote = 5120
 kActionMusicSetController = 5121
***************
*** 213,216 ****
--- 224,228 ----
 kActionSetFocus = 6162
 kActionDontPassKeyEvent = 6163
+ kActionSetRandomSeed = 6164
 kActionSpriteTrackSetVariable = 7168
 kActionSpriteTrackNewSprite = 7169
***************
*** 220,223 ****
--- 232,238 ----
 kActionSpriteTrackSetVariableToMovieURL = 7173
 kActionSpriteTrackSetVariableToMovieBaseURL = 7174
+ kActionSpriteTrackSetAllSpritesHitTestingMode = 7181
+ kActionSpriteTrackNewImage = 7182
+ kActionSpriteTrackDisposeImage = 7183
 kActionApplicationNumberAndString = 8192
 kActionQD3DNamedObjectTranslateTo = 9216
***************
*** 307,310 ****
--- 322,333 ----
 kOperandMovieName = 1036
 kOperandMovieID = 1037
+ kOperandMovieChapterCount = 1038
+ kOperandMovieChapterIndex = 1039
+ kOperandMovieChapterName = 1040
+ kOperandMovieChapterNameByIndex = 1041
+ kOperandMovieChapterIndexByName = 1042
+ kOperandMovieAnnotation = 1043
+ kOperandMovieConnectionFlags = 1044
+ kOperandMovieConnectionString = 1045
 kOperandTrackVolume = 2048
 kOperandTrackBalance = 2049
***************
*** 343,346 ****
--- 366,373 ----
 kOperandSpriteTrackSpriteIDAtPoint = 3094
 kOperandSpriteName = 3095
+ kOperandSpriteCanBeHitTested = 3105
+ kOperandSpriteTrackAllSpritesHitTestingMode = 3106
+ kOperandSpriteTrackImageIDByIndex = 3107
+ kOperandSpriteTrackImageIndexByID = 3108
 kOperandQTVRPanAngle = 4096
 kOperandQTVRTiltAngle = 4097
***************
*** 350,353 ****
--- 377,382 ----
 kOperandQTVRViewCenterH = 4101
 kOperandQTVRViewCenterV = 4102
+ kOperandQTVRViewStateCount = 4103
+ kOperandQTVRViewState = 4104
 kOperandMouseLocalHLoc = 5120
 kOperandMouseLocalVLoc = 5121
***************
*** 385,401 ****
 kOperandStringConcat = 10243 
 kFirstMovieAction = kActionMovieSetVolume
! kLastMovieAction = kActionMovieRestartAtTime
 kFirstTrackAction = kActionTrackSetVolume
 kLastTrackAction = kActionTrackSetBassTreble
 kFirstSpriteAction = kActionSpriteSetMatrix
! kLastSpriteAction = kActionSpriteStretch
 kFirstQTVRAction = kActionQTVRSetPanAngle
! kLastQTVRAction = kActionQTVRTranslateObject
 kFirstMusicAction = kActionMusicPlayNote
 kLastMusicAction = kActionMusicSetController
 kFirstSystemAction = kActionCase
! kLastSystemAction = kActionDontPassKeyEvent
 kFirstSpriteTrackAction = kActionSpriteTrackSetVariable
! kLastSpriteTrackAction = kActionSpriteTrackSetVariableToMovieBaseURL
 kFirstApplicationAction = kActionApplicationNumberAndString
 kLastApplicationAction = kActionApplicationNumberAndString
--- 414,430 ----
 kOperandStringConcat = 10243 
 kFirstMovieAction = kActionMovieSetVolume
! kLastMovieAction = kActionMovieSetScale
 kFirstTrackAction = kActionTrackSetVolume
 kLastTrackAction = kActionTrackSetBassTreble
 kFirstSpriteAction = kActionSpriteSetMatrix
! kLastSpriteAction = kActionSpriteSetCanBeHitTested
 kFirstQTVRAction = kActionQTVRSetPanAngle
! kLastQTVRAction = kActionQTVRSetViewState
 kFirstMusicAction = kActionMusicPlayNote
 kLastMusicAction = kActionMusicSetController
 kFirstSystemAction = kActionCase
! kLastSystemAction = kActionSetRandomSeed
 kFirstSpriteTrackAction = kActionSpriteTrackSetVariable
! kLastSpriteTrackAction = kActionSpriteTrackDisposeImage
 kFirstApplicationAction = kActionApplicationNumberAndString
 kLastApplicationAction = kActionApplicationNumberAndString
***************
*** 461,464 ****
--- 490,494 ----
 kQTEventRequestToModifyMovie = FOUR_CHAR_CODE('reqm')
 kQTEventListReceived = FOUR_CHAR_CODE('list')
+ kQTEventKeyUp = FOUR_CHAR_CODE('keyU') 
 kActionFlagActionIsDelta = 1L << 1
 kActionFlagParameterWrapsAround = 1L << 2
***************
*** 540,543 ****
--- 570,574 ----
 newMovieAsyncOK = 1 << 8
 newMovieIdleImportOK = 1 << 10
+ newMovieDontInteractWithUser = 1 << 11
 trackUsageInMovie = 1 << 1
 trackUsageInPreview = 1 << 2
***************
*** 595,602 ****
--- 626,644 ----
 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
***************
*** 610,613 ****
--- 652,657 ----
 kQTGetMIMETypeInfoIsQuickTimeMovieType = FOUR_CHAR_CODE('moov')
 kQTGetMIMETypeInfoIsUnhelpfulType = FOUR_CHAR_CODE('dumb') 
+ kQTCopyUserDataReplace = FOUR_CHAR_CODE('rplc')
+ kQTCopyUserDataMerge = FOUR_CHAR_CODE('merg') 
 kMovieLoadStateError = -1L
 kMovieLoadStateLoading = 1000
***************
*** 628,631 ****
--- 672,685 ----
 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
***************
*** 637,640 ****
--- 691,695 ----
 kSpritePropertyImageDataSize = 7
 kSpritePropertyActionHandlingSpriteID = 8
+ kSpritePropertyCanBeHitTested = 9
 kSpritePropertyImageIndex = 100
 kSpriteTrackPropertyBackgroundColor = 101
***************
*** 645,651 ****
--- 700,715 ----
 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
***************
*** 658,662 ****
--- 722,729 ----
 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')
***************
*** 674,682 ****
 pdActionConductStopAlert = 11
 pdActionModelessCallback = 12
! pdActionFetchPreview = 13 
 elOptionsIncludeNoneInList = 0x00000001 
 pdOptionsCollectOneValue = 0x00000001
 pdOptionsAllowOptionalInterpolations = 0x00000002
! pdOptionsModalDialogBox = 0x00000004 
 effectIsRealtime = 0 
 kAccessKeyAtomType = FOUR_CHAR_CODE('acky')
--- 741,779 ----
 pdActionConductStopAlert = 11
 pdActionModelessCallback = 12
! 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
! pdOptionsEditCurrentEffectOnly = 0x00000008
! pdOptionsHidePreview = 0x00000010 
 effectIsRealtime = 0 
 kAccessKeyAtomType = FOUR_CHAR_CODE('acky')
***************
*** 739,742 ****
--- 836,840 ----
 kTrackModifierVerticalFieldOfViewAngle = FOUR_CHAR_CODE('fov ')
 kTrackModifierObjectQTEventSend = FOUR_CHAR_CODE('evnt')
+ kTrackModifierObjectCanBeHitTested = 15
 kTweenTypeShort = 1
 kTweenTypeLong = 2
***************
*** 793,796 ****
--- 891,906 ----
 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
***************
*** 808,812 ****
 spriteHitTestInvisibleSprites = 1L << 2
 spriteHitTestIsClick = 1L << 3
! spriteHitTestLocInDisplayCoordinates = 1L << 4 
 kSpriteAtomType = FOUR_CHAR_CODE('sprt')
 kSpriteImagesContainerAtomType = FOUR_CHAR_CODE('imct')
--- 918,923 ----
 spriteHitTestInvisibleSprites = 1L << 2
 spriteHitTestIsClick = 1L << 3
! spriteHitTestLocInDisplayCoordinates = 1L << 4
! spriteHitTestTreatAllSpritesAsHitTestable = 1L << 5 
 kSpriteAtomType = FOUR_CHAR_CODE('sprt')
 kSpriteImagesContainerAtomType = FOUR_CHAR_CODE('imct')
***************
*** 1010,1013 ****
--- 1121,1125 ----
 kQTCursorUpArrow = -19177
 kQTCursorIBeam = -19176
+ kControllerUnderstandsIdleManagers = 1 << 0
 kVideoMediaResetStatisticsSelect = 0x0105
 kVideoMediaGetStatisticsSelect = 0x0106
***************
*** 1050,1053 ****
--- 1162,1169 ----
 kSpriteMediaSetActionVariableToStringSelect = 0x0116
 kSpriteMediaGetActionVariableAsStringSelect = 0x0117
+ kSpriteMediaNewImageSelect = 0x011B
+ kSpriteMediaDisposeImageSelect = 0x011C
+ kSpriteMediaImageIndexToIDSelect = 0x011D
+ kSpriteMediaImageIDToIndexSelect = 0x011E
 kFlashMediaSetPanSelect = 0x0101
 kFlashMediaSetZoomSelect = 0x0102
***************
*** 1132,1134 ****
--- 1248,1252 ----
 kMCAddMovieSegmentSelect = 0x0033
 kMCTrimMovieSegmentSelect = 0x0034
+ kMCSetIdleManagerSelect = 0x0035
+ kMCSetControllerCapabilitiesSelect = 0x0036
 kMusicMediaGetIndexedTunePlayerSelect = 0x0101
Index: Windows.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Windows.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Windows.py	30 Dec 2002 22:04:21 -0000	1.1
--- Windows.py	5 Dec 2003 23:59:37 -0000	1.2
***************
*** 4,22 ****
 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 
 kWindowNoAttributes = 0L
 kWindowCloseBoxAttribute = (1L << 0)
--- 4,24 ----
 false = 0
 true = 1
! 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)
***************
*** 27,30 ****
--- 29,33 ----
 kWindowResizableAttribute = (1L << 4)
 kWindowSideTitlebarAttribute = (1L << 5)
+ kWindowToolbarButtonAttribute = (1L << 6)
 kWindowNoUpdatesAttribute = (1L << 16)
 kWindowNoActivatesAttribute = (1L << 17)
***************
*** 36,39 ****
--- 39,43 ----
 kWindowInWindowMenuAttribute = (1L << 27)
 kWindowLiveResizeAttribute = (1L << 28)
+ # kWindowNoConstrainAttribute = (unsigned long)((1L << 31))
 kWindowStandardDocumentAttributes = (kWindowCloseBoxAttribute | kWindowFullZoomAttribute | kWindowCollapseBoxAttribute | kWindowResizableAttribute)
 kWindowStandardFloatingAttributes = (kWindowCloseBoxAttribute | kWindowCollapseBoxAttribute)
***************
*** 120,132 ****
 kWindowAlertPositionParentWindowScreen = 0x700A
 kWindowStaggerParentWindowScreen = 0x780A
! kWindowCenterOnMainScreen = 0x00000001
! kWindowCenterOnParentWindow = 0x00000002
! kWindowCenterOnParentWindowScreen = 0x00000003
! kWindowCascadeOnMainScreen = 0x00000004
! kWindowCascadeOnParentWindow = 0x00000005
! kWindowCascadeOnParentWindowScreen = 0x00000006
! kWindowAlertPositionOnMainScreen = 0x00000007
! kWindowAlertPositionOnParentWindow = 0x00000008
! kWindowAlertPositionOnParentWindowScreen = 0x00000009
 kWindowTitleBarRgn = 0
 kWindowTitleTextRgn = 1
--- 124,137 ----
 kWindowAlertPositionParentWindowScreen = 0x700A
 kWindowStaggerParentWindowScreen = 0x780A
! kWindowCenterOnMainScreen = 1
! kWindowCenterOnParentWindow = 2
! kWindowCenterOnParentWindowScreen = 3
! kWindowCascadeOnMainScreen = 4
! kWindowCascadeOnParentWindow = 5
! kWindowCascadeOnParentWindowScreen = 6
! kWindowCascadeStartAtParentWindowScreen = 10
! kWindowAlertPositionOnMainScreen = 7
! kWindowAlertPositionOnParentWindow = 8
! kWindowAlertPositionOnParentWindowScreen = 9
 kWindowTitleBarRgn = 0
 kWindowTitleTextRgn = 1
***************
*** 157,161 ****
 inZoomOut = 8
 inCollapseBox = 11
! inProxyIcon = 12 
 wNoHit = 0
 wInContent = 1
--- 162,168 ----
 inZoomOut = 8
 inCollapseBox = 11
! inProxyIcon = 12
! inToolbarButton = 13
! inStructure = 15 
 wNoHit = 0
 wInContent = 1
***************
*** 166,170 ****
 wInZoomOut = 6
 wInCollapseBox = 9
! wInProxyIcon = 10 
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
--- 173,179 ----
 wInZoomOut = 6
 wInCollapseBox = 9
! wInProxyIcon = 10
! wInToolbarButton = 11
! wInStructure = 13 
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
***************
*** 228,232 ****
 kWindowModalityAppModal = 2
 kWindowModalityWindowModal = 3
- windowGroupInvalidErr = -5616 
 kWindowGroupAttrSelectAsLayer = 1 << 0
 kWindowGroupAttrMoveTogether = 1 << 1
--- 237,240 ----
***************
*** 246,261 ****
 kScrollWindowInvalidate = (1L << 0)
 kScrollWindowEraseToPortBackground = (1L << 1) 
 kWindowZoomTransitionEffect = 1
 kWindowSheetTransitionEffect = 2
! kWindowSlideTransitionEffect = 3 
 kWindowShowTransitionAction = 1
 kWindowHideTransitionAction = 2
 kWindowMoveTransitionAction = 3
! kWindowResizeTransitionAction = 4 
 kWindowConstrainMayResize = (1L << 0)
 kWindowConstrainMoveRegardlessOfFit = (1L << 1)
 kWindowConstrainAllowPartial = (1L << 2)
 kWindowConstrainCalcOnly = (1L << 3)
 kWindowConstrainStandardOptions = kWindowConstrainMoveRegardlessOfFit
 kWindowPropertyPersistent = 0x00000001 
 kWindowGroupAttrSelectable = kWindowGroupAttrSelectAsLayer
--- 254,277 ----
 kScrollWindowInvalidate = (1L << 0)
 kScrollWindowEraseToPortBackground = (1L << 1) 
+ kWindowMenuIncludeRotate = 1 << 0
 kWindowZoomTransitionEffect = 1
 kWindowSheetTransitionEffect = 2
! kWindowSlideTransitionEffect = 3
 kWindowShowTransitionAction = 1
 kWindowHideTransitionAction = 2
 kWindowMoveTransitionAction = 3
! 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


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /