summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-05-22 21:48:40 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-05-22 21:48:40 (GMT)
commit1129671350048d9f415d3ba3c411b9bcd8b7ae75 (patch)
treef693701fffd0fc2d52946e8676a402c5f22b9ca0 /Mac
parentcf9922531243e697b330dc33e108385fd158e5bb (diff)
downloadcpython-1129671350048d9f415d3ba3c411b9bcd8b7ae75.zip
cpython-1129671350048d9f415d3ba3c411b9bcd8b7ae75.tar.gz
cpython-1129671350048d9f415d3ba3c411b9bcd8b7ae75.tar.bz2
Fixed changed UPP routines names. The module now compiles and loads.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Modules/Nav.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 934dc87..ff7724e 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -32,7 +32,11 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Python.h"
#include "macglue.h"
#include "pymactoolbox.h"
+#ifdef WITHOUT_FRAMEWORKS
#include <Navigation.h>
+#else
+#include <Carbon/Carbon.h>
+#endif
static PyObject *ErrorObject;
@@ -965,9 +969,9 @@ initNav()
/* XXXX Add constants here */
/* Set UPPs */
- my_eventProcUPP = NewNavEventProc(my_eventProc);
- my_previewProcUPP = NewNavPreviewProc(my_previewProc);
- my_filterProcUPP = NewNavObjectFilterProc(my_filterProc);
+ my_eventProcUPP = NewNavEventUPP(my_eventProc);
+ my_previewProcUPP = NewNavPreviewUPP(my_previewProc);
+ my_filterProcUPP = NewNavObjectFilterUPP(my_filterProc);
}