Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7588
Modified Files:
win32gui.i
Log Message:
GetWindowText was returning Unicode for an empty string, and string objects
otherwise. That is insane - it always returns a string now.
Index: win32gui.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32gui.i,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** win32gui.i 10 Feb 2005 23:56:02 -0000 1.57
--- win32gui.i 5 Mar 2005 04:59:52 -0000 1.58
***************
*** 1801,1805 ****
len = GetWindowText(hwnd, buffer, sizeof(buffer)/sizeof(TCHAR));
Py_END_ALLOW_THREADS
! if (len == 0) return PyUnicodeObject_FromString("");
return PyWinObject_FromTCHAR(buffer, len);
}
--- 1801,1807 ----
len = GetWindowText(hwnd, buffer, sizeof(buffer)/sizeof(TCHAR));
Py_END_ALLOW_THREADS
! // @comm Note that previous versions of PyWin32 returned a (empty) Unicode
! // object when the string was empty, or an MBCS encoded string value
! // otherwise. A String is now returned in all cases.
return PyWinObject_FromTCHAR(buffer, len);
}
|
