[Python-checkins] python/dist/src/Mac/Modules/mlte _Mltemodule.c, 1.19, 1.20 mltescan.py, 1.12, 1.13

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/mlte
In directory sc8-pr-cvs1:/tmp/cvs-serv22913/mlte

Modified Files:
	_Mltemodule.c mltescan.py 
Log Message:
Ported to Universal Headers 3.4.2. Qd and Qt remain to be done.

Completely untested.


Index: _Mltemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/mlte/_Mltemodule.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** _Mltemodule.c	20 Nov 2003 13:30:58 -0000	1.19
--- _Mltemodule.c	3 Dec 2003 23:20:12 -0000	1.20
***************
*** 362,366 ****
  {
  	PyObject *_res = NULL;
! 	short iPart;
  #ifndef TXNZoomWindow
  	PyMac_PRECHECK(TXNZoomWindow);
--- 362,366 ----
  {
  	PyObject *_res = NULL;
! 	SInt16 iPart;
  #ifndef TXNZoomWindow
  	PyMac_PRECHECK(TXNZoomWindow);
***************
*** 698,732 ****
  }
  
- static PyObject *TXNObj_TXNSetData(TXNObjectObject *_self, PyObject *_args)
- {
- 	PyObject *_res = NULL;
- 	OSStatus _err;
- 	TXNDataType iDataType;
- 	void * *iDataPtr__in__;
- 	ByteCount iDataPtr__len__;
- 	int iDataPtr__in_len__;
- 	TXNOffset iStartOffset;
- 	TXNOffset iEndOffset;
- #ifndef TXNSetData
- 	PyMac_PRECHECK(TXNSetData);
- #endif
- 	if (!PyArg_ParseTuple(_args, "O&s#ll",
- 	                      PyMac_GetOSType, &iDataType,
- 	                      &iDataPtr__in__, &iDataPtr__in_len__,
- 	                      &iStartOffset,
- 	                      &iEndOffset))
- 		return NULL;
- 	iDataPtr__len__ = iDataPtr__in_len__;
- 	_err = TXNSetData(_self->ob_itself,
- 	                  iDataType,
- 	                  iDataPtr__in__, iDataPtr__len__,
- 	                  iStartOffset,
- 	                  iEndOffset);
- 	if (_err != noErr) return PyMac_Error(_err);
- 	Py_INCREF(Py_None);
- 	_res = Py_None;
- 	return _res;
- }
- 
  static PyObject *TXNObj_TXNGetChangeCount(TXNObjectObject *_self, PyObject *_args)
  {
--- 698,701 ----
***************
*** 1151,1154 ****
--- 1120,1137 ----
  }
  
+ static PyObject *TXNObj_TXNRecalcTextLayout(TXNObjectObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+ #ifndef TXNRecalcTextLayout
+ 	PyMac_PRECHECK(TXNRecalcTextLayout);
+ #endif
+ 	if (!PyArg_ParseTuple(_args, ""))
+ 		return NULL;
+ 	TXNRecalcTextLayout(_self->ob_itself);
+ 	Py_INCREF(Py_None);
+ 	_res = Py_None;
+ 	return _res;
+ }
+ 
  static PyMethodDef TXNObj_methods[] = {
  	{"TXNDeleteObject", (PyCFunction)TXNObj_TXNDeleteObject, 1,
***************
*** 1181,1185 ****
  	 PyDoc_STR("(EventRecord iEvent) -> None")},
  	{"TXNZoomWindow", (PyCFunction)TXNObj_TXNZoomWindow, 1,
! 	 PyDoc_STR("(short iPart) -> None")},
  	{"TXNCanUndo", (PyCFunction)TXNObj_TXNCanUndo, 1,
  	 PyDoc_STR("() -> (Boolean _rv, TXNActionKey oTXNActionKey)")},
--- 1164,1168 ----
  	 PyDoc_STR("(EventRecord iEvent) -> None")},
  	{"TXNZoomWindow", (PyCFunction)TXNObj_TXNZoomWindow, 1,
! 	 PyDoc_STR("(SInt16 iPart) -> None")},
  	{"TXNCanUndo", (PyCFunction)TXNObj_TXNCanUndo, 1,
  	 PyDoc_STR("() -> (Boolean _rv, TXNActionKey oTXNActionKey)")},
***************
*** 1216,1221 ****
  	{"TXNSetDataFromFile", (PyCFunction)TXNObj_TXNSetDataFromFile, 1,
  	 PyDoc_STR("(SInt16 iFileRefNum, OSType iFileType, ByteCount iFileLength, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
- 	{"TXNSetData", (PyCFunction)TXNObj_TXNSetData, 1,
- 	 PyDoc_STR("(TXNDataType iDataType, Buffer iDataPtr, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
  	{"TXNGetChangeCount", (PyCFunction)TXNObj_TXNGetChangeCount, 1,
  	 PyDoc_STR("() -> (ItemCount _rv)")},
--- 1199,1202 ----
***************
*** 1258,1261 ****
--- 1239,1244 ----
  	{"TXNIsObjectAttachedToSpecificWindow", (PyCFunction)TXNObj_TXNIsObjectAttachedToSpecificWindow, 1,
  	 PyDoc_STR("(WindowPtr iWindow) -> (Boolean oAttached)")},
+ 	{"TXNRecalcTextLayout", (PyCFunction)TXNObj_TXNRecalcTextLayout, 1,
+ 	 PyDoc_STR("() -> None")},
  	{NULL, NULL, 0}
  };
***************
*** 1494,1498 ****
  	FSSpec * iFileSpec;
  	WindowPtr iWindow;
! 	Rect * iFrame;
  	TXNFrameOptions iFrameOptions;
  	TXNFrameType iFrameType;
--- 1477,1481 ----
  	FSSpec * iFileSpec;
  	WindowPtr iWindow;
! 	Rect iFrame;
  	TXNFrameOptions iFrameOptions;
  	TXNFrameType iFrameType;
***************
*** 1507,1511 ****
  	                      OptFSSpecPtr_Convert, &iFileSpec,
  	                      WinObj_Convert, &iWindow,
! 	                      OptRectPtr_Convert, &iFrame,
  	                      &iFrameOptions,
  	                      &iFrameType,
--- 1490,1494 ----
  	                      OptFSSpecPtr_Convert, &iFileSpec,
  	                      WinObj_Convert, &iWindow,
! 	                      PyMac_GetRect, &iFrame,
  	                      &iFrameOptions,
  	                      &iFrameType,
***************
*** 1515,1519 ****
  	_err = TXNNewObject(iFileSpec,
  	                    iWindow,
! 	                    iFrame,
  	                    iFrameOptions,
  	                    iFrameType,
--- 1498,1502 ----
  	_err = TXNNewObject(iFileSpec,
  	                    iWindow,
! 	                    &iFrame,
  	                    iFrameOptions,
  	                    iFrameType,
***************
*** 1657,1661 ****
  static PyMethodDef Mlte_methods[] = {
  	{"TXNNewObject", (PyCFunction)Mlte_TXNNewObject, 1,
! 	 PyDoc_STR("(FSSpec * iFileSpec, WindowPtr iWindow, Rect * iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)")},
  	{"TXNTerminateTextension", (PyCFunction)Mlte_TXNTerminateTextension, 1,
  	 PyDoc_STR("() -> None")},
--- 1640,1644 ----
  static PyMethodDef Mlte_methods[] = {
  	{"TXNNewObject", (PyCFunction)Mlte_TXNNewObject, 1,
! 	 PyDoc_STR("(FSSpec * iFileSpec, WindowPtr iWindow, Rect iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)")},
  	{"TXNTerminateTextension", (PyCFunction)Mlte_TXNTerminateTextension, 1,
  	 PyDoc_STR("() -> None")},

Index: mltescan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/mlte/mltescan.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mltescan.py	19 Nov 2003 16:34:04 -0000	1.12
--- mltescan.py	3 Dec 2003 23:20:13 -0000	1.13
***************
*** 53,56 ****
--- 53,57 ----
  kTXNUseEncodingWordRulesMask = 0x80000000
  kTXNFontSizeAttributeSize = 4
+ normal = 0
  """)
  
***************
*** 95,102 ****
--- 96,111 ----
  			"TXNFindUPP", 
  			"ATSUStyle", #TBD
+ 			"TXNBackground_ptr", #TBD
+ 			"TXNControlData_ptr", #TBD
+ 			"TXNControlTag_ptr", #TBD
+ 			"TXNLongRect", #TBD
+ 			"TXNLongRect_ptr", #TBD
+ 			"TXNTypeAttributes_ptr", #TBD
+ 
  			"TXNActionKeyMapperProcPtr",
  			"TXNActionKeyMapperUPP",
  			"TXNTextBoxOptionsData",
  			"TXNCountOptions",
+ 			"void_ptr",
  			]