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/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py
index eb6d789..f7bd888 100644
--- a/Mac/Modules/ctl/ctlscan.py
+++ b/Mac/Modules/ctl/ctlscan.py
@@ -94,160 +94,13 @@
# too lazy for now
'GetImageWellContentInfo',
'GetBevelButtonContentInfo',
+ # OS8 only
+ 'GetAuxiliaryControlRecord',
+ 'SetControlColor',
]
def makegreylist(self):
return [
- ('#if !TARGET_API_MAC_CARBON', [
- 'GetAuxiliaryControlRecord',
- 'SetControlColor',
- # These have suddenly disappeared in UH 3.3.2...
-## 'GetBevelButtonMenuValue',
-## 'SetBevelButtonMenuValue',
-## 'GetBevelButtonMenuHandle',
-## 'SetBevelButtonTransform',
-## 'SetImageWellTransform',
-## 'GetTabContentRect',
-## 'SetTabEnabled',
-## 'SetDisclosureTriangleLastValue',
- ]),
- ('#if TARGET_API_MAC_CARBON', [
- 'IsAutomaticControlDragTrackingEnabledForWindow',
- 'SetAutomaticControlDragTrackingEnabledForWindow',
- 'HandleControlDragReceive',
- 'HandleControlDragTracking',
- 'GetControlByID',
- 'IsControlDragTrackingEnabled',
- 'SetControlDragTrackingEnabled',
- 'GetControlPropertyAttributes',
- 'ChangeControlPropertyAttributes',
- 'GetControlID',
- 'SetControlID',
- 'HandleControlSetCursor',
- 'GetControlClickActivation',
- 'HandleControlContextualMenuClick',
-
- "CreateScrollBarControl",
- "CreateSliderControl",
- "CreateBevelButtonControl",
- "CreateImageWellControl",
- "CreatePictureControl",
- "CreateIconControl",
- "CreatePushButtonWithIconControl",
- "SetBevelButtonContentInfo",
- "SetImageWellContentInfo",
- "AddDataBrowserListViewColumn",
-
- "CreateDataBrowserControl",
- "CreateScrollingTextBoxControl",
- "CreateRadioGroupControl",
- "CreatePopupButtonControl",
- "CreateCheckBoxControl",
- "CreateRadioButtonControl",
- "CreatePushButtonControl",
- "CreateWindowHeaderControl",
- "CreateStaticTextControl",
- "CreateEditTextControl",
- "CreateUserPaneControl",
- "CreateClockControl",
- "CreatePlacardControl",
- "CreatePopupArrowControl",
- "CreatePopupGroupBoxControl",
- "CreateCheckGroupBoxControl",
- "CreateGroupBoxControl",
- "CreateSeparatorControl",
- "CreateChasingArrowsControl",
- "CreateLittleArrowsControl",
- "CreateProgressBarControl",
- "CreateDisclosureTriangleControl",
- "GetDataBrowserColumnViewDisplayType",
- "SetDataBrowserColumnViewDisplayType",
- "GetDataBrowserColumnViewPathLength",
- "GetDataBrowserColumnViewPath",
- "GetDataBrowserListViewDisclosureColumn",
- "SetDataBrowserListViewDisclosureColumn",
- "GetDataBrowserListViewUsePlainBackground",
- "SetDataBrowserListViewUsePlainBackground",
- "GetDataBrowserListViewHeaderBtnHeight",
- "SetDataBrowserListViewHeaderBtnHeight",
- "AutoSizeDataBrowserListViewColumns",
- "GetDataBrowserTableViewColumnProperty",
- "GetDataBrowserTableViewColumnPosition",
- "SetDataBrowserTableViewColumnPosition",
- "GetDataBrowserTableViewItemRow",
- "SetDataBrowserTableViewItemRow",
- "GetDataBrowserTableViewItemID",
- "GetDataBrowserTableViewGeometry",
- "SetDataBrowserTableViewGeometry",
- "GetDataBrowserTableViewNamedColumnWidth",
- "SetDataBrowserTableViewNamedColumnWidth",
- "GetDataBrowserTableViewItemRowHeight",
- "SetDataBrowserTableViewItemRowHeight",
- "GetDataBrowserTableViewColumnWidth",
- "SetDataBrowserTableViewColumnWidth",
- "GetDataBrowserTableViewRowHeight",
- "SetDataBrowserTableViewRowHeight",
- "GetDataBrowserTableViewHiliteStyle",
- "SetDataBrowserTableViewHiliteStyle",
- "GetDataBrowserTableViewColumnCount",
- "RemoveDataBrowserTableViewColumn",
- "GetDataBrowserItemPartBounds",
- "GetDataBrowserEditItem",
- "SetDataBrowserEditItem",
- "GetDataBrowserEditText",
- "SetDataBrowserEditText",
- "GetDataBrowserPropertyFlags",
- "SetDataBrowserPropertyFlags",
- "GetDataBrowserSelectionFlags",
- "SetDataBrowserSelectionFlags",
- "GetDataBrowserSortProperty",
- "SetDataBrowserSortProperty",
- "GetDataBrowserHasScrollBars",
- "SetDataBrowserHasScrollBars",
- "GetDataBrowserScrollPosition",
- "SetDataBrowserScrollPosition",
- "GetDataBrowserSortOrder",
- "SetDataBrowserSortOrder",
- "GetDataBrowserTarget",
- "SetDataBrowserTarget",
- "GetDataBrowserScrollBarInset",
- "SetDataBrowserScrollBarInset",
- "GetDataBrowserActiveItems",
- "SetDataBrowserActiveItems",
- "RevealDataBrowserItem",
- "GetDataBrowserItemState",
- "IsDataBrowserItemSelected",
- "GetDataBrowserItemCount",
- "GetDataBrowserItems",
- "SortDataBrowserContainer",
- "CloseDataBrowserContainer",
- "OpenDataBrowserContainer",
- "MoveDataBrowserSelectionAnchor",
- "GetDataBrowserSelectionAnchor",
- "ExecuteDataBrowserEditCommand",
- "EnableDataBrowserEditCommand",
- "SetDataBrowserViewStyle",
- "GetDataBrowserViewStyle",
- "GetControlCommandID",
- "SetControlCommandID",
- "CopyControlTitleAsCFString",
- "SetControlTitleWithCFString",
- ]),
- ('#if ACCESSOR_CALLS_ARE_FUNCTIONS', [
- # XXX These are silly, they should be #defined to access the fields
- # directly. Later...
- 'GetControlBounds',
- 'IsControlHilited',
- 'GetControlHilite',
- 'GetControlOwner',
- 'GetControlDataHandle',
- 'GetControlPopupMenuHandle',
- 'GetControlPopupMenuID',
- 'SetControlDataHandle',
- 'SetControlBounds',
- 'SetControlPopupMenuHandle',
- 'SetControlPopupMenuID',
- ]),
('#if TARGET_API_MAC_OSX', [
'CreateRoundButtonControl',
'CreateDisclosureButtonControl',