[pywin32-checkins] pywin32/win32/src PyWinTypes.h, 1.36, 1.37 PyWinTypesmodule.cpp, 1.26, 1.27 win32api_display.cpp, 1.3, 1.4

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17137/win32/src

Modified Files:
	PyWinTypes.h PyWinTypesmodule.cpp win32api_display.cpp 
Log Message:
Move RECT conversion functions into pywintypes

Index: win32api_display.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32api_display.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** win32api_display.cpp	12 Jul 2006 11:30:01 -0000	1.3
--- win32api_display.cpp	1 Apr 2007 13:07:41 -0000	1.4
***************
*** 277,303 ****
  }
  
- // @object PyRECT|Tuple of 4 ints: (left, top, right, bottom)
- BOOL PyWinObject_AsRECT(PyObject *obrect, LPRECT prect)
- {
- 	if (!PyTuple_Check(obrect)){
- 		PyErr_SetString(PyExc_TypeError, "RECT must be a tuple of 4 ints (left, top, right, bottom)");
- 		return FALSE;
- 		}
- 	return PyArg_ParseTuple(obrect, "llll;RECT must be a tuple of 4 ints (left, top, right, bottom)", 
- 			&prect->left, &prect->top, &prect->right, &prect->bottom);
- }
- 
- PyObject *PyWinObject_FromRECT(LPRECT prect)
- {
- 	if (prect==NULL){
- 		Py_INCREF(Py_None);
- 		return Py_None;
- 		}
- 	return Py_BuildValue("llll",
- 		prect->left, prect->top,
- 		prect->right, prect->bottom);
- }
- 
- 
  // @pymethod int|win32api|ChangeDisplaySettings|Changes video mode for default display
  // @rdesc Returns DISP_CHANGE_SUCCESSFUL on success, or one of the DISP_CHANGE_* error constants on failure
--- 277,280 ----
***************
*** 362,366 ****
  	// @pyparm int|DevNum|0|Index of device of interest, starting with zero
  	// @pyparm int|Flags|0|Reserved, use 0 if passed in
! 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|zkk", keywords, 
  		&Device, &DevNum, &Flags))
  		return NULL;
--- 339,343 ----
  	// @pyparm int|DevNum|0|Index of device of interest, starting with zero
  	// @pyparm int|Flags|0|Reserved, use 0 if passed in
! 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|zkk:EnumDisplayDevices", keywords, 
  		&Device, &DevNum, &Flags))
  		return NULL;
***************
*** 457,461 ****
  	LPRECT prect;
  	PyObject *obhdc=Py_None, *obrect=Py_None;
! 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OO", keywords, 
  		&obhdc,		// @pyparm <o PyHANDLE>|hdc|None|Handle to device context, use None for virtual desktop
  		&obrect))	// @pyparm <o PyRECT>|rcClip|None|Clipping rectangle, can be None
--- 434,438 ----
  	LPRECT prect;
  	PyObject *obhdc=Py_None, *obrect=Py_None;
! 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OO:EnumDisplayMonitors", keywords, 
  		&obhdc,		// @pyparm <o PyHANDLE>|hdc|None|Handle to device context, use None for virtual desktop
  		&obrect))	// @pyparm <o PyRECT>|rcClip|None|Clipping rectangle, can be None

Index: PyWinTypesmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyWinTypesmodule.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** PyWinTypesmodule.cpp	20 Feb 2007 10:05:39 -0000	1.26
--- PyWinTypesmodule.cpp	1 Apr 2007 13:07:41 -0000	1.27
***************
*** 647,650 ****
--- 647,672 ----
  }
  
+ // @object PyRECT|Tuple of 4 ints defining a rectangle: (left, top, right, bottom)
+ BOOL PyWinObject_AsRECT(PyObject *obrect, LPRECT prect)
+ {
+ 	if (!PyTuple_Check(obrect)){
+ 		PyErr_SetString(PyExc_TypeError, "RECT must be a tuple of 4 ints (left, top, right, bottom)");
+ 		return FALSE;
+ 		}
+ 	return PyArg_ParseTuple(obrect, "llll;RECT must be a tuple of 4 ints (left, top, right, bottom)", 
+ 			&prect->left, &prect->top, &prect->right, &prect->bottom);
+ }
+ 
+ PyObject *PyWinObject_FromRECT(LPRECT prect)
+ {
+ 	if (prect==NULL){
+ 		Py_INCREF(Py_None);
+ 		return Py_None;
+ 		}
+ 	return Py_BuildValue("llll",
+ 		prect->left, prect->top,
+ 		prect->right, prect->bottom);
+ }
+ 
  
  /* List of functions exported by this module */

Index: PyWinTypes.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyWinTypes.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** PyWinTypes.h	14 Mar 2007 04:29:35 -0000	1.36
--- PyWinTypes.h	1 Apr 2007 13:07:41 -0000	1.37
***************
*** 356,359 ****
--- 356,364 ----
  PYWINTYPES_EXPORT BOOL PyWinObject_AsPARAM(PyObject *ob, WPARAM *pparam);
  
+ // RECT conversions
+ // @object PyRECT|Tuple of 4 ints defining a rectangle: (left, top, right, bottom)
+ PYWINTYPES_EXPORT BOOL PyWinObject_AsRECT(PyObject *obrect, LPRECT prect);
+ PYWINTYPES_EXPORT PyObject *PyWinObject_FromRECT(LPRECT prect);
+ 
  /*
  ** SECURITY_ATTRIBUTES support