[pywin32-checkins] pywin32/win32/src win32gui.i,1.26,1.27
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
From: <mha...@us...> - 2003-08-27 04:26:30
|
Update of /cvsroot/pywin32/pywin32/win32/src In directory sc8-pr-cvs1:/tmp/cvs-serv7890 Modified Files: win32gui.i Log Message: Clear a couple of pending exceptions that would cause failure. Add IsIconic, ImageList_LoadBitmap, and GetString() takes an optional length param. Index: win32gui.i =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/src/win32gui.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** win32gui.i 7 Apr 2003 13:01:46 -0000 1.26 --- win32gui.i 27 Aug 2003 04:26:25 -0000 1.27 *************** *** 233,236 **** --- 233,237 ---- } if (obFunc==NULL) { + PyErr_Clear(); return FALSE; } *************** *** 340,343 **** --- 341,346 ---- obFunc = PyDict_GetItem(g_DLGMap, key); Py_XDECREF(key); + if (!obFunc) + PyErr_Clear(); } if (obFunc) { *************** *** 781,789 **** { TCHAR *addr = 0; // @pyparm int|addr||Address of the memory to reference (must be null terminated) ! if (!PyArg_ParseTuple(args, "l:PyGetString",&addr)) return NULL; ! int len = _tcslen(addr); if (len == 0) return PyUnicodeObject_FromString(""); --- 784,794 ---- { TCHAR *addr = 0; + int len = -1; // @pyparm int|addr||Address of the memory to reference (must be null terminated) ! if (!PyArg_ParseTuple(args, "l|i:PyGetString",&addr, &len)) return NULL; ! if (len==-1) ! len = _tcslen(addr); if (len == 0) return PyUnicodeObject_FromString(""); *************** *** 1359,1362 **** --- 1364,1370 ---- // @pyswig |EndDialog|Ends a dialog box. + // @pyparm int|hwnd||Handle to the window. + // @pyparm int|result||result + BOOLAPI EndDialog( HWND hwnd, int result ); *************** *** 1448,1451 **** --- 1456,1466 ---- #define LR_VGACOLOR LR_VGACOLOR + // @pyswig int|ImageList_Add|Adds an image or images to an image list. + // @rdesc Returns the index of the first new image if successful, or -1 otherwise. + int ImageList_Add(HIMAGELIST himl, // @pyswig int|himl||Handle to the image list. + HBITMAP hbmImage, // @pyswig int|hbmImage||Handle to the bitmap that contains the image or images. The number of images is inferred from the width of the bitmap. + HBITMAP hbmMask); // @pyswig int|hbmMask||Handle to the bitmap that contains the mask. If no mask is used with the image list, this parameter is ignored + + // @pyswig HIMAGELIST|ImageList_Create|Create an image list HIMAGELIST ImageList_Create(int cx, int cy, UINT flags, int cInitial, int cGrow); *************** *** 1486,1489 **** --- 1501,1508 ---- int cx, int cGrow, COLORREF crMask, UINT uType, UINT uFlags); + // @pyswig HANDLE|ImageList_LoadBitmap|Creates an image list from the specified bitmap resource. + HIMAGELIST ImageList_LoadBitmap(HINSTANCE hInst, TCHAR *name, + int cx, int cGrow, COLORREF crMask); + // @pyswig BOOL|ImageList_Remove|Remove an image from an imagelist BOOLAPI ImageList_Remove(HIMAGELIST himl, int i); *************** *** 1890,1893 **** --- 1909,1913 ---- %native (Edit_GetLine) PyEdit_GetLine; + #ifdef MS_WINCE %{ *************** *** 2105,2114 **** // @pyswig |IsIconic|determines whether the specified window is minimized (iconic). ! BOOLAPI IsIconic( HWND hWnd // @pyparm int|hWnd||handle to window ); // @pyswig |IsWindow|determines whether the specified window handle identifies an existing window. ! BOOLAPI IsWindow( HWND hWnd // @pyparm int|hWnd||handle to window ); --- 2125,2140 ---- // @pyswig |IsIconic|determines whether the specified window is minimized (iconic). ! BOOL IsIconic( HWND hWnd // @pyparm int|hWnd||handle to window ); // @pyswig |IsWindow|determines whether the specified window handle identifies an existing window. ! BOOL IsWindow( HWND hWnd // @pyparm int|hWnd||handle to window ! ); ! ! // @pyswig |IsChild|Tests whether a window is a child window or descendant window of a specified parent window ! BOOL IsIconic( ! HWND hWndParent, // @pyparm int|hWndParent||handle to parent window ! HWND hWnd // @pyparm int|hWnd||handle to window to test ); |