[Python-checkins] python/dist/src/Mac/Demo/imgbrowse imgbrowse.py,1.5,1.6

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Demo/imgbrowse
In directory sc8-pr-cvs1:/tmp/cvs-serv20028/Demo/imgbrowse

Modified Files:
	imgbrowse.py 
Log Message:
Lots of minor tweaks for the pep252 checkins, mainly because Qd
attributes are no longer supported.


Index: imgbrowse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/imgbrowse/imgbrowse.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** imgbrowse.py	25 Aug 2001 12:05:40 -0000	1.5
--- imgbrowse.py	30 Nov 2002 00:01:17 -0000	1.6
***************
*** 1,3 ****
! """imgbrowse - Display pictures using img"""
  
  import FrameWork
--- 1,3 ----
! GetPortBounds()"""imgbrowse - Display pictures using img"""
  
  import FrameWork
***************
*** 89,96 ****
  		print 'PICT:', self.pictrect
  		print 'WIND:', currect
! 		print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().portBits, self.pictrect,
  				currect, QuickDraw.srcCopy, None)
  		self.info()
! 		Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().portBits, self.pictrect,
  				currect, QuickDraw.srcCopy, None)
  		
--- 89,96 ----
  		print 'PICT:', self.pictrect
  		print 'WIND:', currect
! 		print 'ARGS:', (self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
  				currect, QuickDraw.srcCopy, None)
  		self.info()
! 		Qd.CopyBits(self.pixmap, self.wid.GetWindowPort().GetPortBitMapForCopyBits(), self.pictrect,
  				currect, QuickDraw.srcCopy, None)
  		
***************
*** 98,102 ****
  		"""Return self.pictrect scaled to fit in window"""
  		graf = self.wid.GetWindowPort()
! 		screenrect = graf.portRect
  		picwidth = self.pictrect[2] - self.pictrect[0]
  		picheight = self.pictrect[3] - self.pictrect[1]
--- 98,102 ----
  		"""Return self.pictrect scaled to fit in window"""
  		graf = self.wid.GetWindowPort()
! 		screenrect = graf.GetPortBounds()
  		picwidth = self.pictrect[2] - self.pictrect[0]
  		picheight = self.pictrect[3] - self.pictrect[1]
***************
*** 114,118 ****
  	def info(self):
  		graf = self.wid.GetWindowPort()
! 		bits = graf.portBits
  		mac_image.dumppixmap(bits.pixmap_data)
  
--- 114,118 ----
  	def info(self):
  		graf = self.wid.GetWindowPort()
! 		bits = graf.GetPortBitMapForCopyBits()
  		mac_image.dumppixmap(bits.pixmap_data)