From bb7e213a8b643dfed007f940d0c4beeb6dd56ca3 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 14 Jul 2000 22:15:24 +0000
Subject: PyMac_PromptGetFile and PyMac_GetDirectory don't exist in
 carbonpython.

---
 Mac/Include/macglue.h | 2 ++
 Mac/Python/macglue.c  | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index 6785dff..a0410cc 100644
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -92,9 +92,11 @@ int PyMac_FindCodeResourceModule(PyStringObject *, char *, char *); /* Test for
 PyObject * PyMac_LoadCodeResourceModule(char *, char *); /* Load 'PYD ' resource from file */
 struct filedescr *PyMac_FindModuleExtension(char *, size_t *, char *); /* Look for module in single folder */
 
+#ifndef TARGET_API_MAC_CARBON
 int PyMac_GetDirectory(FSSpec *dirfss, char *prompt);		/* Ask user for a directory */
 void PyMac_PromptGetFile(short numTypes, ConstSFTypeListPtr typeList, 
 	StandardFileReply *reply, char *prompt);	/* Ask user for file, with prompt */
+#endif /* TARGET_API_MAC_CARBON */
 
 int PyMac_GetOSType(PyObject *, OSType *);	/* argument parser for OSType */
 PyObject *PyMac_BuildOSType(OSType);		/* Convert OSType to PyObject */
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 607f4bb..d7eb9ec 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -754,7 +754,7 @@ myhook_proc(short item, DialogPtr theDialog, struct hook_args *dataptr)
 	}
 	return item;
 }	
-
+#ifndef TARGET_API_MAC_CARBON
 /*
 ** Ask the user for a directory. I still can't understand
 ** why Apple doesn't provide a standard solution for this...
@@ -769,12 +769,10 @@ PyMac_GetDirectory(dirfss, prompt)
 	StandardFileReply reply;
 	struct hook_args hook_args;
 	
-#ifndef TARGET_API_MAC_CARBON
 	if ( !upp_inited ) {
 		myhook_upp = NewDlgHookYDProc(myhook_proc);
 		upp_inited = 1;
 	}
-#endif
 	if ( prompt && *prompt )
 		hook_args.prompt = (char *)Pstring(prompt);
 	else
@@ -797,12 +795,10 @@ void PyMac_PromptGetFile(short numTypes, ConstSFTypeListPtr typeList,
 	static Point where = {-1, -1};
 	struct hook_args hook_args;
 	
-#ifndef TARGET_API_MAC_CARBON
 	if ( !upp_inited ) {
 		myhook_upp = NewDlgHookYDProc(myhook_proc);
 		upp_inited = 1;
 	}
-#endif
 	if ( prompt && *prompt )
 		hook_args.prompt = (char *)Pstring(prompt);
 	else
@@ -811,6 +807,7 @@ void PyMac_PromptGetFile(short numTypes, ConstSFTypeListPtr typeList,
 	CustomGetFile((FileFilterYDUPP)0, numTypes, typeList, reply, GETFILEPROMPT_ID, where,
 				myhook_upp, NULL, NULL, NULL, (void *)&hook_args);
 }
+#endif /* TARGET_API_MAC_CARBON */
 
 /* Convert a 4-char string object argument to an OSType value */
 int
-- 
cgit v0.12

