[pywin32-checkins] pywin32/com/win32comext/shell/src PyINameSpaceTreeControl.cpp, 1.1, 1.2 PyINameSpaceTreeControl.h, 1.1, 1.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1390/com/win32comext/shell/src

Modified Files:
	PyINameSpaceTreeControl.cpp PyINameSpaceTreeControl.h 
Log Message:
fix issues building NameSpaceTree support

Index: PyINameSpaceTreeControl.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyINameSpaceTreeControl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyINameSpaceTreeControl.cpp	26 Jul 2008 07:02:34 -0000	1.1
--- PyINameSpaceTreeControl.cpp	17 Nov 2010 04:12:51 -0000	1.2
***************
*** 423,427 ****
  	PyObject *obpsi;
  	IShellItem * psi;
! 	DWORD nstcgi;
  	IShellItem * ppsiNext;
  	if ( !PyArg_ParseTuple(args, "Ol:GetNextItem", &obpsi, &nstcgi) )
--- 423,427 ----
  	PyObject *obpsi;
  	IShellItem * psi;
! 	long nstcgi;
  	IShellItem * ppsiNext;
  	if ( !PyArg_ParseTuple(args, "Ol:GetNextItem", &obpsi, &nstcgi) )
***************
*** 431,435 ****
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pINSTC->GetNextItem( psi, nstcgi, &ppsiNext );
  	if (psi) psi->Release();
  	PY_INTERFACE_POSTCALL;
--- 431,435 ----
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pINSTC->GetNextItem( psi, (NSTCGNI)nstcgi, &ppsiNext );
  	if (psi) psi->Release();
  	PY_INTERFACE_POSTCALL;

Index: PyINameSpaceTreeControl.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyINameSpaceTreeControl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyINameSpaceTreeControl.h	26 Jul 2008 07:02:34 -0000	1.1
--- PyINameSpaceTreeControl.h	17 Nov 2010 04:12:51 -0000	1.2
***************
*** 37,129 ****
  	~PyINameSpaceTreeControl();
  };
- // ---------------------------------------------------
- //
- // Gateway Declaration
- 
- class PyGNameSpaceTreeControl : public PyGatewayBase, public INameSpaceTreeControl
- {
- protected:
- 	PyGNameSpaceTreeControl(PyObject *instance) : PyGatewayBase(instance) { ; }
- 	PYGATEWAY_MAKE_SUPPORT2(PyGNameSpaceTreeControl, INameSpaceTreeControl, IID_INameSpaceTreeControl, PyGatewayBase)
- 
- 
- 
- 	// INameSpaceTreeControl
- 	STDMETHOD(Initialize)(
- 		HWND hwndParent,
- 		RECT * prc,
- 		DWORD nsctsFlags);
- 
- 	STDMETHOD(TreeAdvise)(
- 		IUnknown * punk,
- 		DWORD * pdwCookie);
- 
- 	STDMETHOD(TreeUnadvise)(
- 		DWORD dwCookie);
- 
- 	STDMETHOD(AppendRoot)(
- 		IShellItem * psiRoot,
- 		DWORD grfEnumFlags,
- 		DWORD grfRootStyle,
- 		IShellItemFilter * pif);
- 
- 	STDMETHOD(InsertRoot)(
- 		int iIndex,
- 		IShellItem * psiRoot,
- 		DWORD grfEnumFlags,
- 		DWORD grfRootStyle,
- 		IShellItemFilter * pif);
- 
- 	STDMETHOD(RemoveRoot)(
- 		IShellItem * psiRoot);
- 
- 	STDMETHOD(RemoveAllRoots)(
- 		void);
- 
- 	STDMETHOD(GetRootItems)(
- 		IShellItemArray ** ppsiaRootItems);
- 
- 	STDMETHOD(SetItemState)(
- 		IShellItem * psi,
- 		DWORD nstcisMask,
- 		DWORD nstcisFlags);
- 
- 	STDMETHOD(GetItemState)(
- 		IShellItem * psi,
- 		DWORD nstcisMask,
- 		DWORD * pnstcisFlags);
- 
- 	STDMETHOD(GetSelectedItems)(
- 		IShellItemArray ** psiaItems);
- 
- 	STDMETHOD(GetItemCustomState)(
- 		IShellItem * psi,
- 		int * piStateNumber);
- 
- 	STDMETHOD(SetItemCustomState)(
- 		IShellItem * psi,
- 		int iStateNumber);
- 
- 	STDMETHOD(EnsureItemVisible)(
- 		IShellItem * psi);
- 
- 	STDMETHOD(SetTheme)(
- 		LPCWSTR pszTheme);
- 
- 	STDMETHOD(GetNextItem)(
- 		IShellItem * psi,
- 		DWORD nstcgi,
- 		IShellItem ** ppsiNext);
- 
- 	STDMETHOD(HitTest)(
- 		POINT * ppt,
- 		IShellItem ** ppsiOut);
- 
- 	STDMETHOD(GetItemRect)(
- 		IShellItem * psi,
- 		RECT * prect);
- 
- 	STDMETHOD(CollapseAll)(
- 		void);
- 
- };
--- 37,38 ----