[Python-checkins] CVS: python/dist/src/Mac/Demo/PICTbrowse ICONbrowse.py,1.5,1.6 PICTbrowse.py,1.7,1.8 PICTbrowse2.py,1.7,1.8 oldPICTbrowse.py,1.3,1.4

[Jack Jansen]

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

Modified Files:
	ICONbrowse.py PICTbrowse.py PICTbrowse2.py oldPICTbrowse.py 
Log Message:
Merging appropriate 2.1.1 fixes back into the main trunk.


Index: ICONbrowse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/PICTbrowse/ICONbrowse.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ICONbrowse.py	2001/01/09 22:22:58	1.5
--- ICONbrowse.py	2001/08/03 13:31:34	1.6
***************
*** 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)
--- 120,126 ----
  		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)

Index: PICTbrowse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/PICTbrowse/PICTbrowse.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PICTbrowse.py	2001/01/09 22:22:58	1.7
--- PICTbrowse.py	2001/08/03 13:31:34	1.8
***************
*** 98,104 ****
  		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)
--- 98,104 ----
  		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)

Index: PICTbrowse2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/PICTbrowse/PICTbrowse2.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PICTbrowse2.py	2001/01/09 22:22:58	1.7
--- PICTbrowse2.py	2001/08/03 13:31:34	1.8
***************
*** 99,103 ****
  	def fitrect(self):
  		"""Return self.pictrect scaled to fit in window"""
! 		graf = self.wid.GetWindowPort()
  		screenrect = graf.portRect
  		picwidth = self.pictrect[2] - self.pictrect[0]
--- 99,103 ----
  	def fitrect(self):
  		"""Return self.pictrect scaled to fit in window"""
! 		graf = self.dlg.GetWindowPort()
  		screenrect = graf.portRect
  		picwidth = self.pictrect[2] - self.pictrect[0]
***************
*** 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)
--- 120,126 ----
  		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)

Index: oldPICTbrowse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/PICTbrowse/oldPICTbrowse.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** oldPICTbrowse.py	2001/01/23 14:32:10	1.3
--- oldPICTbrowse.py	2001/08/03 13:31:34	1.4
***************
*** 97,102 ****
  		self.id = id
  		FrameWork.DialogWindow.open(self, ID_MAIN)
! 		self.wid.SetDialogDefaultItem(MAIN_SHOW)
! 		tp, h, rect = self.wid.GetDialogItem(MAIN_LIST)
  		rect2 = rect[0]+1, rect[1]+1, rect[2]-17, rect[3]-17	# Scroll bar space
  		self.list = List.LNew(rect2, (0, 0, 1, len(contents)), (0,0), 0, self.wid,
--- 97,102 ----
  		self.id = id
  		FrameWork.DialogWindow.open(self, ID_MAIN)
! 		self.dlg.SetDialogDefaultItem(MAIN_SHOW)
! 		tp, h, rect = self.dlg.GetDialogItem(MAIN_LIST)
  		rect2 = rect[0]+1, rect[1]+1, rect[2]-17, rect[3]-17	# Scroll bar space
  		self.list = List.LNew(rect2, (0, 0, 1, len(contents)), (0,0), 0, self.wid,
***************
*** 146,150 ****
  		
  	def do_rawupdate(self, window, event):
! 		tp, h, rect = self.wid.GetDialogItem(MAIN_LIST)
  		Qd.SetPort(self.wid)
  		Qd.FrameRect(rect)
--- 146,150 ----
  		
  	def do_rawupdate(self, window, event):
! 		tp, h, rect = self.dlg.GetDialogItem(MAIN_LIST)
  		Qd.SetPort(self.wid)
  		Qd.FrameRect(rect)