Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
diff --git a/Mac/Modules/drag/Dragmodule.c b/Mac/Modules/drag/Dragmodule.c
index 3ce19b7..2fd7cfe 100644
--- a/Mac/Modules/drag/Dragmodule.c
+++ b/Mac/Modules/drag/Dragmodule.c
@@ -8,7 +8,11 @@
#include "macglue.h"
#include "pymactoolbox.h"
+#ifdef WITHOUT_FRAMEWORKS
#include <Drag.h>
+#else
+#include <Carbon/Carbon.h>
+#endif
/* Callback glue routines */
DragTrackingHandlerUPP dragglue_TrackingHandlerUPP;
@@ -41,8 +45,7 @@
PyObject *sendproc;
} DragObjObject;
-PyObject *DragObj_New(itself)
- DragRef itself;
+PyObject *DragObj_New(DragRef itself)
{
DragObjObject *it;
if (itself == NULL) {
@@ -55,9 +58,7 @@
it->sendproc = NULL;
return (PyObject *)it;
}
-DragObj_Convert(v, p_itself)
- PyObject *v;
- DragRef *p_itself;
+DragObj_Convert(PyObject *v, DragRef *p_itself)
{
if (!DragObj_Check(v))
{
@@ -68,16 +69,13 @@
return 1;
}
-static void DragObj_dealloc(self)
- DragObjObject *self;
+static void DragObj_dealloc(DragObjObject *self)
{
Py_XDECREF(self->sendproc);
PyMem_DEL(self);
}
-static PyObject *DragObj_DisposeDrag(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_DisposeDrag(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -90,9 +88,7 @@
return _res;
}
-static PyObject *DragObj_AddDragItemFlavor(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_AddDragItemFlavor(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -121,9 +117,7 @@
return _res;
}
-static PyObject *DragObj_SetDragItemFlavorData(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_SetDragItemFlavorData(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -152,9 +146,7 @@
return _res;
}
-static PyObject *DragObj_SetDragImage(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_SetDragImage(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -179,9 +171,7 @@
return _res;
}
-static PyObject *DragObj_ChangeDragBehaviors(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_ChangeDragBehaviors(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -200,9 +190,7 @@
return _res;
}
-static PyObject *DragObj_TrackDrag(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_TrackDrag(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -221,9 +209,7 @@
return _res;
}
-static PyObject *DragObj_CountDragItems(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_CountDragItems(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -238,9 +224,7 @@
return _res;
}
-static PyObject *DragObj_GetDragItemReferenceNumber(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDragItemReferenceNumber(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -258,9 +242,7 @@
return _res;
}
-static PyObject *DragObj_CountDragItemFlavors(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_CountDragItemFlavors(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -278,9 +260,7 @@
return _res;
}
-static PyObject *DragObj_GetFlavorType(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetFlavorType(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -301,9 +281,7 @@
return _res;
}
-static PyObject *DragObj_GetFlavorFlags(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetFlavorFlags(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -324,9 +302,7 @@
return _res;
}
-static PyObject *DragObj_GetFlavorDataSize(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetFlavorDataSize(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -347,9 +323,7 @@
return _res;
}
-static PyObject *DragObj_GetFlavorData(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetFlavorData(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -384,9 +358,7 @@
return _res;
}
-static PyObject *DragObj_GetDragItemBounds(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDragItemBounds(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -404,9 +376,7 @@
return _res;
}
-static PyObject *DragObj_SetDragItemBounds(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_SetDragItemBounds(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -425,9 +395,7 @@
return _res;
}
-static PyObject *DragObj_GetDropLocation(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDropLocation(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -442,9 +410,7 @@
return _res;
}
-static PyObject *DragObj_SetDropLocation(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_SetDropLocation(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -460,9 +426,7 @@
return _res;
}
-static PyObject *DragObj_GetDragAttributes(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDragAttributes(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -477,9 +441,7 @@
return _res;
}
-static PyObject *DragObj_GetDragMouse(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDragMouse(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -497,9 +459,7 @@
return _res;
}
-static PyObject *DragObj_SetDragMouse(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_SetDragMouse(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -515,9 +475,7 @@
return _res;
}
-static PyObject *DragObj_GetDragOrigin(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDragOrigin(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -532,9 +490,7 @@
return _res;
}
-static PyObject *DragObj_GetDragModifiers(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_GetDragModifiers(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -555,9 +511,7 @@
return _res;
}
-static PyObject *DragObj_ShowDragHilite(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_ShowDragHilite(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -576,9 +530,7 @@
return _res;
}
-static PyObject *DragObj_HideDragHilite(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_HideDragHilite(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -591,9 +543,7 @@
return _res;
}
-static PyObject *DragObj_DragPreScroll(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_DragPreScroll(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -612,9 +562,7 @@
return _res;
}
-static PyObject *DragObj_DragPostScroll(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_DragPostScroll(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -627,9 +575,7 @@
return _res;
}
-static PyObject *DragObj_UpdateDragHilite(_self, _args)
- DragObjObject *_self;
- PyObject *_args;
+static PyObject *DragObj_UpdateDragHilite(DragObjObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -705,9 +651,7 @@
PyMethodChain DragObj_chain = { DragObj_methods, NULL };
-static PyObject *DragObj_getattr(self, name)
- DragObjObject *self;
- char *name;
+static PyObject *DragObj_getattr(DragObjObject *self, char *name)
{
return Py_FindMethodInChain(&DragObj_chain, (PyObject *)self, name);
}
@@ -742,9 +686,7 @@
/* -------------------- End object type DragObj --------------------- */
-static PyObject *Drag_NewDrag(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_NewDrag(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -758,9 +700,7 @@
return _res;
}
-static PyObject *Drag_GetDragHiliteColor(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_GetDragHiliteColor(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -777,9 +717,7 @@
return _res;
}
-static PyObject *Drag_WaitMouseMoved(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_WaitMouseMoved(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
Boolean _rv;
@@ -793,9 +731,7 @@
return _res;
}
-static PyObject *Drag_ZoomRects(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_ZoomRects(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -819,9 +755,7 @@
return _res;
}
-static PyObject *Drag_ZoomRegion(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_ZoomRegion(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSErr _err;
@@ -845,9 +779,7 @@
return _res;
}
-static PyObject *Drag_InstallTrackingHandler(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_InstallTrackingHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
@@ -865,9 +797,7 @@
}
-static PyObject *Drag_InstallReceiveHandler(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_InstallReceiveHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
@@ -885,9 +815,7 @@
}
-static PyObject *Drag_RemoveTrackingHandler(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_RemoveTrackingHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
@@ -903,9 +831,7 @@
}
-static PyObject *Drag_RemoveReceiveHandler(_self, _args)
- PyObject *_self;
- PyObject *_args;
+static PyObject *Drag_RemoveReceiveHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
@@ -1041,15 +967,15 @@
-void initDrag()
+void initDrag(void)
{
PyObject *m;
PyObject *d;
- 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);
m = Py_InitModule("Drag", Drag_methods);
@@ -1063,12 +989,12 @@
if (PyDict_SetItemString(d, "DragObjType", (PyObject *)&DragObj_Type) != 0)
Py_FatalError("can't initialize DragObjType");
- 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