Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.155
retrieving revision 1.156
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.155 -r1.156
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
+ - 2004-10-29 AP 1.2B4 full casting in utffile fixing some compilers
- 2004-10-27 AP 1.2B4 Workaround for wxGrid bug not returning selected rows
- 2004-10-27 AP 1.2B4 Fix user/group selection in privileges (r: Walter Haslbeck, Gary Doades)
- 2004-10-27 AP 1.2B4 Fix refresh when dropping single object from collection listview
Index: utffile.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/utffile.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/utils/utffile.cpp -Lsrc/utils/utffile.cpp -u -w -r1.6 -r1.7
--- src/utils/utffile.cpp
+++ src/utils/utffile.cpp
@@ -83,7 +83,7 @@
if (decr)
Seek(-decr, wxFromCurrent);
- m_conversion->MB2WC(wxStringBuffer(str, nLen), buffer, nLen+1);
+ m_conversion->MB2WC((wchar_t*)(wxChar*)wxStringBuffer(str, nLen), (const char*)buffer, (size_t)(nLen+1));
}
else
str = (wxChar*)buffer;