Reverting to previous version, which works. And I don't really care about
the new waste functionality because it's probably going to be dropped
anyway.
diff --git a/Lib/plat-mac/Carbon/WASTEconst.py b/Lib/plat-mac/Carbon/WASTEconst.py
index f674e60..dc73905 100644
--- a/Lib/plat-mac/Carbon/WASTEconst.py
+++ b/Lib/plat-mac/Carbon/WASTEconst.py
@@ -51,7 +51,6 @@
kTrailingEdge = 0
kObjectEdge = 2
weFAutoScroll = 0
-weFAutoIdle = 1
weFOutlineHilite = 2
weFReadOnly = 5
weFUndo = 6
@@ -63,13 +62,10 @@
weFInhibitRedraw = 12
weFMonoStyled = 13
weFMultipleUndo = 14
-weFLeftMarginClick = 16
-weFNoAutoTabForHangingIndent = 28
weFNoKeyboardSync = 29
weFInhibitICSupport = 30
weFInhibitColor = 31
# weDoAutoScroll = 1UL << weFAutoScroll
-weDoAutoIdle = 1UL << weFAutoIdle
# weDoOutlineHilite = 1UL << weFOutlineHilite
# weDoReadOnly = 1UL << weFReadOnly
# weDoUndo = 1UL << weFUndo
@@ -81,8 +77,6 @@
# weDoInhibitRedraw = 1UL << weFInhibitRedraw
# weDoMonoStyled = 1UL << weFMonoStyled
# weDoMultipleUndo = 1UL << weFMultipleUndo
-weDoLeftMarginClick = 1UL << weFLeftMarginClick
-weDoNoAutoTabForHangingIndent = 1UL << weFNoAutoTabForHangingIndent
# weDoNoKeyboardSync = 1UL << weFNoKeyboardSync
# weDoInhibitICSupport = 1UL << weFInhibitICSupport
# weDoInhibitColor = 1UL << weFInhibitColor
@@ -92,9 +86,6 @@
weBitSet = 1
weLowerCase = 0
weUpperCase = 1
-weRedWigglyUnderline = 29303
-weGreenWigglyUnderline = 26487
-weOrangeWigglyUnderline = 28535
weFindWholeWords = 0x00000001
weFindCaseInsensitive = 0x00000002
weFindDiacriticalInsensitive = 0x00000004
@@ -103,13 +94,8 @@
wePutDetectUnicodeBOM = 0x00000200
weStreamDestinationKindMask = 0x000000FF
weStreamIncludeObjects = 0x00000100
-weCopyPromiseFlavors = 0x00000001
weGetAddUnicodeBOM = 0x00000200
weGetLittleEndian = 0x00000400
-weSaveAddResources = 0x00000001
-weSaveCompatibilityResources = 0x00000002
-weSaveLittleEndian = 0x00000004
-kWASTECreator = FOUR_CHAR_CODE('OEDE')
weTagFontFamily = FOUR_CHAR_CODE('font')
weTagFontSize = FOUR_CHAR_CODE('ptsz')
weTagPlain = FOUR_CHAR_CODE('plan')
@@ -121,19 +107,10 @@
weTagCondensed = FOUR_CHAR_CODE('cond')
weTagExtended = FOUR_CHAR_CODE('pexp')
weTagStrikethrough = FOUR_CHAR_CODE('strk')
-weTagHidden = FOUR_CHAR_CODE('hidn')
-weTagAllCaps = FOUR_CHAR_CODE('alcp')
-weTagAllLowercase = FOUR_CHAR_CODE('lowc')
weTagTextColor = FOUR_CHAR_CODE('colr')
weTagBackgroundColor = FOUR_CHAR_CODE('pbcl')
weTagTransferMode = FOUR_CHAR_CODE('pptm')
weTagVerticalShift = FOUR_CHAR_CODE('xshf')
-weTagLanguage = FOUR_CHAR_CODE('lang')
-weTagUnderlineStyle = FOUR_CHAR_CODE('unds')
-weTagSmallCaps = FOUR_CHAR_CODE('smcp')
-weTagDoubleStrikethrough = FOUR_CHAR_CODE('dstr')
-weTagEmbossed = FOUR_CHAR_CODE('embo')
-weTagEngraved = FOUR_CHAR_CODE('engr')
weTagAlignment = FOUR_CHAR_CODE('pjst')
weTagDirection = FOUR_CHAR_CODE('LDIR')
weTagLineSpacing = FOUR_CHAR_CODE('ledg')
@@ -142,66 +119,28 @@
weTagFirstLineIndent = FOUR_CHAR_CODE('fidt')
weTagSpaceBefore = FOUR_CHAR_CODE('spbe')
weTagSpaceAfter = FOUR_CHAR_CODE('spaf')
-weTagTabList = FOUR_CHAR_CODE('tabs')
weTagBottomBorderStyle = FOUR_CHAR_CODE('BBRD')
-weTagKeepTogether = FOUR_CHAR_CODE('keep')
-weTagKeepWithNext = FOUR_CHAR_CODE('kepn')
-weTagPageBreakBefore = FOUR_CHAR_CODE('pbrb')
-weTagWidowOrphanOverride = FOUR_CHAR_CODE('wdov')
-weTagWidowOrphanControl = FOUR_CHAR_CODE('wido')
-weTagNoLineNumbering = FOUR_CHAR_CODE('!ln#')
-weTagNoHyphenation = FOUR_CHAR_CODE('!hyp')
-weTagParagraphUserData = FOUR_CHAR_CODE('pusr')
weTagForceFontFamily = FOUR_CHAR_CODE('ffnt')
weTagAddFontSize = FOUR_CHAR_CODE('+siz')
weTagAddVerticalShift = FOUR_CHAR_CODE('+shf')
-weTagAddLeftIndent = FOUR_CHAR_CODE('+lei')
-weTagAddRightIndent = FOUR_CHAR_CODE('+rii')
-weTagAddFirstLineIndent = FOUR_CHAR_CODE('+fid')
-weTagAddSpaceBefore = FOUR_CHAR_CODE('+spb')
-weTagAddSpaceAfter = FOUR_CHAR_CODE('+spa')
-weTagAddLineSpacing = FOUR_CHAR_CODE('+led')
weTagTextEncoding = FOUR_CHAR_CODE('ptxe')
weTagQDStyles = FOUR_CHAR_CODE('qdst')
weTagTETextStyle = FOUR_CHAR_CODE('tets')
-weTagRunDirection = FOUR_CHAR_CODE('rdir')
-weTagUnderlineDefault = FOUR_CHAR_CODE('deft')
-weTagUnderlineWord = FOUR_CHAR_CODE('word')
-weTagUnderlineDouble = FOUR_CHAR_CODE('dubl')
-weTagUnderlineThick = FOUR_CHAR_CODE('thck')
-weTagUnderlineDash = FOUR_CHAR_CODE('- ')
-weTagUnderlineDot = FOUR_CHAR_CODE('. ')
-weTagUnderlineDotDash = FOUR_CHAR_CODE('.- ')
-weTagUnderlineDotDotDash = FOUR_CHAR_CODE('..- ')
-weTagUnderlineWave = FOUR_CHAR_CODE('wave')
weTagAlignmentDefault = FOUR_CHAR_CODE('deft')
weTagAlignmentLeft = FOUR_CHAR_CODE('left')
weTagAlignmentCenter = FOUR_CHAR_CODE('cent')
weTagAlignmentRight = FOUR_CHAR_CODE('rght')
weTagAlignmentFull = FOUR_CHAR_CODE('full')
-weTagAlignmentDecimal = FOUR_CHAR_CODE('decm')
weTagDirectionDefault = FOUR_CHAR_CODE('deft')
weTagDirectionLeftToRight = FOUR_CHAR_CODE('L->R')
weTagDirectionRightToLeft = FOUR_CHAR_CODE('R->L')
-weTagLeaderNone = FOUR_CHAR_CODE('NONE')
-weTagLeaderDots = FOUR_CHAR_CODE('DOTS')
-weTagLeaderHyphens = FOUR_CHAR_CODE('HYPH')
-weTagLeaderUnderline = FOUR_CHAR_CODE('UNDL')
-weTagLeaderThickLine = FOUR_CHAR_CODE('THKL')
-weTagLeaderEqualSigns = FOUR_CHAR_CODE('= ')
weTagBorderStyleNone = FOUR_CHAR_CODE('NONE')
weTagBorderStyleThin = FOUR_CHAR_CODE('SLDL')
weTagBorderStyleDotted = FOUR_CHAR_CODE('DTDL')
weTagBorderStyleThick = FOUR_CHAR_CODE('THKL')
-weTagLineSpacingAbsolute = FOUR_CHAR_CODE('abso')
-weTagLineSpacingAtLeast = FOUR_CHAR_CODE('atle')
-weTagLineSpacingRelative = FOUR_CHAR_CODE('rele')
weLineSpacingSingle = 0x00000000
weLineSpacingOneAndHalf = 0x00008000
weLineSpacingDouble = 0x00010000
-weAutoScrollDelay = FOUR_CHAR_CODE('ausd')
-weBusyProc = FOUR_CHAR_CODE('busy')
-weBusyInterval = FOUR_CHAR_CODE('bzin')
weCharByteHook = FOUR_CHAR_CODE('cbyt')
weCharToPixelHook = FOUR_CHAR_CODE('c2p ')
weCharTypeHook = FOUR_CHAR_CODE('ctyp')
@@ -226,7 +165,6 @@
weTSMDocumentID = FOUR_CHAR_CODE('tsmd')
weTSMPreUpdate = FOUR_CHAR_CODE('pre ')
weTSMPostUpdate = FOUR_CHAR_CODE('post')
-weUndoProc = FOUR_CHAR_CODE('undo')
weURLHint = FOUR_CHAR_CODE('urlh')
weWordBreakHook = FOUR_CHAR_CODE('wbrk')
weNewHandler = FOUR_CHAR_CODE('new ')
@@ -246,8 +184,6 @@
kTypeUnicodeText = FOUR_CHAR_CODE('utxt')
kTypeUTF8Text = FOUR_CHAR_CODE('UTF8')
kTypeStyledText = FOUR_CHAR_CODE('STXT')
-kTypeRTF = FOUR_CHAR_CODE('RTF ')
-kTypeRTFD = FOUR_CHAR_CODE('RTFD')
weAKNone = 0
weAKUnspecified = 1
weAKTyping = 2
@@ -261,30 +197,11 @@
weAKFwdDelete = 10
weAKCaseChange = 11
weAKObjectChange = 12
-weUndoNewAction = 0
-weUndoNewSubAction = 1
-weUndoBeginSequence = 2
weToScrap = 0
weToDrag = 1
weToSoup = 2
weMouseEnter = 0
weMouseWithin = 1
weMouseLeave = 2
-weBusyRecalBreaks = 0
-weCreatorDocumentInfo = FOUR_CHAR_CODE('Info')
-weTagDocumentTitle = FOUR_CHAR_CODE('Titl')
-weTagDocumentSubject = FOUR_CHAR_CODE('Subj')
-weTagDocumentAuthor = FOUR_CHAR_CODE('Auth')
-weTagDocumentManager = FOUR_CHAR_CODE('Mngr')
-weTagDocumentCompany = FOUR_CHAR_CODE('Cmpy')
-weTagDocumentCategory = FOUR_CHAR_CODE('Ctgy')
-weTagDocumentKeywords = FOUR_CHAR_CODE('Keyw')
-weTagDocumentComments = FOUR_CHAR_CODE('Cmnt')
-weTagDocumentOperator = FOUR_CHAR_CODE('Oper')
-weTagDocumentBaseAddress = FOUR_CHAR_CODE('Hlnk')
-weTagPageInfo = FOUR_CHAR_CODE('Page')
-weTagMacPrintRecord = FOUR_CHAR_CODE('PRec')
kCurrentSelection = -1
kNullStyle = -2
-kMaxTabCount = 20
-kMaxLanguageTagSize = 32