diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-19 16:13:35 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-19 16:13:35 (GMT) |
| commit | e48cef7aba0993ca6d01579f62900f0596960885 (patch) | |
| tree | 008187dc4bba4fdd74ebca680bdef67e589527e9 /Mac/Modules/ctl | |
| parent | 10d176f77e04ad95c3e501f8b65a0b9ad931a098 (diff) | |
| download | cpython-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/ctl')
| -rw-r--r-- | Mac/Modules/ctl/_Ctlmodule.c | 11 | ||||
| -rw-r--r-- | Mac/Modules/ctl/ctlsupport.py | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/Mac/Modules/ctl/_Ctlmodule.c b/Mac/Modules/ctl/_Ctlmodule.c index 98c6f4f..60fcef4 100644 --- a/Mac/Modules/ctl/_Ctlmodule.c +++ b/Mac/Modules/ctl/_Ctlmodule.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 <Controls.h> -#include <ControlDefinitions.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_CtlObj_New(ControlHandle); diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py index 2fc51cf..b2d9ad5 100644 --- a/Mac/Modules/ctl/ctlsupport.py +++ b/Mac/Modules/ctl/ctlsupport.py @@ -113,12 +113,7 @@ ControlSliderOrientation = UInt16 includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Controls.h> -#include <ControlDefinitions.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_CtlObj_New(ControlHandle); |