[pywin32-checkins] pywin32/Pythonwin win32win.cpp, 1.21.2.3, 1.21.2.4

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

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4261/Pythonwin

Modified Files:
      Tag: py3k
	win32win.cpp 
Log Message:
merge lots of changes (most via 2to3) from the trunk

Index: win32win.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32win.cpp,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -C2 -d -r1.21.2.3 -r1.21.2.4
*** win32win.cpp	28 Dec 2008 12:53:32 -0000	1.21.2.3
--- win32win.cpp	5 Jan 2009 12:51:26 -0000	1.21.2.4
***************
*** 2711,2716 ****
  		RETURN_ERR("BeginPaint failed");
  	PyObject *obDC = ui_assoc_object::make (ui_dc_object::type, pTemp)->GetGoodRet();
! 	PyObject *obRet = Py_BuildValue("O(Ni(iiii)iiN)", obDC,
! 		PyWinLong_FromHANDLE(ps.hdc),
  		ps.fErase,
  		ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom,
--- 2711,2716 ----
  		RETURN_ERR("BeginPaint failed");
  	PyObject *obDC = ui_assoc_object::make (ui_dc_object::type, pTemp)->GetGoodRet();
! 	PyObject *obRet = Py_BuildValue("O(ii(iiii)iiN)", obDC,
! 		ps.hdc,
  		ps.fErase,
  		ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom,
***************
*** 3703,3710 ****
  		return NULL;
  	GUI_BGN_SAVE;
! 	try {
  		pFrame->LoadBarState(profileName); // @pyseemfc CFrameWnd|LoadBarState
  	}
! 	catch (...) {
  		GUI_BLOCK_THREADS;
  		PyWinObject_FreeTCHAR(profileName);
--- 3703,3710 ----
  		return NULL;
  	GUI_BGN_SAVE;
! 	PYWINTYPES_TRY {
  		pFrame->LoadBarState(profileName); // @pyseemfc CFrameWnd|LoadBarState
  	}
! 	PYWINTYPES_EXCEPT {
  		GUI_BLOCK_THREADS;
  		PyWinObject_FreeTCHAR(profileName);