[Python-checkins] python/dist/src/Mac/Modules/dlg _Dlgmodule.c,1.13,1.14 dlgscan.py,1.17,1.18

2002年12月12日 02:32:22 -0800

Update of /cvsroot/python/python/dist/src/Mac/Modules/dlg
In directory sc8-pr-cvs1:/tmp/cvs-serv21368/Modules/dlg
Modified Files:
	_Dlgmodule.c dlgscan.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: _Dlgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/_Dlgmodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** _Dlgmodule.c	3 Dec 2002 23:40:20 -0000	1.13
--- _Dlgmodule.c	12 Dec 2002 10:31:50 -0000	1.14
***************
*** 448,453 ****
 }
 
- #if TARGET_API_MAC_CARBON
- 
 static PyObject *DlgObj_InsertDialogItem(DialogObject *_self, PyObject *_args)
 {
--- 448,451 ----
***************
*** 477,483 ****
 	return _res;
 }
- #endif
- 
- #if TARGET_API_MAC_CARBON
 
 static PyObject *DlgObj_RemoveDialogItems(DialogObject *_self, PyObject *_args)
--- 475,478 ----
***************
*** 505,509 ****
 	return _res;
 }
- #endif
 
 static PyObject *DlgObj_StdFilterProc(DialogObject *_self, PyObject *_args)
--- 500,503 ----
***************
*** 912,925 ****
 	{"ShortenDITL", (PyCFunction)DlgObj_ShortenDITL, 1,
 	 PyDoc_STR("(DialogItemIndex numberItems) -> None")},
- 
- #if TARGET_API_MAC_CARBON
 	{"InsertDialogItem", (PyCFunction)DlgObj_InsertDialogItem, 1,
 	 PyDoc_STR("(DialogItemIndex afterItem, DialogItemType itemType, Handle itemHandle, Rect box) -> None")},
- #endif
- 
- #if TARGET_API_MAC_CARBON
 	{"RemoveDialogItems", (PyCFunction)DlgObj_RemoveDialogItems, 1,
 	 PyDoc_STR("(DialogItemIndex itemNo, DialogItemIndex amountToRemove, Boolean disposeItemData) -> None")},
- #endif
 	{"StdFilterProc", (PyCFunction)DlgObj_StdFilterProc, 1,
 	 PyDoc_STR("() -> (Boolean _rv, EventRecord event, DialogItemIndex itemHit)")},
--- 906,913 ----
***************
*** 1391,1396 ****
 }
 
- #if TARGET_API_MAC_CARBON
- 
 static PyObject *Dlg_GetParamText(PyObject *_self, PyObject *_args)
 {
--- 1379,1382 ----
***************
*** 1417,1421 ****
 	return _res;
 }
- #endif
 
 static PyObject *Dlg_NewFeaturesDialog(PyObject *_self, PyObject *_args)
--- 1403,1406 ----
***************
*** 1540,1548 ****
 	{"ResetAlertStage", (PyCFunction)Dlg_ResetAlertStage, 1,
 	 PyDoc_STR("() -> None")},
- 
- #if TARGET_API_MAC_CARBON
 	{"GetParamText", (PyCFunction)Dlg_GetParamText, 1,
 	 PyDoc_STR("(Str255 param0, Str255 param1, Str255 param2, Str255 param3) -> None")},
- #endif
 	{"NewFeaturesDialog", (PyCFunction)Dlg_NewFeaturesDialog, 1,
 	 PyDoc_STR("(Rect inBoundsRect, Str255 inTitle, Boolean inIsVisible, SInt16 inProcID, WindowPtr inBehind, Boolean inGoAwayFlag, SInt32 inRefCon, Handle inItemListHandle, UInt32 inFlags) -> (DialogPtr _rv)")},
--- 1525,1530 ----
Index: dlgscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/dlgscan.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dlgscan.py	15 Aug 2002 21:48:13 -0000	1.17
--- dlgscan.py	12 Dec 2002 10:31:50 -0000	1.18
***************
*** 61,74 ****
 			]
 
- 	def makegreylist(self):
- 		return [
- 			('#if TARGET_API_MAC_CARBON', [
- 				'InsertDialogItem',
- 				'RemoveDialogItems',
- 				'GetParamText',
- 				'CloseStandardSheet',
- 				'RunStandardAlert',
- 			])]
- 			
 	def makeblacklisttypes(self):
 		return [
--- 61,64 ----