[Python-checkins] python/dist/src/Lib/plat-mac EasyDialogs.py,1.7,1.8

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Fri, 07 Feb 2003 07:45:44 -0800


Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv15762

Modified Files:
	EasyDialogs.py 
Log Message:
Made AskFile* dialogs movable-modal by default, by providing a dummy
eventProc (which simply drops all events on the floor). Also added a
method SetDefaultEventProc through which frameworks can set a global
event handler (which can still be overridden on a per-call basis
with the eventProc argument).


Index: EasyDialogs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/EasyDialogs.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EasyDialogs.py	26 Jan 2003 20:22:18 -0000	1.7
--- EasyDialogs.py	7 Feb 2003 15:45:40 -0000	1.8
***************
*** 592,596 ****
--- 592,612 ----
  	return args, tpwanted
  	
+ def _dummy_Nav_eventproc(msg, data):
+ 	pass
+ 	
+ _default_Nav_eventproc = _dummy_Nav_eventproc
+ 
+ def SetDefaultEventProc(proc):
+ 	global _default_Nav_eventproc
+ 	rv = _default_Nav_eventproc
+ 	if proc is None:
+ 		proc = _dummy_Nav_eventproc
+ 	_default_Nav_eventproc = proc
+ 	return rv
+ 	
  def AskFileForOpen(
+ 		message=None,
+ 		typeList=None,
+ 		# From here on the order is not documented
  		version=None,
  		defaultLocation=None,
***************
*** 601,611 ****
  		actionButtonLabel=None,
  		cancelButtonLabel=None,
- 		message=None,
  		preferenceKey=None,
  		popupExtension=None,
! 		eventProc=None,
  		previewProc=None,
  		filterProc=None,
- 		typeList=None,
  		wanted=None,
  		multiple=None):
--- 617,625 ----
  		actionButtonLabel=None,
  		cancelButtonLabel=None,
  		preferenceKey=None,
  		popupExtension=None,
! 		eventProc=_dummy_Nav_eventproc,
  		previewProc=None,
  		filterProc=None,
  		wanted=None,
  		multiple=None):
***************
*** 643,646 ****
--- 657,663 ----
  
  def AskFileForSave(
+ 		message=None,
+ 		savedFileName=None,
+ 		# From here on the order is not documented
  		version=None,
  		defaultLocation=None,
***************
*** 651,659 ****
  		actionButtonLabel=None,
  		cancelButtonLabel=None,
- 		savedFileName=None,
- 		message=None,
  		preferenceKey=None,
  		popupExtension=None,
! 		eventProc=None,
  		fileType=None,
  		fileCreator=None,
--- 668,674 ----
  		actionButtonLabel=None,
  		cancelButtonLabel=None,
  		preferenceKey=None,
  		popupExtension=None,
! 		eventProc=_dummy_Nav_eventproc,
  		fileType=None,
  		fileCreator=None,
***************
*** 672,677 ****
  		actionButtonLabel=actionButtonLabel,cancelButtonLabel=cancelButtonLabel,
  		savedFileName=savedFileName,message=message,preferenceKey=preferenceKey,
! 		popupExtension=popupExtension,fileType=fileType,fileCreator=fileCreator,
! 		wanted=wanted,multiple=multiple) 
  	try:
  		rr = Nav.NavPutFile(args)
--- 687,692 ----
  		actionButtonLabel=actionButtonLabel,cancelButtonLabel=cancelButtonLabel,
  		savedFileName=savedFileName,message=message,preferenceKey=preferenceKey,
! 		popupExtension=popupExtension,eventProc=eventProc,fileType=fileType,
! 		fileCreator=fileCreator,wanted=wanted,multiple=multiple) 
  	try:
  		rr = Nav.NavPutFile(args)
***************
*** 704,707 ****
--- 719,724 ----
  		
  def AskFolder(
+ 		message=None,
+ 		# From here on the order is not documented
  		version=None,
  		defaultLocation=None,
***************
*** 712,719 ****
  		actionButtonLabel=None,
  		cancelButtonLabel=None,
- 		message=None,
  		preferenceKey=None,
  		popupExtension=None,
! 		eventProc=None,
  		filterProc=None,
  		wanted=None,
--- 729,735 ----
  		actionButtonLabel=None,
  		cancelButtonLabel=None,
  		preferenceKey=None,
  		popupExtension=None,
! 		eventProc=_dummy_Nav_eventproc,
  		filterProc=None,
  		wanted=None,