[Python-checkins] CVS: python/dist/src/Mac/Demo/PICTbrowse cicnbrowse.py,1.6,1.7

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Demo/PICTbrowse
In directory usw-pr-cvs1:/tmp/cvs-serv5658/Python/Mac/Demo/PICTbrowse

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

Index: cicnbrowse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/PICTbrowse/cicnbrowse.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cicnbrowse.py	2001/08/25 12:02:09	1.6
--- cicnbrowse.py	2001/08/27 21:41:03	1.7
***************
*** 11,14 ****
--- 11,15 ----
  import struct
  from Carbon import Icn
+ import macresource
  
  #
***************
*** 27,38 ****
  
  def main():
! 	try:
! 		dummy = Res.GetResource('DLOG', ID_MAIN)
! 	except Res.Error:
! 		try:
! 			Res.FSpOpenResFile("PICTbrowse.rsrc", 1)
! 		except Res.Error, arg:
! 			EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
! 			sys.exit(1)	
  	CIconbrowse()
  
--- 28,32 ----
  
  def main():
! 	macresource.need('DLOG', ID_MAIN, "PICTbrowse.rsrc")
  	CIconbrowse()
  
***************
*** 120,126 ****
  		self.id = id
  		FrameWork.DialogWindow.open(self, ID_MAIN)
! 		self.wid.SetDialogDefaultItem(MAIN_SHOW)
  		self.contents = contents
! 		self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
  		h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
  				Controls.kControlListBoxListHandleTag)
--- 114,120 ----
  		self.id = id
  		FrameWork.DialogWindow.open(self, ID_MAIN)
! 		self.dlg.SetDialogDefaultItem(MAIN_SHOW)
  		self.contents = contents
! 		self.ctl = self.dlg.GetDialogItemAsControl(MAIN_LIST)
  		h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
  				Controls.kControlListBoxListHandleTag)