[Python-checkins] python/dist/src/Lib/plat-mac/Carbon Aliases.py, 1.1, 1.2 Appearance.py, 1.2, 1.3 AppleEvents.py, 1.2, 1.3 CarbonEvents.py, 1.2, 1.3 Components.py, 1.1, 1.2 ControlAccessor.py, 1.2, 1.3 Controls.py, 1.2, 1.3 CoreFoundation.py, 1.1, 1.2 CoreGraphics.py, 1.2, 1.3 Dialogs.py, 1.2, 1.3 Dragconst.py, 1.2, 1.3 Events.py, 1.2, 1.3 Files.py, 1.2, 1.3 Folders.py, 1.2, 1.3 Icons.py, 1.2, 1.3 LaunchServices.py, 1.3, 1.4 Lists.py, 1.1, 1.2 MacHelp.py, 1.1, 1.2 MacTextEditor.py, 1.2, 1.3 MediaDescr.py, 1.2, 1.3 Menus.py, 1.2, 1.3 OSAconst.py, 1.2, 1.3 Qt.py, 1.2, 1.3 QuickDraw.py, 1.2, 1.3 QuickTime.py, 1.3, 1.4 Resources.py, 1.1, 1.2 Sound.py, 1.1, 1.2 TextEdit.py, 1.1, 1.2 Windows.py, 1.2, 1.3 __init__.py, 1.1, 1.2

tim_one at users.sourceforge.net tim_one at users.sourceforge.net
Sun Jul 18 08:15:22 CEST 2004


Update of /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31286/plat-mac/Carbon
Modified Files:
	Aliases.py Appearance.py AppleEvents.py CarbonEvents.py 
	Components.py ControlAccessor.py Controls.py CoreFoundation.py 
	CoreGraphics.py Dialogs.py Dragconst.py Events.py Files.py 
	Folders.py Icons.py LaunchServices.py Lists.py MacHelp.py 
	MacTextEditor.py MediaDescr.py Menus.py OSAconst.py Qt.py 
	QuickDraw.py QuickTime.py Resources.py Sound.py TextEdit.py 
	Windows.py __init__.py 
Log Message:
Whitespace normalization, via reindent.py.
Index: Aliases.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Aliases.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Aliases.py	30 Dec 2002 22:04:20 -0000	1.1
--- Aliases.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 4,8 ****
 true = True
 false = False
! rAliasType = FOUR_CHAR_CODE('alis') 
 kARMMountVol = 0x00000001
 kARMNoUI = 0x00000002
--- 4,8 ----
 true = True
 false = False
! rAliasType = FOUR_CHAR_CODE('alis')
 kARMMountVol = 0x00000001
 kARMNoUI = 0x00000002
***************
*** 10,18 ****
 kARMSearch = 0x00000100
 kARMSearchMore = 0x00000200
! kARMSearchRelFirst = 0x00000400 
 asiZoneName = -3
 asiServerName = -2
 asiVolumeName = -1
 asiAliasName = 0
! asiParentName = 1 
! kResolveAliasFileNoUI = 0x00000001 
--- 10,18 ----
 kARMSearch = 0x00000100
 kARMSearchMore = 0x00000200
! kARMSearchRelFirst = 0x00000400
 asiZoneName = -3
 asiServerName = -2
 asiVolumeName = -1
 asiAliasName = 0
! asiParentName = 1
! kResolveAliasFileNoUI = 0x00000001
Index: Appearance.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Appearance.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Appearance.py	5 Dec 2003 23:59:37 -0000	1.2
--- Appearance.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 6,10 ****
 kAESystemFontChanged = FOUR_CHAR_CODE('sysf')
 kAESmallSystemFontChanged = FOUR_CHAR_CODE('ssfn')
! kAEViewsFontChanged = FOUR_CHAR_CODE('vfnt') 
 kThemeDataFileType = FOUR_CHAR_CODE('thme')
 kThemePlatinumFileType = FOUR_CHAR_CODE('pltn')
--- 6,10 ----
 kAESystemFontChanged = FOUR_CHAR_CODE('sysf')
 kAESmallSystemFontChanged = FOUR_CHAR_CODE('ssfn')
! kAEViewsFontChanged = FOUR_CHAR_CODE('vfnt')
 kThemeDataFileType = FOUR_CHAR_CODE('thme')
 kThemePlatinumFileType = FOUR_CHAR_CODE('pltn')
***************
*** 65,74 ****
 kThemeBrushSheetBackgroundTransparent = 53
 kThemeBrushMenuBackground = 54
! kThemeBrushMenuBackgroundSelected = 55 
 kThemeBrushSheetBackground = kThemeBrushSheetBackgroundOpaque
 kThemeBrushBlack = -1
 kThemeBrushWhite = -2
 kThemeBrushPrimaryHighlightColor = -3
! kThemeBrushSecondaryHighlightColor = -4 
 kThemeTextColorDialogActive = 1
 kThemeTextColorDialogInactive = 2
--- 65,74 ----
 kThemeBrushSheetBackgroundTransparent = 53
 kThemeBrushMenuBackground = 54
! kThemeBrushMenuBackgroundSelected = 55
 kThemeBrushSheetBackground = kThemeBrushSheetBackgroundOpaque
 kThemeBrushBlack = -1
 kThemeBrushWhite = -2
 kThemeBrushPrimaryHighlightColor = -3
! kThemeBrushSecondaryHighlightColor = -4
 kThemeTextColorDialogActive = 1
 kThemeTextColorDialogInactive = 2
***************
*** 128,132 ****
 kThemeStateDisabled = 0
 kThemeStatePressedUp = 2
! kThemeStatePressedDown = 3 
 kThemeArrowCursor = 0
 kThemeCopyArrowCursor = 1
--- 128,132 ----
 kThemeStateDisabled = 0
 kThemeStatePressedUp = 2
! kThemeStatePressedDown = 3
 kThemeArrowCursor = 0
 kThemeCopyArrowCursor = 1
***************
*** 166,170 ****
 kThemeMenuItemPopUpBackground = 0x0800
 kThemeMenuItemHasIcon = 0x8000
! kThemeMenuItemNoBackground = 0x4000 
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
--- 166,170 ----
 kThemeMenuItemPopUpBackground = 0x0800
 kThemeMenuItemHasIcon = 0x8000
! kThemeMenuItemNoBackground = 0x4000
 kThemeBackgroundTabPane = 1
 kThemeBackgroundPlacard = 2
***************
*** 179,183 ****
 kThemeScrollBarThumbStyleTag = FOUR_CHAR_CODE('sbth')
 kThemeSoundsEnabledTag = FOUR_CHAR_CODE('snds')
! kThemeDblClickCollapseTag = FOUR_CHAR_CODE('coll') 
 kThemeAppearanceFileNameTag = FOUR_CHAR_CODE('thme')
 kThemeSystemFontTag = FOUR_CHAR_CODE('lgsf')
--- 179,183 ----
 kThemeScrollBarThumbStyleTag = FOUR_CHAR_CODE('sbth')
 kThemeSoundsEnabledTag = FOUR_CHAR_CODE('snds')
! kThemeDblClickCollapseTag = FOUR_CHAR_CODE('coll')
 kThemeAppearanceFileNameTag = FOUR_CHAR_CODE('thme')
 kThemeSystemFontTag = FOUR_CHAR_CODE('lgsf')
***************
*** 196,211 ****
 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
! kThemeScrollBarArrowsLowerRight = 1 
 kThemeScrollBarThumbNormal = 0
! kThemeScrollBarThumbProportional = 1 
 kThemeSystemFont = 0
 kThemeSmallSystemFont = 1
--- 196,211 ----
 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
! kThemeScrollBarArrowsLowerRight = 1
 kThemeScrollBarThumbNormal = 0
! kThemeScrollBarThumbProportional = 1
 kThemeSystemFont = 0
 kThemeSmallSystemFont = 1
***************
*** 239,243 ****
 kThemeTabPaneOverlap = 3
 kThemeSmallTabHeightMax = 19
! kThemeLargeTabHeightMax = 24 
 kThemeMediumScrollBar = 0
 kThemeSmallScrollBar = 1
--- 239,243 ----
 kThemeTabPaneOverlap = 3
 kThemeSmallTabHeightMax = 19
! kThemeLargeTabHeightMax = 24
 kThemeMediumScrollBar = 0
 kThemeSmallScrollBar = 1
***************
*** 310,314 ****
 kThemeGrowRight = (1 << 1)
 kThemeGrowUp = (1 << 2)
! kThemeGrowDown = (1 << 3) 
 kThemePushButton = 0
 kThemeCheckBox = 1
--- 310,314 ----
 kThemeGrowRight = (1 << 1)
 kThemeGrowUp = (1 << 2)
! kThemeGrowDown = (1 << 3)
 kThemePushButton = 0
 kThemeCheckBox = 1
***************
*** 352,356 ****
 kThemeAdornmentArrowDownArrow = (1 << 7)
 kThemeAdornmentArrowDoubleArrow = (1 << 8)
! kThemeAdornmentArrowUpArrow = (1 << 9) 
 kThemeNoSounds = 0
 kThemeWindowSoundsMask = (1 << 0)
--- 352,356 ----
 kThemeAdornmentArrowDownArrow = (1 << 7)
 kThemeAdornmentArrowDoubleArrow = (1 << 8)
! kThemeAdornmentArrowUpArrow = (1 << 9)
 kThemeNoSounds = 0
 kThemeWindowSoundsMask = (1 << 0)
***************
*** 630,634 ****
 kThemeActivePopupLabelTextColor = kThemeTextColorPopupLabelActive
 kThemeInactivePopupLabelTextColor = kThemeTextColorPopupLabelInactive
! kAEThemeSwitch = kAEAppearanceChanged 
 kThemeNoAdornment = kThemeAdornmentNone
 kThemeDefaultAdornment = kThemeAdornmentDefault
--- 630,634 ----
 kThemeActivePopupLabelTextColor = kThemeTextColorPopupLabelActive
 kThemeInactivePopupLabelTextColor = kThemeTextColorPopupLabelInactive
! kAEThemeSwitch = kAEAppearanceChanged
 kThemeNoAdornment = kThemeAdornmentNone
 kThemeDefaultAdornment = kThemeAdornmentDefault
***************
*** 642,646 ****
 kThemeMetricBestListHeaderHeight = kThemeMetricListHeaderHeight
 kThemeMetricSmallProgressBarThickness = kThemeMetricNormalProgressBarThickness
! kThemeMetricProgressBarThickness = kThemeMetricLargeProgressBarThickness 
 kThemeScrollBar = kThemeMediumScrollBar
 kThemeSlider = kThemeMediumSlider
--- 642,646 ----
 kThemeMetricBestListHeaderHeight = kThemeMetricListHeaderHeight
 kThemeMetricSmallProgressBarThickness = kThemeMetricNormalProgressBarThickness
! kThemeMetricProgressBarThickness = kThemeMetricLargeProgressBarThickness
 kThemeScrollBar = kThemeMediumScrollBar
 kThemeSlider = kThemeMediumSlider
Index: AppleEvents.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/AppleEvents.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AppleEvents.py	5 Dec 2003 23:59:37 -0000	1.2
--- AppleEvents.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 45,49 ****
 typeProcessSerialNumber = FOUR_CHAR_CODE('psn ')
 typeApplicationURL = FOUR_CHAR_CODE('aprl')
! typeNull = FOUR_CHAR_CODE('null') 
 typeSessionID = FOUR_CHAR_CODE('ssid')
 typeTargetID = FOUR_CHAR_CODE('targ')
--- 45,49 ----
 typeProcessSerialNumber = FOUR_CHAR_CODE('psn ')
 typeApplicationURL = FOUR_CHAR_CODE('aprl')
! typeNull = FOUR_CHAR_CODE('null')
 typeSessionID = FOUR_CHAR_CODE('ssid')
 typeTargetID = FOUR_CHAR_CODE('targ')
***************
*** 60,69 ****
 keyMissedKeywordAttr = FOUR_CHAR_CODE('miss')
 keyOriginalAddressAttr = FOUR_CHAR_CODE('from')
! keyAcceptTimeoutAttr = FOUR_CHAR_CODE('actm') 
 kAEDescListFactorNone = 0
 kAEDescListFactorType = 4
 kAEDescListFactorTypeAndSize = 8
 kAutoGenerateReturnID = -1
! kAnyTransactionID = 0 
 kAEDataArray = 0
 kAEPackedArray = 1
--- 60,69 ----
 keyMissedKeywordAttr = FOUR_CHAR_CODE('miss')
 keyOriginalAddressAttr = FOUR_CHAR_CODE('from')
! keyAcceptTimeoutAttr = FOUR_CHAR_CODE('actm')
 kAEDescListFactorNone = 0
 kAEDescListFactorType = 4
 kAEDescListFactorTypeAndSize = 8
 kAutoGenerateReturnID = -1
! kAnyTransactionID = 0
 kAEDataArray = 0
 kAEPackedArray = 1
***************
*** 72,76 ****
 kAEHandleArray = 2
 kAENormalPriority = 0x00000000
! kAEHighPriority = 0x00000001 
 kAENoReply = 0x00000001
 kAEQueueReply = 0x00000002
--- 72,76 ----
 kAEHandleArray = 2
 kAENormalPriority = 0x00000000
! kAEHighPriority = 0x00000001
 kAENoReply = 0x00000001
 kAEQueueReply = 0x00000002
***************
*** 84,90 ****
 kAEDontRecord = 0x00001000
 kAEDontExecute = 0x00002000
! kAEProcessNonReplyEvents = 0x00008000 
 kAEDefaultTimeout = -1
! kNoTimeOut = -2 
 kAEInteractWithSelf = 0
 kAEInteractWithLocal = 1
--- 84,90 ----
 kAEDontRecord = 0x00001000
 kAEDontExecute = 0x00002000
! kAEProcessNonReplyEvents = 0x00008000
 kAEDefaultTimeout = -1
! kNoTimeOut = -2
 kAEInteractWithSelf = 0
 kAEInteractWithLocal = 1
***************
*** 96,102 ****
 kAEIgnoreSysEventHandler = 0x00000008
 kAEIngoreBuiltInEventHandler = 0x00000010
! # kAEDontDisposeOnResume = (long)0x80000000 
 kAENoDispatch = 0
! # kAEUseStandardDispatch = (long)0xFFFFFFFF 
 keyDirectObject = FOUR_CHAR_CODE('----')
 keyErrorNumber = FOUR_CHAR_CODE('errn')
--- 96,102 ----
 kAEIgnoreSysEventHandler = 0x00000008
 kAEIngoreBuiltInEventHandler = 0x00000010
! # kAEDontDisposeOnResume = (long)0x80000000
 kAENoDispatch = 0
! # kAEUseStandardDispatch = (long)0xFFFFFFFF
 keyDirectObject = FOUR_CHAR_CODE('----')
 keyErrorNumber = FOUR_CHAR_CODE('errn')
***************
*** 106,110 ****
 keySelectProc = FOUR_CHAR_CODE('selh')
 keyAERecorderCount = FOUR_CHAR_CODE('recr')
! keyAEVersion = FOUR_CHAR_CODE('vers') 
 kCoreEventClass = FOUR_CHAR_CODE('aevt')
 kAEOpenApplication = FOUR_CHAR_CODE('oapp')
--- 106,110 ----
 keySelectProc = FOUR_CHAR_CODE('selh')
 keyAERecorderCount = FOUR_CHAR_CODE('recr')
! keyAEVersion = FOUR_CHAR_CODE('vers')
 kCoreEventClass = FOUR_CHAR_CODE('aevt')
 kAEOpenApplication = FOUR_CHAR_CODE('oapp')
***************
*** 114,123 ****
 kAEAnswer = FOUR_CHAR_CODE('ansr')
 kAEApplicationDied = FOUR_CHAR_CODE('obit')
! kAEShowPreferences = FOUR_CHAR_CODE('pref') 
 kAEStartRecording = FOUR_CHAR_CODE('reca')
 kAEStopRecording = FOUR_CHAR_CODE('recc')
 kAENotifyStartRecording = FOUR_CHAR_CODE('rec1')
 kAENotifyStopRecording = FOUR_CHAR_CODE('rec0')
! kAENotifyRecording = FOUR_CHAR_CODE('recr') 
 kAEUnknownSource = 0
 kAEDirectCall = 1
--- 114,123 ----
 kAEAnswer = FOUR_CHAR_CODE('ansr')
 kAEApplicationDied = FOUR_CHAR_CODE('obit')
! kAEShowPreferences = FOUR_CHAR_CODE('pref')
 kAEStartRecording = FOUR_CHAR_CODE('reca')
 kAEStopRecording = FOUR_CHAR_CODE('recc')
 kAENotifyStartRecording = FOUR_CHAR_CODE('rec1')
 kAENotifyStopRecording = FOUR_CHAR_CODE('rec0')
! kAENotifyRecording = FOUR_CHAR_CODE('recr')
 kAEUnknownSource = 0
 kAEDirectCall = 1
***************
*** 144,148 ****
 cGraphicShape = FOUR_CHAR_CODE('cgsh')
 cGraphicText = FOUR_CHAR_CODE('cgtx')
! cGroupedGraphic = FOUR_CHAR_CODE('cpic') 
 cInsertionLoc = FOUR_CHAR_CODE('insl')
 cInsertionPoint = FOUR_CHAR_CODE('cins')
--- 144,148 ----
 cGraphicShape = FOUR_CHAR_CODE('cgsh')
 cGraphicText = FOUR_CHAR_CODE('cgtx')
! cGroupedGraphic = FOUR_CHAR_CODE('cpic')
 cInsertionLoc = FOUR_CHAR_CODE('insl')
 cInsertionPoint = FOUR_CHAR_CODE('cins')
***************
*** 164,168 ****
 cObjectSpecifier = FOUR_CHAR_CODE('obj ')
 cOpenableObject = FOUR_CHAR_CODE('coob')
! cOval = FOUR_CHAR_CODE('covl') 
 cParagraph = FOUR_CHAR_CODE('cpar')
 cPICT = FOUR_CHAR_CODE('PICT')
--- 164,168 ----
 cObjectSpecifier = FOUR_CHAR_CODE('obj ')
 cOpenableObject = FOUR_CHAR_CODE('coob')
! cOval = FOUR_CHAR_CODE('covl')
 cParagraph = FOUR_CHAR_CODE('cpar')
 cPICT = FOUR_CHAR_CODE('PICT')
***************
*** 184,188 ****
 cTextFlow = FOUR_CHAR_CODE('cflo')
 cTextStyles = FOUR_CHAR_CODE('tsty')
! cType = FOUR_CHAR_CODE('type') 
 cVersion = FOUR_CHAR_CODE('vers')
 cWindow = FOUR_CHAR_CODE('cwin')
--- 184,188 ----
 cTextFlow = FOUR_CHAR_CODE('cflo')
 cTextStyles = FOUR_CHAR_CODE('tsty')
! cType = FOUR_CHAR_CODE('type')
 cVersion = FOUR_CHAR_CODE('vers')
 cWindow = FOUR_CHAR_CODE('cwin')
