[Python-checkins] CVS: python/dist/src/Mac/Modules/list _Listmodule.c,1.7,1.7.2.1 listscan.py,1.8,1.8.4.1 listsupport.py,1.13,1.13.4.1
Jack Jansen
jackjansen@users.sourceforge.net
2001年12月19日 07:10:48 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/list
In directory usw-pr-cvs1:/tmp/cvs-serv12554/Modules/list
Modified Files:
Tag: r22rc1-branch
_Listmodule.c listscan.py listsupport.py
Log Message:
Merged Mac subtree into the 22c1 branch.
Index: _Listmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/list/_Listmodule.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** _Listmodule.c 2001年12月08日 18:02:52 1.7
--- _Listmodule.c 2001年12月19日 15:10:15 1.7.2.1
***************
*** 6,11 ****
--- 6,15 ----
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
#include "macglue.h"
#include "pymactoolbox.h"
+ #endif
/* Macro to test whether a weak-loaded CFM function exists */
***************
*** 379,384 ****
Boolean _rv;
Point pt;
! short modifiers;
! if (!PyArg_ParseTuple(_args, "O&h",
PyMac_GetPoint, &pt,
&modifiers))
--- 383,388 ----
Boolean _rv;
Point pt;
! EventModifiers modifiers;
! if (!PyArg_ParseTuple(_args, "O&H",
PyMac_GetPoint, &pt,
&modifiers))
***************
*** 581,585 ****
"(Point cSize) -> None"},
{"LClick", (PyCFunction)ListObj_LClick, 1,
! "(Point pt, short modifiers) -> (Boolean _rv)"},
{"LAddToCell", (PyCFunction)ListObj_LAddToCell, 1,
"(Buffer dataPtr, Point theCell) -> None"},
--- 585,589 ----
"(Point cSize) -> None"},
{"LClick", (PyCFunction)ListObj_LClick, 1,
! "(Point pt, EventModifiers modifiers) -> (Boolean _rv)"},
{"LAddToCell", (PyCFunction)ListObj_LAddToCell, 1,
"(Buffer dataPtr, Point theCell) -> None"},
Index: listscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/list/listscan.py,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** listscan.py 2001年11月05日 08:27:57 1.8
--- listscan.py 2001年12月19日 15:10:15 1.8.4.1
***************
*** 57,60 ****
--- 57,61 ----
return [
"ListClickLoopUPP", # Too difficult for now
+ "ListDefSpecPtr", # later
]
Index: listsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/list/listsupport.py,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -d -r1.13 -r1.13.4.1
*** listsupport.py 2001年11月05日 11:12:12 1.13
--- listsupport.py 2001年12月19日 15:10:15 1.13.4.1
***************
*** 37,40 ****
--- 37,41 ----
Handle = OpaqueByValueType("Handle", "ResObj")
CGrafPtr = OpaqueByValueType("CGrafPtr", "GrafObj")
+ EventModifiers = Type("EventModifiers", "H")
includestuff = includestuff + """