summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-01-03 16:44:27 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-01-03 16:44:27 (GMT)
commitb55e5f1b62534786cf7e5be9fe25473a78613b83 (patch)
tree0d7a823ef3fd4b487343627c2199f294d749a692
parent2d4ac208b595083cd3229da368294f34977e5cfa (diff)
downloadcpython-b55e5f1b62534786cf7e5be9fe25473a78613b83.zip
cpython-b55e5f1b62534786cf7e5be9fe25473a78613b83.tar.gz
cpython-b55e5f1b62534786cf7e5be9fe25473a78613b83.tar.bz2
Fixed a few declarations.
-rw-r--r--Mac/Lib/lib-toolbox/Fonts.py4
-rw-r--r--Mac/Lib/lib-toolbox/Icons.py36
-rw-r--r--Mac/Modules/fm/fmscan.py4
-rw-r--r--Mac/Modules/icn/icnscan.py2
4 files changed, 27 insertions, 19 deletions
diff --git a/Mac/Lib/lib-toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
index 217c3f5..5f7ad03 100644
--- 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 1b02a4a..0bb9695 100644
--- 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Ÿ')
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Ÿ')
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Ÿ')
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('Ÿ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Ÿ')
kPrinterDescriptionFolderIcon = FOUR_CHAR_CODE('ppdf')
-kPrinterDriverFolderIcon = FOUR_CHAR_CODE('Äprd')
+kPrinterDriverFolderIcon = FOUR_CHAR_CODE('Ÿprd')
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('Ÿscr')
+kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('Ÿlib')
+kScriptsFolderIcon = FOUR_CHAR_CODE('scrŸ')
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('Ÿtex')
kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
-kUtilitiesFolderIcon = FOUR_CHAR_CODE('utiÄ')
+kUtilitiesFolderIcon = FOUR_CHAR_CODE('utiŸ')
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Ÿ')
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 9c9cab9..02f8ec2 100644
--- 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 4dbccfe..3b24a6d 100644
--- 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):