Tentative fix for UNICODE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bart A.M. Jourquin
2000-02-25 16:27:24 +00:00
parent 52a07708c4
commit 13d12797d2

View File

@@ -1783,16 +1783,18 @@ wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
case DB_DATA_TYPE_VARCHAR:
{
// Be sure to allocate enough memory
if (pColInfs[index].bufferLength >= pColInfs[index].columnSize)
{
pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].bufferLength+1];
pColDataPtrs[index].SzDataObj = pColInfs[index].bufferLength;
}
else
// Tentative fix for Access. Relative to UNICODE?
if (pColInfs[index].bufferLength == 2*pColInfs[index].columnSize)
{
pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].columnSize+1];
pColDataPtrs[index].SzDataObj = pColInfs[index].columnSize;
}
else
{
// Still needed because iodbc (unix) returns 0 in columnSize
pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].bufferLength+1];
pColDataPtrs[index].SzDataObj = pColInfs[index].bufferLength;
}
pColDataPtrs[index].SqlCtype = SQL_C_CHAR;
break;