6 files changed, 61 insertions, 59 deletions
diff --git a/Mac/Lib/Carbon/AppleEvents.py b/Mac/Lib/Carbon/AppleEvents.py
index e887ea0..68dfc79 100644
--- a/Mac/Lib/Carbon/AppleEvents.py
+++ b/Mac/Lib/Carbon/AppleEvents.py
@@ -710,7 +710,7 @@ 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½')
+kAEISWebStarSuite = FOUR_CHAR_CODE('WWW\xbd')
 kAEISGetURL = FOUR_CHAR_CODE('gurl')
 KAEISHandleCGI = FOUR_CHAR_CODE('sdoc')
 cURL = FOUR_CHAR_CODE('url ')
diff --git a/Mac/Lib/Carbon/Controls.py b/Mac/Lib/Carbon/Controls.py
index 9cb74ba..23a2b9e 100644
--- a/Mac/Lib/Carbon/Controls.py
+++ b/Mac/Lib/Carbon/Controls.py
@@ -1,14 +1,14 @@
 # Generated from 'Controls.h'
 
 def FOUR_CHAR_CODE(x): return x
-from TextEdit import *
-from QuickDraw import *
-from Dragconst import *
-from CarbonEvents import *
-from Appearance import *
+from Carbon.TextEdit import *
+from Carbon.QuickDraw import *
+from Carbon.Dragconst import *
+from Carbon.CarbonEvents import *
+from Carbon.Appearance import *
 kDataBrowserItemAnyState = -1
 kControlBevelButtonCenterPopupGlyphTag = -1
-kDataBrowserClientPropertyFlagsMask = 0xFF << 24  # kDataBrowserClientPropertyFlagsOffset
+kDataBrowserClientPropertyFlagsMask = 0xFF000000
 
 kControlDefProcType = FOUR_CHAR_CODE('CDEF')
 kControlTemplateResourceType = FOUR_CHAR_CODE('CNTL')
diff --git a/Mac/Lib/Carbon/Dragconst.py b/Mac/Lib/Carbon/Dragconst.py
index ae2d616..f08f478 100644
--- a/Mac/Lib/Carbon/Dragconst.py
+++ b/Mac/Lib/Carbon/Dragconst.py
@@ -1,8 +1,8 @@
 # Generated from 'Drag.h'
 
 def FOUR_CHAR_CODE(x): return x
-from TextEdit import *
-from QuickDraw import *
+from Carbon.TextEdit import *
+from Carbon.QuickDraw import *
 
 
 kDragHasLeftSenderWindow	= (1 << 0)
diff --git a/Mac/Lib/Carbon/Icons.py b/Mac/Lib/Carbon/Icons.py
index e47e733..5a03dac 100644
--- a/Mac/Lib/Carbon/Icons.py
+++ b/Mac/Lib/Carbon/Icons.py
@@ -279,35 +279,35 @@ kGuestUserIcon = FOUR_CHAR_CODE('gusr')
 kUserIcon = FOUR_CHAR_CODE('user')
 kOwnerIcon = FOUR_CHAR_CODE('susr')
 kGroupIcon = FOUR_CHAR_CODE('grup')
-kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aex€')
+kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aex\xc4')
 kAppleMenuFolderIcon = FOUR_CHAR_CODE('amnu')
 kApplicationsFolderIcon = FOUR_CHAR_CODE('apps')
 kApplicationSupportFolderIcon = FOUR_CHAR_CODE('asup')
-kAssistantsFolderIcon = FOUR_CHAR_CODE('ast€')
+kAssistantsFolderIcon = FOUR_CHAR_CODE('ast\xc4')
 kContextualMenuItemsFolderIcon = FOUR_CHAR_CODE('cmnu')
 kControlPanelDisabledFolderIcon = FOUR_CHAR_CODE('ctrD')
 kControlPanelFolderIcon = FOUR_CHAR_CODE('ctrl')
