Added old-exceptions and no-site-python options and upped preference

version to 4.
Added balloon-help item to options dialog.

diff --git a/Mac/Include/pythonresources.h b/Mac/Include/pythonresources.h
index 347a53cbb4e131abd5a4d00d4f7c17875035f32c..b7e2da83d0578361be37d22679e1b62258c69651 100644 (file)
--- a/Mac/Include/pythonresources.h
+++ b/Mac/Include/pythonresources.h
@@ -62,12 +62,15 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define OPT_CANCEL             2
 #define OPT_INSPECT            3
 #define OPT_VERBOSE            4
-#define OPT_SUPPRESS   5
+#define OPT_OPTIMIZE   5
 #define OPT_UNBUFFERED 6
 #define OPT_DEBUGGING  7
 #define OPT_KEEPNORMAL 8
 #define OPT_KEEPERROR  9
 #define OPT_CMDLINE            10
+#define OPT_OLDEXC     13
+#define OPT_NOSITE     14
+#define OPT_HELP       16
 
 /* Dialog for 'No preferences directory' */
 #define NOPREFDIR_ID   133
@@ -126,6 +129,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* The Python options resource and offset of its members */
 #define PYTHONOPTIONS_ID 128
 #define PYTHONOPTIONSOVERRIDE_ID 129
+#if 0
 #define POPT_INSPECT   0
 #define POPT_VERBOSE   1
 #define POPT_OPTIMIZE  2
@@ -133,8 +137,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define POPT_DEBUGGING 4
 #define POPT_KEEPNORM  5
 #define POPT_KEEPERR   6
+#endif
 
-#define POPT_VERSION_CURRENT   3       /* Current version number */
+#define POPT_VERSION_CURRENT   4       /* Current version number */
 
 typedef struct PyMac_PrefRecord {
        unsigned char   version;
@@ -147,6 +152,8 @@ typedef struct PyMac_PrefRecord {
        unsigned char   keep_error;
        unsigned char   nointopt;
        unsigned char   noargs;
+       unsigned char   oldexc;
+       unsigned char   nosite;
 } PyMac_PrefRecord;
 
 /* The GUSI options resources */