summaryrefslogtreecommitdiffstats
path: root/Mac/Modules/app
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-11-19 16:13:35 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-11-19 16:13:35 (GMT)
commite48cef7aba0993ca6d01579f62900f0596960885 (patch)
tree008187dc4bba4fdd74ebca680bdef67e589527e9 /Mac/Modules/app
parent10d176f77e04ad95c3e501f8b65a0b9ad931a098 (diff)
downloadcpython-e48cef7aba0993ca6d01579f62900f0596960885.zip
cpython-e48cef7aba0993ca6d01579f62900f0596960885.tar.gz
cpython-e48cef7aba0993ca6d01579f62900f0596960885.tar.bz2
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.
Diffstat (limited to 'Mac/Modules/app')
-rw-r--r--Mac/Modules/app/_Appmodule.c11
-rw-r--r--Mac/Modules/app/appsupport.py5
2 files changed, 3 insertions, 13 deletions
diff --git a/Mac/Modules/app/_Appmodule.c b/Mac/Modules/app/_Appmodule.c
index 069c08f..2a74325 100644
--- a/Mac/Modules/app/_Appmodule.c
+++ b/Mac/Modules/app/_Appmodule.c
@@ -14,18 +14,13 @@
/* Macro to test whether a weak-loaded CFM function exists */
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
- PyErr_SetString(PyExc_NotImplementedError, \
- "Not available in this shared library/OS version"); \
- return NULL; \
+ PyErr_SetString(PyExc_NotImplementedError, \
+ "Not available in this shared library/OS version"); \
+ return NULL; \
}} while(0)
-#ifdef WITHOUT_FRAMEWORKS
-#include <Appearance.h>
-#else
#include <Carbon/Carbon.h>
-#endif
-
int ThemeButtonDrawInfo_Convert(PyObject *v, ThemeButtonDrawInfo *p_itself)
diff --git a/Mac/Modules/app/appsupport.py b/Mac/Modules/app/appsupport.py
index dc8ae4f..a9d8768 100644
--- a/Mac/Modules/app/appsupport.py
+++ b/Mac/Modules/app/appsupport.py
@@ -79,12 +79,7 @@ ThemeButtonDrawUPP = FakeType("NULL")
includestuff = includestuff + """
-#ifdef WITHOUT_FRAMEWORKS
-#include <Appearance.h>
-#else
#include <Carbon/Carbon.h>
-#endif
-
int ThemeButtonDrawInfo_Convert(PyObject *v, ThemeButtonDrawInfo *p_itself)