-kControlStripModulesFolderIcon = FOUR_CHAR_CODE('sdv€')
+kControlStripModulesFolderIcon = FOUR_CHAR_CODE('sdv\xc4')
 kDocumentsFolderIcon = FOUR_CHAR_CODE('docs')
 kExtensionsDisabledFolderIcon = FOUR_CHAR_CODE('extD')
 kExtensionsFolderIcon = FOUR_CHAR_CODE('extn')
 kFavoritesFolderIcon = FOUR_CHAR_CODE('favs')
 kFontsFolderIcon = FOUR_CHAR_CODE('font')
-kHelpFolderIcon = FOUR_CHAR_CODE('€hlp')
-kInternetFolderIcon = FOUR_CHAR_CODE('int€')
-kInternetPlugInFolderIcon = FOUR_CHAR_CODE('€net')
-kLocalesFolderIcon = FOUR_CHAR_CODE('€loc')
-kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('mor€')
-kPreferencesFolderIcon = FOUR_CHAR_CODE('prf€')
+kHelpFolderIcon = FOUR_CHAR_CODE('\xc4hlp')
+kInternetFolderIcon = FOUR_CHAR_CODE('int\xc4')
+kInternetPlugInFolderIcon = FOUR_CHAR_CODE('\xc4net')
+kLocalesFolderIcon = FOUR_CHAR_CODE('\xc4loc')
+kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('mor\xc4')
+kPreferencesFolderIcon = FOUR_CHAR_CODE('prf\xc4')
 kPrinterDescriptionFolderIcon = FOUR_CHAR_CODE('ppdf')
-kPrinterDriverFolderIcon = FOUR_CHAR_CODE('€prd')
+kPrinterDriverFolderIcon = FOUR_CHAR_CODE('\xc4prd')
 kPrintMonitorFolderIcon = FOUR_CHAR_CODE('prnt')
 kRecentApplicationsFolderIcon = FOUR_CHAR_CODE('rapp')
 kRecentDocumentsFolderIcon = FOUR_CHAR_CODE('rdoc')
 kRecentServersFolderIcon = FOUR_CHAR_CODE('rsrv')
-kScriptingAdditionsFolderIcon = FOUR_CHAR_CODE('€scr')
-kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('€lib')
-kScriptsFolderIcon = FOUR_CHAR_CODE('scr€')
+kScriptingAdditionsFolderIcon = FOUR_CHAR_CODE('\xc4scr')
+kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('\xc4lib')
+kScriptsFolderIcon = FOUR_CHAR_CODE('scr\xc4')
 kShutdownItemsDisabledFolderIcon = FOUR_CHAR_CODE('shdD')
 kShutdownItemsFolderIcon = FOUR_CHAR_CODE('shdf')
 kSpeakableItemsFolder = FOUR_CHAR_CODE('spki')
@@ -315,13 +315,13 @@ kStartupItemsDisabledFolderIcon = FOUR_CHAR_CODE('strD')
 kStartupItemsFolderIcon = FOUR_CHAR_CODE('strt')
 kSystemExtensionDisabledFolderIcon = FOUR_CHAR_CODE('macD')
 kSystemFolderIcon = FOUR_CHAR_CODE('macs')
-kTextEncodingsFolderIcon = FOUR_CHAR_CODE('€tex')
+kTextEncodingsFolderIcon = FOUR_CHAR_CODE('\xc4tex')
 kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
-kUtilitiesFolderIcon = FOUR_CHAR_CODE('uti€')
+kUtilitiesFolderIcon = FOUR_CHAR_CODE('uti\xc4')
 kVoicesFolderIcon = FOUR_CHAR_CODE('fvoc')
 kColorSyncFolderIcon = FOUR_CHAR_CODE('prof')
 kInternetSearchSitesFolderIcon = FOUR_CHAR_CODE('issf')
-kUsersFolderIcon = FOUR_CHAR_CODE('usr€')
+kUsersFolderIcon = FOUR_CHAR_CODE('usr\xc4')
 kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
 kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
 kMountedBadgeIcon = FOUR_CHAR_CODE('mbdg')
