Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

First tweaks to allow MacPython to be compiled with 

Universal Headers 3.4
This commit is contained in:
Jack Jansen 2001-11-05 16:16:39 +00:00
parent 34cbe718d4
commit bd00884415
5 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Mac/Modules/dlg/_Dlgmodule.c
View File

@ -36,7 +36,7 @@ extern int _DlgObj_Convert(PyObject *, DialogRef *);
#define DlgObj_Convert _DlgObj_Convert
#endif
#if !ACCESSOR_CALLS_ARE_FUNCTIONS
#if !ACCESSOR_CALLS_ARE_FUNCTIONS && UNIVERSAL_INTERFACES_VERSION < 0x340
#define GetDialogTextEditHandle(dlg) (((DialogPeek)(dlg))->textH)
#define SetPortDialogPort(dlg) SetPort(dlg)
#define GetDialogPort(dlg) ((CGrafPtr)(dlg))
@ -769,20 +769,6 @@ static PyObject *DlgObj_GetDialogPort(DialogObject *_self, PyObject *_args)
return _res;
}
#if !TARGET_API_MAC_CARBON
static PyObject *DlgObj_SetGrafPortOfDialog(DialogObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
if (!PyArg_ParseTuple(_args, ""))
return NULL;
SetGrafPortOfDialog(_self->ob_itself);
Py_INCREF(Py_None);
_res = Py_None;
return _res;
}
#endif
static PyMethodDef DlgObj_methods[] = {
{"DrawDialog", (PyCFunction)DlgObj_DrawDialog, 1,
"() -> None"},
@ -865,10 +851,6 @@ static PyMethodDef DlgObj_methods[] = {
{"GetDialogPort", (PyCFunction)DlgObj_GetDialogPort, 1,
"() -> (CGrafPtr _rv)"},
#if !TARGET_API_MAC_CARBON
{"SetGrafPortOfDialog", (PyCFunction)DlgObj_SetGrafPortOfDialog, 1,
"() -> None"},
#endif
{NULL, NULL, 0}
};

1
Mac/Modules/dlg/dlgscan.py
View File

@ -53,6 +53,7 @@ class MyScanner(Scanner):
## # Can't find these in the CW Pro 3 libraries
'SetDialogMovableModal',
'GetDialogControlNotificationProc',
'SetGrafPortOfDialog', # Funny, and probably not useful
]
def makegreylist(self):

2
Mac/Modules/dlg/dlgsupport.py
View File

@ -47,7 +47,7 @@ extern int _DlgObj_Convert(PyObject *, DialogRef *);
#define DlgObj_Convert _DlgObj_Convert
#endif
#if !ACCESSOR_CALLS_ARE_FUNCTIONS
#if !ACCESSOR_CALLS_ARE_FUNCTIONS && UNIVERSAL_INTERFACES_VERSION < 0x340
#define GetDialogTextEditHandle(dlg) (((DialogPeek)(dlg))->textH)
#define SetPortDialogPort(dlg) SetPort(dlg)
#define GetDialogPort(dlg) ((CGrafPtr)(dlg))

4
Mac/Modules/win/_Winmodule.c
View File

@ -36,11 +36,13 @@ extern int _WinObj_Convert(PyObject *, WindowRef *);
#define WinObj_Convert _WinObj_Convert
#endif
#if !ACCESSOR_CALLS_ARE_FUNCTIONS
#if !ACCESSOR_CALLS_ARE_FUNCTIONS && UNIVERSAL_INTERFACES_VERSION < 0x340
/* Carbon calls that we emulate in classic mode */
#define GetWindowSpareFlag(win) (((CWindowPeek)(win))->spareFlag)
#define GetWindowFromPort(port) ((WindowRef)(port))
#define GetWindowPortBounds(win, rectp) (*(rectp) = ((CWindowPeek)(win))->port.portRect)
#endif
#if !ACCESSOR_CALLS_ARE_FUNCTIONS
#define IsPointerValid(p) (((long)p&3) == 0)
#endif
#if ACCESSOR_CALLS_ARE_FUNCTIONS

4
Mac/Modules/win/winsupport.py
View File

@ -70,11 +70,13 @@ extern int _WinObj_Convert(PyObject *, WindowRef *);
#define WinObj_Convert _WinObj_Convert
#endif
#if !ACCESSOR_CALLS_ARE_FUNCTIONS
#if !ACCESSOR_CALLS_ARE_FUNCTIONS && UNIVERSAL_INTERFACES_VERSION < 0x340
/* Carbon calls that we emulate in classic mode */
#define GetWindowSpareFlag(win) (((CWindowPeek)(win))->spareFlag)
#define GetWindowFromPort(port) ((WindowRef)(port))
#define GetWindowPortBounds(win, rectp) (*(rectp) = ((CWindowPeek)(win))->port.portRect)
#endif
#if !ACCESSOR_CALLS_ARE_FUNCTIONS
#define IsPointerValid(p) (((long)p&3) == 0)
#endif
#if ACCESSOR_CALLS_ARE_FUNCTIONS