***************
*** 204,208 ****
 kAEArrowAtEnd = FOUR_CHAR_CODE('aren')
 kAEArrowAtStart = FOUR_CHAR_CODE('arst')
! kAEArrowBothEnds = FOUR_CHAR_CODE('arbo') 
 kAEAsk = FOUR_CHAR_CODE('ask ')
 kAEBefore = FOUR_CHAR_CODE('befo')
--- 204,208 ----
 kAEArrowAtEnd = FOUR_CHAR_CODE('aren')
 kAEArrowAtStart = FOUR_CHAR_CODE('arst')
! kAEArrowBothEnds = FOUR_CHAR_CODE('arbo')
 kAEAsk = FOUR_CHAR_CODE('ask ')
 kAEBefore = FOUR_CHAR_CODE('befo')
***************
*** 224,228 ****
 kAECreatePublisher = FOUR_CHAR_CODE('cpub')
 kAECut = FOUR_CHAR_CODE('cut ')
! kAEDelete = FOUR_CHAR_CODE('delo') 
 kAEDoObjectsExist = FOUR_CHAR_CODE('doex')
 kAEDoScript = FOUR_CHAR_CODE('dosc')
--- 224,228 ----
 kAECreatePublisher = FOUR_CHAR_CODE('cpub')
 kAECut = FOUR_CHAR_CODE('cut ')
! kAEDelete = FOUR_CHAR_CODE('delo')
 kAEDoObjectsExist = FOUR_CHAR_CODE('doex')
 kAEDoScript = FOUR_CHAR_CODE('dosc')
***************
*** 244,248 ****
 kAEGetDataSize = FOUR_CHAR_CODE('dsiz')
 kAEGetEventInfo = FOUR_CHAR_CODE('gtei')
! kAEGetInfoSelection = FOUR_CHAR_CODE('sinf') 
 kAEGetPrivilegeSelection = FOUR_CHAR_CODE('sprv')
 kAEGetSuiteInfo = FOUR_CHAR_CODE('gtsi')
--- 244,248 ----
 kAEGetDataSize = FOUR_CHAR_CODE('dsiz')
 kAEGetEventInfo = FOUR_CHAR_CODE('gtei')
! kAEGetInfoSelection = FOUR_CHAR_CODE('sinf')
 kAEGetPrivilegeSelection = FOUR_CHAR_CODE('sprv')
 kAEGetSuiteInfo = FOUR_CHAR_CODE('gtsi')
***************
*** 264,268 ****
 kAEMove = FOUR_CHAR_CODE('move')
 kAENo = FOUR_CHAR_CODE('no ')
! kAENoArrow = FOUR_CHAR_CODE('arno') 
 kAENonmodifiable = FOUR_CHAR_CODE('nmod')
 kAEOpen = FOUR_CHAR_CODE('odoc')
--- 264,268 ----
 kAEMove = FOUR_CHAR_CODE('move')
 kAENo = FOUR_CHAR_CODE('no ')
! kAENoArrow = FOUR_CHAR_CODE('arno')
 kAENonmodifiable = FOUR_CHAR_CODE('nmod')
 kAEOpen = FOUR_CHAR_CODE('odoc')
***************
*** 284,288 ****
 kAEQDCopy = FOUR_CHAR_CODE('cpy ')
 kAEQDNotBic = FOUR_CHAR_CODE('nbic')
! kAEQDNotCopy = FOUR_CHAR_CODE('ncpy') 
 kAEQDNotOr = FOUR_CHAR_CODE('ntor')
 kAEQDNotXor = FOUR_CHAR_CODE('nxor')
--- 284,288 ----
 kAEQDCopy = FOUR_CHAR_CODE('cpy ')
 kAEQDNotBic = FOUR_CHAR_CODE('nbic')
! kAEQDNotCopy = FOUR_CHAR_CODE('ncpy')
 kAEQDNotOr = FOUR_CHAR_CODE('ntor')
 kAEQDNotXor = FOUR_CHAR_CODE('nxor')
***************
*** 305,309 ****
 kAESave = FOUR_CHAR_CODE('save')
 kAESelect = FOUR_CHAR_CODE('slct')
! kAESetData = FOUR_CHAR_CODE('setd') 
 kAESetPosition = FOUR_CHAR_CODE('posn')
 kAEShadow = FOUR_CHAR_CODE('shad')
--- 305,309 ----
 kAESave = FOUR_CHAR_CODE('save')
 kAESelect = FOUR_CHAR_CODE('slct')
! kAESetData = FOUR_CHAR_CODE('setd')
 kAESetPosition = FOUR_CHAR_CODE('posn')
 kAEShadow = FOUR_CHAR_CODE('shad')
***************
*** 323,327 ****
 kAEWholeWordEquals = FOUR_CHAR_CODE('wweq')
 kAEYes = FOUR_CHAR_CODE('yes ')
! kAEZoom = FOUR_CHAR_CODE('zoom') 
 kAEMouseClass = FOUR_CHAR_CODE('mous')
 kAEDown = FOUR_CHAR_CODE('down')
--- 323,327 ----
 kAEWholeWordEquals = FOUR_CHAR_CODE('wweq')
 kAEYes = FOUR_CHAR_CODE('yes ')
! kAEZoom = FOUR_CHAR_CODE('zoom')
 kAEMouseClass = FOUR_CHAR_CODE('mous')
 kAEDown = FOUR_CHAR_CODE('down')
***************
*** 348,352 ****
 kAEHighLevel = FOUR_CHAR_CODE('high')
 keyAEAngle = FOUR_CHAR_CODE('kang')
! keyAEArcAngle = FOUR_CHAR_CODE('parc') 
 keyAEBaseAddr = FOUR_CHAR_CODE('badd')
 keyAEBestType = FOUR_CHAR_CODE('pbst')
--- 348,352 ----
 kAEHighLevel = FOUR_CHAR_CODE('high')
 keyAEAngle = FOUR_CHAR_CODE('kang')
! keyAEArcAngle = FOUR_CHAR_CODE('parc')
 keyAEBaseAddr = FOUR_CHAR_CODE('badd')
 keyAEBestType = FOUR_CHAR_CODE('pbst')
***************
*** 368,372 ****
 keyAEDoAntiAlias = FOUR_CHAR_CODE('anta')
 keyAEDoDithered = FOUR_CHAR_CODE('gdit')
! keyAEDoRotate = FOUR_CHAR_CODE('kdrt') 
 keyAEDoScale = FOUR_CHAR_CODE('ksca')
 keyAEDoTranslate = FOUR_CHAR_CODE('ktra')
--- 368,372 ----
 keyAEDoAntiAlias = FOUR_CHAR_CODE('anta')
 keyAEDoDithered = FOUR_CHAR_CODE('gdit')
! keyAEDoRotate = FOUR_CHAR_CODE('kdrt')
 keyAEDoScale = FOUR_CHAR_CODE('ksca')
 keyAEDoTranslate = FOUR_CHAR_CODE('ktra')
***************
*** 388,392 ****
 keyAEImageQuality = FOUR_CHAR_CODE('gqua')
 keyAEInsertHere = FOUR_CHAR_CODE('insh')
! keyAEKeyForms = FOUR_CHAR_CODE('keyf') 
 keyAEKeyword = FOUR_CHAR_CODE('kywd')
 keyAELevel = FOUR_CHAR_CODE('levl')
--- 388,392 ----
 keyAEImageQuality = FOUR_CHAR_CODE('gqua')
 keyAEInsertHere = FOUR_CHAR_CODE('insh')
! keyAEKeyForms = FOUR_CHAR_CODE('keyf')
 keyAEKeyword = FOUR_CHAR_CODE('kywd')
 keyAELevel = FOUR_CHAR_CODE('levl')
***************
*** 408,412 ****
 keyAEPointList = FOUR_CHAR_CODE('ptlt')
 keyAEPointSize = FOUR_CHAR_CODE('ptsz')
! keyAEPosition = FOUR_CHAR_CODE('kpos') 
 keyAEPropData = FOUR_CHAR_CODE('prdt')
 keyAEProperties = FOUR_CHAR_CODE('qpro')
--- 408,412 ----
 keyAEPointList = FOUR_CHAR_CODE('ptlt')
 keyAEPointSize = FOUR_CHAR_CODE('ptsz')
! keyAEPosition = FOUR_CHAR_CODE('kpos')
 keyAEPropData = FOUR_CHAR_CODE('prdt')
 keyAEProperties = FOUR_CHAR_CODE('qpro')
***************
*** 428,432 ****
 keyAEStartAngle = FOUR_CHAR_CODE('pang')
 keyAEStartPoint = FOUR_CHAR_CODE('pstp')
! keyAEStyles = FOUR_CHAR_CODE('ksty') 
 keyAESuiteID = FOUR_CHAR_CODE('suit')
 keyAEText = FOUR_CHAR_CODE('ktxt')
--- 428,432 ----
 keyAEStartAngle = FOUR_CHAR_CODE('pang')
 keyAEStartPoint = FOUR_CHAR_CODE('pstp')
! keyAEStyles = FOUR_CHAR_CODE('ksty')
 keyAESuiteID = FOUR_CHAR_CODE('suit')
 keyAEText = FOUR_CHAR_CODE('ktxt')
***************
*** 445,449 ****
 keyAEUserTerm = FOUR_CHAR_CODE('utrm')
 keyAEWindow = FOUR_CHAR_CODE('wndw')
! keyAEWritingCode = FOUR_CHAR_CODE('wrcd') 
 keyMiscellaneous = FOUR_CHAR_CODE('fmsc')
 keySelection = FOUR_CHAR_CODE('fsel')
--- 445,449 ----
 keyAEUserTerm = FOUR_CHAR_CODE('utrm')
 keyAEWindow = FOUR_CHAR_CODE('wndw')
! keyAEWritingCode = FOUR_CHAR_CODE('wrcd')
 keyMiscellaneous = FOUR_CHAR_CODE('fmsc')
 keySelection = FOUR_CHAR_CODE('fsel')
***************
*** 478,482 ****
 pFillColor = FOUR_CHAR_CODE('flcl')
 pFillPattern = FOUR_CHAR_CODE('flpt')
! pFont = FOUR_CHAR_CODE('font') 
 pFormula = FOUR_CHAR_CODE('pfor')
 pGraphicObjects = FOUR_CHAR_CODE('gobs')
--- 478,482 ----
 pFillColor = FOUR_CHAR_CODE('flcl')
 pFillPattern = FOUR_CHAR_CODE('flpt')
! pFont = FOUR_CHAR_CODE('font')
 pFormula = FOUR_CHAR_CODE('pfor')
 pGraphicObjects = FOUR_CHAR_CODE('gobs')
***************
*** 498,502 ****
 pLineArrow = FOUR_CHAR_CODE('arro')
 pMenuID = FOUR_CHAR_CODE('mnid')
! pName = FOUR_CHAR_CODE('pnam') 
 pNewElementLoc = FOUR_CHAR_CODE('pnel')
 pPenColor = FOUR_CHAR_CODE('ppcl')
--- 498,502 ----
 pLineArrow = FOUR_CHAR_CODE('arro')
 pMenuID = FOUR_CHAR_CODE('mnid')
! pName = FOUR_CHAR_CODE('pnam')
 pNewElementLoc = FOUR_CHAR_CODE('pnel')
 pPenColor = FOUR_CHAR_CODE('ppcl')
***************
*** 518,522 ****
 pTextFont = FOUR_CHAR_CODE('ptxf')
 pTextItemDelimiters = FOUR_CHAR_CODE('txdl')
! pTextPointSize = FOUR_CHAR_CODE('ptps') 
 pTextStyles = FOUR_CHAR_CODE('txst')
 pTransferMode = FOUR_CHAR_CODE('pptm')
--- 518,522 ----
 pTextFont = FOUR_CHAR_CODE('ptxf')
 pTextItemDelimiters = FOUR_CHAR_CODE('txdl')
! pTextPointSize = FOUR_CHAR_CODE('ptps')
 pTextStyles = FOUR_CHAR_CODE('txst')
 pTransferMode = FOUR_CHAR_CODE('pptm')
***************
*** 526,530 ****
 pUserSelection = FOUR_CHAR_CODE('pusl')
 pVersion = FOUR_CHAR_CODE('vers')
! pVisible = FOUR_CHAR_CODE('pvis') 
 typeAEText = FOUR_CHAR_CODE('tTXT')
 typeArc = FOUR_CHAR_CODE('carc')
--- 526,530 ----
 pUserSelection = FOUR_CHAR_CODE('pusl')
 pVersion = FOUR_CHAR_CODE('vers')
! pVisible = FOUR_CHAR_CODE('pvis')
 typeAEText = FOUR_CHAR_CODE('tTXT')
 typeArc = FOUR_CHAR_CODE('carc')
***************
*** 540,544 ****
 typeEnumeration = FOUR_CHAR_CODE('enum')
 typeEPS = FOUR_CHAR_CODE('EPS ')
! typeEventInfo = FOUR_CHAR_CODE('evin') 
 typeFinderWindow = FOUR_CHAR_CODE('fwin')
 typeFixedPoint = FOUR_CHAR_CODE('fpnt')
--- 540,544 ----
 typeEnumeration = FOUR_CHAR_CODE('enum')
 typeEPS = FOUR_CHAR_CODE('EPS ')
! typeEventInfo = FOUR_CHAR_CODE('evin')
 typeFinderWindow = FOUR_CHAR_CODE('fwin')
 typeFixedPoint = FOUR_CHAR_CODE('fpnt')
***************
*** 559,563 ****
 typeOval = FOUR_CHAR_CODE('covl')
 typeParamInfo = FOUR_CHAR_CODE('pmin')
! typePict = FOUR_CHAR_CODE('PICT') 
 typePixelMap = FOUR_CHAR_CODE('cpix')
 typePixMapMinus = FOUR_CHAR_CODE('tpmm')
--- 559,563 ----
 typeOval = FOUR_CHAR_CODE('covl')
 typeParamInfo = FOUR_CHAR_CODE('pmin')
! typePict = FOUR_CHAR_CODE('PICT')
 typePixelMap = FOUR_CHAR_CODE('cpix')
 typePixMapMinus = FOUR_CHAR_CODE('tpmm')
***************
*** 579,585 ****
 typeSuiteInfo = FOUR_CHAR_CODE('suin')
 typeTable = FOUR_CHAR_CODE('ctbl')
! typeTextStyles = FOUR_CHAR_CODE('tsty') 
 typeTIFF = FOUR_CHAR_CODE('TIFF')
! typeVersion = FOUR_CHAR_CODE('vers') 
 kAEMenuClass = FOUR_CHAR_CODE('menu')
 kAEMenuSelect = FOUR_CHAR_CODE('mhit')
--- 579,585 ----
 typeSuiteInfo = FOUR_CHAR_CODE('suin')
 typeTable = FOUR_CHAR_CODE('ctbl')
! typeTextStyles = FOUR_CHAR_CODE('tsty')
 typeTIFF = FOUR_CHAR_CODE('TIFF')
! typeVersion = FOUR_CHAR_CODE('vers')
 kAEMenuClass = FOUR_CHAR_CODE('menu')
 kAEMenuSelect = FOUR_CHAR_CODE('mhit')
***************
*** 641,645 ****
 typeLowLevelEventRecord = FOUR_CHAR_CODE('evtr')
 typeEventRef = FOUR_CHAR_CODE('evrf')
! typeText = typeChar 
 kTSMOutsideOfBody = 1
 kTSMInsideOfBody = 2
--- 641,645 ----
 typeLowLevelEventRecord = FOUR_CHAR_CODE('evtr')
 typeEventRef = FOUR_CHAR_CODE('evrf')
! typeText = typeChar
 kTSMOutsideOfBody = 1
 kTSMInsideOfBody = 2
***************
*** 654,658 ****
 kBlockFillText = 6
 kOutlineText = 7
! kSelectedText = 8 
 keyAEHiliteRange = FOUR_CHAR_CODE('hrng')
 keyAEPinRange = FOUR_CHAR_CODE('pnrg')
--- 654,658 ----
 kBlockFillText = 6
 kOutlineText = 7
! kSelectedText = 8
 keyAEHiliteRange = FOUR_CHAR_CODE('hrng')
 keyAEPinRange = FOUR_CHAR_CODE('pnrg')
***************
*** 662,666 ****
 keyAELeftSide = FOUR_CHAR_CODE('klef')
 keyAERegionClass = FOUR_CHAR_CODE('rgnc')
! keyAEDragging = FOUR_CHAR_CODE('bool') 
 keyAELeadingEdge = keyAELeftSide
 typeUnicodeText = FOUR_CHAR_CODE('utxt')
--- 662,666 ----
 keyAELeftSide = FOUR_CHAR_CODE('klef')
 keyAERegionClass = FOUR_CHAR_CODE('rgnc')
! keyAEDragging = FOUR_CHAR_CODE('bool')
 keyAELeadingEdge = keyAELeftSide
 typeUnicodeText = FOUR_CHAR_CODE('utxt')
***************
*** 711,715 ****
 kFAEditCommand = FOUR_CHAR_CODE('edfa')
 kFAFileParam = FOUR_CHAR_CODE('faal')
! kFAIndexParam = FOUR_CHAR_CODE('indx') 
 kAEInternetSuite = FOUR_CHAR_CODE('gurl')
 kAEISWebStarSuite = FOUR_CHAR_CODE('WWW\xbd')
--- 711,715 ----
 kFAEditCommand = FOUR_CHAR_CODE('edfa')
 kFAFileParam = FOUR_CHAR_CODE('faal')
! kFAIndexParam = FOUR_CHAR_CODE('indx')
 kAEInternetSuite = FOUR_CHAR_CODE('gurl')
 kAEISWebStarSuite = FOUR_CHAR_CODE('WWW\xbd')
***************
*** 918,922 ****
 keyAEContainer = FOUR_CHAR_CODE('from')
 keyAEKeyForm = FOUR_CHAR_CODE('form')
! keyAEKeyData = FOUR_CHAR_CODE('seld') 
 keyAERangeStart = FOUR_CHAR_CODE('star')
 keyAERangeStop = FOUR_CHAR_CODE('stop')
--- 918,922 ----
 keyAEContainer = FOUR_CHAR_CODE('from')
 keyAEKeyForm = FOUR_CHAR_CODE('form')
! keyAEKeyData = FOUR_CHAR_CODE('seld')
 keyAERangeStart = FOUR_CHAR_CODE('star')
 keyAERangeStop = FOUR_CHAR_CODE('stop')
***************
*** 927,931 ****
 keyAEMarkProc = FOUR_CHAR_CODE('mark')
 keyAEAdjustMarksProc = FOUR_CHAR_CODE('adjm')
! keyAEGetErrDescProc = FOUR_CHAR_CODE('indc') 
 formAbsolutePosition = FOUR_CHAR_CODE('indx')
 formRelativePosition = FOUR_CHAR_CODE('rele')
--- 927,931 ----
 keyAEMarkProc = FOUR_CHAR_CODE('mark')
 keyAEAdjustMarksProc = FOUR_CHAR_CODE('adjm')
