[Python-checkins] CVS: python/dist/src/Mac/Tools/IDE Wlists.py,1.7,1.7.2.1

[Jack Jansen]

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

Modified Files:
      Tag: r22b2-branch
	Wlists.py 
Log Message:
Merged Just's trunk changes.

Index: Wlists.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wlists.py,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** Wlists.py	2001/11/05 08:51:24	1.7
--- Wlists.py	2001/11/20 23:21:21	1.7.2.1
***************
*** 6,9 ****
--- 6,11 ----
  from Carbon.Lists import kListDefUserProcType, lInitMsg, lDrawMsg, lHiliteMsg, lCloseMsg
  from Carbon.QuickDraw import hilitetransfermode
+ from Carbon import App
+ from Carbon.Appearance import kThemeStateActive, kThemeStateInactive, kThemeStatePressed
  
  
***************
*** 254,260 ****
  				visRgn = self._parentwindow.wid.GetWindowPort().visRgn
  			self._list.LUpdate(visRgn)
! 			Qd.FrameRect(self._bounds)
! 			if self._selected and self._activated:
! 				self.drawselframe(1)
  	
  	def select(self, onoff, isclick = 0):
--- 256,262 ----
  				visRgn = self._parentwindow.wid.GetWindowPort().visRgn
  			self._list.LUpdate(visRgn)
! 			App.DrawThemeListBoxFrame(self._bounds, kThemeStateActive)
! 			#if self._selected and self._activated:
! 			#	self.drawselframe(1)
  	
  	def select(self, onoff, isclick = 0):
***************
*** 262,266 ****
  			return
  		self.SetPort()
! 		self.drawselframe(onoff)
  	
  	def activate(self, onoff):
--- 264,270 ----
  			return
  		self.SetPort()
! 		state = [kThemeStateActive, kThemeStatePressed][onoff]
! 		App.DrawThemeListBoxFrame(self._bounds, kThemeStateActive)
! 		#self.drawselframe(onoff)
  	
  	def activate(self, onoff):
***************
*** 268,273 ****
  		if self._visible:
  			self._list.LActivate(onoff)
! 			if self._selected:
! 				self.drawselframe(onoff)
  	
  	def get(self):
--- 272,277 ----
  		if self._visible:
  			self._list.LActivate(onoff)
! 			#if self._selected:
! 			#	self.drawselframe(onoff)
  	
  	def get(self):
***************
*** 450,453 ****
--- 454,458 ----
  				Qd.DrawText(line2, 0, len(line2))
  			Qd.PenPat("\x11\x11\x11\x11\x11\x11\x11\x11")
+ 			bottom = top + theList.cellSize[1]
  			Qd.MoveTo(left, bottom - 1)
  			Qd.LineTo(right, bottom - 1)