diff options
Diffstat (limited to 'Mac/Modules/menu/_Menumodule.c')
| -rw-r--r-- | Mac/Modules/menu/_Menumodule.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c index 4e3aa20..c48edb1 100644 --- a/Mac/Modules/menu/_Menumodule.c +++ b/Mac/Modules/menu/_Menumodule.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 <Devices.h> /* Defines OpenDeskAcc in universal headers */ -#include <Menus.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE @@ -37,16 +32,6 @@ extern int _MenuObj_Convert(PyObject *, MenuHandle *); #define MenuObj_Convert _MenuObj_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS -#define GetMenuID(menu) ((*(menu))->menuID) -#define GetMenuWidth(menu) ((*(menu))->menuWidth) -#define GetMenuHeight(menu) ((*(menu))->menuHeight) - -#define SetMenuID(menu, id) ((*(menu))->menuID = (id)) -#define SetMenuWidth(menu, width) ((*(menu))->menuWidth = (width)) -#define SetMenuHeight(menu, height) ((*(menu))->menuHeight = (height)) -#endif - #define as_Menu(h) ((MenuHandle)h) #define as_Resource(h) ((Handle)h) |