Getting rid of pre-Carbon (MacOS8) support. All code depending on
TARGET_API_MAC_OS8 (or !TARGET_API_MAC_CARBON) is gone. Also some
TARGET_API_MAC_OSX conditional code is gone, because it is no longer
used on OSX-only Python (only in MacPython-OS9).
diff --git a/Mac/Modules/menu/menuscan.py b/Mac/Modules/menu/menuscan.py
index 60c6915..281cc86 100644
--- a/Mac/Modules/menu/menuscan.py
+++ b/Mac/Modules/menu/menuscan.py
@@ -44,80 +44,21 @@
"GetMenuTitle", # Funny arg/returnvalue
"SetMenuTitle",
"SetMenuTitleIcon", # void*
+ # OS8 calls:
+ 'GetMenuItemRefCon2',
+ 'SetMenuItemRefCon2',
+ 'EnableItem',
+ 'DisableItem',
+ 'CheckItem',
+ 'CountMItems',
+ 'OpenDeskAcc',
+ 'SystemEdit',
+ 'SystemMenu',
+ 'SetMenuFlash',
+ 'InitMenus',
+ 'InitProcMenu',
]
- def makegreylist(self):
- return [
- ('#if !TARGET_API_MAC_CARBON', [
- 'GetMenuItemRefCon2',
- 'SetMenuItemRefCon2',
- 'EnableItem',
- 'DisableItem',
- 'CheckItem',
- 'CountMItems',
- 'OpenDeskAcc',
- 'SystemEdit',
- 'SystemMenu',
- 'SetMenuFlash',
- 'InitMenus',
- 'InitProcMenu',
- ]),
- ('#if TARGET_API_MAC_CARBON', [
- 'DisposeMenuBar',
- 'DuplicateMenuBar',
- 'CreateNewMenu',
- 'GetFontFamilyFromMenuSelection',
- 'UpdateStandardFontMenu',
- 'CreateStandardFontMenu',
- 'RemoveMenuCommandProperty',
- 'GetMenuCommandPropertySize',
- 'IsMenuCommandEnabled',
- 'DisableMenuCommand',
- 'EnableMenuCommand',
- 'GetIndMenuItemWithCommandID',
- 'CountMenuItemsWithCommandID',
- 'MenuHasEnabledItems',
- 'EnableAllMenuItems',
- 'DisableAllMenuItems',
- 'ChangeMenuItemAttributes',
- 'GetMenuItemAttributes',
- 'ChangeMenuAttributes',
- 'GetMenuAttributes',
- 'ChangeMenuItemPropertyAttributes',
- 'GetMenuItemPropertyAttributes',
- 'AcquireRootMenu',
- 'UpdateInvalidMenuItems',
- 'InvalidateMenuItems',
- 'IsMenuItemInvalid',
- 'GetMenuCommandMark',
- 'SetMenuCommandMark',
- 'GetMenuType',
- 'SetMenuItemCommandKey',
- 'GetMenuItemCommandKey',
- 'SetMenuItemIndent',
- 'GetMenuItemIndent',
- 'SetMenuItemTextWithCFString',
- 'CopyMenuItemTextAsCFString',
- 'GetMenuItemHierarchicalMenu',
- 'SetMenuItemHierarchicalMenu',
- 'SetRootMenu',
- 'IsMenuBarInvalid',
- 'InvalidateMenuEnabling',
- 'InsertMenuItemTextWithCFString',
- 'AppendMenuItemTextWithCFString',
- 'DeleteMenuItems',
- 'CopyMenuItems',
- 'IsMenuSizeInvalid',
- 'InvalidateMenuSize',
- 'SetMenuTitleWithCFString',
- 'CopyMenuTitleAsCFString',
- 'DuplicateMenu',
- 'ReleaseMenu',
- 'RetainMenu',
- 'GetMenuRetainCount',
- 'IsValidMenu',
- ])]
-
def makeblacklisttypes(self):
return [
'MCTableHandle',