diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-05 16:16:39 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-05 16:16:39 (GMT) |
| commit | bd008844156384108a71423005911e37c0ca5395 (patch) | |
| tree | e17e51b58c53b11d28b8e2f4379746a9ce2d7bc2 /Mac/Modules/dlg | |
| parent | 34cbe718d463fce6a335477081b18852676fb7e1 (diff) | |
| download | cpython-bd008844156384108a71423005911e37c0ca5395.zip cpython-bd008844156384108a71423005911e37c0ca5395.tar.gz cpython-bd008844156384108a71423005911e37c0ca5395.tar.bz2 | |
First tweaks to allow MacPython to be compiled with
Universal Headers 3.4
Diffstat (limited to 'Mac/Modules/dlg')
| -rw-r--r-- | Mac/Modules/dlg/_Dlgmodule.c | 20 | ||||
| -rw-r--r-- | Mac/Modules/dlg/dlgscan.py | 1 | ||||
| -rw-r--r-- | Mac/Modules/dlg/dlgsupport.py | 2 |
3 files changed, 3 insertions, 20 deletions
diff --git a/Mac/Modules/dlg/_Dlgmodule.c b/Mac/Modules/dlg/_Dlgmodule.c index e465129..6983321 100644 --- a/Mac/Modules/dlg/_Dlgmodule.c +++ b/Mac/Modules/dlg/_Dlgmodule.c @@ -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} }; diff --git a/Mac/Modules/dlg/dlgscan.py b/Mac/Modules/dlg/dlgscan.py index 549d0b3..2c63080 100644 --- a/Mac/Modules/dlg/dlgscan.py +++ b/Mac/Modules/dlg/dlgscan.py @@ -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): diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py index af72b3a..e496eb2 100644 --- a/Mac/Modules/dlg/dlgsupport.py +++ b/Mac/Modules/dlg/dlgsupport.py @@ -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)) |