diff options
Diffstat (limited to 'Mac/Modules/drag/dragsupport.py')
| -rw-r--r-- | Mac/Modules/drag/dragsupport.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Mac/Modules/drag/dragsupport.py b/Mac/Modules/drag/dragsupport.py index 79bf00c..c35111e 100644 --- a/Mac/Modules/drag/dragsupport.py +++ b/Mac/Modules/drag/dragsupport.py @@ -44,7 +44,11 @@ FlavorFlags = Type("FlavorFlags", "l") DragTrackingMessage = Type("DragTrackingMessage", "h") includestuff = includestuff + """ -#include <%s>""" % MACHEADERFILE + """ +#ifdef WITHOUT_FRAMEWORKS +#include <Drag.h> +#else +#include <Carbon/Carbon.h> +#endif /* Callback glue routines */ DragTrackingHandlerUPP dragglue_TrackingHandlerUPP; @@ -162,17 +166,17 @@ dragglue_Drawing(xxxx """ initstuff = initstuff + """ - PyMac_INIT_TOOLBOX_OBJECT_NEW(DragObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DragObj_Convert); + PyMac_INIT_TOOLBOX_OBJECT_NEW(DragRef, DragObj_New); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DragRef, DragObj_Convert); """ variablestuff = """ -dragglue_TrackingHandlerUPP = NewDragTrackingHandlerProc(dragglue_TrackingHandler); -dragglue_ReceiveHandlerUPP = NewDragReceiveHandlerProc(dragglue_ReceiveHandler); -dragglue_SendDataUPP = NewDragSendDataProc(dragglue_SendData); +dragglue_TrackingHandlerUPP = NewDragTrackingHandlerUPP(dragglue_TrackingHandler); +dragglue_ReceiveHandlerUPP = NewDragReceiveHandlerUPP(dragglue_ReceiveHandler); +dragglue_SendDataUPP = NewDragSendDataUPP(dragglue_SendData); #if 0 -dragglue_InputUPP = NewDragInputProc(dragglue_Input); -dragglue_DrawingUPP = NewDragDrawingProc(dragglue_Drawing); +dragglue_InputUPP = NewDragInputUPP(dragglue_Input); +dragglue_DrawingUPP = NewDragDrawingUPP(dragglue_Drawing); #endif """ |