Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22520/com/win32comext/shell/src
Modified Files:
Tag: py3k
PyIShellBrowser.cpp shell.cpp
Log Message:
Move OLEMENUGROUPWIDTHS from win32com.shell to pythoncom
Index: PyIShellBrowser.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellBrowser.cpp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** PyIShellBrowser.cpp 18 Aug 2008 13:04:10 -0000 1.10
--- PyIShellBrowser.cpp 2 Nov 2008 12:43:47 -0000 1.10.2.1
***************
*** 9,15 ****
// ---------------------------------------------------
//
- extern BOOL PyObject_AsOLEMENUGROUPWIDTHS( PyObject *oblpMenuWidths, OLEMENUGROUPWIDTHS *pWidths);
- PyObject *PyObject_FromOLEMENUGROUPWIDTHS(OLEMENUGROUPWIDTHS *p);
-
extern BOOL PyObject_AsTBBUTTONs( PyObject *ob, TBBUTTON **ppButtons, UINT *nButtons );
extern void PyObject_FreeTBBUTTONs(TBBUTTON *);
--- 9,12 ----
***************
*** 32,36 ****
}
! // @pymethod <o PyLPOLEMENUGROUPWIDTHS>|PyIShellBrowser|InsertMenusSB|Updates a composite menu with container's options
PyObject *PyIShellBrowser::InsertMenusSB(PyObject *self, PyObject *args)
{
--- 29,33 ----
}
! // @pymethod <o PyOLEMENUGROUPWIDTHS>|PyIShellBrowser|InsertMenusSB|Updates a composite menu with container's options
PyObject *PyIShellBrowser::InsertMenusSB(PyObject *self, PyObject *args)
{
***************
*** 43,47 ****
if ( !PyArg_ParseTuple(args, "OO:InsertMenusSB",
&obhmenuShared, // @pyparm <o PyHANDLE>|hmenuShared||Newly created menu that contains no items
! &obMenuWidths)) // @pyparm <o PyLPOLEMENUGROUPWIDTHS>|lpMenuWidths||Tuple of 6 ints. Items 0,2,and 4 are updated when the tuple is returned.
return NULL;
if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared))
--- 40,44 ----
if ( !PyArg_ParseTuple(args, "OO:InsertMenusSB",
&obhmenuShared, // @pyparm <o PyHANDLE>|hmenuShared||Newly created menu that contains no items
! &obMenuWidths)) // @pyparm <o PyOLEMENUGROUPWIDTHS>|lpMenuWidths||Tuple of 6 ints. Items 0,2,and 4 are updated when the tuple is returned.
return NULL;
if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared))
Index: shell.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v
retrieving revision 1.68.2.2
retrieving revision 1.68.2.3
diff -C2 -d -r1.68.2.2 -r1.68.2.3
*** shell.cpp 13 Sep 2008 15:48:31 -0000 1.68.2.2
--- shell.cpp 2 Nov 2008 12:43:47 -0000 1.68.2.3
***************
*** 892,916 ****
}
- // @object PyLPOLEMENUGROUPWIDTHS|Tuple containing 6 ints indicating nbr of options in each menu group
- BOOL PyObject_AsOLEMENUGROUPWIDTHS( PyObject *oblpMenuWidths, OLEMENUGROUPWIDTHS *pWidths)
- {
- return PyArg_ParseTuple(oblpMenuWidths, "iiiiii",
- &pWidths->width[0], &pWidths->width[1],
- &pWidths->width[2], &pWidths->width[3],
- &pWidths->width[4], &pWidths->width[5]) != NULL;
- }
-
- PyObject *PyObject_FromOLEMENUGROUPWIDTHS(OLEMENUGROUPWIDTHS *pWidths)
- {
- if (!pWidths) {
- Py_INCREF(Py_None);
- return Py_None;
- }
- return Py_BuildValue("(iiiiii)",
- pWidths->width[0], pWidths->width[1],
- pWidths->width[2], pWidths->width[3],
- pWidths->width[4], pWidths->width[5]);
- }
-
static BOOL MakeDoubleTerminatedStringList(PyObject *ob, TCHAR **ret)
{
--- 892,895 ----
|