! keyAEGetErrDescProc = FOUR_CHAR_CODE('indc')
 formAbsolutePosition = FOUR_CHAR_CODE('indx')
 formRelativePosition = FOUR_CHAR_CODE('rele')
***************
*** 944,948 ****
 typeLogicalDescriptor = FOUR_CHAR_CODE('logi')
 typeCompDescriptor = FOUR_CHAR_CODE('cmpd')
! typeOSLTokenList = FOUR_CHAR_CODE('ostl') 
 kAEIDoMinimum = 0x0000
 kAEIDoWhose = 0x0001
--- 944,948 ----
 typeLogicalDescriptor = FOUR_CHAR_CODE('logi')
 typeCompDescriptor = FOUR_CHAR_CODE('cmpd')
! typeOSLTokenList = FOUR_CHAR_CODE('ostl')
 kAEIDoMinimum = 0x0000
 kAEIDoWhose = 0x0001
***************
*** 958,960 ****
 keyAEWhoseRangeStop = FOUR_CHAR_CODE('wstp')
 keyAEIndex = FOUR_CHAR_CODE('kidx')
! keyAETest = FOUR_CHAR_CODE('ktst') 
--- 958,960 ----
 keyAEWhoseRangeStop = FOUR_CHAR_CODE('wstp')
 keyAEIndex = FOUR_CHAR_CODE('kidx')
! keyAETest = FOUR_CHAR_CODE('ktst')
Index: CarbonEvents.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/CarbonEvents.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CarbonEvents.py	5 Dec 2003 23:59:37 -0000	1.2
--- CarbonEvents.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 72,78 ****
 kEventRawKeyModifiersChanged = 4
 kEventHotKeyPressed = 5
! kEventHotKeyReleased = 6 
 kEventKeyModifierNumLockBit = 16
! kEventKeyModifierFnBit = 17 
 kEventKeyModifierNumLockMask = 1L << kEventKeyModifierNumLockBit
 kEventKeyModifierFnMask = 1L << kEventKeyModifierFnBit
--- 72,78 ----
 kEventRawKeyModifiersChanged = 4
 kEventHotKeyPressed = 5
! kEventHotKeyReleased = 6
 kEventKeyModifierNumLockBit = 16
! kEventKeyModifierFnBit = 17
 kEventKeyModifierNumLockMask = 1L << kEventKeyModifierNumLockBit
 kEventKeyModifierFnMask = 1L << kEventKeyModifierFnBit
***************
*** 263,270 ****
 kEventTabletPoint = 1
 kEventTabletProximity = 2
! kEventTabletPointer = 1 
 kEventVolumeMounted = 1
! kEventVolumeUnmounted = 2 
! typeFSVolumeRefNum = FOUR_CHAR_CODE('voln') 
 kEventAppearanceScrollBarVariantChanged = 1
 kEventServiceCopy = 1
--- 263,270 ----
 kEventTabletPoint = 1
 kEventTabletProximity = 2
! kEventTabletPointer = 1
 kEventVolumeMounted = 1
! kEventVolumeUnmounted = 2
! typeFSVolumeRefNum = FOUR_CHAR_CODE('voln')
 kEventAppearanceScrollBarVariantChanged = 1
 kEventServiceCopy = 1
***************
*** 272,278 ****
 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')
--- 272,278 ----
 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')
***************
*** 305,309 ****
 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')
--- 305,309 ----
 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')
***************
*** 315,319 ****
 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')
--- 315,319 ----
 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')
***************
*** 321,325 ****
 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')
--- 321,325 ----
 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')
***************
*** 351,357 ****
 kEventParamTextInputSendKeyboardEvent = FOUR_CHAR_CODE('tske')
 kEventParamTextInputSendTextServiceEncoding = FOUR_CHAR_CODE('tsse')
! kEventParamTextInputSendTextServiceMacEncoding = FOUR_CHAR_CODE('tssm') 
 kEventParamHICommand = FOUR_CHAR_CODE('hcmd')
! typeHICommand = FOUR_CHAR_CODE('hcmd') 
 kEventParamWindowFeatures = FOUR_CHAR_CODE('wftr')
 kEventParamWindowDefPart = FOUR_CHAR_CODE('wdpc')
--- 351,357 ----
 kEventParamTextInputSendKeyboardEvent = FOUR_CHAR_CODE('tske')
 kEventParamTextInputSendTextServiceEncoding = FOUR_CHAR_CODE('tsse')
! kEventParamTextInputSendTextServiceMacEncoding = FOUR_CHAR_CODE('tssm')
 kEventParamHICommand = FOUR_CHAR_CODE('hcmd')
! typeHICommand = FOUR_CHAR_CODE('hcmd')
 kEventParamWindowFeatures = FOUR_CHAR_CODE('wftr')
 kEventParamWindowDefPart = FOUR_CHAR_CODE('wdpc')
***************
*** 376,380 ****
 typeWindowRegionCode = FOUR_CHAR_CODE('wshp')
 typeWindowDefPartCode = FOUR_CHAR_CODE('wdpt')
! typeClickActivationResult = FOUR_CHAR_CODE('clac') 
 kEventParamControlPart = FOUR_CHAR_CODE('cprt')
 kEventParamInitCollection = FOUR_CHAR_CODE('icol')
--- 376,380 ----
 typeWindowRegionCode = FOUR_CHAR_CODE('wshp')
 typeWindowDefPartCode = FOUR_CHAR_CODE('wdpt')
! typeClickActivationResult = FOUR_CHAR_CODE('clac')
 kEventParamControlPart = FOUR_CHAR_CODE('cprt')
 kEventParamInitCollection = FOUR_CHAR_CODE('icol')
***************
*** 403,407 ****
 typeControlActionUPP = FOUR_CHAR_CODE('caup')
 typeIndicatorDragConstraint = FOUR_CHAR_CODE('cidc')
! typeControlPartCode = FOUR_CHAR_CODE('cprt') 
 kEventParamCurrentMenuTrackingMode = FOUR_CHAR_CODE('cmtm')
 kEventParamNewMenuTrackingMode = FOUR_CHAR_CODE('nmtm')
--- 403,407 ----
 typeControlActionUPP = FOUR_CHAR_CODE('caup')
 typeIndicatorDragConstraint = FOUR_CHAR_CODE('cidc')
! typeControlPartCode = FOUR_CHAR_CODE('cprt')
 kEventParamCurrentMenuTrackingMode = FOUR_CHAR_CODE('cmtm')
 kEventParamNewMenuTrackingMode = FOUR_CHAR_CODE('nmtm')
***************
*** 429,436 ****
 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')
--- 429,436 ----
 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')
***************
*** 438,443 ****
 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')
--- 438,443 ----
 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')
***************
*** 446,450 ****
 kEventParamServiceUserData = FOUR_CHAR_CODE('svud')
 typeScrapRef = FOUR_CHAR_CODE('scrp')
! typeCFMutableArrayRef = FOUR_CHAR_CODE('cfma') 
 # sHandler = NewEventHandlerUPP( x )
 kMouseTrackingMousePressed = kMouseTrackingMouseDown
--- 446,450 ----
 kEventParamServiceUserData = FOUR_CHAR_CODE('svud')
 typeScrapRef = FOUR_CHAR_CODE('scrp')
! typeCFMutableArrayRef = FOUR_CHAR_CODE('cfma')
 # sHandler = NewEventHandlerUPP( x )
 kMouseTrackingMousePressed = kMouseTrackingMouseDown
Index: Components.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Components.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Components.py	30 Dec 2002 22:04:21 -0000	1.1
--- Components.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 4,8 ****
 kAppleManufacturer = FOUR_CHAR_CODE('appl')
 kComponentResourceType = FOUR_CHAR_CODE('thng')
! kComponentAliasResourceType = FOUR_CHAR_CODE('thga') 
 kAnyComponentType = 0
 kAnyComponentSubType = 0
--- 4,8 ----
 kAppleManufacturer = FOUR_CHAR_CODE('appl')
 kComponentResourceType = FOUR_CHAR_CODE('thng')
! kComponentAliasResourceType = FOUR_CHAR_CODE('thga')
 kAnyComponentType = 0
 kAnyComponentSubType = 0
***************
*** 20,24 ****
 kComponentGetMPWorkFunctionSelect = -8
 kComponentExecuteWiredActionSelect = -9
! kComponentGetPublicResourceSelect = -10 
 componentDoAutoVersion = (1 << 0)
 componentWantsUnregister = (1 << 1)
--- 20,24 ----
 kComponentGetMPWorkFunctionSelect = -8
 kComponentExecuteWiredActionSelect = -9
! kComponentGetPublicResourceSelect = -10
 componentDoAutoVersion = (1 << 0)
 componentWantsUnregister = (1 << 1)
Index: ControlAccessor.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/ControlAccessor.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ControlAccessor.py	9 Apr 2003 13:25:19 -0000	1.2
--- ControlAccessor.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 7,14 ****
 def SetControlData_Handle(control, part, selector, data):
 control.SetControlData_Handle(part, selector, data)
! 
 def GetControlData_Handle(control, part, selector):
 return control.GetControlData_Handle(part, selector)
! 
 _accessdict = {
 kControlPopupButtonMenuHandleTag: (SetControlData_Handle, GetControlData_Handle),
--- 7,14 ----
 def SetControlData_Handle(control, part, selector, data):
 control.SetControlData_Handle(part, selector, data)
! 
 def GetControlData_Handle(control, part, selector):
 return control.GetControlData_Handle(part, selector)
! 
 _accessdict = {
 kControlPopupButtonMenuHandleTag: (SetControlData_Handle, GetControlData_Handle),
***************
*** 17,26 ****
 _codingdict = {
 kControlPushButtonDefaultTag : ("b", None, None),
! 
 kControlEditTextTextTag: (None, None, None),
 kControlEditTextPasswordTag: (None, None, None),
! 
 kControlPopupButtonMenuIDTag: ("h", None, None),
! 
 kControlListBoxDoubleClickTag: ("b", None, None),
 }
--- 17,26 ----
 _codingdict = {
 kControlPushButtonDefaultTag : ("b", None, None),
! 
 kControlEditTextTextTag: (None, None, None),
 kControlEditTextPasswordTag: (None, None, None),
! 
 kControlPopupButtonMenuIDTag: ("h", None, None),
! 
 kControlListBoxDoubleClickTag: ("b", None, None),
 }
***************
*** 39,43 ****
 data = struct.pack(structfmt, data)
 control.SetControlData(part, selector, data)
! 
 def GetControlData(control, part, selector):
 if _accessdict.has_key(selector):
--- 39,43 ----
 data = struct.pack(structfmt, data)
 control.SetControlData(part, selector, data)
! 
 def GetControlData(control, part, selector):
 if _accessdict.has_key(selector):
***************
*** 55,57 ****
 data = data[0]
 return data
- 
--- 55,56 ----
Index: Controls.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Controls.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Controls.py	5 Dec 2003 23:59:37 -0000	1.2
--- Controls.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 18,28 ****
 controlNotifyClick = FOUR_CHAR_CODE('clik')
 controlNotifyFocus = FOUR_CHAR_CODE('focu')
! controlNotifyKey = FOUR_CHAR_CODE('key ') 
! kControlCanAutoInvalidate = 1L << 0 
 staticTextProc = 256
 editTextProc = 272
 iconProc = 288
 userItemProc = 304
! pictItemProc = 320 
 cFrameColor = 0
 cBodyColor = 1
--- 18,28 ----
 controlNotifyClick = FOUR_CHAR_CODE('clik')
 controlNotifyFocus = FOUR_CHAR_CODE('focu')
! controlNotifyKey = FOUR_CHAR_CODE('key ')
! kControlCanAutoInvalidate = 1L << 0
 staticTextProc = 256
 editTextProc = 272
 iconProc = 288
 userItemProc = 304
! pictItemProc = 320
 cFrameColor = 0
 cBodyColor = 1
***************
*** 31,35 ****
 kNumberCtlCTabEntries = 4
 kControlNoVariant = 0
! kControlUsesOwningWindowsFontVariant = 1 << 3 
 kControlNoPart = 0
 kControlIndicatorPart = 129
--- 31,35 ----
 kNumberCtlCTabEntries = 4
 kControlNoVariant = 0
! kControlUsesOwningWindowsFontVariant = 1 << 3
 kControlNoPart = 0
 kControlIndicatorPart = 129
***************
*** 41,45 ****
 kControlFocusNoPart = 0
 kControlFocusNextPart = -1
! kControlFocusPrevPart = -2 
 kControlCollectionTagBounds = FOUR_CHAR_CODE('boun')
 kControlCollectionTagValue = FOUR_CHAR_CODE('valu')
--- 41,45 ----
 kControlFocusNoPart = 0
 kControlFocusNextPart = -1
! kControlFocusPrevPart = -2
 kControlCollectionTagBounds = FOUR_CHAR_CODE('boun')
 kControlCollectionTagValue = FOUR_CHAR_CODE('valu')
***************
*** 54,58 ****
 kControlCollectionTagIDID = FOUR_CHAR_CODE('idid')
 kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')
! kControlCollectionTagVarCode = FOUR_CHAR_CODE('varc') 
 kControlContentTextOnly = 0
 kControlNoContent = 0
--- 54,58 ----
 kControlCollectionTagIDID = FOUR_CHAR_CODE('idid')
 kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')
! kControlCollectionTagVarCode = FOUR_CHAR_CODE('varc')
 kControlContentTextOnly = 0
 kControlNoContent = 0
***************
*** 68,76 ****
 kControlKeyScriptBehaviorAllowAnyScript = FOUR_CHAR_CODE('any ')
 kControlKeyScriptBehaviorPrefersRoman = FOUR_CHAR_CODE('prmn')
! kControlKeyScriptBehaviorRequiresRoman = FOUR_CHAR_CODE('rrmn') 
 kControlFontBigSystemFont = -1
 kControlFontSmallSystemFont = -2
 kControlFontSmallBoldSystemFont = -3
! kControlFontViewSystemFont = -4 
 kControlUseFontMask = 0x0001
 kControlUseFaceMask = 0x0002
--- 68,76 ----
 kControlKeyScriptBehaviorAllowAnyScript = FOUR_CHAR_CODE('any ')
 kControlKeyScriptBehaviorPrefersRoman = FOUR_CHAR_CODE('prmn')
! kControlKeyScriptBehaviorRequiresRoman = FOUR_CHAR_CODE('rrmn')
 kControlFontBigSystemFont = -1
 kControlFontSmallSystemFont = -2
 kControlFontSmallBoldSystemFont = -3
! kControlFontViewSystemFont = -4
 kControlUseFontMask = 0x0001
 kControlUseFaceMask = 0x0002
***************
*** 82,91 ****
 kControlUseAllMask = 0x00FF
 kControlAddFontSizeMask = 0x0100
! kControlAddToMetaFontMask = 0x0200 
! kControlUseThemeFontIDMask = 0x0080 
 kDoNotActivateAndIgnoreClick = 0
 kDoNotActivateAndHandleClick = 1
 kActivateAndIgnoreClick = 2
! kActivateAndHandleClick = 3 
 kControlFontStyleTag = FOUR_CHAR_CODE('font')
 kControlKeyFilterTag = FOUR_CHAR_CODE('fltr')
--- 82,91 ----
 kControlUseAllMask = 0x00FF
 kControlAddFontSizeMask = 0x0100
! kControlAddToMetaFontMask = 0x0200
! kControlUseThemeFontIDMask = 0x0080
 kDoNotActivateAndIgnoreClick = 0
 kDoNotActivateAndHandleClick = 1
 kActivateAndIgnoreClick = 2
! kActivateAndHandleClick = 3
 kControlFontStyleTag = FOUR_CHAR_CODE('font')
 kControlKeyFilterTag = FOUR_CHAR_CODE('fltr')
***************
*** 111,115 ****
 kControlSupportsContextualMenus = 1 << 21
 kControlSupportsClickActivation = 1 << 22
! kControlIdlesWithTimer = 1 << 23 
 drawCntl = 0
 testCntl = 1
--- 111,115 ----
 kControlSupportsContextualMenus = 1 << 21
 kControlSupportsClickActivation = 1 << 22
! kControlIdlesWithTimer = 1 << 23
 drawCntl = 0
 testCntl = 1
***************
*** 150,154 ****
 kControlMsgDisplayDebugInfo = 46
 kControlMsgContextualMenuClick = 47
! kControlMsgGetClickActivation = 48 
 kControlSizeNormal = 0
 kControlSizeSmall = 1
--- 150,154 ----
 kControlMsgDisplayDebugInfo = 46
 kControlMsgContextualMenuClick = 47
! kControlMsgGetClickActivation = 48
 kControlSizeNormal = 0
 kControlSizeSmall = 1
***************
*** 166,172 ****
 vAxisOnly = 2
 kControlDefProcPtr = 0
! kControlDefObjectClass = 1 
 kControlKindSignatureApple = FOUR_CHAR_CODE('appl')
! kControlPropertyPersistent = 0x00000001 
 kDragTrackingEnterControl = 2
 kDragTrackingInControl = 3
--- 166,172 ----
 vAxisOnly = 2
 kControlDefProcPtr = 0
! kControlDefObjectClass = 1
 kControlKindSignatureApple = FOUR_CHAR_CODE('appl')
! kControlPropertyPersistent = 0x00000001
 kDragTrackingEnterControl = 2
 kDragTrackingInControl = 3
***************
*** 179,183 ****
 kControlInactiveControlPart = kControlInactivePart
 kControlTabListResType = FOUR_CHAR_CODE('tab#')
! kControlListDescResType = FOUR_CHAR_CODE('ldes') 
 kControlCheckBoxUncheckedValue = 0
 kControlCheckBoxCheckedValue = 1
--- 179,183 ----
 kControlInactiveControlPart = kControlInactivePart
 kControlTabListResType = FOUR_CHAR_CODE('tab#')
! kControlListDescResType = FOUR_CHAR_CODE('ldes')
 kControlCheckBoxUncheckedValue = 0
 kControlCheckBoxCheckedValue = 1
***************
*** 229,233 ****
 kControlClockAMPMPart = 12
 kControlDataBrowserPart = 24
! kControlDataBrowserDraggedPart = 25 
 kControlBevelButtonSmallBevelProc = 32
 kControlBevelButtonNormalBevelProc = 33
--- 229,233 ----
 kControlClockAMPMPart = 12
 kControlDataBrowserPart = 24
! kControlDataBrowserDraggedPart = 25
 kControlBevelButtonSmallBevelProc = 32
 kControlBevelButtonNormalBevelProc = 33
***************
*** 246,250 ****
 kControlBehaviorMultiValueMenu = 0x4000
 kControlBehaviorOffsetContents = 0x8000
! kControlBehaviorCommandMenu = 0x2000 
 kControlBevelButtonMenuOnBottom = 0
 kControlBevelButtonMenuOnRight = (1 << 2)
--- 246,250 ----
 kControlBehaviorMultiValueMenu = 0x4000
 kControlBehaviorOffsetContents = 0x8000
! kControlBehaviorCommandMenu = 0x2000
 kControlBevelButtonMenuOnBottom = 0
 kControlBevelButtonMenuOnRight = (1 << 2)
***************
*** 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)
--- 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)
***************
*** 303,307 ****
 kControlDisclosureTrianglePointLeft = 2
 kControlKindDisclosureTriangle = FOUR_CHAR_CODE('dist')
