From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 9 May 2000 10:01:52 +0000 (+0000)
Subject: Selecting the macfsn option didn't work, fixed.
X-Git-Tag: v2.0b1~1805
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f8a6d21a16fcd38924c1beb992c4af84e5ae1c2;p=thirdparty%2FPython%2Fcpython.git

Selecting the macfsn option didn't work, fixed.
Fixed the help strings.
Swapped the macfsn and help button numbers.
---

diff --git a/Mac/scripts/EditPythonPrefs.py b/Mac/scripts/EditPythonPrefs.py
index 618d33e4ec18..44d89a63153c 100644
--- a/Mac/scripts/EditPythonPrefs.py
+++ b/Mac/scripts/EditPythonPrefs.py
@@ -50,8 +50,7 @@ opt_dialog_map = [
 	None, None, None, None, None, None, None, None, # 11-18 are different
 	"tabwarn",
 	"nosite",
-	None,
-	"nonavservices"]
+	"nonavservice"]
 opt_dialog_dict = {}
 for i in range(len(opt_dialog_map)):
 	if opt_dialog_map[i]:
diff --git a/Mac/scripts/EditPythonPrefs.rsrc b/Mac/scripts/EditPythonPrefs.rsrc
index 7ed29c7c38c9..f4b893f683e9 100644
Binary files a/Mac/scripts/EditPythonPrefs.rsrc and b/Mac/scripts/EditPythonPrefs.rsrc differ
diff --git a/Mac/scripts/EditPythonPrefsBH.bh b/Mac/scripts/EditPythonPrefsBH.bh
index c12f31d90b9c..25b55ccfcea7 100644
--- a/Mac/scripts/EditPythonPrefsBH.bh
+++ b/Mac/scripts/EditPythonPrefsBH.bh
@@ -32,12 +32,12 @@ DIALOG 510
 12.1 The type code Python will create files with. TEXT is probably best.
 13.1 Press here when satisfied with your new settings in this dialog.
 14.1 Press here when you're not satisfied with your new settings.
-19.1 Select to use string-type values for standard exceptions.
-19.3 Deselect to use new class-based standard exceptions.
+19.1 Select to warn for inconsistent TAB usage in sources.
+19.3 Deselect to disable TAB consistency warnings.
 20.1 Selecting this disables the new package and site-python features.
 20.3 Deselecting this enables the new package and site-python features.
-21.1 Press here to turn help balloons off again.
-22.1 Select this to use old-style Standard File calls in macfs
-22.3 Deselect this to auto-import macfsn which replaces macfs StandardFile calls with Navigation Services wrappers
+21.1 Select this to use old-style Standard File calls in macfs
+21.3 Deselect this to auto-import macfsn which replaces macfs StandardFile calls with Navigation Services wrappers
+22.1 Press here to turn help balloons off again.
 END-DIALOG
 END
diff --git a/Mac/scripts/EditPythonPrefsBH.prj b/Mac/scripts/EditPythonPrefsBH.prj
index dcfa46746fad..955426d9e1d3 100644
Binary files a/Mac/scripts/EditPythonPrefsBH.prj and b/Mac/scripts/EditPythonPrefsBH.prj differ
diff --git a/Mac/scripts/EditPythonPrefsBH.rsrc b/Mac/scripts/EditPythonPrefsBH.rsrc
index d272f638f14c..ab50d323bdcc 100644
Binary files a/Mac/scripts/EditPythonPrefsBH.rsrc and b/Mac/scripts/EditPythonPrefsBH.rsrc differ