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

jackjansen · jackjansen · commit 08c3be35c330 · 1997-04-08T15:27:00.000Z
Started working on MSL support
diff --git 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
@@ -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
@@ -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);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ PyMac_FixGUSIcd()`
`173`	`173`	`pb.ioNamePtr= "\p";`
`174`	`174`	`pb.ioVRefNum= curdirfss.vRefNum;`
`175`	`175`	`pb.ioWDDirID= curdirfss.parID;`
`176`		`- if (PBHSetVol(&pb, 0) != noErr)`
	`176`	`+ if (PBHSetVolSync(&pb) != noErr)`
`177`	`177`	`return;`
`178`	`178`	`}`
`179`	`179`
`@@ -540,7 +540,7 @@ PyMac_InitMenuBar()`
`540`	`540`	`MenuHandle applemenu;`
`541`	`541`
`542`	`542`	`if ( (bar=GetMenuBar()) == NULL ) return;`
`543`		`- if ( (applemenu=GetMHandle(SIOUX_APPLEID)) == NULL ) return;`
	`543`	`+ if ( (applemenu=GetMenuHandle(SIOUX_APPLEID)) == NULL ) return;`
`544`	`544`	`SetMenuItemText(applemenu, 1, "\pAbout Python...");`
`545`	`545`	`}`
`546`	`546`