[Python-checkins]
python/dist/src/Mac/Modules/win _Winmodule.c, 1.21,
1.22 winscan.py, 1.25, 1.26
jackjansen at users.sourceforge.net
jackjansen at users.sourceforge.net
Wed Dec 3 18:20:16 EST 2003
Update of /cvsroot/python/python/dist/src/Mac/Modules/win
In directory sc8-pr-cvs1:/tmp/cvs-serv22913/win
Modified Files:
_Winmodule.c winscan.py
Log Message:
Ported to Universal Headers 3.4.2. Qd and Qt remain to be done.
Completely untested.
Index: _Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/_Winmodule.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** _Winmodule.c 20 Nov 2003 13:30:59 -0000 1.21
--- _Winmodule.c 3 Dec 2003 23:20:13 -0000 1.22
***************
*** 1042,1054 ****
PyObject *_res = NULL;
OSStatus _err;
! AliasHandle alias;
#ifndef SetWindowProxyAlias
PyMac_PRECHECK(SetWindowProxyAlias);
#endif
if (!PyArg_ParseTuple(_args, "O&",
! ResObj_Convert, &alias))
return NULL;
_err = SetWindowProxyAlias(_self->ob_itself,
! alias);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
--- 1042,1054 ----
PyObject *_res = NULL;
OSStatus _err;
! AliasHandle inAlias;
#ifndef SetWindowProxyAlias
PyMac_PRECHECK(SetWindowProxyAlias);
#endif
if (!PyArg_ParseTuple(_args, "O&",
! ResObj_Convert, &inAlias))
return NULL;
_err = SetWindowProxyAlias(_self->ob_itself,
! inAlias);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
***************
*** 1333,1351 ****
PyObject *_res = NULL;
OSStatus _err;
! WindowTransitionEffect effect;
! WindowTransitionAction action;
! Rect rect;
#ifndef TransitionWindow
PyMac_PRECHECK(TransitionWindow);
#endif
if (!PyArg_ParseTuple(_args, "llO&",
! &effect,
! &action,
! PyMac_GetRect, &rect))
return NULL;
_err = TransitionWindow(_self->ob_itself,
! effect,
! action,
! &rect);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
--- 1333,1351 ----
PyObject *_res = NULL;
OSStatus _err;
! WindowTransitionEffect inEffect;
! WindowTransitionAction inAction;
! Rect inRect;
#ifndef TransitionWindow
PyMac_PRECHECK(TransitionWindow);
#endif
if (!PyArg_ParseTuple(_args, "llO&",
! &inEffect,
! &inAction,
! PyMac_GetRect, &inRect))
return NULL;
_err = TransitionWindow(_self->ob_itself,
! inEffect,
! inAction,
! &inRect);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
***************
*** 1358,1379 ****
PyObject *_res = NULL;
OSStatus _err;
! WindowPtr parentWindow;
! WindowTransitionEffect effect;
! WindowTransitionAction action;
! Rect rect;
#ifndef TransitionWindowAndParent
PyMac_PRECHECK(TransitionWindowAndParent);
#endif
if (!PyArg_ParseTuple(_args, "O&llO&",
! WinObj_Convert, &parentWindow,
! &effect,
! &action,
! PyMac_GetRect, &rect))
return NULL;
_err = TransitionWindowAndParent(_self->ob_itself,
! parentWindow,
! effect,
! action,
! &rect);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
--- 1358,1379 ----
PyObject *_res = NULL;
OSStatus _err;
! WindowPtr inParentWindow;
! WindowTransitionEffect inEffect;
! WindowTransitionAction inAction;
! Rect inRect;
#ifndef TransitionWindowAndParent
PyMac_PRECHECK(TransitionWindowAndParent);
#endif
if (!PyArg_ParseTuple(_args, "O&llO&",
! WinObj_Convert, &inParentWindow,
! &inEffect,
! &inAction,
! PyMac_GetRect, &inRect))
return NULL;
_err = TransitionWindowAndParent(_self->ob_itself,
! inParentWindow,
! inEffect,
! inAction,
! &inRect);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
***************
*** 1563,1583 ****
PyObject *_res = NULL;
Boolean _rv;
! Point startPoint;
! Rect sizeConstraints;
! Rect newContentRect;
#ifndef ResizeWindow
PyMac_PRECHECK(ResizeWindow);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
! PyMac_GetPoint, &startPoint,
! PyMac_GetRect, &sizeConstraints))
return NULL;
_rv = ResizeWindow(_self->ob_itself,
! startPoint,
! &sizeConstraints,
! &newContentRect);
_res = Py_BuildValue("bO&",
_rv,
! PyMac_BuildRect, &newContentRect);
return _res;
}
--- 1563,1583 ----
PyObject *_res = NULL;
Boolean _rv;
! Point inStartPoint;
! Rect inSizeConstraints;
! Rect outNewContentRect;
#ifndef ResizeWindow
PyMac_PRECHECK(ResizeWindow);
#endif
if (!PyArg_ParseTuple(_args, "O&O&",
! PyMac_GetPoint, &inStartPoint,
! PyMac_GetRect, &inSizeConstraints))
return NULL;
_rv = ResizeWindow(_self->ob_itself,
! inStartPoint,
! &inSizeConstraints,
! &outNewContentRect);
_res = Py_BuildValue("bO&",
_rv,
! PyMac_BuildRect, &outNewContentRect);
return _res;
}
***************
*** 1653,1670 ****
PyObject *_res = NULL;
Boolean _rv;
! Point idealSize;
! Rect idealStandardState;
#ifndef IsWindowInStandardState
PyMac_PRECHECK(IsWindowInStandardState);
#endif
! if (!PyArg_ParseTuple(_args, ""))
return NULL;
_rv = IsWindowInStandardState(_self->ob_itself,
! &idealSize,
! &idealStandardState);
! _res = Py_BuildValue("bO&O&",
_rv,
! PyMac_BuildPoint, idealSize,
! PyMac_BuildRect, &idealStandardState);
return _res;
}
--- 1653,1670 ----
PyObject *_res = NULL;
Boolean _rv;
! Point inIdealSize;
! Rect outIdealStandardState;
#ifndef IsWindowInStandardState
PyMac_PRECHECK(IsWindowInStandardState);
#endif
! if (!PyArg_ParseTuple(_args, "O&",
! PyMac_GetPoint, &inIdealSize))
return NULL;
_rv = IsWindowInStandardState(_self->ob_itself,
! &inIdealSize,
! &outIdealStandardState);
! _res = Py_BuildValue("bO&",
_rv,
! PyMac_BuildRect, &outIdealStandardState);
return _res;
}
***************
*** 1674,1678 ****
PyObject *_res = NULL;
OSStatus _err;
! WindowPartCode partCode;
Point ioIdealSize;
#ifndef ZoomWindowIdeal
--- 1674,1678 ----
PyObject *_res = NULL;
OSStatus _err;
! WindowPartCode inPartCode;
Point ioIdealSize;
#ifndef ZoomWindowIdeal
***************
*** 1680,1687 ****
#endif
if (!PyArg_ParseTuple(_args, "h",
! &partCode))
return NULL;
_err = ZoomWindowIdeal(_self->ob_itself,
! partCode,
&ioIdealSize);
if (_err != noErr) return PyMac_Error(_err);
--- 1680,1687 ----
#endif
if (!PyArg_ParseTuple(_args, "h",
! &inPartCode))
return NULL;
_err = ZoomWindowIdeal(_self->ob_itself,
! inPartCode,
&ioIdealSize);
if (_err != noErr) return PyMac_Error(_err);
***************
*** 1695,1699 ****
PyObject *_res = NULL;
OSStatus _err;
! Rect userState;
#ifndef GetWindowIdealUserState
PyMac_PRECHECK(GetWindowIdealUserState);
--- 1695,1699 ----
PyObject *_res = NULL;
OSStatus _err;
! Rect outUserState;
#ifndef GetWindowIdealUserState
PyMac_PRECHECK(GetWindowIdealUserState);
***************
*** 1702,1709 ****
return NULL;
_err = GetWindowIdealUserState(_self->ob_itself,
! &userState);
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("O&",
! PyMac_BuildRect, &userState);
return _res;
}
--- 1702,1709 ----
return NULL;
_err = GetWindowIdealUserState(_self->ob_itself,
! &outUserState);
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("O&",
! PyMac_BuildRect, &outUserState);
return _res;
}
***************
*** 1713,1725 ****
PyObject *_res = NULL;
OSStatus _err;
! Rect userState;
#ifndef SetWindowIdealUserState
PyMac_PRECHECK(SetWindowIdealUserState);
#endif
if (!PyArg_ParseTuple(_args, "O&",
! PyMac_GetRect, &userState))
return NULL;
_err = SetWindowIdealUserState(_self->ob_itself,
! &userState);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
--- 1713,1725 ----
PyObject *_res = NULL;
OSStatus _err;
! Rect inUserState;
#ifndef SetWindowIdealUserState
PyMac_PRECHECK(SetWindowIdealUserState);
#endif
if (!PyArg_ParseTuple(_args, "O&",
! PyMac_GetRect, &inUserState))
return NULL;
_err = SetWindowIdealUserState(_self->ob_itself,
! &inUserState);
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
***************
*** 1998,2001 ****
--- 1998,2016 ----
}
+ static PyObject *WinObj_GetWindowStructurePort(WindowObject *_self, PyObject *_args)
+ {
+ PyObject *_res = NULL;
+ CGrafPtr _rv;
+ #ifndef GetWindowStructurePort
+ PyMac_PRECHECK(GetWindowStructurePort);
+ #endif
+ if (!PyArg_ParseTuple(_args, ""))
+ return NULL;
+ _rv = GetWindowStructurePort(_self->ob_itself);
+ _res = Py_BuildValue("O&",
+ GrafObj_New, _rv);
+ return _res;
+ }
+
static PyObject *WinObj_GetWindowKind(WindowObject *_self, PyObject *_args)
{
***************
*** 2413,2417 ****
PyDoc_STR("() -> (FSSpec outFile)")},
{"SetWindowProxyAlias", (PyCFunction)WinObj_SetWindowProxyAlias, 1,
! PyDoc_STR("(AliasHandle alias) -> None")},
{"GetWindowProxyAlias", (PyCFunction)WinObj_GetWindowProxyAlias, 1,
PyDoc_STR("() -> (AliasHandle alias)")},
--- 2428,2432 ----
PyDoc_STR("() -> (FSSpec outFile)")},
{"SetWindowProxyAlias", (PyCFunction)WinObj_SetWindowProxyAlias, 1,
! PyDoc_STR("(AliasHandle inAlias) -> None")},
{"GetWindowProxyAlias", (PyCFunction)WinObj_GetWindowProxyAlias, 1,
PyDoc_STR("() -> (AliasHandle alias)")},
***************
*** 2443,2449 ****
PyDoc_STR("(Boolean hilited) -> None")},
{"TransitionWindow", (PyCFunction)WinObj_TransitionWindow, 1,
! PyDoc_STR("(WindowTransitionEffect effect, WindowTransitionAction action, Rect rect) -> None")},
{"TransitionWindowAndParent", (PyCFunction)WinObj_TransitionWindowAndParent, 1,
! PyDoc_STR("(WindowPtr parentWindow, WindowTransitionEffect effect, WindowTransitionAction action, Rect rect) -> None")},
{"MacMoveWindow", (PyCFunction)WinObj_MacMoveWindow, 1,
PyDoc_STR("(short hGlobal, short vGlobal, Boolean front) -> None")},
--- 2458,2464 ----
PyDoc_STR("(Boolean hilited) -> None")},
{"TransitionWindow", (PyCFunction)WinObj_TransitionWindow, 1,
! PyDoc_STR("(WindowTransitionEffect inEffect, WindowTransitionAction inAction, Rect inRect) -> None")},
{"TransitionWindowAndParent", (PyCFunction)WinObj_TransitionWindowAndParent, 1,
! PyDoc_STR("(WindowPtr inParentWindow, WindowTransitionEffect inEffect, WindowTransitionAction inAction, Rect inRect) -> None")},
{"MacMoveWindow", (PyCFunction)WinObj_MacMoveWindow, 1,
PyDoc_STR("(short hGlobal, short vGlobal, Boolean front) -> None")},
***************
*** 2465,2469 ****
PyDoc_STR("(WindowRegionCode regionCode) -> (Rect globalBounds)")},
{"ResizeWindow", (PyCFunction)WinObj_ResizeWindow, 1,
! PyDoc_STR("(Point startPoint, Rect sizeConstraints) -> (Boolean _rv, Rect newContentRect)")},
{"SetWindowBounds", (PyCFunction)WinObj_SetWindowBounds, 1,
PyDoc_STR("(WindowRegionCode regionCode, Rect globalBounds) -> None")},
--- 2480,2484 ----
PyDoc_STR("(WindowRegionCode regionCode) -> (Rect globalBounds)")},
{"ResizeWindow", (PyCFunction)WinObj_ResizeWindow, 1,
! PyDoc_STR("(Point inStartPoint, Rect inSizeConstraints) -> (Boolean _rv, Rect outNewContentRect)")},
{"SetWindowBounds", (PyCFunction)WinObj_SetWindowBounds, 1,
PyDoc_STR("(WindowRegionCode regionCode, Rect globalBounds) -> None")},
***************
*** 2473,2483 ****
PyDoc_STR("(short hGlobal, short vGlobal) -> None")},
{"IsWindowInStandardState", (PyCFunction)WinObj_IsWindowInStandardState, 1,
! PyDoc_STR("() -> (Boolean _rv, Point idealSize, Rect idealStandardState)")},
{"ZoomWindowIdeal", (PyCFunction)WinObj_ZoomWindowIdeal, 1,
! PyDoc_STR("(WindowPartCode partCode) -> (Point ioIdealSize)")},
{"GetWindowIdealUserState", (PyCFunction)WinObj_GetWindowIdealUserState, 1,
! PyDoc_STR("() -> (Rect userState)")},
{"SetWindowIdealUserState", (PyCFunction)WinObj_SetWindowIdealUserState, 1,
! PyDoc_STR("(Rect userState) -> None")},
{"GetWindowGreatestAreaDevice", (PyCFunction)WinObj_GetWindowGreatestAreaDevice, 1,
PyDoc_STR("(WindowRegionCode inRegion) -> (GDHandle outGreatestDevice, Rect outGreatestDeviceRect)")},
--- 2488,2498 ----
PyDoc_STR("(short hGlobal, short vGlobal) -> None")},
{"IsWindowInStandardState", (PyCFunction)WinObj_IsWindowInStandardState, 1,
! PyDoc_STR("(Point inIdealSize) -> (Boolean _rv, Rect outIdealStandardState)")},
{"ZoomWindowIdeal", (PyCFunction)WinObj_ZoomWindowIdeal, 1,
! PyDoc_STR("(WindowPartCode inPartCode) -> (Point ioIdealSize)")},
{"GetWindowIdealUserState", (PyCFunction)WinObj_GetWindowIdealUserState, 1,
! PyDoc_STR("() -> (Rect outUserState)")},
{"SetWindowIdealUserState", (PyCFunction)WinObj_SetWindowIdealUserState, 1,
! PyDoc_STR("(Rect inUserState) -> None")},
{"GetWindowGreatestAreaDevice", (PyCFunction)WinObj_GetWindowGreatestAreaDevice, 1,
PyDoc_STR("(WindowRegionCode inRegion) -> (GDHandle outGreatestDevice, Rect outGreatestDeviceRect)")},
***************
*** 2508,2511 ****
--- 2523,2528 ----
{"GetWindowPort", (PyCFunction)WinObj_GetWindowPort, 1,
PyDoc_STR("() -> (CGrafPtr _rv)")},
+ {"GetWindowStructurePort", (PyCFunction)WinObj_GetWindowStructurePort, 1,
+ PyDoc_STR("() -> (CGrafPtr _rv)")},
{"GetWindowKind", (PyCFunction)WinObj_GetWindowKind, 1,
PyDoc_STR("() -> (short _rv)")},
***************
*** 2999,3003 ****
OSStatus _err;
GDHandle inDevice;
! Rect availableRect;
#ifndef GetAvailableWindowPositioningBounds
PyMac_PRECHECK(GetAvailableWindowPositioningBounds);
--- 3016,3020 ----
OSStatus _err;
GDHandle inDevice;
! Rect outAvailableRect;
#ifndef GetAvailableWindowPositioningBounds
PyMac_PRECHECK(GetAvailableWindowPositioningBounds);
***************
*** 3007,3014 ****
return NULL;
_err = GetAvailableWindowPositioningBounds(inDevice,
! &availableRect);
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("O&",
! PyMac_BuildRect, &availableRect);
return _res;
}
--- 3024,3031 ----
return NULL;
_err = GetAvailableWindowPositioningBounds(inDevice,
! &outAvailableRect);
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("O&",
! PyMac_BuildRect, &outAvailableRect);
return _res;
}
***************
*** 3167,3171 ****
PyDoc_STR("(Boolean collapse) -> None")},
{"GetAvailableWindowPositioningBounds", (PyCFunction)Win_GetAvailableWindowPositioningBounds, 1,
! PyDoc_STR("(GDHandle inDevice) -> (Rect availableRect)")},
{"DisableScreenUpdates", (PyCFunction)Win_DisableScreenUpdates, 1,
PyDoc_STR("() -> None")},
--- 3184,3188 ----
PyDoc_STR("(Boolean collapse) -> None")},
{"GetAvailableWindowPositioningBounds", (PyCFunction)Win_GetAvailableWindowPositioningBounds, 1,
! PyDoc_STR("(GDHandle inDevice) -> (Rect outAvailableRect)")},
{"DisableScreenUpdates", (PyCFunction)Win_DisableScreenUpdates, 1,
PyDoc_STR("() -> None")},
Index: winscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winscan.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** winscan.py 19 Nov 2003 16:34:04 -0000 1.25
--- winscan.py 3 Dec 2003 23:20:13 -0000 1.26
***************
*** 36,39 ****
--- 36,40 ----
self.defsfile.write("false = 0\n")
self.defsfile.write("true = 1\n")
+ self.defsfile.write("kWindowNoConstrainAttribute = 0x80000000\n")
def makeblacklistnames(self):
***************
*** 50,53 ****
--- 51,55 ----
'kMouseUpOutOfSlop',
'kAllWindowClasses',
+ 'kWindowNoConstrainAttribute',
# OS8 only:
'GetAuxWin',
More information about the Python-checkins
mailing list