Commit ce8f314b authored by Jack Jansen's avatar Jack Jansen

I give in. Now Tk is also using resources just above 128, so Python

now uses only 228-256, leaving 128-228 free for others. This mod
affects prefs files, libraries and almost everything else, so I've
upped my local Python to 1.5b4 to remain sane.
parent f3367bfa
#define BUILD 5 #define BUILD 29
...@@ -26,7 +26,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -26,7 +26,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
** Resource-IDs in use by Python. ** Resource-IDs in use by Python.
** **
** All resources used by the python interpreter itself fall ** All resources used by the python interpreter itself fall
** in the range 128-256. ** in the range 228-256. The range 128-228 is not used, because
** there is too much chance of conflicts with other packages.
** **
** Standard python modules use resources in the range ** Standard python modules use resources in the range
** 256-512. ** 256-512.
...@@ -41,23 +42,23 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -41,23 +42,23 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* The alert for "No Python directory, where is it?" (OBSOLETE) */ /* The alert for "No Python directory, where is it?" (OBSOLETE) */
#define NOPYTHON_ALERT 128 #define NOPYTHON_ALERT 228
#define YES_ITEM 1 #define YES_ITEM 1
#define NO_ITEM 2 #define NO_ITEM 2
#define CURWD_ITEM 3 #define CURWD_ITEM 3
/* The alert for "this is an applet template" */ /* The alert for "this is an applet template" */
#define NOPYC_ALERT 129 #define NOPYC_ALERT 229
/* The dialog for our GetDirectory and PromptGetFile call */ /* The dialog for our GetDirectory and PromptGetFile call */
#define GETDIR_ID 130 /* Resource ID for our "get directory" */ #define GETDIR_ID 230 /* Resource ID for our "get directory" */
#define GETFILEPROMPT_ID 132 /* Resource id for prompted get file */ #define GETFILEPROMPT_ID 232 /* Resource id for prompted get file */
#define PROMPT_ITEM 10 /* The prompt, at the top */ #define PROMPT_ITEM 10 /* The prompt, at the top */
#define SELECTCUR_ITEM 11 /* "Select current directory" button */ #define SELECTCUR_ITEM 11 /* "Select current directory" button */
/* The dialog for interactive options */ /* The dialog for interactive options */
#define OPT_DIALOG 131 /* Resource ID for dialog */ #define OPT_DIALOG 231 /* Resource ID for dialog */
#define OPT_OK 1 #define OPT_OK 1
#define OPT_CANCEL 2 #define OPT_CANCEL 2
#define OPT_INSPECT 3 #define OPT_INSPECT 3
...@@ -73,21 +74,21 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -73,21 +74,21 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define OPT_HELP 16 #define OPT_HELP 16
/* Dialog for 'No preferences directory' */ /* Dialog for 'No preferences directory' */
#define NOPREFDIR_ID 133 #define NOPREFDIR_ID 233
/* Dialog for 'Bad or outdated preferences' */ /* Dialog for 'Bad or outdated preferences' */
#define BADPREFERENCES_ID 134 #define BADPREFERENCES_ID 234
#define BADPREF_DELETE 1 #define BADPREF_DELETE 1
#define BADPREF_CONTINUE 2 #define BADPREF_CONTINUE 2
#define BADPREF_QUIT 3 #define BADPREF_QUIT 3
/* Dialog for 'Bad preference file' */ /* Dialog for 'Bad preference file' */
#define BADPREFFILE_ID 135 #define BADPREFFILE_ID 235
/* About box */ /* About box */
#define ABOUT_ID 136 #define ABOUT_ID 236
/* No preferences file name resource */ /* No preferences file name resource */
#define NOPREFNAME_ID 137 #define NOPREFNAME_ID 237
/* EditPythonPrefs range. Needed here to forestall conflicts with applets */ /* EditPythonPrefs range. Needed here to forestall conflicts with applets */
#define EDITPYTHONPREFS_MIN 508 #define EDITPYTHONPREFS_MIN 508
...@@ -108,27 +109,27 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -108,27 +109,27 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
** of the resource file chain and the non-override version of the resource is ** of the resource file chain and the non-override version of the resource is
** searched in any resource file. ** searched in any resource file.
** **
** The effect of this is that, for example, a 'Popt' of 128 in the application or ** The effect of this is that, for example, a 'Popt' of 228 in the application or
** shared library provides default options for use when no preferences are set, ** shared library provides default options for use when no preferences are set,
** while a 'Popt' of 129 (in the application *only*) overrides any options in the ** while a 'Popt' of 229 (in the application *only*) overrides any options in the
** preferences file. ** preferences file.
*/ */
/* The STR resource that holds the preference file name */ /* The STR resource that holds the preference file name */
/* #define PREFFILENAME_ID 128 */ /* #define PREFFILENAME_ID 228 */
#define PREFFILENAME_NAME "\pPythonPreferenceFileName" #define PREFFILENAME_NAME "\pPythonPreferenceFileName"
/* The STR# resource for sys.path initialization */ /* The STR# resource for sys.path initialization */
#define PYTHONPATH_ID 128 #define PYTHONPATH_ID 228
#define PYTHONPATHOVERRIDE_ID 129 #define PYTHONPATHOVERRIDE_ID 229
/* The alis resource for locating the python home directory */ /* The alis resource for locating the python home directory */
#define PYTHONHOME_ID 128 #define PYTHONHOME_ID 228
#define PYTHONHOMEOVERRIDE_ID 129 #define PYTHONHOMEOVERRIDE_ID 229
/* The Python options resource and offset of its members */ /* The Python options resource and offset of its members */
#define PYTHONOPTIONS_ID 128 #define PYTHONOPTIONS_ID 228
#define PYTHONOPTIONSOVERRIDE_ID 129 #define PYTHONOPTIONSOVERRIDE_ID 229
#if 0 #if 0
#define POPT_INSPECT 0 #define POPT_INSPECT 0
#define POPT_VERBOSE 1 #define POPT_VERBOSE 1
......
...@@ -4,15 +4,15 @@ from preferences import * ...@@ -4,15 +4,15 @@ from preferences import *
PREFNAME_NAME="PythonPreferenceFileName" PREFNAME_NAME="PythonPreferenceFileName"
# Resource IDs in the preferences file # Resource IDs in the preferences file
PATH_ID = 128 PATH_ID = 228
DIR_ID = 128 DIR_ID = 228
POPT_ID = 128 POPT_ID = 228
GUSI_ID = 10240 GUSI_ID = 10240
# Override IDs (in the applet) # Override IDs (in the applet)
OVERRIDE_PATH_ID = 129 OVERRIDE_PATH_ID = 229
OVERRIDE_DIR_ID = 129 OVERRIDE_DIR_ID = 229
OVERRIDE_POPT_ID = 129 OVERRIDE_POPT_ID = 229
OVERRIDE_GUSI_ID = 10241 OVERRIDE_GUSI_ID = 10241
# version # version
......
This diff is collapsed.
DIALOG 131 Options DIALOG 231 Options
1.1 Start the interpreter. 1.1 Start the interpreter.
2.1 Return to the finder. 2.1 Return to the finder.
3.1 Turn this item on to get the standard >>> prompt after a script terminates. 3.1 Turn this item on to get the standard >>> prompt after a script terminates.
...@@ -22,7 +22,7 @@ DIALOG 131 Options ...@@ -22,7 +22,7 @@ DIALOG 131 Options
14.3 Deselecting this enables the new package and site-python features. 14.3 Deselecting this enables the new package and site-python features.
16.1 Turn off balloon help. 16.1 Turn off balloon help.
END-DIALOG END-DIALOG
DIALOG 134 DIALOG 234
1.1 Deleting the incorrect preference will not always work, but Python will run with standard options. 1.1 Deleting the incorrect preference will not always work, but Python will run with standard options.
2.1 Python will continue to run, but with standard options. 2.1 Python will continue to run, but with standard options.
3.1 Don't run, return to the finder. 3.1 Don't run, return to the finder.
......
This diff is collapsed.
This diff is collapsed.
(This file must be converted with BinHex 4.0) (This file must be converted with BinHex 4.0)
:$h"jG'K[ER"KG'JZFR0bB`"bFh*M8P0&4!%!N!F$a9jA!*!%!3!!!!-C!!!#'3! :$h"jG'K[ER"KG'JZFR0bB`"bFh*M8P0&4!%!N!F$a9jA!*!%!3!!!!-C!!!#'3!
!!+`!N!X"!!!"H+[4@X`28h"PC@4[E@9dCA)2F(PdD'pZF'&dD#jbFh*M!J!!!$q !!+`!N!X"!!!"H+[4@X`28h"PC@4[E@9dCA)2F(PdD'pZF'&dD#jbFh*M!J!#!(*
3#!#3"Mq3#!#3',$5a*F!N!B$aA*KF'KTBd0[ERCPFR4PFJ#3%J%!!&*9Uqj3Y!T cFQ058d9%!3$rr`)!FR0bBe*6483"!2q3"!#3$`'P+l$5a*F!N!B$aA*KF'KTBd0
6D@e`E'98CAKd!*!B!3!!@QHVqpjT$NjPG(0MBA"P)$%Z-@)c!*!8!3!!!ALVhBV [ERCPFR4PFJ#3%J%!!&*9Uqj3Y!T6D@e`E'98CAKd!*!B!3!!@QHVqpjT$NjPG(0
F!!!!'4K3HA4SEfiJ-5ieBM-J8(*PCQ9bC@jMCA-!!!%d%P"bC@CPFQ9ZBf8JGQ9 MBA"P)$%Z-@)c!*!8!3!!!ALVhBVF!!!!'4K3HA4SEfiJ-5ieBM3J8(*PCQ9bC@j
bFfP[EN4#@93B5@jdCA*KBh4TGQ8JB@CdCA)JFf0bDA"d4%*C9!j@CA*LEh0P)'P MCA-!!!%d%P"bC@CPFQ9ZBf8JGQ9bFfP[EN4#@93B5@jdCA*KBh4TGQ8JB@CdCA)
YF'pbG%4#@9346h"dD@eTHQ8JBRPdC@0[C'9%3PP8%&9ZBR9QCQ9bC@3JFh4ND@p JFf0bDA"d4%*C9!j@CA*LEh0P)'PYF'pbG%4#@9346h"dD@eTHQ8JBRPdC@0[C'9
%3PP8#84PBR9RCfPZCd4#@93D5f9PF#"hD@jNEhFJEfiJEQpbE@&X)'9iDA4%3PP %3PP8%&9ZBR9QCQ9bC@3JFh4ND@p%3PP8#84PBR9RCfPZCd4#@93D5f9PF#"hD@j
8'8YPCA!JGfPZC'ph)'pZ)'9bFQpb)'9iDA4%3PP8(8j[)'PZG'9bB@0dDACP)'p NEhFJEfiJEQpbE@&X)'9iDA4%3PP8'8YPCA!JGfPZC'ph)'pZ)'9bFQpb)'9iDA4
`G'P[EL"cCA4dD@jR4%*C9"C1Eb"KFQGM,f&bChBJC@eeE'&dD@pZ4%*C9"e2E'3 %3PP8(8j[)'PZG'9bB@0dDACP)'p`G'P[EL"cCA4dD@jR4%*C9"C1Eb"KFQGM,f&
YFh4jE'8JFh4KEQ4KFQ3JCAKMCA"dD@pZFd4#@9364'PcB@*XC5"cDA4P,A"jG'K bChBJC@eeE'&dD@pZ4%*C9"e2E'3YFh4jE'8JFh4KEQ4KFQ3JCAKMCA"dD@pZFd4
[EN4#@93!!!!-"!#3"J%!N!H`!!N"1JNN+&"C9%K26LN0*#K3@94)6diT1NaTBK% #@9364'PcB@*XC5"cDA4P,A"jG'K[EN4#@93!!!!-"!#3"J%!N!H`!!N"1JNN+&"
N+&"C9%K26LNk8'aeCdPZFa3N+&"C9%K26LNk6'PL1QaTBLedDa%N+&"C9%K26LN C9%K26LN0*#K3@94)6diT1NaTBK%N+&"C9%K26LNk8'aeCdPZFa3N+&"C9%K26LN
k6@&M1NaTBKdN+&"C9%K26LNk6@&M1NaTBMTXD@)YG'p[E'*[H"mN+&"C9%K26LN k6'PL1QaTBLedDa%N+&"C9%K26LNk6@&M1NaTBKdN+&"C9%K26LNk6@&M1NaTBMT
k6@&M1NaTBMTXD@)YFf0bDA"dD@jR(#3S8&P85%p1+6T&H(4PER0TEfjc1QPYCcT XD@)YG'p[E'*[H"mN+&"C9%K26LNk6@&M1NaTBMTXD@)YFf0bDA"dD@jR(#3S8&P
-D@)!!!%!!!!$'3!!!KN!!!#X!0iG9"d%!!!!(!"Z!!069&)M!!!!)P408%`!!!! 85%p1+6T&H(4PER0TEfjc1QPYCcT-D@)!!!%!!!!$'3!!!KN!!!#X!jEKm$6L!!!
Z8'p`G!!!!$T69&)J!!!!4J#!!!d!!!&P!*!&J!#3"4d!N!@!!!8!!!&9!*!&J!! !(!"Z!!069&)M!!!!)P408%`!!!!Z8'p`G!!!!$T69&)J!!!!4J$N!*!%!@8!N!A
P!*!&hK`X"&"[F(3(6h"dD@pZFaGcHA-ZF'&dD#"TEQPdD@&XDATKG'P[EKK3HA4 N!$N!!!!G!*!&j!!a!!!"93#3"H3!'!#3"!1@j*`AFhPc,R"KG'JJD@jTG'PKE'P
SEfj3FQ9QCA*PEQ0P4QPXC8jKE@A"1!: kBA4TEfiB8(PdD'pZ8(*PCQ9bC@jMC8CTE'91B@eP"dp`G'P[ER-%8'p`G2jV:
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment