diff options
57 files changed, 57 insertions, 520 deletions
diff --git a/Mac/Modules/ae/_AEmodule.c b/Mac/Modules/ae/_AEmodule.c index c5445dc..91364e7 100644 --- a/Mac/Modules/ae/_AEmodule.c +++ b/Mac/Modules/ae/_AEmodule.c @@ -14,21 +14,16 @@ /* 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) #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <AppleEvents.h> -#include <AEObjects.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_AEDesc_New(AEDesc *); diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py index 89a571b..672b544 100644 --- a/Mac/Modules/ae/aesupport.py +++ b/Mac/Modules/ae/aesupport.py @@ -85,12 +85,7 @@ includestuff = includestuff + """ #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <AppleEvents.h> -#include <AEObjects.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_AEDesc_New(AEDesc *); diff --git a/Mac/Modules/ah/_AHmodule.c b/Mac/Modules/ah/_AHmodule.c index cf69076..9408e53 100644 --- a/Mac/Modules/ah/_AHmodule.c +++ b/Mac/Modules/ah/_AHmodule.c @@ -14,17 +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 <AppleHelp.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Ah_Error; diff --git a/Mac/Modules/ah/ahsupport.py b/Mac/Modules/ah/ahsupport.py index a1e6d00..c91c298 100644 --- a/Mac/Modules/ah/ahsupport.py +++ b/Mac/Modules/ah/ahsupport.py @@ -20,11 +20,7 @@ from macsupport import * AHTOCType = Type("AHTOCType", "h") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <AppleHelp.h> -#else #include <Carbon/Carbon.h> -#endif """ 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) diff --git a/Mac/Modules/carbonevt/CarbonEvtsupport.py b/Mac/Modules/carbonevt/CarbonEvtsupport.py index 492720f..19d7d6d 100644 --- a/Mac/Modules/carbonevt/CarbonEvtsupport.py +++ b/Mac/Modules/carbonevt/CarbonEvtsupport.py @@ -74,11 +74,7 @@ MouseTrackingResult = UInt16 includestuff = r""" -#ifdef WITHOUT_FRAMEWORKS -#include <CarbonEvents.h> -#else #include <Carbon/Carbon.h> -#endif #include "macglue.h" diff --git a/Mac/Modules/carbonevt/_CarbonEvtmodule.c b/Mac/Modules/carbonevt/_CarbonEvtmodule.c index 6d1aa0f..46eb31e 100755 --- a/Mac/Modules/carbonevt/_CarbonEvtmodule.c +++ b/Mac/Modules/carbonevt/_CarbonEvtmodule.c @@ -5,11 +5,7 @@ -#ifdef WITHOUT_FRAMEWORKS -#include <CarbonEvents.h> -#else #include <Carbon/Carbon.h> -#endif #include "macglue.h" diff --git a/Mac/Modules/cf/_CFmodule.c b/Mac/Modules/cf/_CFmodule.c index d6dba45..8a82d2b 100644 --- a/Mac/Modules/cf/_CFmodule.c +++ b/Mac/Modules/cf/_CFmodule.c @@ -20,18 +20,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <CFBase.h> -#include <CFArray.h> -#include <CFData.h> -#include <CFDictionary.h> -#include <CFString.h> -#include <CFURL.h> -#include <CFPropertyList.h> -#include <CFPreferences.h> -#else #include <CoreServices/CoreServices.h> -#endif #include "pycfbridge.h" diff --git a/Mac/Modules/cf/cfsupport.py b/Mac/Modules/cf/cfsupport.py index f27c58b..e68ae03 100644 --- a/Mac/Modules/cf/cfsupport.py +++ b/Mac/Modules/cf/cfsupport.py @@ -42,18 +42,7 @@ class MethodSkipArg1(MethodGenerator): # Create the type objects includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <CFBase.h> -#include <CFArray.h> -#include <CFData.h> -#include <CFDictionary.h> -#include <CFString.h> -#include <CFURL.h> -#include <CFPropertyList.h> -#include <CFPreferences.h> -#else #include <CoreServices/CoreServices.h> -#endif #include "pycfbridge.h" diff --git a/Mac/Modules/cf/pycfbridge.c b/Mac/Modules/cf/pycfbridge.c index 21a9522..3e4b89a 100644 --- a/Mac/Modules/cf/pycfbridge.c +++ b/Mac/Modules/cf/pycfbridge.c @@ -2,17 +2,7 @@ ** Convert objects from Python to CoreFoundation and vice-versa. */ -#ifdef WITHOUT_FRAMEWORKS -#include <CFBase.h> -#include <CFNumber.h> -#include <CFArray.h> -#include <CFData.h> -#include <CFDictionary.h> -#include <CFString.h> -#include <CFURL.h> -#else #include <CoreServices/CoreServices.h> -#endif #include "Python.h" #include "macglue.h" diff --git a/Mac/Modules/cg/_CGmodule.c b/Mac/Modules/cg/_CGmodule.c index 3bc114c..09b803c 100755 --- a/Mac/Modules/cg/_CGmodule.c +++ b/Mac/Modules/cg/_CGmodule.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 <Quickdraw.h> -#include <CGContext.h> -#else #include <ApplicationServices/ApplicationServices.h> -#endif #if !TARGET_API_MAC_OSX /* This code is adapted from the CallMachOFramework demo at: diff --git a/Mac/Modules/cg/cgsupport.py b/Mac/Modules/cg/cgsupport.py index 7456b55..a8372f2 100755 --- a/Mac/Modules/cg/cgsupport.py +++ b/Mac/Modules/cg/cgsupport.py @@ -23,12 +23,7 @@ RgnHandle = OpaqueByValueType("RgnHandle", "ResObj") # Create the type objects includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Quickdraw.h> -#include <CGContext.h> -#else #include <ApplicationServices/ApplicationServices.h> -#endif #if !TARGET_API_MAC_OSX /* This code is adapted from the CallMachOFramework demo at: diff --git a/Mac/Modules/cm/_Cmmodule.c b/Mac/Modules/cm/_Cmmodule.c index 7abdaa9..f9b1bf7 100644 --- a/Mac/Modules/cm/_Cmmodule.c +++ b/Mac/Modules/cm/_Cmmodule.c @@ -14,17 +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 <Components.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_CmpObj_New(Component); diff --git a/Mac/Modules/cm/cmsupport.py b/Mac/Modules/cm/cmsupport.py index 2468193..98018c4 100644 --- a/Mac/Modules/cm/cmsupport.py +++ b/Mac/Modules/cm/cmsupport.py @@ -21,11 +21,7 @@ from macsupport import * # Create the type objects includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Components.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_CmpObj_New(Component); 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); diff --git a/Mac/Modules/dlg/_Dlgmodule.c b/Mac/Modules/dlg/_Dlgmodule.c index 3e0bc6d..966e1ff 100644 --- a/Mac/Modules/dlg/_Dlgmodule.c +++ b/Mac/Modules/dlg/_Dlgmodule.c @@ -20,11 +20,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <Dialogs.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_DlgObj_New(DialogRef); diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py index 1b561d9..85bc607 100644 --- a/Mac/Modules/dlg/dlgsupport.py +++ b/Mac/Modules/dlg/dlgsupport.py @@ -31,11 +31,7 @@ StringPtr = Str255 EventMask = Type("EventMask", "H") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Dialogs.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_DlgObj_New(DialogRef); diff --git a/Mac/Modules/drag/_Dragmodule.c b/Mac/Modules/drag/_Dragmodule.c index 3b00da8..79f0384 100644 --- a/Mac/Modules/drag/_Dragmodule.c +++ b/Mac/Modules/drag/_Dragmodule.c @@ -14,17 +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 <Drag.h> -#else #include <Carbon/Carbon.h> -#endif /* Callback glue routines */ DragTrackingHandlerUPP dragglue_TrackingHandlerUPP; diff --git a/Mac/Modules/drag/dragsupport.py b/Mac/Modules/drag/dragsupport.py index 84c71a5..c200950 100644 --- a/Mac/Modules/drag/dragsupport.py +++ b/Mac/Modules/drag/dragsupport.py @@ -44,11 +44,7 @@ FlavorFlags = Type("FlavorFlags", "l") DragTrackingMessage = Type("DragTrackingMessage", "h") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Drag.h> -#else #include <Carbon/Carbon.h> -#endif /* Callback glue routines */ DragTrackingHandlerUPP dragglue_TrackingHandlerUPP; diff --git a/Mac/Modules/evt/_Evtmodule.c b/Mac/Modules/evt/_Evtmodule.c index 48c878d..9f62a2f 100644 --- a/Mac/Modules/evt/_Evtmodule.c +++ b/Mac/Modules/evt/_Evtmodule.c @@ -14,17 +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 <Events.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Evt_Error; diff --git a/Mac/Modules/evt/evtsupport.py b/Mac/Modules/evt/evtsupport.py index 7dd7258..ccdc1c5 100644 --- a/Mac/Modules/evt/evtsupport.py +++ b/Mac/Modules/evt/evtsupport.py @@ -35,11 +35,7 @@ EventMask = Type("EventMask", "H") EventKind = Type("EventKind", "H") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Events.h> -#else #include <Carbon/Carbon.h> -#endif """ diff --git a/Mac/Modules/file/_Filemodule.c b/Mac/Modules/file/_Filemodule.c index 5a1cafd..9d6e371 100644 --- a/Mac/Modules/file/_Filemodule.c +++ b/Mac/Modules/file/_Filemodule.c @@ -20,11 +20,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <Files.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern int _PyMac_GetFSSpec(PyObject *v, FSSpec *spec); diff --git a/Mac/Modules/file/filesupport.py b/Mac/Modules/file/filesupport.py index 7223038..9fa8edd 100644 --- a/Mac/Modules/file/filesupport.py +++ b/Mac/Modules/file/filesupport.py @@ -122,11 +122,7 @@ FSCatalogInfo_ptr = OpaqueType("FSCatalogInfo", "FSCatalogInfo") #FSSpecArrayPtr includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Files.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern int _PyMac_GetFSSpec(PyObject *v, FSSpec *spec); diff --git a/Mac/Modules/fm/_Fmmodule.c b/Mac/Modules/fm/_Fmmodule.c index 095fe3a..cba96e0 100644 --- a/Mac/Modules/fm/_Fmmodule.c +++ b/Mac/Modules/fm/_Fmmodule.c @@ -14,17 +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 <Fonts.h> -#else #include <Carbon/Carbon.h> -#endif /* diff --git a/Mac/Modules/fm/fmsupport.py b/Mac/Modules/fm/fmsupport.py index 20ae292..07b944e 100644 --- a/Mac/Modules/fm/fmsupport.py +++ b/Mac/Modules/fm/fmsupport.py @@ -26,11 +26,7 @@ TextBuffer = RevVarInputBufferType() includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Fonts.h> -#else #include <Carbon/Carbon.h> -#endif /* diff --git a/Mac/Modules/folder/_Foldermodule.c b/Mac/Modules/folder/_Foldermodule.c index 07d7bf5..9c7afc6 100644 --- a/Mac/Modules/folder/_Foldermodule.c +++ b/Mac/Modules/folder/_Foldermodule.c @@ -14,17 +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 <Folders.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Folder_Error; diff --git a/Mac/Modules/folder/foldersupport.py b/Mac/Modules/folder/foldersupport.py index 92003e8..b924615 100644 --- a/Mac/Modules/folder/foldersupport.py +++ b/Mac/Modules/folder/foldersupport.py @@ -29,11 +29,7 @@ RoutingFlags = Type("RoutingFlags", "l") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Folders.h> -#else #include <Carbon/Carbon.h> -#endif """ diff --git a/Mac/Modules/help/_Helpmodule.c b/Mac/Modules/help/_Helpmodule.c index 66abdeb..8bd4270 100644 --- a/Mac/Modules/help/_Helpmodule.c +++ b/Mac/Modules/help/_Helpmodule.c @@ -14,20 +14,16 @@ /* 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) #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <MacHelp.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Help_Error; diff --git a/Mac/Modules/help/helpsupport.py b/Mac/Modules/help/helpsupport.py index 8d2237e..230ec0c 100644 --- a/Mac/Modules/help/helpsupport.py +++ b/Mac/Modules/help/helpsupport.py @@ -39,11 +39,7 @@ includestuff = includestuff + """ #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <MacHelp.h> -#else #include <Carbon/Carbon.h> -#endif """ class MyObjectDefinition(PEP253Mixin, GlobalObjectDefinition): diff --git a/Mac/Modules/ibcarbon/IBCarbonsupport.py b/Mac/Modules/ibcarbon/IBCarbonsupport.py index 25406c7..04d4bc1 100644 --- a/Mac/Modules/ibcarbon/IBCarbonsupport.py +++ b/Mac/Modules/ibcarbon/IBCarbonsupport.py @@ -9,11 +9,7 @@ IBCarbonFunction = OSErrFunctionGenerator IBCarbonMethod = OSErrMethodGenerator includestuff = """ -#ifdef WITHOUT_FRAMEWORKS -#include <IBCarbonRuntime.h> -#else #include <Carbon/Carbon.h> -#endif /* WITHOUT_FRAMEWORKS */ #include "macglue.h" #ifdef USE_TOOLBOX_OBJECT_GLUE diff --git a/Mac/Modules/ibcarbon/_IBCarbon.c b/Mac/Modules/ibcarbon/_IBCarbon.c index 1a712c6..1d50db2 100644 --- a/Mac/Modules/ibcarbon/_IBCarbon.c +++ b/Mac/Modules/ibcarbon/_IBCarbon.c @@ -5,11 +5,7 @@ -#ifdef WITHOUT_FRAMEWORKS -#include <IBCarbonRuntime.h> -#else #include <Carbon/Carbon.h> -#endif /* WITHOUT_FRAMEWORKS */ #include "macglue.h" #ifdef USE_TOOLBOX_OBJECT_GLUE diff --git a/Mac/Modules/icn/_Icnmodule.c b/Mac/Modules/icn/_Icnmodule.c index ac49875..7ed2064 100644 --- a/Mac/Modules/icn/_Icnmodule.c +++ b/Mac/Modules/icn/_Icnmodule.c @@ -14,17 +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 <Icons.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Icn_Error; diff --git a/Mac/Modules/icn/icnsupport.py b/Mac/Modules/icn/icnsupport.py index 6f72235..9b4a68f 100644 --- a/Mac/Modules/icn/icnsupport.py +++ b/Mac/Modules/icn/icnsupport.py @@ -46,11 +46,7 @@ RGBColor = OpaqueType("RGBColor", "QdRGB") #EventKind = Type("EventKind", "H") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Icons.h> -#else #include <Carbon/Carbon.h> -#endif """ diff --git a/Mac/Modules/list/_Listmodule.c b/Mac/Modules/list/_Listmodule.c index 05af28e..cf94801 100644 --- a/Mac/Modules/list/_Listmodule.c +++ b/Mac/Modules/list/_Listmodule.c @@ -14,17 +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 <Lists.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ListObj_New(ListHandle); @@ -34,31 +30,6 @@ extern int _ListObj_Convert(PyObject *, ListHandle *); #define ListObj_Convert _ListObj_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS -#define GetListPort(list) ((CGrafPtr)(*(list))->port) -#define GetListVerticalScrollBar(list) ((*(list))->vScroll) -#define GetListHorizontalScrollBar(list) ((*(list))->hScroll) -#define GetListActive(list) ((*(list))->lActive) -#define GetListClickTime(list) ((*(list))->clikTime) -#define GetListRefCon(list) ((*(list))->refCon) -#define GetListDefinition(list) ((*(list))->listDefProc) /* XXX Is this indeed the same? */ -#define GetListUserHandle(list) ((*(list))->userHandle) -#define GetListDataHandle(list) ((*(list))->cells) -#define GetListFlags(list) ((*(list))->listFlags) -#define GetListSelectionFlags(list) ((*(list))->selFlags) -#define SetListViewBounds(list, bounds) (((*(list))->rView) = *(bounds)) - -#define SetListPort(list, port) (((*(list))->port) = (GrafPtr)(port)) -#define SetListCellIndent(list, ind) (((*(list))->indent) = *(ind)) -#define SetListClickTime(list, time) (((*(list))->clikTime) = (time)) -#define SetListLastClick(list, click) (((*(list)->lastClick) = *(click)) -#define SetListRefCon(list, refcon) (((*(list))->refCon) = (refcon)) -#define SetListUserHandle(list, handle) (((*(list))->userHandle) = (handle)) -#define SetListFlags(list, flags) (((*(list))->listFlags) = (flags)) -#define SetListSelectionFlags(list, flags) (((*(list))->selFlags) = (flags)) - -#endif - #define as_List(x) ((ListHandle)x) #define as_Resource(lh) ((Handle)lh) diff --git a/Mac/Modules/list/listsupport.py b/Mac/Modules/list/listsupport.py index ab7cc3a..e44317a 100644 --- a/Mac/Modules/list/listsupport.py +++ b/Mac/Modules/list/listsupport.py @@ -39,11 +39,7 @@ CGrafPtr = OpaqueByValueType("CGrafPtr", "GrafObj") EventModifiers = Type("EventModifiers", "H") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Lists.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ListObj_New(ListHandle); @@ -53,31 +49,6 @@ extern int _ListObj_Convert(PyObject *, ListHandle *); #define ListObj_Convert _ListObj_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS -#define GetListPort(list) ((CGrafPtr)(*(list))->port) -#define GetListVerticalScrollBar(list) ((*(list))->vScroll) -#define GetListHorizontalScrollBar(list) ((*(list))->hScroll) -#define GetListActive(list) ((*(list))->lActive) -#define GetListClickTime(list) ((*(list))->clikTime) -#define GetListRefCon(list) ((*(list))->refCon) -#define GetListDefinition(list) ((*(list))->listDefProc) /* XXX Is this indeed the same? */ -#define GetListUserHandle(list) ((*(list))->userHandle) -#define GetListDataHandle(list) ((*(list))->cells) -#define GetListFlags(list) ((*(list))->listFlags) -#define GetListSelectionFlags(list) ((*(list))->selFlags) -#define SetListViewBounds(list, bounds) (((*(list))->rView) = *(bounds)) - -#define SetListPort(list, port) (((*(list))->port) = (GrafPtr)(port)) -#define SetListCellIndent(list, ind) (((*(list))->indent) = *(ind)) -#define SetListClickTime(list, time) (((*(list))->clikTime) = (time)) -#define SetListLastClick(list, click) (((*(list)->lastClick) = *(click)) -#define SetListRefCon(list, refcon) (((*(list))->refCon) = (refcon)) -#define SetListUserHandle(list, handle) (((*(list))->userHandle) = (handle)) -#define SetListFlags(list, flags) (((*(list))->listFlags) = (flags)) -#define SetListSelectionFlags(list, flags) (((*(list))->selFlags) = (flags)) - -#endif - #define as_List(x) ((ListHandle)x) #define as_Resource(lh) ((Handle)lh) 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) diff --git a/Mac/Modules/menu/menusupport.py b/Mac/Modules/menu/menusupport.py index 6c8229c..7c4ae0d 100644 --- a/Mac/Modules/menu/menusupport.py +++ b/Mac/Modules/menu/menusupport.py @@ -39,12 +39,7 @@ FMFontStyle = Type("FMFontStyle", "h") UniChar = Type("UniChar", "h") includestuff = includestuff + """ -#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 @@ -56,16 +51,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) diff --git a/Mac/Modules/mlte/_Mltemodule.c b/Mac/Modules/mlte/_Mltemodule.c index aebec02..18fdd45 100644 --- a/Mac/Modules/mlte/_Mltemodule.c +++ b/Mac/Modules/mlte/_Mltemodule.c @@ -14,17 +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 <MacTextEditor.h> -#else #include <Carbon/Carbon.h> -#endif /* For now we declare them forward here. They'll go to mactoolbox later */ static PyObject *TXNObj_New(TXNObject); diff --git a/Mac/Modules/mlte/mltesupport.py b/Mac/Modules/mlte/mltesupport.py index fe34fc7..862d0bc 100644 --- a/Mac/Modules/mlte/mltesupport.py +++ b/Mac/Modules/mlte/mltesupport.py @@ -20,11 +20,7 @@ from macsupport import * # Create the type objects includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <MacTextEditor.h> -#else #include <Carbon/Carbon.h> -#endif /* For now we declare them forward here. They'll go to mactoolbox later */ static PyObject *TXNObj_New(TXNObject); diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c index f2994db..e15f848 100644 --- a/Mac/Modules/qd/_Qdmodule.c +++ b/Mac/Modules/qd/_Qdmodule.c @@ -20,11 +20,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <QuickDraw.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_GrafObj_New(GrafPtr); @@ -42,69 +38,6 @@ extern int _QdRGB_Convert(PyObject *, RGBColorPtr); #define QdRGB_Convert _QdRGB_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS -#define GetPortBitMapForCopyBits(port) ((const struct BitMap *)&((GrafPort *)(port))->portBits) -#define GetPortPixMap(port) (((CGrafPtr)(port))->portPixMap) -#define GetPortBounds(port, bounds) (*(bounds) = (port)->portRect, (bounds)) -#define GetPortForeColor(port, color) (*(color) = (port)->rgbFgColor, (color)) -#define GetPortBackColor(port, color) (*(color) = (port)->rgbBkColor, (color)) -#define GetPortOpColor(port, color) (*(color) = (*(GVarHandle)((port)->grafVars))->rgbOpColor, (color)) -#define GetPortHiliteColor(port, color) (*(color) = (*(GVarHandle)((port)->grafVars))->rgbHiliteColor, (color)) -#define GetPortTextFont(port) ((port)->txFont) -#define GetPortTextFace(port) ((port)->txFace) -#define GetPortTextMode(port) ((port)->txMode) -#define GetPortTextSize(port) ((port)->txSize) -#define GetPortChExtra(port) ((port)->chExtra) -#define GetPortFracHPenLocation(port) ((port)->pnLocHFrac) -#define GetPortSpExtra(port) ((port)->spExtra) -#define GetPortPenVisibility(port) ((port)->pnVis) -#define GetPortVisibleRegion(port, rgn) ((rgn) = (port)->visRgn, (rgn)) -#define GetPortClipRegion(port, rgn) ((rgn) = (port)->clipRgn, (rgn)) -#define GetPortBackPixPat(port, pat) ((pat) = (port)->bkPixPat, (pat)) -#define GetPortPenPixPat(port, pat) ((pat) = (port)->pnPixPat, (pat)) -#define GetPortFillPixPat(port, pat) ((pat) = (port)->fillPixPat, (pat)) -#define GetPortPenSize(port, pensize) (*(pensize) = (port)->pnSize, (pensize)) -#define GetPortPenMode(port) ((port)->pnMode) -#define GetPortPenLocation(port, location) ((*location) = (port)->pnLoc, (location)) -#define IsPortRegionBeingDefined(port) (!!((port)->rgnSave)) -#define IsPortPictureBeingDefined(port) (!!((port)->picSave)) -/* #define IsPortOffscreen(port) */ -/* #define IsPortColor(port) */ - -#define SetPortBounds(port, bounds) ((port)->portRect = *(bounds)) -#define SetPortOpColor(port, color) ((*(GVarHandle)((port)->grafVars))->rgbOpColor = *(color)) -#define SetPortVisibleRegion(port, rgn) ((port)->visRgn = (rgn)) -#define SetPortClipRegion(port, rgn) ((port)->clipRgn = (rgn)) -#define SetPortBackPixPat(port, pat) ((port)->bkPixPat = (pat)) -#define SetPortPenPixPat(port, pat) ((port)->pnPixPat = (pat)) -#define SetPortFillPixPat(port, pat) ((port)->fillPixPat = (pat)) -#define SetPortPenSize(port, pensize) ((port)->pnSize = (pensize)) -#define SetPortPenMode(port, mode) ((port)->pnMode = (mode)) -#define SetPortFracHPenLocation(port, frac) ((port)->pnLocHFrac = (frac)) - -/* On pixmaps */ -#define GetPixBounds(pixmap, rect) (*(rect) = (*(pixmap))->bounds, (rect)) -#define GetPixDepth(pixmap) ((*(pixmap))->pixelSize) - -/* On regions */ -#define GetRegionBounds(rgn, rect) (*(rect) = (*(rgn))->rgnBBox, (rect)) - -/* On QD Globals */ -#define GetQDGlobalsRandomSeed() (qd.randSeed) -#define GetQDGlobalsScreenBits(bits) (*(bits) = qd.screenBits, (bits)) -#define GetQDGlobalsArrow(crsr) (*(crsr) = qd.arrow, (crsr)) -#define GetQDGlobalsDarkGray(pat) (*(pat) = qd.dkGray, (pat)) -#define GetQDGlobalsLightGray(pat) (*(pat) = qd.ltGray, (pat)) -#define GetQDGlobalsGray(pat) (*(pat) = qd.gray, (pat)) -#define GetQDGlobalsBlack(pat) (*(pat) = qd.black, (pat)) -#define GetQDGlobalsWhite(pat) (*(pat) = qd.white, (pat)) -#define GetQDGlobalsThePort() ((CGrafPtr)qd.thePort) - -#define SetQDGlobalsRandomSeed(seed) (qd.randSeed = (seed)) -#define SetQDGlobalsArrow(crsr) (qd.arrow = *(crsr)) - -#endif /* ACCESSOR_CALLS_ARE_FUNCTIONS */ - static PyObject *BMObj_NewCopied(BitMapPtr); /* diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py index 18e628f..e361c01 100644 --- a/Mac/Modules/qd/qdsupport.py +++ b/Mac/Modules/qd/qdsupport.py @@ -66,11 +66,7 @@ PenState_ptr = StructInputBufferType('PenState') TruncCode = Type("TruncCode", "h") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <QuickDraw.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_GrafObj_New(GrafPtr); @@ -88,69 +84,6 @@ extern int _QdRGB_Convert(PyObject *, RGBColorPtr); #define QdRGB_Convert _QdRGB_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS -#define GetPortBitMapForCopyBits(port) ((const struct BitMap *)&((GrafPort *)(port))->portBits) -#define GetPortPixMap(port) (((CGrafPtr)(port))->portPixMap) -#define GetPortBounds(port, bounds) (*(bounds) = (port)->portRect, (bounds)) -#define GetPortForeColor(port, color) (*(color) = (port)->rgbFgColor, (color)) -#define GetPortBackColor(port, color) (*(color) = (port)->rgbBkColor, (color)) -#define GetPortOpColor(port, color) (*(color) = (*(GVarHandle)((port)->grafVars))->rgbOpColor, (color)) -#define GetPortHiliteColor(port, color) (*(color) = (*(GVarHandle)((port)->grafVars))->rgbHiliteColor, (color)) -#define GetPortTextFont(port) ((port)->txFont) -#define GetPortTextFace(port) ((port)->txFace) -#define GetPortTextMode(port) ((port)->txMode) -#define GetPortTextSize(port) ((port)->txSize) -#define GetPortChExtra(port) ((port)->chExtra) -#define GetPortFracHPenLocation(port) ((port)->pnLocHFrac) -#define GetPortSpExtra(port) ((port)->spExtra) -#define GetPortPenVisibility(port) ((port)->pnVis) -#define GetPortVisibleRegion(port, rgn) ((rgn) = (port)->visRgn, (rgn)) -#define GetPortClipRegion(port, rgn) ((rgn) = (port)->clipRgn, (rgn)) -#define GetPortBackPixPat(port, pat) ((pat) = (port)->bkPixPat, (pat)) -#define GetPortPenPixPat(port, pat) ((pat) = (port)->pnPixPat, (pat)) -#define GetPortFillPixPat(port, pat) ((pat) = (port)->fillPixPat, (pat)) -#define GetPortPenSize(port, pensize) (*(pensize) = (port)->pnSize, (pensize)) -#define GetPortPenMode(port) ((port)->pnMode) -#define GetPortPenLocation(port, location) ((*location) = (port)->pnLoc, (location)) -#define IsPortRegionBeingDefined(port) (!!((port)->rgnSave)) -#define IsPortPictureBeingDefined(port) (!!((port)->picSave)) -/* #define IsPortOffscreen(port) */ -/* #define IsPortColor(port) */ - -#define SetPortBounds(port, bounds) ((port)->portRect = *(bounds)) -#define SetPortOpColor(port, color) ((*(GVarHandle)((port)->grafVars))->rgbOpColor = *(color)) -#define SetPortVisibleRegion(port, rgn) ((port)->visRgn = (rgn)) -#define SetPortClipRegion(port, rgn) ((port)->clipRgn = (rgn)) -#define SetPortBackPixPat(port, pat) ((port)->bkPixPat = (pat)) -#define SetPortPenPixPat(port, pat) ((port)->pnPixPat = (pat)) -#define SetPortFillPixPat(port, pat) ((port)->fillPixPat = (pat)) -#define SetPortPenSize(port, pensize) ((port)->pnSize = (pensize)) -#define SetPortPenMode(port, mode) ((port)->pnMode = (mode)) -#define SetPortFracHPenLocation(port, frac) ((port)->pnLocHFrac = (frac)) - -/* On pixmaps */ -#define GetPixBounds(pixmap, rect) (*(rect) = (*(pixmap))->bounds, (rect)) -#define GetPixDepth(pixmap) ((*(pixmap))->pixelSize) - -/* On regions */ -#define GetRegionBounds(rgn, rect) (*(rect) = (*(rgn))->rgnBBox, (rect)) - -/* On QD Globals */ -#define GetQDGlobalsRandomSeed() (qd.randSeed) -#define GetQDGlobalsScreenBits(bits) (*(bits) = qd.screenBits, (bits)) -#define GetQDGlobalsArrow(crsr) (*(crsr) = qd.arrow, (crsr)) -#define GetQDGlobalsDarkGray(pat) (*(pat) = qd.dkGray, (pat)) -#define GetQDGlobalsLightGray(pat) (*(pat) = qd.ltGray, (pat)) -#define GetQDGlobalsGray(pat) (*(pat) = qd.gray, (pat)) -#define GetQDGlobalsBlack(pat) (*(pat) = qd.black, (pat)) -#define GetQDGlobalsWhite(pat) (*(pat) = qd.white, (pat)) -#define GetQDGlobalsThePort() ((CGrafPtr)qd.thePort) - -#define SetQDGlobalsRandomSeed(seed) (qd.randSeed = (seed)) -#define SetQDGlobalsArrow(crsr) (qd.arrow = *(crsr)) - -#endif /* ACCESSOR_CALLS_ARE_FUNCTIONS */ - static PyObject *BMObj_NewCopied(BitMapPtr); /* diff --git a/Mac/Modules/qdoffs/_Qdoffsmodule.c b/Mac/Modules/qdoffs/_Qdoffsmodule.c index 8d9f7ef..5bc0f96 100644 --- a/Mac/Modules/qdoffs/_Qdoffsmodule.c +++ b/Mac/Modules/qdoffs/_Qdoffsmodule.c @@ -14,17 +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 <QDOffscreen.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_GWorldObj_New(GWorldPtr); diff --git a/Mac/Modules/qdoffs/qdoffssupport.py b/Mac/Modules/qdoffs/qdoffssupport.py index 0c4dd2a..1bd8f5a 100644 --- a/Mac/Modules/qdoffs/qdoffssupport.py +++ b/Mac/Modules/qdoffs/qdoffssupport.py @@ -34,11 +34,7 @@ GrafPtr = OpaqueByValueType("GrafPtr", "GrafObj") QDErr = OSErrType("QDErr", 'h') includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <QDOffscreen.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_GWorldObj_New(GWorldPtr); diff --git a/Mac/Modules/qt/_Qtmodule.c b/Mac/Modules/qt/_Qtmodule.c index 66bca4b..fd5db6f 100644 --- a/Mac/Modules/qt/_Qtmodule.c +++ b/Mac/Modules/qt/_Qtmodule.c @@ -20,12 +20,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <Movies.h> -#else -/* #include <Carbon/Carbon.h> */ #include <QuickTime/QuickTime.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE diff --git a/Mac/Modules/qt/qtsupport.py b/Mac/Modules/qt/qtsupport.py index c4e1653..589b837 100644 --- a/Mac/Modules/qt/qtsupport.py +++ b/Mac/Modules/qt/qtsupport.py @@ -24,12 +24,7 @@ from macsupport import * # Create the type objects includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Movies.h> -#else -/* #include <Carbon/Carbon.h> */ #include <QuickTime/QuickTime.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c index e759269..0737b19 100644 --- a/Mac/Modules/res/_Resmodule.c +++ b/Mac/Modules/res/_Resmodule.c @@ -14,21 +14,16 @@ /* 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) #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <Resources.h> -#include <string.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ResObj_New(Handle); diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py index 37cb660..91ab00a 100644 --- a/Mac/Modules/res/ressupport.py +++ b/Mac/Modules/res/ressupport.py @@ -28,12 +28,7 @@ includestuff = includestuff + """ #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <Resources.h> -#include <string.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ResObj_New(Handle); diff --git a/Mac/Modules/scrap/_Scrapmodule.c b/Mac/Modules/scrap/_Scrapmodule.c index 288c65a..db8e58b 100644 --- a/Mac/Modules/scrap/_Scrapmodule.c +++ b/Mac/Modules/scrap/_Scrapmodule.c @@ -23,11 +23,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <Scrap.h> -#else #include <Carbon/Carbon.h> -#endif static PyObject *Scrap_Error; diff --git a/Mac/Modules/scrap/scrapsupport.py b/Mac/Modules/scrap/scrapsupport.py index b89b405..85c1e3b 100644 --- a/Mac/Modules/scrap/scrapsupport.py +++ b/Mac/Modules/scrap/scrapsupport.py @@ -29,11 +29,7 @@ includestuff = includestuff + """ #ifndef PyDoc_STR #define PyDoc_STR(x) (x) #endif -#ifdef WITHOUT_FRAMEWORKS -#include <Scrap.h> -#else #include <Carbon/Carbon.h> -#endif /* ** Generate ScrapInfo records diff --git a/Mac/Modules/snd/_Sndmodule.c b/Mac/Modules/snd/_Sndmodule.c index 0075c98..b8f5c33 100644 --- a/Mac/Modules/snd/_Sndmodule.c +++ b/Mac/Modules/snd/_Sndmodule.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 <Sound.h> -#include <OSUtils.h> /* for Set(Current)A5 */ -#else #include <Carbon/Carbon.h> -#endif /* Convert a SndCommand argument */ static int @@ -1150,11 +1145,8 @@ void init_Snd(void) PyModule_AddObject(m, "SndChannelType", (PyObject *)&SndChannel_Type); SPB_Type.ob_type = &PyType_Type; if (PyType_Ready(&SPB_Type) < 0) return; -#if 0 - /* This would shadow the SPB routine, which is bad news (it is important) */ Py_INCREF(&SPB_Type); PyModule_AddObject(m, "SPB", (PyObject *)&SPB_Type); -#endif /* Backward-compatible name */ Py_INCREF(&SPB_Type); PyModule_AddObject(m, "SPBType", (PyObject *)&SPB_Type); diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py index 105fc66..99df5be 100644 --- a/Mac/Modules/snd/sndsupport.py +++ b/Mac/Modules/snd/sndsupport.py @@ -17,12 +17,7 @@ class SndMethod(SndMixIn, OSErrMethodGenerator): pass # includestuff etc. are imported from macsupport includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Sound.h> -#include <OSUtils.h> /* for Set(Current)A5 */ -#else #include <Carbon/Carbon.h> -#endif """ initstuff = initstuff + """ diff --git a/Mac/Modules/te/_TEmodule.c b/Mac/Modules/te/_TEmodule.c index 2da2513..c440640 100644 --- a/Mac/Modules/te/_TEmodule.c +++ b/Mac/Modules/te/_TEmodule.c @@ -14,17 +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 <TextEdit.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_TEObj_New(TEHandle); diff --git a/Mac/Modules/te/tesupport.py b/Mac/Modules/te/tesupport.py index cac020b..13f1b97 100644 --- a/Mac/Modules/te/tesupport.py +++ b/Mac/Modules/te/tesupport.py @@ -32,11 +32,7 @@ TextStyle = OpaqueType("TextStyle", "TextStyle") TextStyle_ptr = TextStyle includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <TextEdit.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_TEObj_New(TEHandle); diff --git a/Mac/Modules/win/_Winmodule.c b/Mac/Modules/win/_Winmodule.c index d1b3ada..d88a5bc 100644 --- a/Mac/Modules/win/_Winmodule.c +++ b/Mac/Modules/win/_Winmodule.c @@ -20,11 +20,7 @@ }} while(0) -#ifdef WITHOUT_FRAMEWORKS -#include <Windows.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_WinObj_New(WindowRef); diff --git a/Mac/Modules/win/winsupport.py b/Mac/Modules/win/winsupport.py index d99ca1e..640e33a 100644 --- a/Mac/Modules/win/winsupport.py +++ b/Mac/Modules/win/winsupport.py @@ -58,11 +58,7 @@ PropertyCreator = OSTypeType("PropertyCreator") PropertyTag = OSTypeType("PropertyTag") includestuff = includestuff + """ -#ifdef WITHOUT_FRAMEWORKS -#include <Windows.h> -#else #include <Carbon/Carbon.h> -#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_WinObj_New(WindowRef); |