[Python-checkins] CVS: python/dist/src/Mac/Modules/dlg _Dlgmodule.c,1.6,1.6.2.1 dlgscan.py,1.14,1.14.4.1 dlgsupport.py,1.27,1.27.2.1

[Jack Jansen]

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

Modified Files:
      Tag: r22rc1-branch
	_Dlgmodule.c dlgscan.py dlgsupport.py 
Log Message:
Merged Mac subtree into the 22c1 branch.


Index: _Dlgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/_Dlgmodule.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** _Dlgmodule.c	2001/12/08 18:02:52	1.6
--- _Dlgmodule.c	2001/12/19 15:10:15	1.6.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 */
***************
*** 877,897 ****
  }
  
- #if !TARGET_API_MAC_CARBON
- 
- static PyObject *DlgObj_SetGrafPortOfDialog(DialogObject *_self, PyObject *_args)
- {
- 	PyObject *_res = NULL;
- #ifndef SetGrafPortOfDialog
- 	PyMac_PRECHECK(SetGrafPortOfDialog);
- #endif
- 	if (!PyArg_ParseTuple(_args, ""))
- 		return NULL;
- 	SetGrafPortOfDialog(_self->ob_itself);
- 	Py_INCREF(Py_None);
- 	_res = Py_None;
- 	return _res;
- }
- #endif
- 
  static PyMethodDef DlgObj_methods[] = {
  	{"DrawDialog", (PyCFunction)DlgObj_DrawDialog, 1,
--- 881,884 ----
***************
*** 975,983 ****
  	{"GetDialogPort", (PyCFunction)DlgObj_GetDialogPort, 1,
  	 "() -> (CGrafPtr _rv)"},
- 
- #if !TARGET_API_MAC_CARBON
- 	{"SetGrafPortOfDialog", (PyCFunction)DlgObj_SetGrafPortOfDialog, 1,
- 	 "() -> None"},
- #endif
  	{NULL, NULL, 0}
  };
--- 962,965 ----

Index: dlgscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/dlgscan.py,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -d -r1.14 -r1.14.4.1
*** dlgscan.py	2001/11/05 16:16:27	1.14
--- dlgscan.py	2001/12/19 15:10:15	1.14.4.1
***************
*** 55,69 ****
  			'GetDialogControlNotificationProc',
  			'SetGrafPortOfDialog', # Funny, and probably not useful
  			]
  
  	def makegreylist(self):
  		return [
- 			('#if !TARGET_API_MAC_CARBON', [
- 				'SetGrafPortOfDialog',
- 			]),
  			('#if TARGET_API_MAC_CARBON', [
  				'InsertDialogItem',
  				'RemoveDialogItems',
  				'GetParamText',
  			])]
  			
--- 55,71 ----
  			'GetDialogControlNotificationProc',
  			'SetGrafPortOfDialog', # Funny, and probably not useful
+ 			# Can't find these:
+ 			'CloseStandardSheet',
+ 			'RunStandardAlert',
  			]
  
  	def makegreylist(self):
  		return [
  			('#if TARGET_API_MAC_CARBON', [
  				'InsertDialogItem',
  				'RemoveDialogItems',
  				'GetParamText',
+ 				'CloseStandardSheet',
+ 				'RunStandardAlert',
  			])]
  			
***************
*** 73,76 ****
--- 75,81 ----
  			"AlertStdAlertParamRec",	# ditto
  			"AlertStdAlertParamRec_ptr",	# ditto
+ 			"AlertStdCFStringAlertParamPtr",	# ditto
+ 			"AlertStdCFStringAlertParamRec",
+ 			"AlertStdCFStringAlertParamRec_ptr",
  			"QTModelessCallbackProcPtr",
  			]

Index: dlgsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/dlg/dlgsupport.py,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** dlgsupport.py	2001/11/30 14:16:32	1.27
--- dlgsupport.py	2001/12/19 15:10:15	1.27.2.1
***************
*** 258,276 ****
  for f in methods: object.add(f)
  
- # Some methods that are currently macro's in C, but will be real routines
- # in MacOS 8.
- 
- ##f = Method(ExistingWindowPtr, 'GetDialogWindow', (DialogRef, 'dialog', InMode))
- ##object.add(f)
- ##f = Method(SInt16, 'GetDialogDefaultItem', (DialogRef, 'dialog', InMode))
- ##object.add(f)
- ##f = Method(SInt16, 'GetDialogCancelItem', (DialogRef, 'dialog', InMode))
- ##object.add(f)
- ##f = Method(SInt16, 'GetDialogKeyboardFocusItem', (DialogRef, 'dialog', InMode))
- ##object.add(f)
- f = Method(void, 'SetGrafPortOfDialog', (DialogRef, 'dialog', InMode), 
- 	condition='#if !TARGET_API_MAC_CARBON')
- object.add(f)
- 
  setuseritembody = """
  	PyObject *new = NULL;
--- 258,261 ----