Some long overdue maintainance. Made all IDE sources 7-bit-clean, to avoid any further encoding conversion troubles.

14 files changed, 86 insertions, 84 deletions

diff --git a/Mac/Tools/IDE/ModuleBrowser.py b/Mac/Tools/IDE/ModuleBrowser.py
index 78581ec..f5b2b0a 100644
--- a/Mac/Tools/IDE/ModuleBrowser.py
+++ b/Mac/Tools/IDE/ModuleBrowser.py
@@ -14,9 +14,9 @@ class _modulebrowser:
 		
 		#self.window.bevelbox = W.BevelBox((0, 0, 0, 56))
 		self.window.openbutton = W.Button((10, 8, 80, 16), "Open", self.openbuttonhit)
-		self.window.browsebutton = W.Button((100, 8, 80, 16), "Browseƒ", self.browsebuttonhit)
+		self.window.browsebutton = W.Button((100, 8, 80, 16), "Browse\xc9", self.browsebuttonhit)
 		self.window.reloadbutton = W.Button((10, 32, 80, 16), "Reload", self.reloadbuttonhit)
-		self.window.openotherbutton = W.Button((100, 32, 80, 16), "Open otherƒ", self.openother)
+		self.window.openotherbutton = W.Button((100, 32, 80, 16), "Open other\xc9", self.openother)
 		
 		self.window.openbutton.enable(0)
 		self.window.reloadbutton.enable(0)
@@ -81,7 +81,7 @@ class _modulebrowser:
 					file, path, description = imp.find_module(modname)
 				except ImportError:
 					W.SetCursor("arrow")
