[Python-checkins] CVS: python/dist/src/Mac/Modules/waste wastemodule.c,1.21,1.21.4.1 wastescan.py,1.7,1.7.22.1 wastesupport.py,1.14,1.14.20.1
Jack Jansen
jackjansen@users.sourceforge.net
2002年3月10日 13:33:21 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/waste
In directory usw-pr-cvs1:/tmp/cvs-serv526
Modified Files:
Tag: release22-maint
wastemodule.c wastescan.py wastesupport.py
Log Message:
Backport of 1.22:
Use waste included with CW in stead of separate package.
(But a truer log message would have been "updated to current version of waste",
as in MachoPython we use a normal standalone separate Waste distribution).
Index: wastemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastemodule.c,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -C2 -d -r1.21 -r1.21.4.1
*** wastemodule.c 18 Dec 2001 15:36:13 -0000 1.21
--- wastemodule.c 10 Mar 2002 21:33:19 -0000 1.21.4.1
***************
*** 267,270 ****
--- 267,294 ----
}
+ static PyObject *WEOObj_WEGetObjectOwner(WEOObject *_self, PyObject *_args)
+ {
+ PyObject *_res = NULL;
+ WEReference _rv;
+ if (!PyArg_ParseTuple(_args, ""))
+ return NULL;
+ _rv = WEGetObjectOwner(_self->ob_itself);
[...2589 lines suppressed...]
--- 2425,2443 ----
"() -> None"},
{"WEHandleTSMEvent", (PyCFunction)waste_WEHandleTSMEvent, 1,
! "(AppleEvent inAppleEvent) -> (AppleEvent ioReply)"},
{"WELongPointToPoint", (PyCFunction)waste_WELongPointToPoint, 1,
! "(LongPt inLongPoint) -> (Point outPoint)"},
{"WEPointToLongPoint", (PyCFunction)waste_WEPointToLongPoint, 1,
! "(Point inPoint) -> (LongPt outLongPoint)"},
{"WESetLongRect", (PyCFunction)waste_WESetLongRect, 1,
! "(SInt32 inLeft, SInt32 inTop, SInt32 inRight, SInt32 inBottom) -> (LongRect outLongRect)"},
{"WELongRectToRect", (PyCFunction)waste_WELongRectToRect, 1,
! "(LongRect inLongRect) -> (Rect outRect)"},
{"WERectToLongRect", (PyCFunction)waste_WERectToLongRect, 1,
! "(Rect inRect) -> (LongRect outLongRect)"},
{"WEOffsetLongRect", (PyCFunction)waste_WEOffsetLongRect, 1,
! "(SInt32 inHorizontalOffset, SInt32 inVerticalOffset) -> (LongRect ioLongRect)"},
{"WELongPointInLongRect", (PyCFunction)waste_WELongPointInLongRect, 1,
! "(LongPt inLongPoint, LongRect inLongRect) -> (Boolean _rv)"},
{"STDObjectHandlers", (PyCFunction)waste_STDObjectHandlers, 1,
NULL},
Index: wastescan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastescan.py,v
retrieving revision 1.7
retrieving revision 1.7.22.1
diff -C2 -d -r1.7 -r1.7.22.1
*** wastescan.py 17 Apr 1998 14:07:55 -0000 1.7
--- wastescan.py 10 Mar 2002 21:33:19 -0000 1.7.22.1
***************
*** 5,12 ****
BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
sys.path.append(BGENDIR)
! from scantools import Scanner_PreUH3
from bgenlocations import MWERKSDIR, TOOLBOXDIR
! WASTEDIR=":::::Waste 1.3 Distribution:WASTE C/C++ Headers:"
OBJECT = "TEHandle"
--- 5,13 ----
BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
sys.path.append(BGENDIR)
! from scantools import Scanner
from bgenlocations import MWERKSDIR, TOOLBOXDIR
! #WASTEDIR=":::::Waste 1.3 Distribution:WASTE C/C++ Headers:"
! WASTEDIR=MWERKSDIR + 'MacOS Support:(Third Party Support):Waste 2.0 Distribution:C_C++ Headers:'
OBJECT = "TEHandle"
***************
*** 27,31 ****
print "=== Done. It's up to you to compile it now! ==="
! class MyScanner(Scanner_PreUH3):
def destination(self, type, name, arglist):
--- 28,33 ----
print "=== Done. It's up to you to compile it now! ==="
! #class MyScanner(Scanner_PreUH3):
! class MyScanner(Scanner):
def destination(self, type, name, arglist):
***************
*** 53,56 ****
--- 55,60 ----
"WEGetInfo",
"WEVersion", # Unfortunately...
+ "WEPut", # XXXX TBD: needs array of flavortypes.
+ "WEGetOneAttribute", # XXXX TBD: output buffer
]
***************
*** 61,64 ****
--- 65,96 ----
"WEFontIDToNameUPP",
"WEFontNameToIDUPP",
+ "WEClickLoopUPP",
+ "WEScrollUPP",
+ "WETSMPreUpdateUPP",
+ "WETSMPostUpdateUPP",
+ "WEPreTrackDragUPP",
+ "WETranslateDragUPP",
+ "WEHiliteDropAreaUPP",
+ "WEDrawTextUPP",
+ "WEDrawTSMHiliteUPP",
+ "WEPixelToCharUPP",
+ "WECharToPixelUPP",
+ "WELineBreakUPP",
+ "WEWordBreakUPP",
+ "WECharByteUPP",
+ "WECharTypeUPP",
+ "WEEraseUPP",
+ "WEFluxUPP",
+ "WENewObjectUPP",
+ "WEDisposeObjectUPP",
+ "WEDrawObjectUPP",
+ "WEClickObjectUPP",
+ "WEStreamObjectUPP",
+ "WEHoverObjectUPP",
+ "WERuler", # XXXX To be done
+ "WERuler_ptr", # ditto
+ "WEParaInfo", # XXXX To be done
+ "WEPrintSession", # XXXX To be done
+ "WEPrintOptions_ptr", # XXXX To be done
]
***************
*** 69,90 ****
# WEContinuousStyle
! ([("WEStyleMode", "mode", "OutMode"), ("TextStyle", "ts", "OutMode")],
! [("WEStyleMode", "mode", "InOutMode"), ("TextStyle", "ts", "OutMode")]),
# WECopyRange
! ([('Handle', 'hText', 'InMode'), ('StScrpHandle', 'hStyles', 'InMode'),
! ('WESoupHandle', 'hSoup', 'InMode')],
! [('OptHandle', 'hText', 'InMode'), ('OptStScrpHandle', 'hStyles', 'InMode'),
! ('OptSoupHandle', 'hSoup', 'InMode')]),
# WEInsert
! ([('StScrpHandle', 'hStyles', 'InMode'), ('WESoupHandle', 'hSoup', 'InMode')],
! [('OptStScrpHandle', 'hStyles', 'InMode'), ('OptSoupHandle', 'hSoup', 'InMode')]),
# WEGetObjectOwner
("WEGetObjectOwner",
[('WEReference', '*', 'ReturnMode')],
! [('ExistingWEReference', '*', 'ReturnMode')])
!
]
--- 101,129 ----
# WEContinuousStyle
! ([("WEStyleMode", "ioMode", "OutMode"), ("TextStyle", "outTextStyle", "OutMode")],
! [("WEStyleMode", "*", "InOutMode"), ("TextStyle", "*", "*")]),
# WECopyRange
! ([('Handle', 'outText', 'InMode'), ('StScrpHandle', 'outStyles', 'InMode'),
! ('WESoupHandle', 'outSoup', 'InMode')],
! [('OptHandle', '*', '*'), ('OptStScrpHandle', '*', '*'),
! ('OptSoupHandle', '*', '*')]),
# WEInsert
! ([('StScrpHandle', 'inStyles', 'InMode'), ('WESoupHandle', 'inSoup', 'InMode')],
! [('OptStScrpHandle', '*', '*'), ('OptSoupHandle', '*', '*')]),
# WEGetObjectOwner
("WEGetObjectOwner",
[('WEReference', '*', 'ReturnMode')],
! [('ExistingWEReference', '*', 'ReturnMode')]),
!
! # WEFindParagraph
! ([("char_ptr", "inKey", "InMode")],
! [("stringptr", "*", "*")]),
!
! # WESetOneAttribute
! ([("void_ptr", "*", "InMode"), ("ByteCount", "*", "InMode")],
! [("InBuffer", "*", "*")]),
]
Index: wastesupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastesupport.py,v
retrieving revision 1.14
retrieving revision 1.14.20.1
diff -C2 -d -r1.14 -r1.14.20.1
*** wastesupport.py 20 Jun 2001 21:21:07 -0000 1.14
--- wastesupport.py 10 Mar 2002 21:33:19 -0000 1.14.20.1
***************
*** 37,40 ****
--- 37,41 ----
WEStyleMode = Type("WEStyleMode", "H")
+ WERulerMode = Type("WERulerMode", "l")
WEActionKind = Type("WEActionKind", "h")
WEAlignment = Type("WEAlignment", "B")
***************
*** 55,58 ****
--- 56,62 ----
LongRect = OpaqueType("LongRect", "LongRect")
LongRect_ptr = LongRect
+
+ TextEncodingVariant = Type("TextEncodingVariant", "l")
+ TextEncodingFormat = Type("TextEncodingFormat", "l")
includestuff = includestuff + """