From f1d7b41fa0d4e0b24755809a8fd9d34f5a851b57 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Wed, 28 Feb 2001 23:32:42 +0000 Subject: [PATCH] Disable GetWindowSpareFlag and GetWindowGoAwayBox on carbon. --- Mac/Modules/win/Winmodule.c | 12 ++++++++++++ Mac/Modules/win/winscan.py | 2 ++ 2 files changed, 14 insertions(+) diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c index 0aa6e11c457..00d58a48ae9 100644 --- a/Mac/Modules/win/Winmodule.c +++ b/Mac/Modules/win/Winmodule.c @@ -1637,6 +1637,8 @@ static PyObject *WinObj_GetAuxWin(_self, _args) } #endif +#if !TARGET_API_MAC_CARBON + static PyObject *WinObj_GetWindowGoAwayFlag(_self, _args) WindowObject *_self; PyObject *_args; @@ -1650,6 +1652,9 @@ static PyObject *WinObj_GetWindowGoAwayFlag(_self, _args) _rv); return _res; } +#endif + +#if !TARGET_API_MAC_CARBON static PyObject *WinObj_GetWindowSpareFlag(_self, _args) WindowObject *_self; @@ -1664,6 +1669,7 @@ static PyObject *WinObj_GetWindowSpareFlag(_self, _args) _rv); return _res; } +#endif static PyObject *WinObj_GetWindowPort(_self, _args) WindowObject *_self; @@ -2226,10 +2232,16 @@ static PyMethodDef WinObj_methods[] = { {"GetAuxWin", (PyCFunction)WinObj_GetAuxWin, 1, "() -> (Boolean _rv, AuxWinHandle awHndl)"}, #endif + +#if !TARGET_API_MAC_CARBON {"GetWindowGoAwayFlag", (PyCFunction)WinObj_GetWindowGoAwayFlag, 1, "() -> (Boolean _rv)"}, +#endif + +#if !TARGET_API_MAC_CARBON {"GetWindowSpareFlag", (PyCFunction)WinObj_GetWindowSpareFlag, 1, "() -> (Boolean _rv)"}, +#endif {"GetWindowPort", (PyCFunction)WinObj_GetWindowPort, 1, "() -> (CGrafPtr _rv)"}, {"GetWindowKind", (PyCFunction)WinObj_GetWindowKind, 1, diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py index cdc2b66f301..dcb62c3f442 100644 --- a/Mac/Modules/win/winscan.py +++ b/Mac/Modules/win/winscan.py @@ -68,6 +68,8 @@ class MyScanner(Scanner): 'IsValidWindowPtr', # I think this is useless for Python, but not sure... 'GetWindowZoomFlag', # Not available in Carbon 'GetWindowTitleWidth', # Ditto + 'GetWindowGoAwayFlag', + 'GetWindowSpareFlag', ]), ('#if TARGET_API_MAC_CARBON', [ 'IsWindowUpdatePending',