! kControlTriangleLastValueTag = FOUR_CHAR_CODE('last') 
 kControlProgressBarProc = 80
 kControlRelevanceBarProc = 81
--- 303,307 ----
 kControlDisclosureTrianglePointLeft = 2
 kControlKindDisclosureTriangle = FOUR_CHAR_CODE('dist')
! kControlTriangleLastValueTag = FOUR_CHAR_CODE('last')
 kControlProgressBarProc = 80
 kControlRelevanceBarProc = 81
***************
*** 309,318 ****
 kControlKindRelevanceBar = FOUR_CHAR_CODE('relb')
 kControlProgressBarIndeterminateTag = FOUR_CHAR_CODE('inde')
! kControlProgressBarAnimatingTag = FOUR_CHAR_CODE('anim') 
 kControlLittleArrowsProc = 96
 kControlKindLittleArrows = FOUR_CHAR_CODE('larr')
 kControlChasingArrowsProc = 112
 kControlKindChasingArrows = FOUR_CHAR_CODE('carr')
! kControlChasingArrowsAnimatingTag = FOUR_CHAR_CODE('anim') 
 kControlTabLargeProc = 128
 kControlTabSmallProc = 129
--- 309,318 ----
 kControlKindRelevanceBar = FOUR_CHAR_CODE('relb')
 kControlProgressBarIndeterminateTag = FOUR_CHAR_CODE('inde')
! kControlProgressBarAnimatingTag = FOUR_CHAR_CODE('anim')
 kControlLittleArrowsProc = 96
 kControlKindLittleArrows = FOUR_CHAR_CODE('larr')
 kControlChasingArrowsProc = 112
 kControlKindChasingArrows = FOUR_CHAR_CODE('carr')
! kControlChasingArrowsAnimatingTag = FOUR_CHAR_CODE('anim')
 kControlTabLargeProc = 128
 kControlTabSmallProc = 129
***************
*** 324,328 ****
 kControlTabSmallEastProc = 133
 kControlTabLargeWestProc = 134
! kControlTabSmallWestProc = 135 
 kControlTabDirectionNorth = 0
 kControlTabDirectionSouth = 1
--- 324,328 ----
 kControlTabSmallEastProc = 133
 kControlTabLargeWestProc = 134
! kControlTabSmallWestProc = 135
 kControlTabDirectionNorth = 0
 kControlTabDirectionSouth = 1
***************
*** 334,342 ****
 kControlTabContentRectTag = FOUR_CHAR_CODE('rect')
 kControlTabEnabledFlagTag = FOUR_CHAR_CODE('enab')
! kControlTabFontStyleTag = kControlFontStyleTag 
! kControlTabInfoTag = FOUR_CHAR_CODE('tabi') 
! kControlTabImageContentTag = FOUR_CHAR_CODE('cont') 
 kControlTabInfoVersionZero = 0
! kControlTabInfoVersionOne = 1 
 kControlSeparatorLineProc = 144
 kControlKindSeparator = FOUR_CHAR_CODE('sepa')
--- 334,342 ----
 kControlTabContentRectTag = FOUR_CHAR_CODE('rect')
 kControlTabEnabledFlagTag = FOUR_CHAR_CODE('enab')
! kControlTabFontStyleTag = kControlFontStyleTag
! kControlTabInfoTag = FOUR_CHAR_CODE('tabi')
! kControlTabImageContentTag = FOUR_CHAR_CODE('cont')
 kControlTabInfoVersionZero = 0
! kControlTabInfoVersionOne = 1
 kControlSeparatorLineProc = 144
 kControlKindSeparator = FOUR_CHAR_CODE('sepa')
***************
*** 352,362 ****
 kControlGroupBoxMenuHandleTag = FOUR_CHAR_CODE('mhan')
 kControlGroupBoxMenuRefTag = FOUR_CHAR_CODE('mhan')
! kControlGroupBoxFontStyleTag = kControlFontStyleTag 
! kControlGroupBoxTitleRectTag = FOUR_CHAR_CODE('trec') 
 kControlImageWellProc = 176
 kControlKindImageWell = FOUR_CHAR_CODE('well')
 kControlImageWellContentTag = FOUR_CHAR_CODE('cont')
 kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')
! kControlImageWellIsDragDestinationTag = FOUR_CHAR_CODE('drag') 
 kControlPopupArrowEastProc = 192
 kControlPopupArrowWestProc = 193
--- 352,362 ----
 kControlGroupBoxMenuHandleTag = FOUR_CHAR_CODE('mhan')
 kControlGroupBoxMenuRefTag = FOUR_CHAR_CODE('mhan')
! kControlGroupBoxFontStyleTag = kControlFontStyleTag
! kControlGroupBoxTitleRectTag = FOUR_CHAR_CODE('trec')
 kControlImageWellProc = 176
 kControlKindImageWell = FOUR_CHAR_CODE('well')
 kControlImageWellContentTag = FOUR_CHAR_CODE('cont')
 kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')
! kControlImageWellIsDragDestinationTag = FOUR_CHAR_CODE('drag')
 kControlPopupArrowEastProc = 192
 kControlPopupArrowWestProc = 193
***************
*** 393,397 ****
 kControlClockLongDateTag = FOUR_CHAR_CODE('date')
 kControlClockFontStyleTag = kControlFontStyleTag
! kControlClockAnimatingTag = FOUR_CHAR_CODE('anim') 
 kControlUserPaneProc = 256
 kControlKindUserPane = FOUR_CHAR_CODE('upan')
--- 393,397 ----
 kControlClockLongDateTag = FOUR_CHAR_CODE('date')
 kControlClockFontStyleTag = kControlFontStyleTag
! kControlClockAnimatingTag = FOUR_CHAR_CODE('anim')
 kControlUserPaneProc = 256
 kControlKindUserPane = FOUR_CHAR_CODE('upan')
***************
*** 404,411 ****
 kControlUserPaneActivateProcTag = FOUR_CHAR_CODE('acti')
 kControlUserPaneFocusProcTag = FOUR_CHAR_CODE('foci')
! kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back') 
 kControlEditTextProc = 272
 kControlEditTextPasswordProc = 274
! kControlEditTextInlineInputProc = 276 
 kControlKindEditText = FOUR_CHAR_CODE('etxt')
 kControlEditTextStyleTag = kControlFontStyleTag
--- 404,411 ----
 kControlUserPaneActivateProcTag = FOUR_CHAR_CODE('acti')
 kControlUserPaneFocusProcTag = FOUR_CHAR_CODE('foci')
! kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back')
 kControlEditTextProc = 272
 kControlEditTextPasswordProc = 274
! kControlEditTextInlineInputProc = 276
 kControlKindEditText = FOUR_CHAR_CODE('etxt')
 kControlEditTextStyleTag = kControlFontStyleTag
***************
*** 414,418 ****
 kControlEditTextKeyFilterTag = kControlKeyFilterTag
 kControlEditTextSelectionTag = FOUR_CHAR_CODE('sele')
! kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass') 
 kControlEditTextKeyScriptBehaviorTag = FOUR_CHAR_CODE('kscr')
 kControlEditTextLockedTag = FOUR_CHAR_CODE('lock')
--- 414,418 ----
 kControlEditTextKeyFilterTag = kControlKeyFilterTag
 kControlEditTextSelectionTag = FOUR_CHAR_CODE('sele')
! kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass')
 kControlEditTextKeyScriptBehaviorTag = FOUR_CHAR_CODE('kscr')
 kControlEditTextLockedTag = FOUR_CHAR_CODE('lock')
***************
*** 420,450 ****
 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
 kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
! kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei') 
! kControlStaticTextTruncTag = FOUR_CHAR_CODE('trun') 
! kControlStaticTextCFStringTag = FOUR_CHAR_CODE('cfst') 
 kControlPictureProc = 304
! kControlPictureNoTrackProc = 305 
 kControlKindPicture = FOUR_CHAR_CODE('pict')
! kControlPictureHandleTag = FOUR_CHAR_CODE('pich') 
 kControlIconProc = 320
 kControlIconNoTrackProc = 321
 kControlIconSuiteProc = 322
! kControlIconSuiteNoTrackProc = 323 
 kControlIconRefProc = 324
! kControlIconRefNoTrackProc = 325 
 kControlKindIcon = FOUR_CHAR_CODE('icon')
 kControlIconTransformTag = FOUR_CHAR_CODE('trfm')
! kControlIconAlignmentTag = FOUR_CHAR_CODE('algn') 
 kControlIconResourceIDTag = FOUR_CHAR_CODE('ires')
! kControlIconContentTag = FOUR_CHAR_CODE('cont') 
 kControlWindowHeaderProc = 336
! kControlWindowListViewHeaderProc = 337 
 kControlKindWindowHeader = FOUR_CHAR_CODE('whed')
 kControlListBoxProc = 352
--- 420,450 ----
 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
 kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
! kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei')
! kControlStaticTextTruncTag = FOUR_CHAR_CODE('trun')
! kControlStaticTextCFStringTag = FOUR_CHAR_CODE('cfst')
 kControlPictureProc = 304
! kControlPictureNoTrackProc = 305
 kControlKindPicture = FOUR_CHAR_CODE('pict')
! kControlPictureHandleTag = FOUR_CHAR_CODE('pich')
 kControlIconProc = 320
 kControlIconNoTrackProc = 321
 kControlIconSuiteProc = 322
! kControlIconSuiteNoTrackProc = 323
 kControlIconRefProc = 324
! kControlIconRefNoTrackProc = 325
 kControlKindIcon = FOUR_CHAR_CODE('icon')
 kControlIconTransformTag = FOUR_CHAR_CODE('trfm')
! kControlIconAlignmentTag = FOUR_CHAR_CODE('algn')
 kControlIconResourceIDTag = FOUR_CHAR_CODE('ires')
! kControlIconContentTag = FOUR_CHAR_CODE('cont')
 kControlWindowHeaderProc = 336
! kControlWindowListViewHeaderProc = 337
 kControlKindWindowHeader = FOUR_CHAR_CODE('whed')
 kControlListBoxProc = 352
***************
*** 453,464 ****
 kControlListBoxListHandleTag = FOUR_CHAR_CODE('lhan')
 kControlListBoxKeyFilterTag = kControlKeyFilterTag
! kControlListBoxFontStyleTag = kControlFontStyleTag 
 kControlListBoxDoubleClickTag = FOUR_CHAR_CODE('dblc')
! kControlListBoxLDEFTag = FOUR_CHAR_CODE('ldef') 
 kControlPushButtonProc = 368
 kControlCheckBoxProc = 369
 kControlRadioButtonProc = 370
 kControlPushButLeftIconProc = 374
! kControlPushButRightIconProc = 375 
 kControlCheckBoxAutoToggleProc = 371
 kControlRadioButtonAutoToggleProc = 372
--- 453,464 ----
 kControlListBoxListHandleTag = FOUR_CHAR_CODE('lhan')
 kControlListBoxKeyFilterTag = kControlKeyFilterTag
! kControlListBoxFontStyleTag = kControlFontStyleTag
 kControlListBoxDoubleClickTag = FOUR_CHAR_CODE('dblc')
! kControlListBoxLDEFTag = FOUR_CHAR_CODE('ldef')
 kControlPushButtonProc = 368
 kControlCheckBoxProc = 369
 kControlRadioButtonProc = 370
 kControlPushButLeftIconProc = 374
! kControlPushButRightIconProc = 375
 kControlCheckBoxAutoToggleProc = 371
 kControlRadioButtonAutoToggleProc = 372
***************
*** 470,478 ****
 kControlKindCheckBox = FOUR_CHAR_CODE('cbox')
 kControlPushButtonDefaultTag = FOUR_CHAR_CODE('dflt')
! kControlPushButtonCancelTag = FOUR_CHAR_CODE('cncl') 
 kControlScrollBarProc = 384
! kControlScrollBarLiveProc = 386 
 kControlKindScrollBar = FOUR_CHAR_CODE('sbar')
! kControlScrollBarShowsArrowsTag = FOUR_CHAR_CODE('arro') 
 kControlPopupButtonProc = 400
 kControlPopupFixedWidthVariant = 1 << 0
--- 470,478 ----
 kControlKindCheckBox = FOUR_CHAR_CODE('cbox')
 kControlPushButtonDefaultTag = FOUR_CHAR_CODE('dflt')
! kControlPushButtonCancelTag = FOUR_CHAR_CODE('cncl')
 kControlScrollBarProc = 384
! kControlScrollBarLiveProc = 386
 kControlKindScrollBar = FOUR_CHAR_CODE('sbar')
! kControlScrollBarShowsArrowsTag = FOUR_CHAR_CODE('arro')
 kControlPopupButtonProc = 400
 kControlPopupFixedWidthVariant = 1 << 0
***************
*** 483,490 ****
 kControlPopupButtonMenuHandleTag = FOUR_CHAR_CODE('mhan')
 kControlPopupButtonMenuRefTag = FOUR_CHAR_CODE('mhan')
! kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid') 
 kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
! kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf') 
! kControlPopupButtonCheckCurrentTag = FOUR_CHAR_CODE('chck') 
 kControlRadioGroupProc = 416
 kControlKindRadioGroup = FOUR_CHAR_CODE('rgrp')
--- 483,490 ----
 kControlPopupButtonMenuHandleTag = FOUR_CHAR_CODE('mhan')
 kControlPopupButtonMenuRefTag = FOUR_CHAR_CODE('mhan')
! kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid')
 kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
! kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
! kControlPopupButtonCheckCurrentTag = FOUR_CHAR_CODE('chck')
 kControlRadioGroupProc = 416
 kControlKindRadioGroup = FOUR_CHAR_CODE('rgrp')
***************
*** 496,500 ****
 kControlScrollTextBoxAutoScrollAmountTag = FOUR_CHAR_CODE('samt')
 kControlScrollTextBoxContentsTag = FOUR_CHAR_CODE('tres')
! kControlScrollTextBoxAnimatingTag = FOUR_CHAR_CODE('anim') 
 kControlKindDisclosureButton = FOUR_CHAR_CODE('disb')
 kControlDisclosureButtonClosed = 0
--- 496,500 ----
 kControlScrollTextBoxAutoScrollAmountTag = FOUR_CHAR_CODE('samt')
 kControlScrollTextBoxContentsTag = FOUR_CHAR_CODE('tres')
! kControlScrollTextBoxAnimatingTag = FOUR_CHAR_CODE('anim')
 kControlKindDisclosureButton = FOUR_CHAR_CODE('disb')
 kControlDisclosureButtonClosed = 0
***************
*** 503,507 ****
 kControlRoundButtonLargeSize = kControlSizeLarge
 kControlRoundButtonContentTag = FOUR_CHAR_CODE('cont')
! kControlRoundButtonSizeTag = kControlSizeTag 
 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')
***************
*** 512,516 ****
 errDataBrowserInvalidPropertyPart = -4973
 errDataBrowserInvalidPropertyData = -4974
! errDataBrowserPropertyNotSupported = -4979 
 kControlDataBrowserIncludesFrameAndFocusTag = FOUR_CHAR_CODE('brdr')
 kControlDataBrowserKeyFilterTag = kControlEditTextKeyFilterTag
--- 512,516 ----
 errDataBrowserInvalidPropertyPart = -4973
 errDataBrowserInvalidPropertyData = -4974
! errDataBrowserPropertyNotSupported = -4979
 kControlDataBrowserIncludesFrameAndFocusTag = FOUR_CHAR_CODE('brdr')
 kControlDataBrowserKeyFilterTag = kControlEditTextKeyFilterTag
***************
*** 526,539 ****
 kDataBrowserNoDisjointSelection = 1 << 4
 kDataBrowserAlwaysExtendSelection = 1 << 5
! kDataBrowserNeverEmptySelectionSet = 1 << 6 
 kDataBrowserOrderUndefined = 0
 kDataBrowserOrderIncreasing = 1
 kDataBrowserOrderDecreasing = 2
! kDataBrowserNoItem = 0L 
 kDataBrowserItemNoState = 0
 # kDataBrowserItemAnyState = (unsigned long)(-1)
 kDataBrowserItemIsSelected = 1 << 0
 kDataBrowserContainerIsOpen = 1 << 1
! kDataBrowserItemIsDragTarget = 1 << 2 
 kDataBrowserRevealOnly = 0
 kDataBrowserRevealAndCenterInView = 1 << 0
--- 526,539 ----
 kDataBrowserNoDisjointSelection = 1 << 4
 kDataBrowserAlwaysExtendSelection = 1 << 5
! kDataBrowserNeverEmptySelectionSet = 1 << 6
 kDataBrowserOrderUndefined = 0
 kDataBrowserOrderIncreasing = 1
 kDataBrowserOrderDecreasing = 2
! kDataBrowserNoItem = 0L
 kDataBrowserItemNoState = 0
 # kDataBrowserItemAnyState = (unsigned long)(-1)
 kDataBrowserItemIsSelected = 1 << 0
 kDataBrowserContainerIsOpen = 1 << 1
! kDataBrowserItemIsDragTarget = 1 << 2
 kDataBrowserRevealOnly = 0
 kDataBrowserRevealAndCenterInView = 1 << 0
***************
*** 542,546 ****
 kDataBrowserItemsAssign = 1
 kDataBrowserItemsToggle = 2
! kDataBrowserItemsRemove = 3 
 kDataBrowserSelectionAnchorUp = 0
 kDataBrowserSelectionAnchorDown = 1
--- 542,546 ----
 kDataBrowserItemsAssign = 1
 kDataBrowserItemsToggle = 2
! kDataBrowserItemsRemove = 3
 kDataBrowserSelectionAnchorUp = 0
 kDataBrowserSelectionAnchorDown = 1
***************
*** 569,573 ****
 kDataBrowserTargetChanged = 15
 kDataBrowserUserStateChanged = 13
! kDataBrowserSelectionSetChanged = 14 
 kDataBrowserItemNoProperty = 0L
 kDataBrowserItemIsActiveProperty = 1L
--- 569,573 ----
 kDataBrowserTargetChanged = 15
 kDataBrowserUserStateChanged = 13
! kDataBrowserSelectionSetChanged = 14
 kDataBrowserItemNoProperty = 0L
 kDataBrowserItemIsActiveProperty = 1L
***************
*** 581,585 ****
 kDataBrowserContainerAliasIDProperty = 9L
 kDataBrowserColumnViewPreviewProperty = 10L
! kDataBrowserItemParentContainerProperty = 11L 
 kDataBrowserCustomType = 0x3F3F3F3F
 kDataBrowserIconType = FOUR_CHAR_CODE('icnr')