diff --git a/Mac/Lib/Carbon/MacTextEditor.py b/Mac/Lib/Carbon/MacTextEditor.py
index baa74cf..bf3ebe5 100644
--- a/Mac/Lib/Carbon/MacTextEditor.py
+++ b/Mac/Lib/Carbon/MacTextEditor.py
@@ -12,6 +12,8 @@ kTXNUseCurrentSelection = 0xFFFFFFFF
 kTXNStartOffset = 0
 kTXNEndOffset = 0x7FFFFFFF
 MovieFileType = FOUR_CHAR_CODE('moov')
+kTXNUseEncodingWordRulesMask = 0x80000000
+kTXNFontSizeAttributeSize = 4
 kTXNWillDefaultToATSUIBit = 0
 kTXNWillDefaultToATSUIMask = 1L << kTXNWillDefaultToATSUIBit
 kTXNWantMoviesBit = 0
@@ -83,7 +85,7 @@ kTXNEntireWordBit = 1
 kTXNUseEncodingWordRulesBit = 31
 kTXNIgnoreCaseMask = 1L << kTXNIgnoreCaseBit
 kTXNEntireWordMask = 1L << kTXNEntireWordBit
-kTXNUseEncodingWordRulesMask = (unsigned long)(1L << kTXNUseEncodingWordRulesBit)
+# kTXNUseEncodingWordRulesMask = (unsigned long)(1L << kTXNUseEncodingWordRulesBit)
 kTXNTextensionFile = FOUR_CHAR_CODE('txtn')
 kTXNTextFile = FOUR_CHAR_CODE('TEXT')
 kTXNPictureFile = FOUR_CHAR_CODE('PICT')
@@ -193,7 +195,7 @@ kTXNATSUIFontVariationsAttribute = FOUR_CHAR_CODE('atva')
 # kTXNQDFontStyleAttributeSize = sizeof(Style)
 # kTXNQDFontColorAttributeSize = sizeof(RGBColor)
 # kTXNTextEncodingAttributeSize = sizeof(TextEncoding)
-kTXNFontSizeAttributeSize = sizeof(Fixed)
+# kTXNFontSizeAttributeSize = sizeof(Fixed)
 kTXNSystemDefaultEncoding = 0
 kTXNMacOSEncoding = 1
 kTXNUnicodeEncoding = 2
diff --git a/Mac/Lib/Carbon/QuickTime.py b/Mac/Lib/Carbon/QuickTime.py
index 6757b0b..a6284ec 100644
--- a/Mac/Lib/Carbon/QuickTime.py
+++ b/Mac/Lib/Carbon/QuickTime.py
@@ -40,38 +40,38 @@ kCharacteristicCanStep = FOUR_CHAR_CODE('step')
 kCharacteristicHasNoDuration = FOUR_CHAR_CODE('noti')
 kUserDataMovieControllerType = FOUR_CHAR_CODE('ctyp')
 kUserDataName = FOUR_CHAR_CODE('name')
