[Python-checkins] CVS: python/dist/src/Mac/Demo/waste htmled.py,1.8,1.9 swed.py,1.9,1.10 wed.py,1.5,1.6

[Jack Jansen]

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

Modified Files:
	htmled.py swed.py wed.py 
Log Message:
Merging appropriate 2.1.1 fixes back into the main trunk.


Index: htmled.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/waste/htmled.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** htmled.py	2001/01/29 15:32:00	1.8
--- htmled.py	2001/08/03 13:31:34	1.9
***************
*** 16,20 ****
  import macfs
  import MACFS
- import regsub
  import string
  import htmllib
--- 16,19 ----
***************
*** 48,52 ****
  		self.name = name
  		r = windowbounds(400, 400)
! 		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
  		self.wid = w
  		vr = LEFTMARGIN, 0, r[2]-r[0]-15, r[3]-r[1]-15
--- 47,51 ----
  		self.name = name
  		r = windowbounds(400, 400)
! 		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0)
  		self.wid = w
  		vr = LEFTMARGIN, 0, r[2]-r[0]-15, r[3]-r[1]-15
***************
*** 446,450 ****
  		
  	def send_literal_data(self, data):
! 		data = regsub.gsub('\n', '\r', data)
  		data = string.expandtabs(data)
  		self.ted.WEInsert(data, None, None)
--- 445,449 ----
  		
  	def send_literal_data(self, data):
! 		data = string.replace(data, '\n', '\r')
  		data = string.expandtabs(data)
  		self.ted.WEInsert(data, None, None)
***************
*** 776,779 ****
--- 775,780 ----
  		if self.active:
  			self.active.do_idle(event)
+ 		else:
+ 			Qd.SetCursor(Qd.qd.arrow)
  			
  	def newRuler(self, obj):

Index: swed.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/waste/swed.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** swed.py	2001/01/29 15:32:00	1.9
--- swed.py	2001/08/03 13:31:34	1.10
***************
*** 35,39 ****
  		self.name = name
  		r = windowbounds(400, 400)
! 		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
  		self.wid = w
  		vr = 0, 0, r[2]-r[0]-15, r[3]-r[1]-15
--- 35,39 ----
  		self.name = name
  		r = windowbounds(400, 400)
! 		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0)
  		self.wid = w
  		vr = 0, 0, r[2]-r[0]-15, r[3]-r[1]-15
***************
*** 604,607 ****
--- 604,609 ----
  		if self.active:
  			self.active.do_idle(event)
+ 		else:
+ 			Qd.SetCursor(Qd.qd.arrow)
  			
  def getfontnames():

Index: wed.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/waste/wed.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wed.py	2001/01/23 14:57:41	1.5
--- wed.py	2001/08/03 13:31:34	1.6
***************
*** 26,30 ****
  		self.name = name
  		r = windowbounds(400, 400)
! 		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
  		self.wid = w
  		vr = 0, 0, r[2]-r[0]-15, r[3]-r[1]-15
--- 26,30 ----
  		self.name = name
  		r = windowbounds(400, 400)
! 		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0)
  		self.wid = w
  		vr = 0, 0, r[2]-r[0]-15, r[3]-r[1]-15
***************
*** 412,415 ****
--- 412,417 ----
  		if self.active:
  			self.active.do_idle(event)
+ 		else:
+ 			Qd.SetCursor(Qd.qd.arrow)
  
  def main():