--- 581,585 ----
 kDataBrowserContainerAliasIDProperty = 9L
 kDataBrowserColumnViewPreviewProperty = 10L
! kDataBrowserItemParentContainerProperty = 11L
 kDataBrowserCustomType = 0x3F3F3F3F
 kDataBrowserIconType = FOUR_CHAR_CODE('icnr')
***************
*** 591,595 ****
 kDataBrowserRelevanceRankType = FOUR_CHAR_CODE('rank')
 kDataBrowserPopupMenuType = FOUR_CHAR_CODE('menu')
! kDataBrowserIconAndTextType = FOUR_CHAR_CODE('ticn') 
 kDataBrowserPropertyEnclosingPart = 0L
 kDataBrowserPropertyContentPart = FOUR_CHAR_CODE('----')
--- 591,595 ----
 kDataBrowserRelevanceRankType = FOUR_CHAR_CODE('rank')
 kDataBrowserPopupMenuType = FOUR_CHAR_CODE('menu')
! kDataBrowserIconAndTextType = FOUR_CHAR_CODE('ticn')
 kDataBrowserPropertyEnclosingPart = 0L
 kDataBrowserPropertyContentPart = FOUR_CHAR_CODE('----')
***************
*** 605,609 ****
 kDataBrowserDefaultPropertyFlags = 0 << 0
 kDataBrowserUniversalPropertyFlags = kDataBrowserUniversalPropertyFlagsMask
! kDataBrowserPropertyIsEditable = kDataBrowserPropertyIsMutable 
 kDataBrowserPropertyFlagsOffset = 8
 kDataBrowserPropertyFlagsMask = 0xFF << kDataBrowserPropertyFlagsOffset
--- 605,609 ----
 kDataBrowserDefaultPropertyFlags = 0 << 0
 kDataBrowserUniversalPropertyFlags = kDataBrowserUniversalPropertyFlagsMask
! kDataBrowserPropertyIsEditable = kDataBrowserPropertyIsMutable
 kDataBrowserPropertyFlagsOffset = 8
 kDataBrowserPropertyFlagsMask = 0xFF << kDataBrowserPropertyFlagsOffset
***************
*** 621,628 ****
 kDataBrowserTruncateTextAtStart = 1 << kDataBrowserPropertyFlagsOffset
 kDataBrowserPropertyModificationFlags = kDataBrowserPropertyFlagsMask
! kDataBrowserRelativeDateTime = kDataBrowserDateTimeRelative 
 kDataBrowserViewSpecificFlagsOffset = 16
 kDataBrowserViewSpecificFlagsMask = 0xFF << kDataBrowserViewSpecificFlagsOffset
! kDataBrowserViewSpecificPropertyFlags = kDataBrowserViewSpecificFlagsMask 
 kDataBrowserClientPropertyFlagsOffset = 24
 # kDataBrowserClientPropertyFlagsMask = (unsigned long)(0xFF << kDataBrowserClientPropertyFlagsOffset)
--- 621,628 ----
 kDataBrowserTruncateTextAtStart = 1 << kDataBrowserPropertyFlagsOffset
 kDataBrowserPropertyModificationFlags = kDataBrowserPropertyFlagsMask
! kDataBrowserRelativeDateTime = kDataBrowserDateTimeRelative
 kDataBrowserViewSpecificFlagsOffset = 16
 kDataBrowserViewSpecificFlagsMask = 0xFF << kDataBrowserViewSpecificFlagsOffset
! kDataBrowserViewSpecificPropertyFlags = kDataBrowserViewSpecificFlagsMask
 kDataBrowserClientPropertyFlagsOffset = 24
 # kDataBrowserClientPropertyFlagsMask = (unsigned long)(0xFF << kDataBrowserClientPropertyFlagsOffset)
Index: CoreFoundation.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/CoreFoundation.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CoreFoundation.py	30 Dec 2002 22:04:21 -0000	1.1
--- CoreFoundation.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 17,21 ****
 kCFStringEncodingUnicode = 0x0100
 kCFStringEncodingUTF8 = 0x08000100
! kCFStringEncodingNonLossyASCII = 0x0BFF 
 kCFCompareCaseInsensitive = 1
 kCFCompareBackwards = 4
--- 17,21 ----
 kCFStringEncodingUnicode = 0x0100
 kCFStringEncodingUTF8 = 0x08000100
! kCFStringEncodingNonLossyASCII = 0x0BFF
 kCFCompareCaseInsensitive = 1
 kCFCompareBackwards = 4
***************
*** 23,27 ****
 kCFCompareNonliteral = 16
 kCFCompareLocalized = 32
! kCFCompareNumerically = 64 
 kCFURLPOSIXPathStyle = 0
 kCFURLHFSPathStyle = 1
--- 23,27 ----
 kCFCompareNonliteral = 16
 kCFCompareLocalized = 32
! kCFCompareNumerically = 64
 kCFURLPOSIXPathStyle = 0
 kCFURLHFSPathStyle = 1
Index: CoreGraphics.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/CoreGraphics.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CoreGraphics.py	5 Dec 2003 23:59:37 -0000	1.2
--- CoreGraphics.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 26,28 ****
 kCGInterpolationNone = 1
 kCGInterpolationLow = 2
! kCGInterpolationHigh = 3 
--- 26,28 ----
 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dialogs.py	5 Dec 2003 23:59:37 -0000	1.2
--- Dialogs.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 46,50 ****
 kAlertDefaultOKText = -1
 kAlertDefaultCancelText = -1
! kAlertDefaultOtherText = -1 
 kAlertStdAlertOKButton = 1
 kAlertStdAlertCancelButton = 2
--- 46,50 ----
 kAlertDefaultOKText = -1
 kAlertDefaultCancelText = -1
! kAlertDefaultOtherText = -1
 kAlertStdAlertOKButton = 1
 kAlertStdAlertCancelButton = 2
***************
*** 72,77 ****
 kDialogFontAddToMetaFontMask = 0x0400
 kDialogFontUseThemeFontIDMask = 0x0080
! kHICommandOther = FOUR_CHAR_CODE('othr') 
! kStdCFStringAlertVersionOne = 1 
 kStdAlertDoNotDisposeSheet = 1 << 0
 kStdAlertDoNotAnimateOnDefault = 1 << 1
--- 72,77 ----
 kDialogFontAddToMetaFontMask = 0x0400
 kDialogFontUseThemeFontIDMask = 0x0080
! kHICommandOther = FOUR_CHAR_CODE('othr')
! kStdCFStringAlertVersionOne = 1
 kStdAlertDoNotDisposeSheet = 1 << 0
 kStdAlertDoNotAnimateOnDefault = 1 << 1
Index: Dragconst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Dragconst.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dragconst.py	5 Dec 2003 23:59:37 -0000	1.2
--- Dragconst.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 7,60 ****
 
 
! kDragHasLeftSenderWindow	= (1 << 0)
 kDragInsideSenderApplication = (1 << 1)
! kDragInsideSenderWindow		= (1 << 2)
! kDragRegionAndImage			= (1 << 4)
! flavorSenderOnly			= (1 << 0)
! flavorSenderTranslated		= (1 << 1)
! flavorNotSaved				= (1 << 2)
! flavorSystemTranslated		= (1 << 8)
 kDragHasLeftSenderWindow = (1L << 0)
 kDragInsideSenderApplication = (1L << 1)
! kDragInsideSenderWindow = (1L << 2) 
 kDragBehaviorNone = 0
! kDragBehaviorZoomBackAnimation = (1L << 0) 
! kDragRegionAndImage = (1L << 4) 
 kDragStandardTranslucency = 0L
 kDragDarkTranslucency = 1L
 kDragDarkerTranslucency = 2L
! kDragOpaqueTranslucency = 3L 
 kDragRegionBegin = 1
 kDragRegionDraw = 2
 kDragRegionHide = 3
 kDragRegionIdle = 4
! kDragRegionEnd = 5 
 kZoomNoAcceleration = 0
 kZoomAccelerate = 1
! kZoomDecelerate = 2 
 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
! flavorTypePromiseHFS = kDragFlavorTypePromiseHFS 
 kDragPromisedFlavorFindFile = FOUR_CHAR_CODE('rWm1')
! kDragPromisedFlavor = FOUR_CHAR_CODE('fssP') 
 kDragPseudoCreatorVolumeOrDirectory = FOUR_CHAR_CODE('MACS')
 kDragPseudoFileTypeVolume = FOUR_CHAR_CODE('disk')
! kDragPseudoFileTypeDirectory = FOUR_CHAR_CODE('fold') 
! flavorTypeDirectory = FOUR_CHAR_CODE('diry') 
 kFlavorTypeClippingName = FOUR_CHAR_CODE('clnm')
 kFlavorTypeClippingFilename = FOUR_CHAR_CODE('clfn')
 kFlavorTypeDragToTrashOnly = FOUR_CHAR_CODE('fdtt')
! kFlavorTypeFinderNoTrackingBehavior = FOUR_CHAR_CODE('fntb') 
 kDragTrackingEnterHandler = 1
 kDragTrackingEnterWindow = 2
 kDragTrackingInWindow = 3
 kDragTrackingLeaveWindow = 4
! kDragTrackingLeaveHandler = 5 
 kDragActionNothing = 0L
 kDragActionCopy = 1L
--- 7,60 ----
 
 
! kDragHasLeftSenderWindow = (1 << 0)
 kDragInsideSenderApplication = (1 << 1)
! kDragInsideSenderWindow = (1 << 2)
! kDragRegionAndImage = (1 << 4)
! flavorSenderOnly = (1 << 0)
! flavorSenderTranslated = (1 << 1)
! flavorNotSaved = (1 << 2)
! flavorSystemTranslated = (1 << 8)
 kDragHasLeftSenderWindow = (1L << 0)
 kDragInsideSenderApplication = (1L << 1)
! kDragInsideSenderWindow = (1L << 2)
 kDragBehaviorNone = 0
! kDragBehaviorZoomBackAnimation = (1L << 0)
! kDragRegionAndImage = (1L << 4)
 kDragStandardTranslucency = 0L
 kDragDarkTranslucency = 1L
 kDragDarkerTranslucency = 2L
! kDragOpaqueTranslucency = 3L
 kDragRegionBegin = 1
 kDragRegionDraw = 2
 kDragRegionHide = 3
 kDragRegionIdle = 4
! kDragRegionEnd = 5
 kZoomNoAcceleration = 0
 kZoomAccelerate = 1
! kZoomDecelerate = 2
 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
! flavorTypePromiseHFS = kDragFlavorTypePromiseHFS
 kDragPromisedFlavorFindFile = FOUR_CHAR_CODE('rWm1')
! kDragPromisedFlavor = FOUR_CHAR_CODE('fssP')
 kDragPseudoCreatorVolumeOrDirectory = FOUR_CHAR_CODE('MACS')
 kDragPseudoFileTypeVolume = FOUR_CHAR_CODE('disk')
! kDragPseudoFileTypeDirectory = FOUR_CHAR_CODE('fold')
! flavorTypeDirectory = FOUR_CHAR_CODE('diry')
 kFlavorTypeClippingName = FOUR_CHAR_CODE('clnm')
 kFlavorTypeClippingFilename = FOUR_CHAR_CODE('clfn')
 kFlavorTypeDragToTrashOnly = FOUR_CHAR_CODE('fdtt')
! kFlavorTypeFinderNoTrackingBehavior = FOUR_CHAR_CODE('fntb')
 kDragTrackingEnterHandler = 1
 kDragTrackingEnterWindow = 2
 kDragTrackingInWindow = 3
 kDragTrackingLeaveWindow = 4
! kDragTrackingLeaveHandler = 5
 kDragActionNothing = 0L
 kDragActionCopy = 1L
***************
*** 67,86 ****
 dragHasLeftSenderWindow = kDragHasLeftSenderWindow
 dragInsideSenderApplication = kDragInsideSenderApplication
! dragInsideSenderWindow = kDragInsideSenderWindow 
 dragTrackingEnterHandler = kDragTrackingEnterHandler
 dragTrackingEnterWindow = kDragTrackingEnterWindow
 dragTrackingInWindow = kDragTrackingInWindow
 dragTrackingLeaveWindow = kDragTrackingLeaveWindow
! dragTrackingLeaveHandler = kDragTrackingLeaveHandler 
 dragRegionBegin = kDragRegionBegin
 dragRegionDraw = kDragRegionDraw
 dragRegionHide = kDragRegionHide
 dragRegionIdle = kDragRegionIdle
! dragRegionEnd = kDragRegionEnd 
 zoomNoAcceleration = kZoomNoAcceleration
 zoomAccelerate = kZoomAccelerate
! zoomDecelerate = kZoomDecelerate 
 kDragStandardImage = kDragStandardTranslucency
 kDragDarkImage = kDragDarkTranslucency
 kDragDarkerImage = kDragDarkerTranslucency
! kDragOpaqueImage = kDragOpaqueTranslucency 
--- 67,86 ----
 dragHasLeftSenderWindow = kDragHasLeftSenderWindow
 dragInsideSenderApplication = kDragInsideSenderApplication
! dragInsideSenderWindow = kDragInsideSenderWindow
 dragTrackingEnterHandler = kDragTrackingEnterHandler
 dragTrackingEnterWindow = kDragTrackingEnterWindow
 dragTrackingInWindow = kDragTrackingInWindow
 dragTrackingLeaveWindow = kDragTrackingLeaveWindow
! dragTrackingLeaveHandler = kDragTrackingLeaveHandler
 dragRegionBegin = kDragRegionBegin
 dragRegionDraw = kDragRegionDraw
 dragRegionHide = kDragRegionHide
 dragRegionIdle = kDragRegionIdle
! dragRegionEnd = kDragRegionEnd
 zoomNoAcceleration = kZoomNoAcceleration
 zoomAccelerate = kZoomAccelerate
! zoomDecelerate = kZoomDecelerate
 kDragStandardImage = kDragStandardTranslucency
 kDragDarkImage = kDragDarkTranslucency
 kDragDarkerImage = kDragDarkerTranslucency
! kDragOpaqueImage = kDragOpaqueTranslucency
Index: Events.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Events.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Events.py	5 Dec 2003 23:59:37 -0000	1.2
--- Events.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 22,26 ****
 highLevelEventMask = 0x0400
 osMask = 1 << osEvt
! everyEvent = 0xFFFF 
 charCodeMask = 0x000000FF
 keyCodeMask = 0x0000FF00
--- 22,26 ----
 highLevelEventMask = 0x0400
 osMask = 1 << osEvt
! everyEvent = 0xFFFF
 charCodeMask = 0x000000FF
 keyCodeMask = 0x0000FF00
***************
*** 29,34 ****
 mouseMovedMessage = 0x00FA
 suspendResumeMessage = 0x0001
! resumeFlag = 1 
! convertClipboardFlag = 2 
 activeFlagBit = 0
 btnStateBit = 7
--- 29,34 ----
 mouseMovedMessage = 0x00FA
 suspendResumeMessage = 0x0001
! resumeFlag = 1
! convertClipboardFlag = 2
 activeFlagBit = 0
 btnStateBit = 7
***************
*** 40,44 ****
 rightShiftKeyBit = 13
 rightOptionKeyBit = 14
! rightControlKeyBit = 15 
 activeFlag = 1 << activeFlagBit
 btnState = 1 << btnStateBit
--- 40,44 ----
 rightShiftKeyBit = 13
 rightOptionKeyBit = 14
! rightControlKeyBit = 15
 activeFlag = 1 << activeFlagBit
 btnState = 1 << btnStateBit
***************
*** 88,92 ****
 kDiamondUnicode = 0x25C6
 kBulletUnicode = 0x2022
! kAppleLogoUnicode = 0xF8FF 
 networkEvt = 10
 driverEvt = 11
--- 88,92 ----
 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Files.py	5 Dec 2003 23:59:37 -0000	1.2
--- Files.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 10,14 ****
 fsRdWrShPerm = 0x04
 fsRdDenyPerm = 0x10
! fsWrDenyPerm = 0x20 
 fsRtParID = 1
 fsRtDirID = 2
--- 10,14 ----
 fsRdWrShPerm = 0x04
 fsRdDenyPerm = 0x10
! fsWrDenyPerm = 0x20
 fsRtParID = 1
 fsRtDirID = 2
***************
*** 28,32 ****
 newLineBit = 7
 newLineMask = 0x0080
! newLineCharMask = 0xFF00 
 fsSBPartialName = 1
 fsSBFullName = 2
--- 28,32 ----
 newLineBit = 7
 newLineMask = 0x0080
! newLineCharMask = 0xFF00
 fsSBPartialName = 1
 fsSBFullName = 2
***************
*** 70,74 ****
 fsSBDrBkDatBit = 11
 fsSBDrFndrInfoBit = 12
! fsSBDrParIDBit = 13 
 bLimitFCBs = 31
 bLocalWList = 30
--- 70,74 ----
 fsSBDrBkDatBit = 11
 fsSBDrFndrInfoBit = 12
! fsSBDrParIDBit = 13
 bLimitFCBs = 31
 bLocalWList = 30
***************
*** 107,116 ****
 bSupportsNamedForks = 7
 bSupportsSubtreeIterators = 8
! bL2PCanMapFileBlocks = 9 
 bParentModDateChanges = 10
! bAncestorModDateChanges = 11 
 bSupportsSymbolicLinks = 13
 bIsAutoMounted = 14
! bAllowCDiDataHandler = 17 
 kLargeIcon = 1
 kLarge4BitIcon = 2
--- 107,116 ----
 bSupportsNamedForks = 7
 bSupportsSubtreeIterators = 8
! bL2PCanMapFileBlocks = 9
 bParentModDateChanges = 10
! bAncestorModDateChanges = 11
 bSupportsSymbolicLinks = 13
 bIsAutoMounted = 14
! bAllowCDiDataHandler = 17
 kLargeIcon = 1
 kLarge4BitIcon = 2
***************
*** 119,123 ****
 kSmall4BitIcon = 5
 kSmall8BitIcon = 6
! kicnsIconFamily = 239 
 kLargeIconSize = 256
 kLarge4BitIconSize = 512
--- 119,123 ----
 kSmall4BitIcon = 5
 kSmall8BitIcon = 6
! kicnsIconFamily = 239
 kLargeIconSize = 256
 kLarge4BitIconSize = 512
***************
*** 230,234 ****
 kioACAccessOwnerSearchMask = 0x00000001
 kfullPrivileges = 0x00070007
! kownerPrivileges = 0x00000007 
 knoUser = 0
 kadministratorUser = 1
--- 230,234 ----
 kioACAccessOwnerSearchMask = 0x00000001
 kfullPrivileges = 0x00070007
! kownerPrivileges = 0x00000007
 knoUser = 0
 kadministratorUser = 1
***************
*** 244,253 ****
 volMountChangedMask = 0x4000
 volMountFSReservedMask = 0x00FF
! volMountSysReservedMask = 0xFF00 
! kAFPExtendedFlagsAlternateAddressMask = 1 
 kAFPTagTypeIP = 0x01
 kAFPTagTypeIPPort = 0x02
 kAFPTagTypeDDP = 0x03
