[Python-checkins] CVS: python/dist/src/Mac/Tools/macfreeze macfreezegui.py,1.3,1.4

Jack Jansen jackjansen@users.sourceforge.net
Mon, 27 Aug 2001 14:39:20 -0700


Update of /cvsroot/python/python/dist/src/Mac/Tools/macfreeze
In directory usw-pr-cvs1:/tmp/cvs-serv4569/Python/Mac/Tools/macfreeze

Modified Files:
	macfreezegui.py 
Log Message:
Use the new macresource module to open the accompanying resource file (if needed).

Index: macfreezegui.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/macfreeze/macfreezegui.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** macfreezegui.py	2001/08/25 12:06:32	1.3
--- macfreezegui.py	2001/08/27 21:39:18	1.4
***************
*** 7,10 ****
--- 7,11 ----
  import string
  from Carbon import Res
+ import macresource
  
  ID_MAINDIALOG=512
***************
*** 55,69 ****
  	
  	# Get the dialog, possibly opening the resource file (if needed)
! 	try:
! 		d = Dlg.GetNewDialog(ID_MAINDIALOG, -1)
! 	except Dlg.Error:
! 		d = None
! 	if d == None:
! 		try:
! 			Res.FSpOpenResFile('macfreeze.rsrc', 1)
! 		except Res.Error:
! 			d = None
! 		else:
! 			d = Dlg.GetNewDialog(ID_MAINDIALOG, -1)
  	if d == None:
  		EasyDialogs.Message("Dialog resource not found or faulty")
--- 56,61 ----
  	
  	# Get the dialog, possibly opening the resource file (if needed)
! 	macresource.need('DLOG', ID_MAINDIALOG, 'macfreeze.rsrc')
! 	d = Dlg.GetNewDialog(ID_MAINDIALOG, -1)
  	if d == None:
  		EasyDialogs.Message("Dialog resource not found or faulty")