-					W.Message("CanÕt find file for module –%s”." 
+					W.Message("Can't find file for module '%s'." 
 							% modname)
 				else:
 					self.openscript(path, modname)					
@@ -93,7 +93,7 @@ class _modulebrowser:
 		elif path[-4:] in ['.pyc', '.pyo']:
 			W.getapplication().openscript(path[:-1], modname=modname)
 		else:
-			W.Message("CanÕt edit –%s”; it might be a shared library or a .pyc file." 
+			W.Message("Can't edit '%s'; it might be a shared library or a .pyc file." 
 					% modname)
 	
 	def openother(self):
@@ -106,9 +106,9 @@ class _modulebrowser:
 				file, path, description = imp.find_module(modname)
 			except ImportError:
 				if modname in sys.builtin_module_names:
-					alerttext = "–%s” is a builtin module, which you canÕt edit." % modname
+					alerttext = "'%s' is a builtin module, which you can't edit." % modname
 				else:
-					alerttext = "No module named –%s”." % modname
+					alerttext = "No module named '%s'." % modname
 				raise W.AlertError, alerttext
 			self.openscript(path, modname)
 	
diff --git a/Mac/Tools/IDE/PyBrowser.py b/Mac/Tools/IDE/PyBrowser.py
index e8aac83..19319a1 100644
--- a/Mac/Tools/IDE/PyBrowser.py
+++ b/Mac/Tools/IDE/PyBrowser.py
@@ -38,7 +38,7 @@ def double_repr(key, value, truncvalue = 0,
 			value = _repr(value)
 			'' + value	# test to see if it is a string, in case a __repr__ method is buggy
 		except:
-			value = '‚‚‚ exception in repr()'
+			value = '\xa5\xa5\xa5 exception in repr()'
 	if truncvalue:
 		return key + '\t' + value[:255]
 	return key + '\t' + value
@@ -360,7 +360,7 @@ INDEXING_TYPES = (
 def unpack_object(object, indent = 0):
 	tp = type(object)
 	if tp in SIMPLE_TYPES and tp is not types.NoneType:
-		raise TypeError, 'canÕt browse simple type: %s' % tp.__name__
+		raise TypeError, "can't browse simple type: %s" % tp.__name__
 	elif tp == types.DictionaryType:
 		return unpack_dict(object, indent)
 	elif tp in (types.TupleType, types.ListType):
diff --git a/Mac/Tools/IDE/PyConsole.py b/Mac/Tools/IDE/PyConsole.py
index ea2cf83..4c32785 100644
--- a/Mac/Tools/IDE/PyConsole.py
+++ b/Mac/Tools/IDE/PyConsole.py
@@ -48,7 +48,7 @@ class ConsoleTextWidget(W.EditText):
 	
 	def open(self):
 		W.EditText.open(self)
-		self.write('Python ' + sys.version + '\n' + sys.copyright + '\n')
+		self.write('Python ' + sys.version + '\nType "copyright", "credits" or "license" for more information.\n')
 		self.write(sys.ps1)
 		self.flush()
 	
@@ -156,8 +156,8 @@ class PyConsole(W.Window):
 	def makenamespacemenu(self, *args):
 		W.SetCursor('watch')
 		namespacelist = self.getnamespacelist()
-		self.namespacemenu.set([("Clear window", self.clearbuffer), ("Font settingsƒ", self.dofontsettings), 
-				["Namespace"] + namespacelist, ("Browse namespaceƒ", self.browsenamespace)])
+		self.namespacemenu.set([("Clear window", self.clearbuffer), ("Font settings\xc9", self.dofontsettings), 
+				["Namespace"] + namespacelist, ("Browse namespace\xc9", self.browsenamespace)])
 		currentname = self.consoletext._namespace["__name__"]
 		for i in range(len(namespacelist)):
 			if namespacelist[i][0] == currentname:
@@ -264,7 +264,7 @@ class PyOutput:
 				tabbable = 0)
 		self.w.outputtext = OutputTextWidget((-1, -1, -14, 1), inset = (6, 5), 
 				fontsettings = self.fontsettings, tabsettings = self.tabsettings, readonly = 1)
-		menuitems = [("Clear window", self.clearbuffer), ("Font settingsƒ", self.dofontsettings)]
+		menuitems = [("Clear window", self.clearbuffer), ("Font settings\xc9", self.dofontsettings)]
 		self.w.popupmenu = W.PopupMenu((-15, -1, 16, 16), menuitems)
 		
 		self.w._bary = W.Scrollbar((-15, 14, 16, -14), self.w.outputtext.vscroll, max = 32767)
diff --git a/Mac/Tools/IDE/PyDebugger.py b/Mac/Tools/IDE/PyDebugger.py
index 61ce17b..c1f9b49 100644
--- a/Mac/Tools/IDE/PyDebugger.py
+++ b/Mac/Tools/IDE/PyDebugger.py
@@ -72,7 +72,7 @@ class Debugger(bdb.Bdb):
 		self.botframe = bottomframe
 		if running:
 			self.set_continue()
-			self.reason = 'Runningƒ'
+			self.reason = 'Running\xc9'
 			self.setstate('running')
 		else:
 			self.set_step()
@@ -187,7 +187,7 @@ class Debugger(bdb.Bdb):
 	def makeoptionsmenu(self):
 		options = [('Clear breakpoints', self.w.panes.bottom.src.source.clearbreakpoints), 
 				('Clear all breakpoints', self.clear_all_breaks),
-				('Edit breakpointsƒ', self.edit_breaks), '-',
+				('Edit breakpoints\xc9', self.edit_breaks), '-',
 				(self.tracemagic and 
 					'Disable __magic__ tracing' or 'Enable __magic__ tracing', self.togglemagic)]
 		self.w.panes.bottom.src.optionsmenu.set(options)
@@ -318,7 +318,7 @@ class Debugger(bdb.Bdb):
 	
 	def running(self):
 		W.SetCursor('watch')
-		self.reason = 'Runningƒ'
+		self.reason = 'Running\xc9'
 		self.setstate('running')
 		#self.w.panes.bottom.src.source.set('')
 		#self.w.panes.browserpanes.stacklist.stack.set([])
@@ -350,7 +350,7 @@ class Debugger(bdb.Bdb):
 						try:
 							f, filename, (suff, mode, dummy) = imp.find_module(modname)
 						except ImportError:
-							self.w.panes.bottom.src.source.set('canÕt find file')
+							self.w.panes.bottom.src.source.set("can't find file")
 						else:
 							if f:
 								f.close()
@@ -360,9 +360,9 @@ class Debugger(bdb.Bdb):
 								f.close()
 								self.w.panes.bottom.src.source.set(data, filename)
 							else:
-								self.w.panes.bottom.src.source.set('canÕt find file')
+								self.w.panes.bottom.src.source.set("can't find file")
 					else:
-						self.w.panes.bottom.src.source.set('canÕt find file')
+						self.w.panes.bottom.src.source.set("can't find file")
 				else:
 					self.w.panes.bottom.src.source.set(data, filename)
 			self.file = filename
@@ -682,7 +682,7 @@ class BreakpointsViewer:
 		self.w.panes.files = W.List(None, callback = self.filehit)		#, flags = Lists.lOnlyOne)
 		self.w.panes.gr = W.Group(None)
 		self.w.panes.gr.breaks = W.List((0, 0, -130, 0), callback = self.linehit)	#, flags = Lists.lOnlyOne)
-		self.w.panes.gr.openbutton = W.Button((-80, 4, 0, 16), 'Viewƒ', self.openbuttonhit)
+		self.w.panes.gr.openbutton = W.Button((-80, 4, 0, 16), 'View\xc9', self.openbuttonhit)
 		self.w.panes.gr.deletebutton = W.Button((-80, 28, 0, 16), 'Delete', self.deletebuttonhit)
 		
 		self.w.bind('<close>', self.close)
@@ -880,7 +880,7 @@ _debugger = None
 
 def getdebugger():
 	if not __debug__:
-		raise W.AlertError, "CanÕt debug in –Optimize bytecode” mode.\r(see –Default startup options” in EditPythonPreferences)"
+		raise W.AlertError, "Can't debug in \"Optimize bytecode\" mode.\r(see \"Default startup options\" in EditPythonPreferences)"
 	global _debugger
 	if _debugger is None:
 		_debugger = Debugger()
diff --git a/Mac/Tools/IDE/PyDocSearch.py b/Mac/Tools/IDE/PyDocSearch.py
index 599c3e0..4b35e46 100644
--- a/Mac/Tools/IDE/PyDocSearch.py
+++ b/Mac/Tools/IDE/PyDocSearch.py
@@ -101,7 +101,7 @@ class Results:
 class Status:
 	
 	def __init__(self):
-		self.w = W.Dialog((440, 64), "Searchingƒ")
+		self.w = W.Dialog((440, 64), "Searching\xc9")
 		self.w.searching = W.TextBox((4, 4, -4, 16), "DevDev:PyPyDoc 1.5.1:ext:parseTupleAndKeywords.html")
 		self.w.hits = W.TextBox((4, 24, -4, 16), "Hits: 0")
 		self.w.canceltip = W.TextBox((4, 44, -4, 16), "Type cmd-period (.) to cancel.")
diff --git a/Mac/Tools/IDE/PyEdit.py b/Mac/Tools/IDE/PyEdit.py
index d968114..a58de1b 100644
--- a/Mac/Tools/IDE/PyEdit.py
+++ b/Mac/Tools/IDE/PyEdit.py
@@ -67,7 +67,7 @@ class Editor(W.Window):
 			else:
 				sourceOS = 'UNIX'
 				searchString = '\n'
-			change = EasyDialogs.AskYesNoCancel('–%s” contains %s-style line feeds. '
+			change = EasyDialogs.AskYesNoCancel('"%s" contains %s-style line feeds. '
 					'Change them to MacOS carriage returns?' % (self.title, sourceOS), 1)
 			# bug: Cancel is treated as No
 			if change > 0:
@@ -224,14 +224,14 @@ class Editor(W.Window):
 		self.linefield.bind("<click>", self.clicklinefield)
 	
 	def makeoptionsmenu(self):
-		menuitems = [('Font settingsƒ', self.domenu_fontsettings), 
-				("Save optionsƒ", self.domenu_options),
+		menuitems = [('Font settings\xc9', self.domenu_fontsettings), 
+				("Save options\xc9", self.domenu_options),
 				'-',
 				('\0' + chr(self.run_as_main) + 'Run as __main__', self.domenu_toggle_run_as_main), 
 				#('\0' + chr(self.run_with_interpreter) + 'Run with Interpreter', self.domenu_toggle_run_with_interpreter), 
 				#'-',
 				('Modularize', self.domenu_modularize),
-				('Browse namespaceƒ', self.domenu_browsenamespace), 
+				('Browse namespace\xc9', self.domenu_browsenamespace), 
 				'-']
 		if self.profiling:
 			menuitems = menuitems + [('Disable profiler', self.domenu_toggleprofiler)]
@@ -240,7 +240,7 @@ class Editor(W.Window):
 		if self.editgroup.editor._debugger:
 			menuitems = menuitems + [('Disable debugger', self.domenu_toggledebugger),
 				('Clear breakpoints', self.domenu_clearbreakpoints),
-				('Edit breakpointsƒ', self.domenu_editbreakpoints)]
+				('Edit breakpoints\xc9', self.domenu_editbreakpoints)]
 		else:
 			menuitems = menuitems + [('Enable debugger', self.domenu_toggledebugger)]
 		self.editgroup.optionsmenu.set(menuitems)
@@ -285,7 +285,7 @@ class Editor(W.Window):
 	def domenu_modularize(self, *args):
 		modname = _filename_as_modname(self.title)
 		if not modname:
-			raise W.AlertError, 'CanÕt modularize –%s”' % self.title
+			raise W.AlertError, "Can't modularize \"%s\"" % self.title
 		run_as_main = self.run_as_main
 		self.run_as_main = 0
 		self.run()
@@ -360,7 +360,7 @@ class Editor(W.Window):
 			import EasyDialogs
 			import Qd
 			Qd.InitCursor() # XXX should be done by dialog
-			save = EasyDialogs.AskYesNoCancel('Save window –%s” before closing?' % self.title, 1)
+			save = EasyDialogs.AskYesNoCancel('Save window "%s" before closing?' % self.title, 1)
 			if save > 0:
 				if self.domenu_save():
 					return 1
@@ -416,11 +416,7 @@ class Editor(W.Window):
 				W.getapplication().makescriptsmenu()
 	
 	def domenu_save_as_applet(self, *args):
-		try:
-			import buildtools
-		except ImportError:
-			# only have buildtools in Python >= 1.5.2
-			raise W.AlertError, "–Save as Applet” is only supported in\rPython 1.5.2 and up."
+		import buildtools
 		
 		buildtools.DEBUG = 0	# ouch.
 		
@@ -504,7 +500,7 @@ class Editor(W.Window):
 			if self.editgroup.editor.changed:
 				import EasyDialogs
 				import Qd; Qd.InitCursor()
-				save = EasyDialogs.AskYesNoCancel('Save –%s” before running?' % self.title, 1)
+				save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1)
 				if save > 0:
 					if self.domenu_save():
 						return
@@ -560,23 +556,23 @@ class Editor(W.Window):
 					classname = string.split(string.strip(line[6:]))[0]
 					classend = identifieRE_match(classname)
 					if classend < 1:
-						raise W.AlertError, 'CanÕt find a class.'
+						raise W.AlertError, "Can't find a class."
 					classname = classname[:classend]
 					break
 				elif line and line[0] not in '\t#':
-					raise W.AlertError, 'CanÕt find a class.'
+					raise W.AlertError, "Can't find a class."
 			else:
-				raise W.AlertError, 'CanÕt find a class.'
+				raise W.AlertError, "Can't find a class."
 			if globals.has_key(classname):
 				locals = globals[classname].__dict__
 			else:
-				raise W.AlertError, 'CanÕt find class –%s”.' % classname
+				raise W.AlertError, "Can't find class \"%s\"." % classname
 			# dedent to top level
 			for i in range(len(lines)):
 				lines[i] = lines[i][1:]
 			pytext = string.join(lines, '\r')
 		elif indent > 0:
-			raise W.AlertError, 'CanÕt run indented code.'
+			raise W.AlertError, "Can't run indented code."
 		
 		# add "newlines" to fool compile/exec: 
 		# now a traceback will give the right line number
@@ -839,7 +835,7 @@ class SearchEngine:
 		self.buttons = [	("Find",		"cmdf",	 self.find), 
 					("Replace",	     "cmdr",	 self.replace), 
 					("Replace all",	 None,   self.replaceall), 
-					("DonÕt find",  "cmdd",	 self.dont), 
+					("Don't find",  "cmdd",	 self.dont), 
 					("Cancel",	      "cmd.",	 self.cancel)
 				]
 		for i in range(len(self.buttons)):
@@ -848,7 +844,7 @@ class SearchEngine:
 			self.w[title] = W.Button(bounds, title, callback)
 			if shortcut:
 				self.w.bind(shortcut, self.w[title].push)
-		self.w.setdefaultbutton(self.w["DonÕt find"])
+		self.w.setdefaultbutton(self.w["Don't find"])
 		self.w.find.edit.bind("<key>", self.key)
 		self.w.bind("<activate>", self.activate)
 		self.w.bind("<close>", self.close)
@@ -881,11 +877,11 @@ class SearchEngine:
 			else:
 				for title, cmd, call in self.buttons[:-2]:
 					self.w[title].enable(0)
-				self.w.setdefaultbutton(self.w["DonÕt find"])
+				self.w.setdefaultbutton(self.w["Don't find"])
 		else:
 			for title, cmd, call in self.buttons[:-2]:
 				self.w[title].enable(0)
-			self.w.setdefaultbutton(self.w["DonÕt find"])
+			self.w.setdefaultbutton(self.w["Don't find"])
 	
 	def find(self):
 		self.getparmsfromwindow()
@@ -1204,7 +1200,7 @@ class _EditorDefaultSettings:
 		self.template = "%s, %d point"
 		self.fontsettings, self.tabsettings, self.windowsize = geteditorprefs()
 		self.w = W.Dialog((328, 120), "Editor default settings")
-		self.w.setfontbutton = W.Button((8, 8, 80, 16), "Set fontƒ", self.dofont)
+		self.w.setfontbutton = W.Button((8, 8, 80, 16), "Set font\xc9", self.dofont)
 		self.w.fonttext = W.TextBox((98, 10, -8, 14), self.template % (self.fontsettings[0], self.fontsettings[2]))
 		
 		self.w.picksizebutton = W.Button((8, 50, 80, 16), "Front window", self.picksize)
diff --git a/Mac/Tools/IDE/PythonIDE.py b/Mac/Tools/IDE/PythonIDE.py
index b80fd5f..9c0902e 100644
--- a/Mac/Tools/IDE/PythonIDE.py
+++ b/Mac/Tools/IDE/PythonIDE.py
@@ -1,9 +1,9 @@
-# copyright 1996-1999 Just van Rossum, Letterror. just@letterror.com
+# copyright 1996-2001 Just van Rossum, Letterror. just@letterror.com
 
 # keep this (__main__) as clean as possible, since we are using 
 # it like the "normal" interpreter.
 
-__version__ = '1.0'
+__version__ = '1.0.1'
 
 
 def init():
diff --git a/Mac/Tools/IDE/PythonIDE.rsrc b/Mac/Tools/IDE/PythonIDE.rsrc
index 1d6ca2c..70f0b2b 100644
--- a/Mac/Tools/IDE/PythonIDE.rsrc
+++ b/Mac/Tools/IDE/PythonIDE.rsrc
diff --git a/Mac/Tools/IDE/PythonIDEMain.py b/Mac/Tools/IDE/PythonIDEMain.py
index d5677a7..55489e2 100644
--- a/Mac/Tools/IDE/PythonIDEMain.py
+++ b/Mac/Tools/IDE/PythonIDEMain.py
@@ -50,13 +50,13 @@ class PythonIDE(Wapplication.Application):
 	def makeusermenus(self):
 		m = Wapplication.Menu(self.menubar, "File")
 		newitem = FrameWork.MenuItem(m, "New", "N", 'new')
-		openitem = FrameWork.MenuItem(m, "Openƒ", "O", 'open')
+		openitem = FrameWork.MenuItem(m, "Open\xc9", "O", 'open')
 		FrameWork.Separator(m)
 		closeitem = FrameWork.MenuItem(m, "Close", "W", 'close')
 		saveitem = FrameWork.MenuItem(m, "Save", "S", 'save')
-		saveasitem = FrameWork.MenuItem(m, "Save asƒ", None, 'save_as')
+		saveasitem = FrameWork.MenuItem(m, "Save as\xc9", None, 'save_as')
 		FrameWork.Separator(m)
-		saveasappletitem = FrameWork.MenuItem(m, "Save as Appletƒ", None, 'save_as_applet')
+		saveasappletitem = FrameWork.MenuItem(m, "Save as Applet\xc9", None, 'save_as_applet')
 		FrameWork.Separator(m)
 		quititem = FrameWork.MenuItem(m, "Quit", "Q", 'quit')
 		
@@ -71,7 +71,7 @@ class PythonIDE(Wapplication.Application):
 		selallitem = FrameWork.MenuItem(m, "Select all", "A", "selectall")
 		sellineitem = FrameWork.MenuItem(m, "Select line", "L", "selectline")
 		FrameWork.Separator(m)
-		finditem = FrameWork.MenuItem(m, "Findƒ", "F", "find")
+		finditem = FrameWork.MenuItem(m, "Find\xc9", "F", "find")
 		findagainitem = FrameWork.MenuItem(m, "Find again", 'G', "findnext")
 		enterselitem = FrameWork.MenuItem(m, "Enter search string", "E", "entersearchstring")
 		replaceitem = FrameWork.MenuItem(m, "Replace", None, "replace")
@@ -84,12 +84,12 @@ class PythonIDE(Wapplication.Application):
 		runitem = FrameWork.MenuItem(m, "Run window", "R", 'run')
 		runselitem = FrameWork.MenuItem(m, "Run selection", None, 'runselection')
 		FrameWork.Separator(m)
-		moditem = FrameWork.MenuItem(m, "Module browserƒ", "M", self.domenu_modulebrowser)
+		moditem = FrameWork.MenuItem(m, "Module browser\xc9", "M", self.domenu_modulebrowser)
 		FrameWork.Separator(m)
 		mm = FrameWork.SubMenu(m, "Preferences")
-		FrameWork.MenuItem(mm, "Set Scripts folderƒ", None, self.do_setscriptsfolder)
-		FrameWork.MenuItem(mm, "Editor default settingsƒ", None, self.do_editorprefs)
-		FrameWork.MenuItem(mm, "Set default window fontƒ", None, self.do_setwindowfont)
+		FrameWork.MenuItem(mm, "Set Scripts folder\xc9", None, self.do_setscriptsfolder)
+		FrameWork.MenuItem(mm, "Editor default settings\xc9", None, self.do_editorprefs)
+		FrameWork.MenuItem(mm, "Set default window font\xc9", None, self.do_setwindowfont)
 		
 		self.openwindowsmenu = Wapplication.Menu(self.menubar, 'Windows')
 		self.makeopenwindowsmenu()
@@ -110,7 +110,7 @@ class PythonIDE(Wapplication.Application):
 				path = os.path.join(os.getcwd(), "Scripts")
 				if not os.path.exists(path):
 					os.mkdir(path)
-					f = open(os.path.join(path, "Place your scripts hereƒ"), "w")
+					f = open(os.path.join(path, "Place your scripts here\xc9"), "w")
 					f.close()
 			fss = macfs.FSSpec(path)
 			self.scriptsfolder = fss.NewAlias()
@@ -156,10 +156,10 @@ class PythonIDE(Wapplication.Application):
 		if ftype == 'TEXT':
 			self.openscript(path)
 		else:
-			W.Message("CanÕt open file of type '%s'." % ftype)
+			W.Message("Can't open file of type '%s'." % ftype)
 	
 	def getabouttext(self):
-		return "About Python IDEƒ"
+		return "About Python IDE\xc9"
 	
 	def do_about(self, id, item, window, event):
 		Splash.about()
diff --git a/Mac/Tools/IDE/Splash.py b/Mac/Tools/IDE/Splash.py
index 07a51e4..60cd7c6 100644
--- a/Mac/Tools/IDE/Splash.py
+++ b/Mac/Tools/IDE/Splash.py
@@ -24,6 +24,9 @@ def uninstall_importhook():
 
 _progress = 0
 
+_about_width = 440
+_about_height = 340
+
 def importing(module):
 	global _progress
 	Qd.SetPort(splash)
@@ -32,17 +35,19 @@ def importing(module):
 		fontID = geneva
 	Qd.TextFont(fontID)
 	Qd.TextSize(9)
-	rect = (35, 265, 365, 281)
+	labelrect = (35, _about_height - 35, _about_width - 35, _about_height - 19)
+	framerect = (35, _about_height - 19, _about_width - 35, _about_height - 11)
+	l, t, r, b = progrect = Qd.InsetRect(framerect, 1, 1)
 	if module:
-		TE.TETextBox('Importing: ' + module, rect, 0)
+		TE.TETextBox('Importing: ' + module, labelrect, 0)
 		if not _progress:
-			Qd.FrameRect((35, 281, 365, 289))
-		pos = min(36 + 330 * _progress / 44, 364)
-		Qd.PaintRect((36, 282, pos, 288))
+			Qd.FrameRect(framerect)
+		pos = min(r, l + ((r - l) * _progress) / 44)
+		Qd.PaintRect((l, t, pos, b))
 		_progress = _progress + 1
 	else:
-		Qd.EraseRect(rect)
-		Qd.PaintRect((36, 282, pos, 288))
+		Qd.EraseRect(labelrect)
+		Qd.PaintRect((l, t, pos, b))
 	Qd.QDFlushPortBuffer(splash.GetDialogWindow().GetWindowPort(), None)
 
 def my__import__(name, globals=None, locals=None, fromlist=None):
@@ -71,20 +76,20 @@ import sys
 
 _keepsplashscreenopen = 0
 
-abouttext1 = """The Python Integrated Development Environment for the MacintoshŽ
+abouttext1 = """The Python Integrated Development Environment for the Macintosh\xaa
 Version: %s
-Copyright 1997-2000 Just van Rossum, Letterror. <just@letterror.com>
+Copyright 1997-2001 Just van Rossum, Letterror. <just@letterror.com>
 Python %s
 %s
 See: <http://www.python.org/> for information and documentation."""
 
-flauwekul = [	'Goodday, Bruce.', 
-			'WhatÕs new?', 
-			'Nudge, nudge, say no more!', 
-			'No, no sir, itÕs not dead. ItÕs resting.',
-			'Albatros!',
-			'ItÕs . . .',
-			'Is your name not Bruce, then?',
+flauwekul = [	"Goodday, Bruce.", 
+			"What's new?",
+			"Nudge, nudge, say no more!", 
+			"No, no sir, it's not dead. It's resting.",
+			"Albatros!",
+			"It's . . .",
+			"Is your name not Bruce, then?",
 			"""But Mr F.G. Superman has a secret identity . . . 
 when trouble strikes at any time . . . 
 at any place . . . he is ready to become . . . 
@@ -111,7 +116,7 @@ def drawtext(what = 0):
 		fontID = geneva
 	Qd.TextFont(fontID)
 	Qd.TextSize(9)
-	rect = (10, 115, 390, 290)
+	rect = (10, 115, _about_width - 10, _about_height - 30)
 	if not what:
 		import __main__
 		abouttxt = nl2return(abouttext1 % (
@@ -134,6 +139,7 @@ def wait():
 	Qd.InitCursor()
 	time = Evt.TickCount()
 	whattext = 0
+	drawtext(whattext)
 	while _keepsplashscreenopen:
 		ok, event = Evt.EventAvail(Events.highLevelEventMask)
 		if ok:
@@ -154,7 +160,7 @@ def wait():
 			drawtext(whattext)
 			time = Evt.TickCount()
 	del splash
-	#Res.CloseResFile(splashresfile)
+
 
 def about():
 	global splash, splashresfile, _keepsplashscreenopen
diff --git a/Mac/Tools/IDE/Wapplication.py b/Mac/Tools/IDE/Wapplication.py
index 540fca0..7a9b74a 100644
--- a/Mac/Tools/IDE/Wapplication.py
+++ b/Mac/Tools/IDE/Wapplication.py
@@ -344,18 +344,18 @@ class Application(FrameWork.Application):
 				# XXX and that's the last thing we want here.
 				f, filename, (suff, mode, dummy) = imp.find_module(modname)
 			except ImportError:
-				raise W.AlertError, "CanÕt find file for –%s”" % modname
+				raise W.AlertError, "Can't find file for \"%s\"" % modname
 			else:
 				if not f:
-					raise W.AlertError, "CanÕt find file for –%s”" % modname
+					raise W.AlertError, "Can't find file for \"%s\"" % modname
 				f.close()
 			if suff == '.py':
 				self.openscript(filename, lineno, charoffset)
 				return
 			else:
-				raise W.AlertError, "CanÕt find file for –%s”" % modname
+				raise W.AlertError, "Can't find file for \"%s\"" % modname
 		else:
-			raise W.AlertError, "CanÕt find file •%sÕ" % filename
+			raise W.AlertError, "Can't find file \"%s\"" % filename
 		if lineno is not None:
 			editor.selectline(lineno, charoffset)
 		return editor
diff --git a/Mac/Tools/IDE/Wtext.py b/Mac/Tools/IDE/Wtext.py
index b87008b..1518683 100644
--- a/Mac/Tools/IDE/Wtext.py
+++ b/Mac/Tools/IDE/Wtext.py
@@ -871,7 +871,7 @@ class PyEditor(TextEditor):
 			if onoff:
 				if not __debug__:
 					import W
-					raise W.AlertError, "CanÕt debug in –Optimize bytecode” mode.\r(see –Default startup options” in EditPythonPreferences)"
+					raise W.AlertError, "Can't debug in \"Optimize bytecode\" mode.\r(see \"Default startup options\" in EditPythonPreferences)"
 				import PyDebugger
 				self._debugger = PyDebugger.getdebugger()
 				self._debugger.register_editor(self, self.file)
diff --git a/Mac/Tools/IDE/Wtraceback.py b/Mac/Tools/IDE/Wtraceback.py
index 10894a8..2637cc6 100644
--- a/Mac/Tools/IDE/Wtraceback.py
+++ b/Mac/Tools/IDE/Wtraceback.py
@@ -57,7 +57,7 @@ class TraceBack:
 			filename = os.path.split(filename)[1]
 		if lineno:
 			charno = charno - 1
-			text = str(value) + '\rFile: "' + str(filename) + '", line ' + str(lineno) + '\r\r' + line[:charno] + "‚" + line[charno:-1]
+			text = str(value) + '\rFile: "' + str(filename) + '", line ' + str(lineno) + '\r\r' + line[:charno] + "\xa5" + line[charno:-1]
 		else:
 			text = str(value) + '\rFile: "' + str(filename) + '"'
 		self.syntaxdialog = W.ModalDialog((360, 120), "Syntax Error")
@@ -123,10 +123,10 @@ class TraceBack:
 		self.w.editbutton = W.Button((10, -30, 60, 16), "Edit", self.edit)
 		self.w.editbutton.enable(0)
 		
-		self.w.browselocalsbutton = W.Button((80, -30, 100, 16), "Browse localsƒ", self.browselocals)
+		self.w.browselocalsbutton = W.Button((80, -30, 100, 16), "Browse locals\xc9", self.browselocals)
 		self.w.browselocalsbutton.enable(0)
 		
-		self.w.postmortembutton = W.Button((190, -30, 100, 16), "Post mortemƒ", self.postmortem)
+		self.w.postmortembutton = W.Button((190, -30, 100, 16), "Post mortem\xc9", self.postmortem)
 		
 		self.w.setdefaultbutton(self.w.editbutton)
 		self.w.bind("cmdb", self.w.browselocalsbutton.push)
diff --git a/Mac/Tools/IDE/Wwindows.py b/Mac/Tools/IDE/Wwindows.py
index e16c647..29c07e5 100644
--- a/Mac/Tools/IDE/Wwindows.py
+++ b/Mac/Tools/IDE/Wwindows.py
@@ -568,7 +568,7 @@ def FrontWindowInsert(stuff):
 				pass
 	import EasyDialogs
 	if EasyDialogs.AskYesNoCancel(
-			"CanÕt find window or widget to insert text into; copy to clipboard instead?", 
+			"Can't find window or widget to insert text into; copy to clipboard instead?", 
 			1) == 1:
 		import Scrap
 		Scrap.ZeroScrap()