! kAFPTagTypeDNS = 0x04 
 kAFPTagLengthIP = 0x06
 kAFPTagLengthIPPort = 0x08
--- 244,253 ----
 volMountChangedMask = 0x4000
 volMountFSReservedMask = 0x00FF
! volMountSysReservedMask = 0xFF00
! kAFPExtendedFlagsAlternateAddressMask = 1
 kAFPTagTypeIP = 0x01
 kAFPTagTypeIPPort = 0x02
 kAFPTagTypeDDP = 0x03
! kAFPTagTypeDNS = 0x04
 kAFPTagLengthIP = 0x06
 kAFPTagLengthIPPort = 0x08
***************
*** 277,281 ****
 kFSCatInfoGettableInfo = 0x0003FFFF
 kFSCatInfoSettableInfo = 0x00001FE3
! # kFSCatInfoReserved = (long)0xFFFC0000 
 kFSNodeLockedBit = 0
 kFSNodeLockedMask = 0x0001
--- 277,281 ----
 kFSCatInfoGettableInfo = 0x0003FFFF
 kFSCatInfoSettableInfo = 0x00001FE3
! # kFSCatInfoReserved = (long)0xFFFC0000
 kFSNodeLockedBit = 0
 kFSNodeLockedMask = 0x0001
***************
*** 312,316 ****
 kFSAllocContiguousMask = 0x0002
 kFSAllocNoRoundUpMask = 0x0004
! kFSAllocReservedMask = 0xFFF8 
 kFSVolInfoNone = 0x0000
 kFSVolInfoCreateDate = 0x0001
--- 312,316 ----
 kFSAllocContiguousMask = 0x0002
 kFSAllocNoRoundUpMask = 0x0004
! kFSAllocReservedMask = 0xFFF8
 kFSVolInfoNone = 0x0000
 kFSVolInfoCreateDate = 0x0001
***************
*** 331,335 ****
 kFSVolInfoDriveInfo = 0x8000
 kFSVolInfoGettableInfo = 0xFFFF
! kFSVolInfoSettableInfo = 0x3004 
 kFSVolFlagDefaultVolumeBit = 5
 kFSVolFlagDefaultVolumeMask = 0x0020
--- 331,335 ----
 kFSVolInfoDriveInfo = 0x8000
 kFSVolInfoGettableInfo = 0xFFFF
! kFSVolInfoSettableInfo = 0x3004
 kFSVolFlagDefaultVolumeBit = 5
 kFSVolFlagDefaultVolumeMask = 0x0020
***************
*** 342,346 ****
 kFNDirectoryModifiedMessage = 1
 kFNNoImplicitAllSubscription = (1 << 0)
! rAliasType = FOUR_CHAR_CODE('alis') 
 kARMMountVol = 0x00000001
 kARMNoUI = 0x00000002
--- 342,346 ----
 kFNDirectoryModifiedMessage = 1
 kFNNoImplicitAllSubscription = (1 << 0)
! rAliasType = FOUR_CHAR_CODE('alis')
 kARMMountVol = 0x00000001
 kARMNoUI = 0x00000002
***************
*** 348,358 ****
 kARMSearch = 0x00000100
 kARMSearchMore = 0x00000200
! kARMSearchRelFirst = 0x00000400 
 asiZoneName = -3
 asiServerName = -2
 asiVolumeName = -1
 asiAliasName = 0
! asiParentName = 1 
! kResolveAliasFileNoUI = 0x00000001 
 kClippingCreator = FOUR_CHAR_CODE('drag')
 kClippingPictureType = FOUR_CHAR_CODE('clpp')
--- 348,358 ----
 kARMSearch = 0x00000100
 kARMSearchMore = 0x00000200
! kARMSearchRelFirst = 0x00000400
 asiZoneName = -3
 asiServerName = -2
 asiVolumeName = -1
 asiAliasName = 0
! asiParentName = 1
! kResolveAliasFileNoUI = 0x00000001
 kClippingCreator = FOUR_CHAR_CODE('drag')
 kClippingPictureType = FOUR_CHAR_CODE('clpp')
***************
*** 370,374 ****
 kInternetLocationNSL = FOUR_CHAR_CODE('ilns')
 kInternetLocationGeneric = FOUR_CHAR_CODE('ilge')
! kCustomIconResource = -16455 
 kCustomBadgeResourceType = FOUR_CHAR_CODE('badg')
 kCustomBadgeResourceID = kCustomIconResource
--- 370,374 ----
 kInternetLocationNSL = FOUR_CHAR_CODE('ilns')
 kInternetLocationGeneric = FOUR_CHAR_CODE('ilge')
! kCustomIconResource = -16455
 kCustomBadgeResourceType = FOUR_CHAR_CODE('badg')
 kCustomBadgeResourceID = kCustomIconResource
***************
*** 389,393 ****
 kApplicationDAAliasType = FOUR_CHAR_CODE('addp')
 kPackageAliasType = FOUR_CHAR_CODE('fpka')
! kAppPackageAliasType = FOUR_CHAR_CODE('fapa') 
 kSystemFolderAliasType = FOUR_CHAR_CODE('fasy')
 kAppleMenuFolderAliasType = FOUR_CHAR_CODE('faam')
--- 389,393 ----
 kApplicationDAAliasType = FOUR_CHAR_CODE('addp')
 kPackageAliasType = FOUR_CHAR_CODE('fpka')
! kAppPackageAliasType = FOUR_CHAR_CODE('fapa')
 kSystemFolderAliasType = FOUR_CHAR_CODE('fasy')
 kAppleMenuFolderAliasType = FOUR_CHAR_CODE('faam')
***************
*** 411,415 ****
 kHasBundle = 0x2000
 kIsInvisible = 0x4000
! kIsAlias = 0x8000 
 fOnDesk = kIsOnDesk
 fHasBundle = kHasBundle
--- 411,415 ----
 kHasBundle = 0x2000
 kIsInvisible = 0x4000
! kIsAlias = 0x8000
 fOnDesk = kIsOnDesk
 fHasBundle = kHasBundle
***************
*** 421,425 ****
 kExtendedFlagsAreInvalid = 0x8000
 kExtendedFlagHasCustomBadge = 0x0100
! kExtendedFlagHasRoutingInfo = 0x0004 
 kFirstMagicBusyFiletype = FOUR_CHAR_CODE('bzy ')
 kLastMagicBusyFiletype = FOUR_CHAR_CODE('bzy?')
--- 421,425 ----
 kExtendedFlagsAreInvalid = 0x8000
 kExtendedFlagHasCustomBadge = 0x0100
! kExtendedFlagHasRoutingInfo = 0x0004
 kFirstMagicBusyFiletype = FOUR_CHAR_CODE('bzy ')
 kLastMagicBusyFiletype = FOUR_CHAR_CODE('bzy?')
Index: Folders.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Folders.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Folders.py	5 Dec 2003 23:59:37 -0000	1.2
--- Folders.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 10,14 ****
 kNetworkDomain = -32764
 kUserDomain = -32763
! kClassicDomain = -32762 
 kCreateFolder = true
 kDontCreateFolder = false
--- 10,14 ----
 kNetworkDomain = -32764
 kUserDomain = -32763
! kClassicDomain = -32762
 kCreateFolder = true
 kDontCreateFolder = false
***************
*** 29,33 ****
 kPreferencesFolderType = FOUR_CHAR_CODE('pref')
 kSystemPreferencesFolderType = FOUR_CHAR_CODE('sprf')
! kTemporaryFolderType = FOUR_CHAR_CODE('temp') 
 kExtensionDisabledFolderType = FOUR_CHAR_CODE('extD')
 kControlPanelDisabledFolderType = FOUR_CHAR_CODE('ctrD')
--- 29,33 ----
 kPreferencesFolderType = FOUR_CHAR_CODE('pref')
 kSystemPreferencesFolderType = FOUR_CHAR_CODE('sprf')
! kTemporaryFolderType = FOUR_CHAR_CODE('temp')
 kExtensionDisabledFolderType = FOUR_CHAR_CODE('extD')
 kControlPanelDisabledFolderType = FOUR_CHAR_CODE('ctrD')
***************
*** 87,91 ****
 kDisplayExtensionsFolderType = FOUR_CHAR_CODE('dspl')
 kMultiprocessingFolderType = FOUR_CHAR_CODE('mpxf')
! kPrintingPlugInsFolderType = FOUR_CHAR_CODE('pplg') 
 kDomainTopLevelFolderType = FOUR_CHAR_CODE('dtop')
 kDomainLibraryFolderType = FOUR_CHAR_CODE('dlib')
--- 87,91 ----
 kDisplayExtensionsFolderType = FOUR_CHAR_CODE('dspl')
 kMultiprocessingFolderType = FOUR_CHAR_CODE('mpxf')
! kPrintingPlugInsFolderType = FOUR_CHAR_CODE('pplg')
 kDomainTopLevelFolderType = FOUR_CHAR_CODE('dtop')
 kDomainLibraryFolderType = FOUR_CHAR_CODE('dlib')
***************
*** 128,134 ****
 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')
 kCurrentUserFolderType = FOUR_CHAR_CODE('cusr')
--- 128,134 ----
 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')
 kCurrentUserFolderType = FOUR_CHAR_CODE('cusr')
***************
*** 136,140 ****
 kCurrentUserRemoteFolderType = FOUR_CHAR_CODE('rusr')
 kSharedUserDataFolderType = FOUR_CHAR_CODE('sdat')
! kVolumeSettingsFolderType = FOUR_CHAR_CODE('vsfd') 
 kAppleshareAutomountServerAliasesFolderType = FOUR_CHAR_CODE('srv\xc4')
 kPreMacOS91ApplicationsFolderType = FOUR_CHAR_CODE('\x8cpps')
--- 136,140 ----
 kCurrentUserRemoteFolderType = FOUR_CHAR_CODE('rusr')
 kSharedUserDataFolderType = FOUR_CHAR_CODE('sdat')
! kVolumeSettingsFolderType = FOUR_CHAR_CODE('vsfd')
 kAppleshareAutomountServerAliasesFolderType = FOUR_CHAR_CODE('srv\xc4')
 kPreMacOS91ApplicationsFolderType = FOUR_CHAR_CODE('\x8cpps')
***************
*** 146,150 ****
 kPreMacOS91InternetFolderType = FOUR_CHAR_CODE('\x94nt\xc4')
 kPreMacOS91AutomountedServersFolderType = FOUR_CHAR_CODE('\xa7rv\xc4')
! kPreMacOS91StationeryFolderType = FOUR_CHAR_CODE('\xbfdst') 
 kCreateFolderAtBoot = 0x00000002
 kCreateFolderAtBootBit = 1
--- 146,150 ----
 kPreMacOS91InternetFolderType = FOUR_CHAR_CODE('\x94nt\xc4')
 kPreMacOS91AutomountedServersFolderType = FOUR_CHAR_CODE('\xa7rv\xc4')
! kPreMacOS91StationeryFolderType = FOUR_CHAR_CODE('\xbfdst')
 kCreateFolderAtBoot = 0x00000002
 kCreateFolderAtBootBit = 1
***************
*** 172,176 ****
 kBlessedFolder = FOUR_CHAR_CODE('blsf')
 kRootFolder = FOUR_CHAR_CODE('rotf')
! kCurrentUserFolderLocation = FOUR_CHAR_CODE('cusf') 
 kFindFolderRedirectionFlagUseDistinctUserFoldersBit = 0
 kFindFolderRedirectionFlagUseGivenVRefAndDirIDAsUserFolderBit = 1
--- 172,176 ----
 kBlessedFolder = FOUR_CHAR_CODE('blsf')
 kRootFolder = FOUR_CHAR_CODE('rotf')
! kCurrentUserFolderLocation = FOUR_CHAR_CODE('cusf')
 kFindFolderRedirectionFlagUseDistinctUserFoldersBit = 0
 kFindFolderRedirectionFlagUseGivenVRefAndDirIDAsUserFolderBit = 1
***************
*** 185,190 ****
 kFolderManagerNotificationMessagePostUserLogOut = FOUR_CHAR_CODE('logp')
 kFolderManagerNotificationDiscardCachedData = FOUR_CHAR_CODE('dche')
! kFolderManagerNotificationMessageLoginStartup = FOUR_CHAR_CODE('stup') 
 kDoNotRemoveWhenCurrentApplicationQuitsBit = 0
! kDoNotRemoveWheCurrentApplicationQuitsBit = kDoNotRemoveWhenCurrentApplicationQuitsBit 
 kStopIfAnyNotificationProcReturnsErrorBit = 31
--- 185,190 ----
 kFolderManagerNotificationMessagePostUserLogOut = FOUR_CHAR_CODE('logp')
 kFolderManagerNotificationDiscardCachedData = FOUR_CHAR_CODE('dche')
! kFolderManagerNotificationMessageLoginStartup = FOUR_CHAR_CODE('stup')
 kDoNotRemoveWhenCurrentApplicationQuitsBit = 0
! kDoNotRemoveWheCurrentApplicationQuitsBit = kDoNotRemoveWhenCurrentApplicationQuitsBit
 kStopIfAnyNotificationProcReturnsErrorBit = 31
Index: Icons.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Icons.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Icons.py	5 Dec 2003 23:59:37 -0000	1.2
--- Icons.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 255,259 ****
 kTrueTypeMultiFlatFontIcon = FOUR_CHAR_CODE('ttcf')
 kUserIDiskIcon = FOUR_CHAR_CODE('udsk')
! kInternationResourcesIcon = kInternationalResourcesIcon 
 kInternetLocationHTTPIcon = FOUR_CHAR_CODE('ilht')
 kInternetLocationFTPIcon = FOUR_CHAR_CODE('ilft')
--- 255,259 ----
 kTrueTypeMultiFlatFontIcon = FOUR_CHAR_CODE('ttcf')
 kUserIDiskIcon = FOUR_CHAR_CODE('udsk')
! kInternationResourcesIcon = kInternationalResourcesIcon
 kInternetLocationHTTPIcon = FOUR_CHAR_CODE('ilht')
 kInternetLocationFTPIcon = FOUR_CHAR_CODE('ilft')
Index: LaunchServices.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/LaunchServices.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LaunchServices.py	13 Mar 2004 23:50:48 -0000	1.3
--- LaunchServices.py	18 Jul 2004 06:14:46 -0000	1.4
***************
*** 21,28 ****
 kLSAppDoesNotSupportSchemeWarning = -10821
 kLSServerCommunicationErr = -10822
! kLSCannotSetInfoErr = -10823 
 kLSInitializeDefaults = 0x00000001
! kLSMinCatInfoBitmap = (kFSCatInfoNodeFlags | kFSCatInfoParentDirID | kFSCatInfoFinderInfo | kFSCatInfoFinderXInfo) 
! # kLSInvalidExtensionIndex = (unsigned long)0xFFFFFFFF 
 kLSRequestExtension = 0x00000001
 kLSRequestTypeCreator = 0x00000002
--- 21,28 ----
 kLSAppDoesNotSupportSchemeWarning = -10821
 kLSServerCommunicationErr = -10822
! kLSCannotSetInfoErr = -10823
 kLSInitializeDefaults = 0x00000001
! kLSMinCatInfoBitmap = (kFSCatInfoNodeFlags | kFSCatInfoParentDirID | kFSCatInfoFinderInfo | kFSCatInfoFinderXInfo)
! # kLSInvalidExtensionIndex = (unsigned long)0xFFFFFFFF
 kLSRequestExtension = 0x00000001
 kLSRequestTypeCreator = 0x00000002
***************
*** 32,36 ****
 kLSRequestIconAndKind = 0x00000020
 kLSRequestExtensionFlagsOnly = 0x00000040
! # kLSRequestAllInfo = (unsigned long)0xFFFFFFFF 
 kLSItemInfoIsPlainFile = 0x00000001
 kLSItemInfoIsPackage = 0x00000002
--- 32,36 ----
 kLSRequestIconAndKind = 0x00000020
 kLSRequestExtensionFlagsOnly = 0x00000040
! # kLSRequestAllInfo = (unsigned long)0xFFFFFFFF
 kLSItemInfoIsPlainFile = 0x00000001
 kLSItemInfoIsPackage = 0x00000002
***************
*** 46,59 ****
 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
--- 46,59 ----
 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
***************
*** 72,74 ****
 kLSLaunchNewInstance = 0x00080000
 kLSLaunchAndHide = 0x00100000
! kLSLaunchAndHideOthers = 0x00200000 
--- 72,74 ----
 kLSLaunchNewInstance = 0x00080000
 kLSLaunchAndHide = 0x00100000
! kLSLaunchAndHideOthers = 0x00200000
Index: Lists.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Lists.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Lists.py	30 Dec 2002 22:04:21 -0000	1.1
--- Lists.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 5,9 ****
 listNotifyClick = FOUR_CHAR_CODE('clik')
 listNotifyDoubleClick = FOUR_CHAR_CODE('dblc')
! listNotifyPreClick = FOUR_CHAR_CODE('pclk') 
 lDrawingModeOffBit = 3
 lDoVAutoscrollBit = 1
--- 5,9 ----
 listNotifyClick = FOUR_CHAR_CODE('clik')
 listNotifyDoubleClick = FOUR_CHAR_CODE('dblc')
! listNotifyPreClick = FOUR_CHAR_CODE('pclk')
 lDrawingModeOffBit = 3
 lDoVAutoscrollBit = 1
Index: MacHelp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/MacHelp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MacHelp.py	30 Dec 2002 22:04:21 -0000	1.1
--- MacHelp.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 52,58 ****
 kHMContentNotProvidedDontPropagate = 2
 kHMMinimumContentIndex = 0
! kHMMaximumContentIndex = 1 
 errHMIllegalContentForMinimumState = -10980
! errHMIllegalContentForMaximumState = -10981 
 kHMIllegalContentForMinimumState = errHMIllegalContentForMinimumState
 kHelpTagEventHandlerTag = FOUR_CHAR_CODE('hevt')
--- 52,58 ----
 kHMContentNotProvidedDontPropagate = 2
 kHMMinimumContentIndex = 0
! kHMMaximumContentIndex = 1
 errHMIllegalContentForMinimumState = -10980
! errHMIllegalContentForMaximumState = -10981
 kHMIllegalContentForMinimumState = errHMIllegalContentForMinimumState
 kHelpTagEventHandlerTag = FOUR_CHAR_CODE('hevt')
Index: MacTextEditor.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/MacTextEditor.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MacTextEditor.py	5 Dec 2003 23:59:37 -0000	1.2
--- MacTextEditor.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 146,150 ****
 kTXNFontFeatureAction = 13
 kTXNFontVariationAction = 14
! kTXNUndoLastAction = 1024 
 # kTXNClearThisControl = (long)0xFFFFFFFF
 # kTXNClearTheseFontFeatures = (long)0x80000000
--- 146,150 ----
 kTXNFontFeatureAction = 13
 kTXNFontVariationAction = 14
! kTXNUndoLastAction = 1024
 # kTXNClearThisControl = (long)0xFFFFFFFF
 # kTXNClearTheseFontFeatures = (long)0x80000000
