mirror of https://github.com/python/cpython.git
Replaced various dummy updateRegions by real arguments
This commit is contained in:
parent
fcdf4378ac
commit
2b72417da0
|
@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *);
|
|||
extern PyObject *BMObj_New(BitMapPtr);
|
||||
extern int BMObj_Convert(PyObject *, BitMapPtr *);
|
||||
|
||||
extern PyObject *PMObj_New(PixMapHandle);
|
||||
extern int PMObj_Convert(PyObject *, PixMapHandle *);
|
||||
|
||||
extern PyObject *WinObj_WhichWindow(WindowPtr);
|
||||
|
||||
#include <Controls.h>
|
||||
|
@ -624,11 +627,13 @@ static PyObject *Ctl_UpdateControls(_self, _args)
|
|||
{
|
||||
PyObject *_res = NULL;
|
||||
WindowPtr theWindow;
|
||||
if (!PyArg_ParseTuple(_args, "O&",
|
||||
WinObj_Convert, &theWindow))
|
||||
RgnHandle updateRegion;
|
||||
if (!PyArg_ParseTuple(_args, "O&O&",
|
||||
WinObj_Convert, &theWindow,
|
||||
ResObj_Convert, &updateRegion))
|
||||
return NULL;
|
||||
UpdateControls(theWindow,
|
||||
theWindow->visRgn);
|
||||
updateRegion);
|
||||
Py_INCREF(Py_None);
|
||||
_res = Py_None;
|
||||
return _res;
|
||||
|
@ -666,7 +671,7 @@ static PyMethodDef Ctl_methods[] = {
|
|||
{"DrawControls", (PyCFunction)Ctl_DrawControls, 1,
|
||||
"(WindowPtr theWindow) -> None"},
|
||||
{"UpdateControls", (PyCFunction)Ctl_UpdateControls, 1,
|
||||
"(WindowPtr theWindow) -> None"},
|
||||
"(WindowPtr theWindow, RgnHandle updateRegion) -> None"},
|
||||
{"FindControl", (PyCFunction)Ctl_FindControl, 1,
|
||||
"(Point thePoint, WindowPtr theWindow) -> (ControlPartCode _rv, ControlHandle theControl)"},
|
||||
{NULL, NULL, 0}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
|
||||
# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
|
||||
|
||||
f = Function(ControlRef, 'NewControl',
|
||||
(WindowRef, 'theWindow', InMode),
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
ControlRef = ControlHandle
|
||||
ExistingControlHandle = OpaqueByValueType(OBJECTTYPE, "CtlObj_WhichControl", "BUG")
|
||||
|
||||
RgnHandle = FakeType("theWindow->visRgn") # XXX
|
||||
RgnHandle = OpaqueByValueType("RgnHandle", "ResObj")
|
||||
ControlPartCode = Type("ControlPartCode", "h")
|
||||
DragConstraint = Type("DragConstraint", "h")
|
||||
|
||||
|
|
|
@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *);
|
|||
extern PyObject *BMObj_New(BitMapPtr);
|
||||
extern int BMObj_Convert(PyObject *, BitMapPtr *);
|
||||
|
||||
extern PyObject *PMObj_New(PixMapHandle);
|
||||
extern int PMObj_Convert(PyObject *, PixMapHandle *);
|
||||
|
||||
extern PyObject *WinObj_WhichWindow(WindowPtr);
|
||||
|
||||
#include <Dialogs.h>
|
||||
|
@ -173,10 +176,12 @@ static PyObject *DlgObj_UpdateDialog(_self, _args)
|
|||
PyObject *_args;
|
||||
{
|
||||
PyObject *_res = NULL;
|
||||
if (!PyArg_ParseTuple(_args, ""))
|
||||
RgnHandle updateRgn;
|
||||
if (!PyArg_ParseTuple(_args, "O&",
|
||||
ResObj_Convert, &updateRgn))
|
||||
return NULL;
|
||||
UpdateDialog(_self->ob_itself,
|
||||
_self->ob_itself->visRgn);
|
||||
updateRgn);
|
||||
Py_INCREF(Py_None);
|
||||
_res = Py_None;
|
||||
return _res;
|
||||
|
@ -481,7 +486,7 @@ static PyMethodDef DlgObj_methods[] = {
|
|||
{"DrawDialog", (PyCFunction)DlgObj_DrawDialog, 1,
|
||||
"() -> None"},
|
||||
{"UpdateDialog", (PyCFunction)DlgObj_UpdateDialog, 1,
|
||||
"() -> None"},
|
||||
"(RgnHandle updateRgn) -> None"},
|
||||
{"GetDialogItem", (PyCFunction)DlgObj_GetDialogItem, 1,
|
||||
"(short itemNo) -> (short itemType, Handle item, Rect box)"},
|
||||
{"SetDialogItem", (PyCFunction)DlgObj_SetDialogItem, 1,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h'
|
||||
# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h'
|
||||
|
||||
f = Function(DialogRef, 'NewDialog',
|
||||
(NullStorage, 'wStorage', InMode),
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
ModalFilterProcPtr.passInput = lambda name: "NewModalFilterProc(Dlg_PassFilterProc(%s))" % name
|
||||
ModalFilterUPP = ModalFilterProcPtr
|
||||
|
||||
RgnHandle = FakeType("_self->ob_itself->visRgn") # XXX
|
||||
RgnHandle = OpaqueByValueType("RgnHandle", "ResObj")
|
||||
|
||||
DITLMethod = Type("DITLMethod", "h")
|
||||
|
||||
|
|
|
@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *);
|
|||
extern PyObject *BMObj_New(BitMapPtr);
|
||||
extern int BMObj_Convert(PyObject *, BitMapPtr *);
|
||||
|
||||
extern PyObject *PMObj_New(PixMapHandle);
|
||||
extern int PMObj_Convert(PyObject *, PixMapHandle *);
|
||||
|
||||
extern PyObject *WinObj_WhichWindow(WindowPtr);
|
||||
|
||||
#include <Events.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h'
|
||||
# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h'
|
||||
|
||||
f = Function(UInt32, 'GetCaretTime',
|
||||
)
|
||||
|
|
|
@ -24,7 +24,9 @@
|
|||
|
||||
#WindowPeek = OpaqueByValueType("WindowPeek", OBJECTPREFIX)
|
||||
|
||||
RgnHandle = FakeType("(RgnHandle)0") # XXX
|
||||
RgnHandle = FakeType("(RgnHandle)0")
|
||||
# XXXX Should be next, but this will break a lot of code...
|
||||
# RgnHandle = OpaqueByValueType("RgnHandle", "OptResObj")
|
||||
|
||||
KeyMap = ArrayOutputBufferType("KeyMap")
|
||||
MacOSEventKind = Type("MacOSEventKind", "h") # Old-style
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Generated from 'flap:CodeWarrior:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Fonts.h'
|
||||
# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Fonts.h'
|
||||
|
||||
f = Function(void, 'InitFonts',
|
||||
)
|
||||
|
|
|
@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *);
|
|||
extern PyObject *BMObj_New(BitMapPtr);
|
||||
extern int BMObj_Convert(PyObject *, BitMapPtr *);
|
||||
|
||||
extern PyObject *PMObj_New(PixMapHandle);
|
||||
extern int PMObj_Convert(PyObject *, PixMapHandle *);
|
||||
|
||||
extern PyObject *WinObj_WhichWindow(WindowPtr);
|
||||
|
||||
#include <Lists.h>
|
||||
|
@ -299,9 +302,11 @@ static PyObject *ListObj_LUpdate(_self, _args)
|
|||
PyObject *_args;
|
||||
{
|
||||
PyObject *_res = NULL;
|
||||
if (!PyArg_ParseTuple(_args, ""))
|
||||
RgnHandle theRgn;
|
||||
if (!PyArg_ParseTuple(_args, "O&",
|
||||
ResObj_Convert, &theRgn))
|
||||
return NULL;
|
||||
LUpdate((*_self->ob_itself)->port->visRgn,
|
||||
LUpdate(theRgn,
|
||||
_self->ob_itself);
|
||||
Py_INCREF(Py_None);
|
||||
_res = Py_None;
|
||||
|
@ -528,7 +533,7 @@ static PyMethodDef ListObj_methods[] = {
|
|||
{"LAutoScroll", (PyCFunction)ListObj_LAutoScroll, 1,
|
||||
"() -> None"},
|
||||
{"LUpdate", (PyCFunction)ListObj_LUpdate, 1,
|
||||
"() -> None"},
|
||||
"(RgnHandle theRgn) -> None"},
|
||||
{"LActivate", (PyCFunction)ListObj_LActivate, 1,
|
||||
"(Boolean act) -> None"},
|
||||
{"LCellSize", (PyCFunction)ListObj_LCellSize, 1,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Lists.h'
|
||||
# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Lists.h'
|
||||
|
||||
f = Function(ListRef, 'LNew',
|
||||
(Rect_ptr, 'rView', InMode),
|
||||
|
|
|
@ -26,8 +26,7 @@
|
|||
VarOutBufferShortsize = VarHeapOutputBufferType('char', 'short', 's') # (buf, &len)
|
||||
InBufferShortsize = VarInputBufferType('char', 'short', 's') # (buf, len)
|
||||
|
||||
# For LUpdate, we alsways update the complete visible region.
|
||||
RgnHandle = FakeType("(*_self->ob_itself)->port->visRgn")
|
||||
RgnHandle = OpaqueByValueType("RgnHandle", "ResObj")
|
||||
|
||||
|
||||
includestuff = includestuff + """
|
||||
|
|
|
@ -40,6 +40,9 @@ extern int GrafObj_Convert(PyObject *, GrafPtr *);
|
|||
extern PyObject *BMObj_New(BitMapPtr);
|
||||
extern int BMObj_Convert(PyObject *, BitMapPtr *);
|
||||
|
||||
extern PyObject *PMObj_New(PixMapHandle);
|
||||
extern int PMObj_Convert(PyObject *, PixMapHandle *);
|
||||
|
||||
extern PyObject *WinObj_WhichWindow(WindowPtr);
|
||||
|
||||
#include <Devices.h> /* Defines OpenDeskAcc in universal headers */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Menus.h'
|
||||
# Generated from 'flap:CW8 Gold:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Menus.h'
|
||||
|
||||
f = Function(short, 'GetMBarHeight',
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue