[pywin32-checkins] pywin32/Pythonwin win32uimodule.cpp, 1.39.2.6, 1.39.2.7

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

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

Modified Files:
      Tag: py3k
	win32uimodule.cpp 
Log Message:
Merge various changes from trunk and py3k-integration bzr branch

Index: win32uimodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32uimodule.cpp,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -C2 -d -r1.39.2.6 -r1.39.2.7
*** win32uimodule.cpp	4 Oct 2008 18:40:01 -0000	1.39.2.6
--- win32uimodule.cpp	26 Nov 2008 07:17:38 -0000	1.39.2.7
***************
*** 337,341 ****
  #if (PY_VERSION_HEX < 0x03000000)
  	USES_CONVERSION;
!  	csRet.Format(_T("object '%s'"), A2T(ob_type->tp_name));
  #else
   	csRet.Format(_T("object '%S'"), ob_type->tp_name);
--- 337,341 ----
  #if (PY_VERSION_HEX < 0x03000000)
  	USES_CONVERSION;
!  	csRet.Format(_T("object '%s'"), A2T((LPSTR)ob_type->tp_name));
  #else
   	csRet.Format(_T("object '%S'"), ob_type->tp_name);