[Python-checkins] CVS: python/dist/src/Mac/Modules/carbonevt CarbonEvtscan.py,1.6,1.7 _CarbonEvtmodule.c,1.7,1.8

[Just van Rossum]

Update of /cvsroot/python/python/dist/src/Mac/Modules/carbonevt
In directory usw-pr-cvs1:/tmp/cvs-serv3588

Modified Files:
	CarbonEvtscan.py _CarbonEvtmodule.c 
Log Message:
Fixed TrackMouseRegion() argument: ioWasInRgn is an in/out parameter.

Index: CarbonEvtscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/carbonevt/CarbonEvtscan.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CarbonEvtscan.py	2002/01/08 11:49:31	1.6
--- CarbonEvtscan.py	2002/01/09 18:54:16	1.7
***************
*** 110,116 ****
  		return [
  			([("UInt32", 'inSize', "InMode"), ("void_ptr", 'inDataPtr', "InMode")],
! 				[("MyInBuffer", 'inDataPtr', "InMode")])
  		]
! 		
  if __name__ == "__main__":
  	main()
--- 110,118 ----
  		return [
  			([("UInt32", 'inSize', "InMode"), ("void_ptr", 'inDataPtr', "InMode")],
! 			 [("MyInBuffer", 'inDataPtr', "InMode")]),
! 			([("Boolean", 'ioWasInRgn', "OutMode")],
! 			 [("Boolean", 'ioWasInRgn', "InOutMode")]),
  		]
! 
  if __name__ == "__main__":
  	main()

Index: _CarbonEvtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/carbonevt/_CarbonEvtmodule.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _CarbonEvtmodule.c	2002/01/08 11:49:31	1.7
--- _CarbonEvtmodule.c	2002/01/09 18:54:16	1.8
***************
*** 1448,1454 ****
  	Boolean ioWasInRgn;
  	UInt16 outResult;
! 	if (!PyArg_ParseTuple(_args, "O&O&",
  	                      GrafObj_Convert, &inPort,
! 	                      ResObj_Convert, &inRegion))
  		return NULL;
  	_err = TrackMouseRegion(inPort,
--- 1448,1455 ----
  	Boolean ioWasInRgn;
  	UInt16 outResult;
! 	if (!PyArg_ParseTuple(_args, "O&O&b",
  	                      GrafObj_Convert, &inPort,
! 	                      ResObj_Convert, &inRegion,
! 	                      &ioWasInRgn))
  		return NULL;
  	_err = TrackMouseRegion(inPort,
***************
*** 1796,1800 ****
  	 "(GrafPtr inPort, OptionBits inOptions, double inTimeout) -> (Point outPt, UInt32 outModifiers, UInt16 outResult)"},
  	{"TrackMouseRegion", (PyCFunction)CarbonEvents_TrackMouseRegion, 1,
! 	 "(GrafPtr inPort, RgnHandle inRegion) -> (Boolean ioWasInRgn, UInt16 outResult)"},
  	{"GetLastUserEventTime", (PyCFunction)CarbonEvents_GetLastUserEventTime, 1,
  	 "() -> (double _rv)"},
--- 1797,1801 ----
  	 "(GrafPtr inPort, OptionBits inOptions, double inTimeout) -> (Point outPt, UInt32 outModifiers, UInt16 outResult)"},
  	{"TrackMouseRegion", (PyCFunction)CarbonEvents_TrackMouseRegion, 1,
! 	 "(GrafPtr inPort, RgnHandle inRegion, Boolean ioWasInRgn) -> (Boolean ioWasInRgn, UInt16 outResult)"},
  	{"GetLastUserEventTime", (PyCFunction)CarbonEvents_GetLastUserEventTime, 1,
  	 "() -> (double _rv)"},