-kUserDataTextAlbum = FOUR_CHAR_CODE('©alb')
-kUserDataTextArtist = FOUR_CHAR_CODE('©ART')
-kUserDataTextAuthor = FOUR_CHAR_CODE('©aut')
-kUserDataTextChapter = FOUR_CHAR_CODE('©chp')
-kUserDataTextComment = FOUR_CHAR_CODE('©cmt')
-kUserDataTextComposer = FOUR_CHAR_CODE('©com')
-kUserDataTextCopyright = FOUR_CHAR_CODE('©cpy')
-kUserDataTextCreationDate = FOUR_CHAR_CODE('©day')
-kUserDataTextDescription = FOUR_CHAR_CODE('©des')
-kUserDataTextDirector = FOUR_CHAR_CODE('©dir')
-kUserDataTextDisclaimer = FOUR_CHAR_CODE('©dis')
-kUserDataTextEncodedBy = FOUR_CHAR_CODE('©enc')
-kUserDataTextFullName = FOUR_CHAR_CODE('©nam')
-kUserDataTextGenre = FOUR_CHAR_CODE('©gen')
-kUserDataTextHostComputer = FOUR_CHAR_CODE('©hst')
-kUserDataTextInformation = FOUR_CHAR_CODE('©inf')
-kUserDataTextKeywords = FOUR_CHAR_CODE('©key')
-kUserDataTextMake = FOUR_CHAR_CODE('©mak')
-kUserDataTextModel = FOUR_CHAR_CODE('©mod')
-kUserDataTextOriginalArtist = FOUR_CHAR_CODE('©ope')
-kUserDataTextOriginalFormat = FOUR_CHAR_CODE('©fmt')
-kUserDataTextOriginalSource = FOUR_CHAR_CODE('©src')
-kUserDataTextPerformers = FOUR_CHAR_CODE('©prf')
-kUserDataTextProducer = FOUR_CHAR_CODE('©prd')
-kUserDataTextProduct = FOUR_CHAR_CODE('©PRD')
-kUserDataTextSoftware = FOUR_CHAR_CODE('©swr')
-kUserDataTextSpecialPlaybackRequirements = FOUR_CHAR_CODE('©req')
-kUserDataTextTrack = FOUR_CHAR_CODE('©trk')
-kUserDataTextWarning = FOUR_CHAR_CODE('©wrn')
-kUserDataTextWriter = FOUR_CHAR_CODE('©wrt')
-kUserDataTextURLLink = FOUR_CHAR_CODE('©url')
-kUserDataTextEditDate1 = FOUR_CHAR_CODE('©ed1')
+kUserDataTextAlbum = FOUR_CHAR_CODE('\xa9alb')
+kUserDataTextArtist = FOUR_CHAR_CODE('\xa9ART')
+kUserDataTextAuthor = FOUR_CHAR_CODE('\xa9aut')
+kUserDataTextChapter = FOUR_CHAR_CODE('\xa9chp')
+kUserDataTextComment = FOUR_CHAR_CODE('\xa9cmt')
+kUserDataTextComposer = FOUR_CHAR_CODE('\xa9com')
+kUserDataTextCopyright = FOUR_CHAR_CODE('\xa9cpy')
+kUserDataTextCreationDate = FOUR_CHAR_CODE('\xa9day')
+kUserDataTextDescription = FOUR_CHAR_CODE('\xa9des')
+kUserDataTextDirector = FOUR_CHAR_CODE('\xa9dir')
+kUserDataTextDisclaimer = FOUR_CHAR_CODE('\xa9dis')
+kUserDataTextEncodedBy = FOUR_CHAR_CODE('\xa9enc')
+kUserDataTextFullName = FOUR_CHAR_CODE('\xa9nam')
+kUserDataTextGenre = FOUR_CHAR_CODE('\xa9gen')
+kUserDataTextHostComputer = FOUR_CHAR_CODE('\xa9hst')
+kUserDataTextInformation = FOUR_CHAR_CODE('\xa9inf')
+kUserDataTextKeywords = FOUR_CHAR_CODE('\xa9key')
+kUserDataTextMake = FOUR_CHAR_CODE('\xa9mak')
+kUserDataTextModel = FOUR_CHAR_CODE('\xa9mod')
+kUserDataTextOriginalArtist = FOUR_CHAR_CODE('\xa9ope')
+kUserDataTextOriginalFormat = FOUR_CHAR_CODE('\xa9fmt')
+kUserDataTextOriginalSource = FOUR_CHAR_CODE('\xa9src')
+kUserDataTextPerformers = FOUR_CHAR_CODE('\xa9prf')
+kUserDataTextProducer = FOUR_CHAR_CODE('\xa9prd')
+kUserDataTextProduct = FOUR_CHAR_CODE('\xa9PRD')
+kUserDataTextSoftware = FOUR_CHAR_CODE('\xa9swr')
+kUserDataTextSpecialPlaybackRequirements = FOUR_CHAR_CODE('\xa9req')
+kUserDataTextTrack = FOUR_CHAR_CODE('\xa9trk')
+kUserDataTextWarning = FOUR_CHAR_CODE('\xa9wrn')
+kUserDataTextWriter = FOUR_CHAR_CODE('\xa9wrt')
+kUserDataTextURLLink = FOUR_CHAR_CODE('\xa9url')
+kUserDataTextEditDate1 = FOUR_CHAR_CODE('\xa9ed1')
 kUserDataUnicodeBit = 1L << 7
 DoTheRightThing = 0
 kQTNetworkStatusNoNetwork = -2