Changed the few old routine names still used to the new ones

Started working on MSL support

diff --git a/Mac/Python/macgetcompiler.c b/Mac/Python/macgetcompiler.c
index be41226264b1ff191396d70b52efe2121dbaae81..347b8d20b617cc4f1f979097bf196f31ed2d8be8 100644 (file)
--- a/Mac/Python/macgetcompiler.c
+++ b/Mac/Python/macgetcompiler.c
@@ -43,13 +43,18 @@ PERFORMANCE OF THIS SOFTWARE.
 #else
 #define HASGUSI ""
 #endif
+#ifdef USE_MSL
+#define HASMSL " w/MSL"
+#else
+#define HASMSL ""
+#endif
 #ifdef __powerc
-#define COMPILER " [CW PPC" HASGUSI "]"
+#define COMPILER " [CW PPC" HASGUSI HASMSL "]"
 #else
 #ifdef __CFM68K__
-#define COMPILER " [CW CFM68K" HASGUSI "]"
+#define COMPILER " [CW CFM68K" HASGUSI HASMSL "]"
 #else
-#define COMPILER " [CW 68K" HASGUSI "]"
+#define COMPILER " [CW 68K" HASGUSI HASMSL "]"
 #endif
 #endif
 #endif

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index d05009e71b20ff2af2eee43fcf657a206d0fbc67..cc55d088e1f486d42ff131468bd309e3803f24a9 100644 (file)
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -173,7 +173,7 @@ PyMac_FixGUSIcd()
        pb.ioNamePtr= "\p";
        pb.ioVRefNum= curdirfss.vRefNum;
        pb.ioWDDirID= curdirfss.parID;
-       if (PBHSetVol(&pb, 0) != noErr)
+       if (PBHSetVolSync(&pb) != noErr)
                return;
 }
 
@@ -540,7 +540,7 @@ PyMac_InitMenuBar()
        MenuHandle applemenu;
        
        if ( (bar=GetMenuBar()) == NULL ) return;
-       if ( (applemenu=GetMHandle(SIOUX_APPLEID)) == NULL ) return;
+       if ( (applemenu=GetMenuHandle(SIOUX_APPLEID)) == NULL ) return;
        SetMenuItemText(applemenu, 1, "\pAbout Python...");
 }
 

diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index 3197388b5e990a48cf797d3ab60a85136d3ab54e..bc02171ed8a6a63e23cb3f56b412b7cca709ba9b 100644 (file)
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -127,7 +127,7 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
        /* Set default values */
 #define SET_OPT_ITEM(num, var) \
                GetDialogItem(dialog, (num), &type, (Handle *)&handle, &rect); \
-               SetCtlValue(handle, (short)p->var);
+               SetControlValue(handle, (short)p->var);
 
        SET_OPT_ITEM(OPT_INSPECT, inspect);
        SET_OPT_ITEM(OPT_VERBOSE, verbose);
@@ -146,7 +146,7 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
                if ( item == OPT_OK )
                        break;
                if ( item == OPT_CANCEL ) {
-                       DisposDialog(dialog);
+                       DisposeDialog(dialog);
                        exit(0);
                }
                if ( item == OPT_CMDLINE ) {
@@ -171,7 +171,7 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
                if ( item == (num) ) { \
                        p->var = !p->var; \
                        GetDialogItem(dialog, (num), &type, (Handle *)&handle, &rect); \
-                       SetCtlValue(handle, (short)p->var); \
+                       SetControlValue(handle, (short)p->var); \
                }
                
                OPT_ITEM(OPT_INSPECT, inspect);
@@ -184,7 +184,7 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
                
 #undef OPT_ITEM
        }
-       DisposDialog(dialog);
+       DisposeDialog(dialog);
 }
 
 /*