[Python-checkins] python/dist/src/Mac/Modules/ctl _Ctlmodule.c,1.21,1.22 ctlscan.py,1.30,1.31 ctlsupport.py,1.52,1.53
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Thu, 12 Dec 2002 02:32:22 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/ctl
In directory sc8-pr-cvs1:/tmp/cvs-serv21368/Modules/ctl
Modified Files:
_Ctlmodule.c ctlscan.py ctlsupport.py
Log Message:
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).
Index: _Ctlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/_Ctlmodule.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** _Ctlmodule.c 3 Dec 2002 23:40:19 -0000 1.21
--- _Ctlmodule.c 12 Dec 2002 10:31:50 -0000 1.22
***************
*** 40,48 ****
#define as_Control(h) ((ControlHandle)h)
#define as_Resource(ctl) ((Handle)ctl)
- #if TARGET_API_MAC_CARBON
#define GetControlRect(ctl, rectp) GetControlBounds(ctl, rectp)
- #else
- #define GetControlRect(ctl, rectp) (*(rectp) = ((*(ctl))->contrlRect))
- #endif
#define MAXTABS 32 /* maximum number of tabs that we support in a tabs control */
--- 40,44 ----
[...2260 lines suppressed...]
-
- #if TARGET_API_MAC_CARBON
{"CreateDataBrowserControl", (PyCFunction)Ctl_CreateDataBrowserControl, 1,
PyDoc_STR("(WindowPtr window, Rect boundsRect, OSType style) -> (ControlHandle outControl)")},
- #endif
#if TARGET_API_MAC_OSX
--- 5567,5572 ----
***************
*** 6466,6474 ****
{"as_Control", (PyCFunction)Ctl_as_Control, 1,
PyDoc_STR("(Handle h) -> (ControlHandle _rv)")},
-
- #if TARGET_API_MAC_CARBON
{"CreateTabsControl", (PyCFunction)Ctl_CreateTabsControl, 1,
PyDoc_STR("(WindowPtr window, Rect boundsRect, UInt16 size, UInt16 direction, ControlTabEntry tabArray) -> (ControlHandle outControl)")},
- #endif
{NULL, NULL, 0}
};
--- 5578,5583 ----
Index: ctlscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/ctlscan.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ctlscan.py 15 Aug 2002 22:05:58 -0000 1.30
--- ctlscan.py 12 Dec 2002 10:31:50 -0000 1.31
***************
*** 95,252 ****
'GetImageWellContentInfo',
'GetBevelButtonContentInfo',
]
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',
--- 95,105 ----
'GetImageWellContentInfo',
'GetBevelButtonContentInfo',
+ # OS8 only
+ 'GetAuxiliaryControlRecord',
+ 'SetControlColor',
]
def makegreylist(self):
return [
('#if TARGET_API_MAC_OSX', [
'CreateRoundButtonControl',
Index: ctlsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/ctlsupport.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ctlsupport.py 3 Dec 2002 23:40:19 -0000 1.52
--- ctlsupport.py 12 Dec 2002 10:31:50 -0000 1.53
***************
*** 133,141 ****
#define as_Control(h) ((ControlHandle)h)
#define as_Resource(ctl) ((Handle)ctl)
- #if TARGET_API_MAC_CARBON
#define GetControlRect(ctl, rectp) GetControlBounds(ctl, rectp)
- #else
- #define GetControlRect(ctl, rectp) (*(rectp) = ((*(ctl))->contrlRect))
- #endif
#define MAXTABS 32 /* maximum number of tabs that we support in a tabs control */
--- 133,137 ----
***************
*** 770,809 ****
object.add(f)
- # And manual generators to get/set popup menu information
- getpopupdata_body = """
- PopupPrivateDataHandle hdl;
-
- if ( (*_self->ob_itself)->contrlData == NULL ) {
- PyErr_SetString(Ctl_Error, "No contrlData handle in control");
- return 0;
- }
- hdl = (PopupPrivateDataHandle)(*_self->ob_itself)->contrlData;
- HLock((Handle)hdl);
- _res = Py_BuildValue("O&i", MenuObj_New, (*hdl)->mHandle, (int)(*hdl)->mID);
- HUnlock((Handle)hdl);
- return _res;
- """
- f = ManualGenerator("GetPopupData", getpopupdata_body, condition="#if !TARGET_API_MAC_CARBON")
- object.add(f)
-
- setpopupdata_body = """
- PopupPrivateDataHandle hdl;
- MenuHandle mHandle;
- short mID;
-
- if (!PyArg_ParseTuple(_args, "O&h", MenuObj_Convert, &mHandle, &mID) )
- return 0;
- if ( (*_self->ob_itself)->contrlData == NULL ) {
- PyErr_SetString(Ctl_Error, "No contrlData handle in control");
- return 0;
- }
- hdl = (PopupPrivateDataHandle)(*_self->ob_itself)->contrlData;
- (*hdl)->mHandle = mHandle;
- (*hdl)->mID = mID;
- Py_INCREF(Py_None);
- return Py_None;
- """
- f = ManualGenerator("SetPopupData", setpopupdata_body, condition="#if !TARGET_API_MAC_CARBON")
- object.add(f)
--- 766,769 ----
***************
*** 863,867 ****
return _res;"""
! f = ManualGenerator("CreateTabsControl", createtabscontrol_body, condition="#if TARGET_API_MAC_CARBON")
f.docstring = lambda: "(WindowPtr window, Rect boundsRect, UInt16 size, UInt16 direction, ControlTabEntry tabArray) -> (ControlHandle outControl)"
module.add(f)
--- 823,827 ----
return _res;"""
! f = ManualGenerator("CreateTabsControl", createtabscontrol_body)
f.docstring = lambda: "(WindowPtr window, Rect boundsRect, UInt16 size, UInt16 direction, ControlTabEntry tabArray) -> (ControlHandle outControl)"
module.add(f)