Merging appropriate 2.1.1 fixes back into the main trunk.

3 files changed, 10 insertions, 5 deletions

diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index 7643947..4d29e1e 100644
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -15,7 +15,6 @@ import Scrap
 import os
 import macfs
 import MACFS
-import regsub
 import string
 import htmllib
 
@@ -47,7 +46,7 @@ class WasteWindow(ScrolledWindow):
 		self.path = path
 		self.name = name
 		r = windowbounds(400, 400)
-		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
+		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
 		dr = (0, 0, vr[2], 0)
@@ -445,7 +444,7 @@ class WasteWindow(ScrolledWindow):
 		self.ted.WEInsert(data, None, None)
 		
 	def send_literal_data(self, data):
-		data = regsub.gsub('\n', '\r', data)
+		data = string.replace(data, '\n', '\r')
 		data = string.expandtabs(data)
 		self.ted.WEInsert(data, None, None)
 		
@@ -775,6 +774,8 @@ class Wed(Application):
 	def idle(self, event):
 		if self.active:
 			self.active.do_idle(event)
+		else:
+			Qd.SetCursor(Qd.qd.arrow)
 			
 	def newRuler(self, obj):
 		"""Insert a new ruler. Make it as wide as the window minus 2 pxls"""
diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index b62fd9a..e4622da 100644
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -34,7 +34,7 @@ class WasteWindow(ScrolledWindow):
 		self.path = path
 		self.name = name
 		r = windowbounds(400, 400)
-		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
+		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
 		dr = (0, 0, 10240, 0)
@@ -603,6 +603,8 @@ class Wed(Application):
 	def idle(self, event):
 		if self.active:
 			self.active.do_idle(event)
+		else:
+			Qd.SetCursor(Qd.qd.arrow)
 			
 def getfontnames():
 	names = []
diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
index 7b40864..342d52e 100644
--- a/Mac/Demo/waste/wed.py
+++ b/Mac/Demo/waste/wed.py
@@ -25,7 +25,7 @@ class WasteWindow(ScrolledWindow):
 		self.path = path
 		self.name = name
 		r = windowbounds(400, 400)
-		w = Win.NewWindow(r, name, 1, 0, -1, 1, 0x55555555)
+		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
 		dr = (0, 0, 10240, 0)
@@ -411,6 +411,8 @@ class Wed(Application):
 	def idle(self, event):
 		if self.active:
 			self.active.do_idle(event)
+		else:
+			Qd.SetCursor(Qd.qd.arrow)
 
 def main():
 	App = Wed()