Fixed a few declarations.

diff --git a/Mac/Lib/lib-toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
index 217c3f5b673685e9b113e9e779a715b9d5533ed6..5f7ad03a1d936407b2b9f6df37db9ad70021bf1f 100644 (file)
--- a/Mac/Lib/lib-toolbox/Fonts.py
+++ b/Mac/Lib/lib-toolbox/Fonts.py
@@ -1,5 +1,7 @@
-# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h'
+# Generated from "Sap:Programma's:Metrowerks CodeWarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Fonts.h"
 
+def FOUR_CHAR_CODE(x): return x
+kNilOptions = 0
 systemFont = 0
 applFont = 1
 kPlatformDefaultGuiFontID = applFont

diff --git a/Mac/Lib/lib-toolbox/Icons.py b/Mac/Lib/lib-toolbox/Icons.py
index 1b02a4a99dd495bb8b40121c1457256169158f7b..0bb969512e93ea9bc43e7d379cda28e13454a246 100644 (file)
--- a/Mac/Lib/lib-toolbox/Icons.py
+++ b/Mac/Lib/lib-toolbox/Icons.py
@@ -1,4 +1,4 @@
-# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h'
+# Generated from "Sap:Programma's:Metrowerks CodeWarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Icons.h"
 
 def FOUR_CHAR_CODE(x): return x
 kGenericDocumentIconResource = -4000
@@ -208,7 +208,7 @@ svAll4BitData = kSelectorAll4BitData
 svAll8BitData = kSelectorAll8BitData
 # svAllAvailableData = kSelectorAllAvailableData
 kSystemIconsCreator = FOUR_CHAR_CODE('macs')
-err = GetIconRef(kOnSystemDisk
+# err = GetIconRef(kOnSystemDisk
 kClipboardIcon = FOUR_CHAR_CODE('CLIP')
 kClippingUnknownTypeIcon = FOUR_CHAR_CODE('clpu')
 kClippingPictureTypeIcon = FOUR_CHAR_CODE('clpp')
@@ -277,35 +277,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\9f')
 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\9f')
 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\9f')
 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('\9fhlp')
+kInternetFolderIcon = FOUR_CHAR_CODE('int\9f')
+kInternetPlugInFolderIcon = FOUR_CHAR_CODE('\9fnet')
+kLocalesFolderIcon = FOUR_CHAR_CODE('\9floc')
+kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('mor\9f')
+kPreferencesFolderIcon = FOUR_CHAR_CODE('prf\9f')
 kPrinterDescriptionFolderIcon = FOUR_CHAR_CODE('ppdf')
-kPrinterDriverFolderIcon = FOUR_CHAR_CODE('Äprd')
+kPrinterDriverFolderIcon = FOUR_CHAR_CODE('\9fprd')
 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('\9fscr')
+kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('\9flib')
+kScriptsFolderIcon = FOUR_CHAR_CODE('scr\9f')
 kShutdownItemsDisabledFolderIcon = FOUR_CHAR_CODE('shdD')
 kShutdownItemsFolderIcon = FOUR_CHAR_CODE('shdf')
 kSpeakableItemsFolder = FOUR_CHAR_CODE('spki')
@@ -313,13 +313,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('\9ftex')
 kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
-kUtilitiesFolderIcon = FOUR_CHAR_CODE('utiÄ')
+kUtilitiesFolderIcon = FOUR_CHAR_CODE('uti\9f')
 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\9f')
 kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
 kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
 kMountedBadgeIcon = FOUR_CHAR_CODE('mbdg')

diff --git a/Mac/Modules/fm/fmscan.py b/Mac/Modules/fm/fmscan.py
index 9c9cab9bc753861648eb773e37e3400ff8d53f6a..02f8ec226a31bef4db246529e84896469cc58d1b 100644 (file)
--- a/Mac/Modules/fm/fmscan.py
+++ b/Mac/Modules/fm/fmscan.py
@@ -59,5 +59,9 @@ class MyScanner(Scanner):
                        ([('FMetricRecPtr', 'theMetrics', 'InMode')], [('FMetricRecPtr', 'theMetrics', 'OutMode')]),
                        ]
                        
+       def writeinitialdefs(self):
+               self.defsfile.write("def FOUR_CHAR_CODE(x): return x\n")
+               self.defsfile.write("kNilOptions = 0\n")
+
 if __name__ == "__main__":
        main()

diff --git a/Mac/Modules/icn/icnscan.py b/Mac/Modules/icn/icnscan.py
index 4dbccfe4f99286a8fc08bbdae01dc309bca3b238..3b24a6df6fdcbcb12c70e161fdd5528db0fe47fa 100644 (file)
--- a/Mac/Modules/icn/icnscan.py
+++ b/Mac/Modules/icn/icnscan.py
@@ -43,6 +43,8 @@ class MyScanner(Scanner):
                        "kSelectorAllHugeData",
                        "kSelectorAllAvailableData",
                        "svAllAvailableData",
+                       # Something in a comment accidentally seen as a const definition
+                       "err",
                        ]
 
        def makegreylist(self):