Tentative fix for UNICODE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index d640ddd82cbe6b0ae3378716e13bdfe8400a4792..f06cccced6be0a3442504ee1cabe6c5d93ba30d7 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -1783,16 +1783,18 @@ wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
                 case DB_DATA_TYPE_VARCHAR:
                 {
 
                 case DB_DATA_TYPE_VARCHAR:
                 {
 

-                 // Be sure to allocate enough memory
-                 if (pColInfs[index].bufferLength >= pColInfs[index].columnSize)
+                 // Tentative fix for Access. Relative to UNICODE?
+                 if (pColInfs[index].bufferLength == 2*pColInfs[index].columnSize)

                    {
                    {

-                     pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].bufferLength+1];
-                     pColDataPtrs[index].SzDataObj  = pColInfs[index].bufferLength;
+                     pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].columnSize+1];
+                     pColDataPtrs[index].SzDataObj  = pColInfs[index].columnSize;
+                     

                    }
                  else
                    {
                    }
                  else
                    {

-                     pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].columnSize+1];
-                     pColDataPtrs[index].SzDataObj  = pColInfs[index].columnSize;
+                     // 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;
                    }
                  pColDataPtrs[index].SqlCtype   = SQL_C_CHAR;
                  break;