diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
| commit | fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f (patch) | |
| tree | 405f4572ec550f86d0c2c2b3a84ca672f3a70520 /Mac/Modules/drag/dragsupport.py | |
| parent | 1129671350048d9f415d3ba3c411b9bcd8b7ae75 (diff) | |
| download | cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.zip cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.gz cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.bz2 | |
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
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 """ |