***************
*** 177,181 ****
 kTXNCenter = 4
 kTXNFullJust = 8
! kTXNForceFullJust = 16 
 kScrollBarsAlwaysActive = true
 kScrollBarsSyncWithFocus = false
--- 177,181 ----
 kTXNCenter = 4
 kTXNFullJust = 8
! kTXNForceFullJust = 16
 kScrollBarsAlwaysActive = true
 kScrollBarsSyncWithFocus = false
***************
*** 193,197 ****
 kTXNShowStart = false
 kTXNShowEnd = true
! kTXNDefaultFontName = 0 
 kTXNDefaultFontSize = 0x000C0000
 kTXNDefaultFontStyle = normal
--- 193,197 ----
 kTXNShowStart = false
 kTXNShowEnd = true
! kTXNDefaultFontName = 0
 kTXNDefaultFontSize = 0x000C0000
 kTXNDefaultFontStyle = normal
Index: MediaDescr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/MediaDescr.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MediaDescr.py	6 Apr 2003 09:01:02 -0000	1.2
--- MediaDescr.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 5,60 ****
 
 class _MediaDescriptionCodec:
! def __init__(self, trunc, size, names, fmt):
! self.trunc = trunc
! self.size = size
! self.names = names
! self.fmt = fmt
 
! def decode(self, data):
! if self.trunc:
! data = data[:self.size]
! values = struct.unpack(self.fmt, data)
! if len(values) != len(self.names):
! raise Error, ('Format length does not match number of names', descr)
! rv = {}
! for i in range(len(values)):
! name = self.names[i]
! value = values[i]
! if type(name) == type(()):
! name, cod, dec = name
! value = dec(value)
! rv[name] = value
! return rv
 
! def encode(dict):
! list = [self.fmt]
! for name in self.names:
! if type(name) == type(()):
! name, cod, dec = name
! else:
! cod = dec = None
! value = dict[name]
! if cod:
! value = cod(value)
! list.append(value)
! rv = struct.pack(*list)
! return rv
 
 # Helper functions
 def _tofixed(float):
! hi = int(float)
! lo = int(float*0x10000) & 0xffff
! return (hi<<16)|lo
 
 def _fromfixed(fixed):
! hi = (fixed >> 16) & 0xffff
! lo = (fixed & 0xffff)
! return hi + (lo / float(0x10000))
 
 def _tostr31(str):
! return chr(len(str)) + str + '0円'*(31-len(str))
 
 def _fromstr31(str31):
! return str31[1:1+ord(str31[0])]
 
 SampleDescription = _MediaDescriptionCodec(
--- 5,60 ----
 
 class _MediaDescriptionCodec:
! def __init__(self, trunc, size, names, fmt):
! self.trunc = trunc
! self.size = size
! self.names = names
! self.fmt = fmt
 
! def decode(self, data):
! if self.trunc:
! data = data[:self.size]
! values = struct.unpack(self.fmt, data)
! if len(values) != len(self.names):
! raise Error, ('Format length does not match number of names', descr)
! rv = {}
! for i in range(len(values)):
! name = self.names[i]
! value = values[i]
! if type(name) == type(()):
! name, cod, dec = name
! value = dec(value)
! rv[name] = value
! return rv
 
! def encode(dict):
! list = [self.fmt]
! for name in self.names:
! if type(name) == type(()):
! name, cod, dec = name
! else:
! cod = dec = None
! value = dict[name]
! if cod:
! value = cod(value)
! list.append(value)
! rv = struct.pack(*list)
! return rv
 
 # Helper functions
 def _tofixed(float):
! hi = int(float)
! lo = int(float*0x10000) & 0xffff
! return (hi<<16)|lo
 
 def _fromfixed(fixed):
! hi = (fixed >> 16) & 0xffff
! lo = (fixed & 0xffff)
! return hi + (lo / float(0x10000))
 
 def _tostr31(str):
! return chr(len(str)) + str + '0円'*(31-len(str))
 
 def _fromstr31(str31):
! return str31[1:1+ord(str31[0])]
 
 SampleDescription = _MediaDescriptionCodec(
Index: Menus.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Menus.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Menus.py	5 Dec 2003 23:59:37 -0000	1.2
--- Menus.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 2,6 ****
 
 def FOUR_CHAR_CODE(x): return x
! noMark = 0 
 kMenuDrawMsg = 0
 kMenuSizeMsg = 2
--- 2,6 ----
 
 def FOUR_CHAR_CODE(x): return x
! noMark = 0
 kMenuDrawMsg = 0
 kMenuSizeMsg = 2
***************
*** 16,20 ****
 kMenuChooseMsg = 1
 kMenuDrawItemMsg = 4
! kThemeSavvyMenuResponse = 0x7473 
 kMenuInitMsg = 8
 kMenuDisposeMsg = 9
--- 16,20 ----
 kMenuChooseMsg = 1
 kMenuDrawItemMsg = 4
! kThemeSavvyMenuResponse = 0x7473
 kMenuInitMsg = 8
 kMenuDisposeMsg = 9
***************
*** 27,31 ****
 kInsertHierarchicalMenu = -1
 mctAllItems = -98
! mctLastIDIndic = -99 
 kMenuStdMenuProc = 63
 kMenuStdMenuBarProc = 63
--- 27,31 ----
 kInsertHierarchicalMenu = -1
 mctAllItems = -98
! mctLastIDIndic = -99
 kMenuStdMenuProc = 63
 kMenuStdMenuBarProc = 63
***************
*** 34,38 ****
 kMenuOptionModifier = (1 << 1)
 kMenuControlModifier = (1 << 2)
! kMenuNoCommandModifier = (1 << 3) 
 kMenuNoIcon = 0
 kMenuIconType = 1
--- 34,38 ----
 kMenuOptionModifier = (1 << 1)
 kMenuControlModifier = (1 << 2)
! kMenuNoCommandModifier = (1 << 3)
 kMenuNoIcon = 0
 kMenuIconType = 1
***************
*** 44,48 ****
 kMenuCGImageRefType = 7
 kMenuSystemIconSelectorType = 8
! kMenuIconResourceType = 9 
 kMenuNullGlyph = 0x00
 kMenuTabRightGlyph = 0x02
--- 44,48 ----
 kMenuCGImageRefType = 7
 kMenuSystemIconSelectorType = 8
! kMenuIconResourceType = 9
 kMenuNullGlyph = 0x00
 kMenuTabRightGlyph = 0x02
***************
*** 102,106 ****
 kMenuF14Glyph = 0x88
 kMenuF15Glyph = 0x89
! kMenuControlISOGlyph = 0x8A 
 kMenuAttrExcludesMarkColumn = (1 << 0)
 kMenuAttrAutoDisable = (1 << 2)
--- 102,106 ----
 kMenuF14Glyph = 0x88
 kMenuF15Glyph = 0x89
! kMenuControlISOGlyph = 0x8A
 kMenuAttrExcludesMarkColumn = (1 << 0)
 kMenuAttrAutoDisable = (1 << 2)
***************
*** 148,153 ****
 kMenuItemDataAllDataVersionOne = 0x000FFFFF
 kMenuItemDataAllDataVersionTwo = kMenuItemDataAllDataVersionOne | kMenuItemDataCmdVirtualKey
! kMenuDefProcPtr = 0 
! kMenuPropertyPersistent = 0x00000001 
 kHierarchicalFontMenuOption = 0x00000001
 gestaltContextualMenuAttr = FOUR_CHAR_CODE('cmnu')
--- 148,153 ----
 kMenuItemDataAllDataVersionOne = 0x000FFFFF
 kMenuItemDataAllDataVersionTwo = kMenuItemDataAllDataVersionOne | kMenuItemDataCmdVirtualKey
! kMenuDefProcPtr = 0
! kMenuPropertyPersistent = 0x00000001
 kHierarchicalFontMenuOption = 0x00000001
 gestaltContextualMenuAttr = FOUR_CHAR_CODE('cmnu')
***************
*** 155,159 ****
 gestaltContextualMenuTrapAvailable = 1
 gestaltContextualMenuHasAttributeAndModifierKeys = 2
! gestaltContextualMenuHasUnicodeSupport = 3 
 kCMHelpItemNoHelp = 0
 kCMHelpItemAppleGuide = 1
--- 155,159 ----
 gestaltContextualMenuTrapAvailable = 1
 gestaltContextualMenuHasAttributeAndModifierKeys = 2
! gestaltContextualMenuHasUnicodeSupport = 3
 kCMHelpItemNoHelp = 0
 kCMHelpItemAppleGuide = 1
Index: OSAconst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/OSAconst.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSAconst.py	5 Dec 2003 23:59:37 -0000	1.2
--- OSAconst.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 19,26 ****
 keyOSADialectCode = FOUR_CHAR_CODE('dcod')
 keyOSADialectLangCode = FOUR_CHAR_CODE('dlcd')
! keyOSADialectScriptCode = FOUR_CHAR_CODE('dscd') 
 kOSANullScript = 0L
 kOSANullMode = 0
! kOSAModeNull = 0 
 kOSASupportsCompiling = 0x0002
 kOSASupportsGetSource = 0x0004
--- 19,26 ----
 keyOSADialectCode = FOUR_CHAR_CODE('dcod')
 keyOSADialectLangCode = FOUR_CHAR_CODE('dlcd')
! keyOSADialectScriptCode = FOUR_CHAR_CODE('dscd')
 kOSANullScript = 0L
 kOSANullMode = 0
! kOSAModeNull = 0
 kOSASupportsCompiling = 0x0002
 kOSASupportsGetSource = 0x0004
***************
*** 131,133 ****
 keyLocalsNames = FOUR_CHAR_CODE('dfln')
 keyGlobalsNames = FOUR_CHAR_CODE('dfgn')
! keyParamsNames = FOUR_CHAR_CODE('dfpn') 
--- 131,133 ----
 keyLocalsNames = FOUR_CHAR_CODE('dfln')
 keyGlobalsNames = FOUR_CHAR_CODE('dfgn')
! keyParamsNames = FOUR_CHAR_CODE('dfpn')
Index: Qt.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Qt.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Qt.py	13 Mar 2004 23:50:48 -0000	1.2
--- Qt.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 4,6 ****
 except:
 raise ImportError, "Old (2.3) _Qt.so module loaded in stead of new (2.4) _Qt.so"
- 	
\ No newline at end of file
--- 4,5 ----
Index: QuickDraw.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/QuickDraw.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QuickDraw.py	5 Dec 2003 23:59:37 -0000	1.2
--- QuickDraw.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 3,15 ****
 
 def FOUR_CHAR_CODE(x): return x
! normal						= 0
! bold						= 1
! italic						= 2
! underline					= 4
! outline						= 8
! shadow						= 0x10
! condense					= 0x20
! extend						= 0x40
! invalColReq = -1 
 srcCopy = 0
 srcOr = 1
--- 3,15 ----
 
 def FOUR_CHAR_CODE(x): return x
! normal = 0
! bold = 1
! italic = 2
! underline = 4
! outline = 8
! shadow = 0x10
! condense = 0x20
! extend = 0x40
! invalColReq = -1
 srcCopy = 0
 srcOr = 1
***************
*** 69,73 ****
 fixedType = 1
 directType = 2
! gdDevType = 0 
 interlacedDevice = 2
 hwMirroredDevice = 4
--- 69,73 ----
 fixedType = 1
 directType = 2
! gdDevType = 0
 interlacedDevice = 2
 hwMirroredDevice = 4
***************
*** 86,90 ****
 defQDColors = 127
 RGBDirect = 16
! baseAddr32 = 4 
 sysPatListID = 0
 iBeamCursor = 1
--- 86,90 ----
 defQDColors = 127
 RGBDirect = 16
! baseAddr32 = 4
 sysPatListID = 0
 iBeamCursor = 1
***************
*** 126,130 ****
 k2IndexedGrayPixelFormat = 0x00000022
 k4IndexedGrayPixelFormat = 0x00000024
! k8IndexedGrayPixelFormat = 0x00000028 
 k16LE555PixelFormat = FOUR_CHAR_CODE('L555')
 k16LE5551PixelFormat = FOUR_CHAR_CODE('5551')
--- 126,130 ----
 k2IndexedGrayPixelFormat = 0x00000022
 k4IndexedGrayPixelFormat = 0x00000024
! k8IndexedGrayPixelFormat = 0x00000028
 k16LE555PixelFormat = FOUR_CHAR_CODE('L555')
 k16LE5551PixelFormat = FOUR_CHAR_CODE('5551')
***************
*** 142,146 ****
 kUYVY422PixelFormat = FOUR_CHAR_CODE('UYVY')
 kYUV211PixelFormat = FOUR_CHAR_CODE('Y211')
! k2vuyPixelFormat = FOUR_CHAR_CODE('2vuy') 
 kCursorImageMajorVersion = 0x0001
 kCursorImageMinorVersion = 0x0000
--- 142,146 ----
 kUYVY422PixelFormat = FOUR_CHAR_CODE('UYVY')
 kYUV211PixelFormat = FOUR_CHAR_CODE('Y211')
! k2vuyPixelFormat = FOUR_CHAR_CODE('2vuy')
 kCursorImageMajorVersion = 0x0001
 kCursorImageMinorVersion = 0x0000
***************
*** 158,162 ****
 customXFer = 54
 kXFer1PixelAtATime = 0x00000001
! kXFerConvertPixelToRGB32 = 0x00000002 
 kCursorComponentsVersion = 0x00010001
 kCursorComponentType = FOUR_CHAR_CODE('curs')
--- 158,162 ----
 customXFer = 54
 kXFer1PixelAtATime = 0x00000001
! kXFerConvertPixelToRGB32 = 0x00000002
 kCursorComponentsVersion = 0x00010001
 kCursorComponentType = FOUR_CHAR_CODE('curs')
***************
*** 180,197 ****
 
 def FOUR_CHAR_CODE(x): return x
! normal						= 0
! bold						= 1
! italic						= 2
! underline					= 4
! outline						= 8
! shadow						= 0x10
! condense					= 0x20
! extend						= 0x40
 leftCaret = 0
 rightCaret = -1
! kHilite = 1 
 smLeftCaret = 0
 smRightCaret = -1
! smHilite = 1 
 onlyStyleRun = 0
 leftStyleRun = 1
--- 180,197 ----
 
 def FOUR_CHAR_CODE(x): return x
! normal = 0
! bold = 1
! italic = 2
! underline = 4
! outline = 8
! shadow = 0x10
! condense = 0x20
! extend = 0x40
 leftCaret = 0
 rightCaret = -1
! kHilite = 1
 smLeftCaret = 0
 smRightCaret = -1
! smHilite = 1
 onlyStyleRun = 0
 leftStyleRun = 1
***************
*** 201,209 ****
 smLeftStyleRun = 1
 smRightStyleRun = 2
! smMiddleStyleRun = 3 
 truncEnd = 0
 truncMiddle = 0x4000
 smTruncEnd = 0
! smTruncMiddle = 0x4000 
 notTruncated = 0
 truncated = 1
--- 201,209 ----
 smLeftStyleRun = 1
 smRightStyleRun = 2
! smMiddleStyleRun = 3
 truncEnd = 0
 truncMiddle = 0x4000
 smTruncEnd = 0
! smTruncMiddle = 0x4000
 notTruncated = 0
 truncated = 1
***************
*** 211,215 ****
 smNotTruncated = 0
 smTruncated = 1
! smTruncErr = -1 
 smBreakWord = 0
 smBreakChar = 1
--- 211,215 ----
 smNotTruncated = 0
 smTruncated = 1
! smTruncErr = -1
 smBreakWord = 0
 smBreakChar = 1
Index: QuickTime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/QuickTime.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QuickTime.py	13 Mar 2004 23:50:48 -0000	1.3
--- QuickTime.py	18 Jul 2004 06:14:46 -0000	1.4
***************
*** 119,123 ****
 dfKeyedText = 1 << 14
 dfInverseHilite = 1 << 15
! dfTextColorHilite = 1 << 16 
 searchTextDontGoToFoundTime = 1L << 16
 searchTextDontHiliteFoundText = 1L << 17
--- 119,123 ----
 dfKeyedText = 1 << 14
 dfInverseHilite = 1 << 15
! dfTextColorHilite = 1 << 16
 searchTextDontGoToFoundTime = 1L << 16
[...1141 lines suppressed...]
 kNoteEventType = 0x00000001
***************
*** 3348,3355 ****
 kGeneralEventNoOp = 10
 kGeneralEventUsedNotes = 11
! kGeneralEventPartMix = 12 
 kMarkerEventEnd = 0
 kMarkerEventBeat = 1
! kMarkerEventTempo = 2 
 kCurrentlyNativeEndian = 1
 kCurrentlyNotNativeEndian = 2
--- 3348,3355 ----
 kGeneralEventNoOp = 10
 kGeneralEventUsedNotes = 11
! kGeneralEventPartMix = 12
 kMarkerEventEnd = 0
 kMarkerEventBeat = 1
! kMarkerEventTempo = 2
 kCurrentlyNativeEndian = 1
 kCurrentlyNotNativeEndian = 2
Index: Resources.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Resources.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Resources.py	30 Dec 2002 22:04:21 -0000	1.1
--- Resources.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 9,13 ****
 mapReadOnly = 128
 mapCompact = 64
! mapChanged = 32 
 resSysRefBit = 7
 resSysHeapBit = 6
--- 9,13 ----
 mapReadOnly = 128
 mapCompact = 64
! mapChanged = 32
 resSysRefBit = 7
 resSysHeapBit = 6
***************
*** 19,27 ****
 mapReadOnlyBit = 7
 mapCompactBit = 6
! mapChangedBit = 5 
 kResFileNotOpened = -1
! kSystemResFile = 0 
 kRsrcChainBelowSystemMap = 0
 kRsrcChainBelowApplicationMap = 1
 kRsrcChainAboveApplicationMap = 2
! kRsrcChainAboveAllMaps = 4 
--- 19,27 ----
 mapReadOnlyBit = 7
 mapCompactBit = 6
! mapChangedBit = 5
 kResFileNotOpened = -1
! kSystemResFile = 0
 kRsrcChainBelowSystemMap = 0
 kRsrcChainBelowApplicationMap = 1
 kRsrcChainAboveApplicationMap = 2
! kRsrcChainAboveAllMaps = 4
Index: Sound.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Sound.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Sound.py	30 Dec 2002 22:04:21 -0000	1.1
--- Sound.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 2,7 ****
 
 def FOUR_CHAR_CODE(x): return x
! soundListRsrc = FOUR_CHAR_CODE('snd ') 
! kSimpleBeepID = 1 
 # rate48khz = (long)0xBB800000
 # rate44khz = (long)0xAC440000
--- 2,7 ----
 
 def FOUR_CHAR_CODE(x): return x
! soundListRsrc = FOUR_CHAR_CODE('snd ')
! kSimpleBeepID = 1
 # rate48khz = (long)0xBB800000
 # rate44khz = (long)0xAC440000
***************
*** 12,30 ****
 rate11khz = 0x2B7745D1
 rate11025hz = 0x2B110000
! rate8khz = 0x1F400000 
! sampledSynth = 5 
 squareWaveSynth = 1
 waveTableSynth = 3
 MACE3snthID = 11
 MACE6snthID = 13
! kMiddleC = 60 
 kNoVolume = 0
! kFullVolume = 0x0100 
 stdQLength = 128
 dataOffsetFlag = 0x8000
! kUseOptionalOutputDevice = -1 
 notCompressed = 0
 fixedCompression = -1
! variableCompression = -2 
 twoToOne = 1
 eightToThree = 2
--- 12,30 ----
 rate11khz = 0x2B7745D1
 rate11025hz = 0x2B110000
! rate8khz = 0x1F400000
! sampledSynth = 5
 squareWaveSynth = 1
 waveTableSynth = 3
 MACE3snthID = 11
 MACE6snthID = 13
! kMiddleC = 60
 kNoVolume = 0
! kFullVolume = 0x0100
 stdQLength = 128
 dataOffsetFlag = 0x8000
! kUseOptionalOutputDevice = -1
 notCompressed = 0
 fixedCompression = -1
! variableCompression = -2
 twoToOne = 1
 eightToThree = 2
***************
*** 36,50 ****
 leftOverBlockSize = 32
 firstSoundFormat = 0x0001
! secondSoundFormat = 0x0002 
 dbBufferReady = 0x00000001
! dbLastBuffer = 0x00000004 
 sysBeepDisable = 0x0000
 sysBeepEnable = (1 << 0)
! sysBeepSynchronous = (1 << 1) 
 unitTypeNoSelection = 0xFFFF
 unitTypeSeconds = 0x0000
 stdSH = 0x00
 extSH = 0xFF
! cmpSH = 0xFE 
 nullCmd = 0
 quietCmd = 3
--- 36,50 ----
 leftOverBlockSize = 32
 firstSoundFormat = 0x0001
! secondSoundFormat = 0x0002
 dbBufferReady = 0x00000001
! dbLastBuffer = 0x00000004
 sysBeepDisable = 0x0000
 sysBeepEnable = (1 << 0)
! sysBeepSynchronous = (1 << 1)
 unitTypeNoSelection = 0xFFFF
 unitTypeSeconds = 0x0000
 stdSH = 0x00
 extSH = 0xFF
! cmpSH = 0xFE
 nullCmd = 0
 quietCmd = 3
***************
*** 85,89 ****
 getRateCmd = 85
 sizeCmd = 90
! convertCmd = 91 
 waveInitChannelMask = 0x07
 waveInitChannel0 = 0x04
--- 85,89 ----
 getRateCmd = 85
 sizeCmd = 90
! convertCmd = 91
 waveInitChannelMask = 0x07
 waveInitChannel0 = 0x04
***************
*** 94,98 ****
 initChan1 = waveInitChannel1
 initChan2 = waveInitChannel2
! initChan3 = waveInitChannel3 
 outsideCmpSH = 0
 insideCmpSH = 1
--- 94,98 ----
 initChan1 = waveInitChannel1
 initChan2 = waveInitChannel2
! initChan3 = waveInitChannel3
 outsideCmpSH = 0
 insideCmpSH = 1
***************
*** 103,107 ****
 aceBadEncode = 4
 aceBadDest = 5
! aceBadCmd = 6 
 initChanLeft = 0x0002
 initChanRight = 0x0003
--- 103,107 ----
 aceBadEncode = 4
 aceBadDest = 5
! aceBadCmd = 6
 initChanLeft = 0x0002
 initChanRight = 0x0003
***************
*** 115,119 ****
 initSRateMask = 0x0030
 initStereoMask = 0x00C0
! initCompMask = 0xFF00 
 siActiveChannels = FOUR_CHAR_CODE('chac')
 siActiveLevels = FOUR_CHAR_CODE('lmac')
--- 115,119 ----
 initSRateMask = 0x0030
 initStereoMask = 0x00C0
! initCompMask = 0xFF00
 siActiveChannels = FOUR_CHAR_CODE('chac')
 siActiveLevels = FOUR_CHAR_CODE('lmac')
***************
*** 201,209 ****
 siSupportedExtendedFlags = FOUR_CHAR_CODE('exfl')
 siRateConverterRollOffSlope = FOUR_CHAR_CODE('rcdb')
! siOutputLatency = FOUR_CHAR_CODE('olte') 
 siCloseDriver = FOUR_CHAR_CODE('clos')
 siInitializeDriver = FOUR_CHAR_CODE('init')
 siPauseRecording = FOUR_CHAR_CODE('paus')
! siUserInterruptProc = FOUR_CHAR_CODE('user') 
 # kInvalidSource = (long)0xFFFFFFFF
 kNoSource = FOUR_CHAR_CODE('none')
--- 201,209 ----
 siSupportedExtendedFlags = FOUR_CHAR_CODE('exfl')
 siRateConverterRollOffSlope = FOUR_CHAR_CODE('rcdb')
! siOutputLatency = FOUR_CHAR_CODE('olte')
 siCloseDriver = FOUR_CHAR_CODE('clos')
 siInitializeDriver = FOUR_CHAR_CODE('init')
 siPauseRecording = FOUR_CHAR_CODE('paus')
! siUserInterruptProc = FOUR_CHAR_CODE('user')
 # kInvalidSource = (long)0xFFFFFFFF
 kNoSource = FOUR_CHAR_CODE('none')
***************
*** 220,224 ****
 kZoomVideoSource = FOUR_CHAR_CODE('zvpc')
 kDVDSource = FOUR_CHAR_CODE('dvda')
! kMicrophoneArray = FOUR_CHAR_CODE('mica') 
 kNoSoundComponentType = FOUR_CHAR_CODE('****')
 kSoundComponentType = FOUR_CHAR_CODE('sift')
--- 220,224 ----
 kZoomVideoSource = FOUR_CHAR_CODE('zvpc')
 kDVDSource = FOUR_CHAR_CODE('dvda')
! kMicrophoneArray = FOUR_CHAR_CODE('mica')
 kNoSoundComponentType = FOUR_CHAR_CODE('****')
 kSoundComponentType = FOUR_CHAR_CODE('sift')
***************
*** 288,292 ****
 kLittleEndianFormat = k16BitLittleEndianFormat
 kMPEGLayer3Format = 0x6D730055
! kFullMPEGLay3Format = FOUR_CHAR_CODE('.mp3') 
 k16BitNativeEndianFormat = k16BitLittleEndianFormat
 k16BitNonNativeEndianFormat = k16BitBigEndianFormat
--- 288,292 ----
 kLittleEndianFormat = k16BitLittleEndianFormat
 kMPEGLayer3Format = 0x6D730055
! kFullMPEGLay3Format = FOUR_CHAR_CODE('.mp3')
 k16BitNativeEndianFormat = k16BitLittleEndianFormat
 k16BitNonNativeEndianFormat = k16BitBigEndianFormat
***************
*** 324,329 ****
 kPagingMixer = (1 << 12)
 kVMAwareMixer = (1 << 13)
! kExtendedSoundData = (1 << 14) 
! kBestQuality = (1 << 0) 
 kInputMask = 0x000000FF
 kOutputMask = 0x0000FF00
--- 324,329 ----
 kPagingMixer = (1 << 12)
 kVMAwareMixer = (1 << 13)
! kExtendedSoundData = (1 << 14)
! kBestQuality = (1 << 0)
 kInputMask = 0x000000FF
 kOutputMask = 0x0000FF00
***************
*** 338,342 ****
 kAVDisplayHeadphoneInsert = 1
 kAVDisplayPlainTalkRemove = 2
! kAVDisplayPlainTalkInsert = 3 
 audioAllChannels = 0
 audioLeftChannel = 1
--- 338,342 ----
 kAVDisplayHeadphoneInsert = 1
 kAVDisplayPlainTalkRemove = 2
! kAVDisplayPlainTalkInsert = 3
 audioAllChannels = 0
 audioLeftChannel = 1
***************
*** 346,364 ****
 audioDoesMono = (1L << 0)
 audioDoesStereo = (1L << 1)
! audioDoesIndependentChannels = (1L << 2) 
 siCDQuality = FOUR_CHAR_CODE('cd ')
 siBestQuality = FOUR_CHAR_CODE('best')
 siBetterQuality = FOUR_CHAR_CODE('betr')
 siGoodQuality = FOUR_CHAR_CODE('good')
! siNoneQuality = FOUR_CHAR_CODE('none') 
 siDeviceIsConnected = 1
 siDeviceNotConnected = 0
 siDontKnowIfConnected = -1
 siReadPermission = 0
! siWritePermission = 1 
 kSoundConverterDidntFillBuffer = (1 << 0)
! kSoundConverterHasLeftOverData = (1 << 1) 
 kExtendedSoundSampleCountNotValid = 1L << 0
! kExtendedSoundBufferSizeValid = 1L << 1 
 kScheduledSoundDoScheduled = 1 << 0
 kScheduledSoundDoCallBack = 1 << 1
--- 346,364 ----
 audioDoesMono = (1L << 0)
 audioDoesStereo = (1L << 1)
! audioDoesIndependentChannels = (1L << 2)
 siCDQuality = FOUR_CHAR_CODE('cd ')
 siBestQuality = FOUR_CHAR_CODE('best')
 siBetterQuality = FOUR_CHAR_CODE('betr')
 siGoodQuality = FOUR_CHAR_CODE('good')
! siNoneQuality = FOUR_CHAR_CODE('none')
 siDeviceIsConnected = 1
 siDeviceNotConnected = 0
 siDontKnowIfConnected = -1
 siReadPermission = 0
! siWritePermission = 1
 kSoundConverterDidntFillBuffer = (1 << 0)
! kSoundConverterHasLeftOverData = (1 << 1)
 kExtendedSoundSampleCountNotValid = 1L << 0
! kExtendedSoundBufferSizeValid = 1L << 1
 kScheduledSoundDoScheduled = 1 << 0
 kScheduledSoundDoCallBack = 1 << 1
Index: TextEdit.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/TextEdit.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextEdit.py	30 Dec 2002 22:04:21 -0000	1.1
--- TextEdit.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 8,12 ****
 teCenter = 1
 teFlushRight = -1
! teFlushLeft = -2 
 fontBit = 0
 faceBit = 1
--- 8,12 ----
 teCenter = 1
 teFlushRight = -1
! teFlushLeft = -2
 fontBit = 0
 faceBit = 1
***************
*** 14,18 ****
 clrBit = 3
 addSizeBit = 4
! toggleBit = 5 
 doFont = 1
 doFace = 2
--- 14,18 ----
 clrBit = 3
 addSizeBit = 4
! toggleBit = 5
 doFont = 1
 doFace = 2
***************
*** 21,25 ****
 doAll = 15
 addSize = 16
! doToggle = 32 
 EOLHook = 0
 DRAWHook = 4
--- 21,25 ----
 doAll = 15
 addSize = 16
! doToggle = 32
 EOLHook = 0
 DRAWHook = 4
***************
*** 27,31 ****
 HITTESTHook = 12
 nWIDTHHook = 24
! TextWidthHook = 28 
 intEOLHook = 0
 intDrawHook = 1
--- 27,31 ----
 HITTESTHook = 12
 nWIDTHHook = 24
! TextWidthHook = 28
 intEOLHook = 0
 intDrawHook = 1
***************
*** 35,39 ****
 intTextWidthHook = 7
 intInlineInputTSMTEPreUpdateHook = 8
! intInlineInputTSMTEPostUpdateHook = 9 
 teFAutoScroll = 0
 teFTextBuffering = 1
--- 35,39 ----
 intTextWidthHook = 7
 intInlineInputTSMTEPreUpdateHook = 8
! intInlineInputTSMTEPostUpdateHook = 9
 teFAutoScroll = 0
 teFTextBuffering = 1
***************
*** 42,57 ****
 teFUseWhiteBackground = 4
 teFUseInlineInput = 5
! teFInlineInputAutoScroll = 6 
! teFIdleWithEventLoopTimer = 7 
 teBitClear = 0
 teBitSet = 1
! teBitTest = -1 
 teWordSelect = 4
 teWordDrag = 8
 teFromFind = 12
! teFromRecal = 16 
 teFind = 0
 teHighlight = 1
 teDraw = -1
! teCaret = -2 
! teFUseTextServices = 4 
--- 42,57 ----
 teFUseWhiteBackground = 4
 teFUseInlineInput = 5
! teFInlineInputAutoScroll = 6
! teFIdleWithEventLoopTimer = 7
 teBitClear = 0
 teBitSet = 1
! teBitTest = -1
 teWordSelect = 4
 teWordDrag = 8
 teFromFind = 12
! teFromRecal = 16
 teFind = 0
 teHighlight = 1
 teDraw = -1
! teCaret = -2
! teFUseTextServices = 4
Index: Windows.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/Windows.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Windows.py	5 Dec 2003 23:59:37 -0000	1.2
--- Windows.py	18 Jul 2004 06:14:46 -0000	1.3
***************
*** 45,49 ****
 kStandardWindowDefinition = 0
 kRoundWindowDefinition = 1
! kFloatingWindowDefinition = 124 
 kDocumentWindowVariantCode = 0
 kModalDialogVariantCode = 1
--- 45,49 ----
 kStandardWindowDefinition = 0
 kRoundWindowDefinition = 1
! kFloatingWindowDefinition = 124
 kDocumentWindowVariantCode = 0
 kModalDialogVariantCode = 1
***************
*** 110,114 ****
 kWindowFloatSideFullZoomGrowProc = 1087
 kWindowSheetProc = 1088
! kWindowSheetAlertProc = 1120 
 kWindowSimpleProc = 1104
 kWindowSimpleFrameProc = 1105
--- 110,114 ----
 kWindowFloatSideFullZoomGrowProc = 1087
 kWindowSheetProc = 1088
! kWindowSheetAlertProc = 1120
 kWindowSimpleProc = 1104
 kWindowSimpleFrameProc = 1105
***************
*** 146,150 ****
 kWindowUpdateRgn = 34
 kWindowOpaqueRgn = 35
! kWindowGlobalPortRgn = 40 
 dialogKind = 2
 userKind = 8
--- 146,150 ----
 kWindowUpdateRgn = 34
 kWindowOpaqueRgn = 35
! kWindowGlobalPortRgn = 40
 dialogKind = 2
 userKind = 8
***************
*** 164,168 ****
 inProxyIcon = 12
 inToolbarButton = 13
! inStructure = 15 
 wNoHit = 0
 wInContent = 1
--- 164,168 ----
 inProxyIcon = 12
 inToolbarButton = 13
! inStructure = 15
 wNoHit = 0
 wInContent = 1
***************
*** 175,179 ****
 wInProxyIcon = 10
 wInToolbarButton = 11
! wInStructure = 13 
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
--- 175,179 ----
 wInProxyIcon = 10
 wInToolbarButton = 11
! wInStructure = 13
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
***************
*** 190,195 ****
 kWindowMsgSetupProxyDragImage = 12
 kWindowMsgStateChanged = 13
! kWindowMsgMeasureTitle = 14 
! kWindowMsgGetGrowImageRegion = 19 
 wDraw = 0
 wHit = 1
--- 190,195 ----
 kWindowMsgSetupProxyDragImage = 12
 kWindowMsgStateChanged = 13
! kWindowMsgMeasureTitle = 14
! kWindowMsgGetGrowImageRegion = 19
 wDraw = 0
 wHit = 1
***************
*** 215,219 ****
 kWindowSupportsGetGrowImageRegion = (1 << 13)
 kWindowDefSupportsColorGrafPort = 0x40000002
! kWindowIsOpaque = (1 << 14) 
 kWindowSupportsSetGrowImageRegion = (1 << 13)
 deskPatID = 16
--- 215,219 ----
 kWindowSupportsGetGrowImageRegion = (1 << 13)
 kWindowDefSupportsColorGrafPort = 0x40000002
! kWindowIsOpaque = (1 << 14)
 kWindowSupportsSetGrowImageRegion = (1 << 13)
 deskPatID = 16
***************
*** 229,236 ****
 kStoredWindowSystemTag = FOUR_CHAR_CODE('appl')
 kStoredBasicWindowDescriptionID = FOUR_CHAR_CODE('sbas')
! kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255') 
 kWindowDefProcPtr = 0
 kWindowDefObjectClass = 1
! kWindowDefProcID = 2 
 kWindowModalityNone = 0
 kWindowModalitySystemModal = 1
--- 229,236 ----
 kStoredWindowSystemTag = FOUR_CHAR_CODE('appl')
 kStoredBasicWindowDescriptionID = FOUR_CHAR_CODE('sbas')
! kStoredWindowPascalTitleID = FOUR_CHAR_CODE('s255')
 kWindowDefProcPtr = 0
 kWindowDefObjectClass = 1
! kWindowDefProcID = 2
 kWindowModalityNone = 0
 kWindowModalitySystemModal = 1
***************
*** 253,257 ****
 kScrollWindowNoOptions = 0
 kScrollWindowInvalidate = (1L << 0)
! kScrollWindowEraseToPortBackground = (1L << 1) 
 kWindowMenuIncludeRotate = 1 << 0
 kWindowZoomTransitionEffect = 1
--- 253,257 ----
 kScrollWindowNoOptions = 0
 kScrollWindowInvalidate = (1L << 0)
! kScrollWindowEraseToPortBackground = (1L << 1)
 kWindowMenuIncludeRotate = 1 << 0
 kWindowZoomTransitionEffect = 1
***************
*** 274,278 ****
 kWindowLatentVisibleCollapsedOwner = 1 << 4
 kWindowLatentVisibleCollapsedGroup = 1 << 5
! kWindowPropertyPersistent = 0x00000001 
 kWindowGroupAttrSelectable = kWindowGroupAttrSelectAsLayer
 kWindowGroupAttrPositionFixed = kWindowGroupAttrMoveTogether
--- 274,278 ----
 kWindowLatentVisibleCollapsedOwner = 1 << 4
 kWindowLatentVisibleCollapsedGroup = 1 << 5
! kWindowPropertyPersistent = 0x00000001
 kWindowGroupAttrSelectable = kWindowGroupAttrSelectAsLayer
 kWindowGroupAttrPositionFixed = kWindowGroupAttrMoveTogether
Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/Carbon/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py	30 Dec 2002 22:04:21 -0000	1.1
--- __init__.py	18 Jul 2004 06:14:46 -0000	1.2
***************
*** 1 ****
! # Filter out warnings about signed/unsigned constants
import warnings
warnings.filterwarnings("ignore", "", FutureWarning, ".*Controls")
warnings.filterwarnings("ignore", "", FutureWarning, ".*MacTextEditor")
\ No newline at end of file
--- 1 ----
! # Filter out warnings about signed/unsigned constants
import warnings
warnings.filterwarnings("ignore", "", FutureWarning, ".*Controls")
warnings.filterwarnings("ignore", "", FutureWarning, ".*MacTextEditor")


More information about the Python-checkins mailing list

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