added (and documented) msw.xp-tab-ok option

[wxWidgets.git] / src / common / dbtable.cpp

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index b66711044c41093d387a0a354ca33abe4e85cda3..3e3349915935a9a01bbc9c11e866c314818a3ee7 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -8,16 +8,7 @@
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.

-// Licence:     wxWindows licence, plus:
-// Notice:      This class library and its intellectual design are free of charge for use,
-//              modification, enhancement, debugging under the following conditions:
-//              1) These classes may only be used as part of the implementation of a
-//                 wxWindows-based application
-//              2) All enhancements and bug fixes are to be submitted back to the wxWindows
-//                 user groups free of all charges for use with the wxWindows library.
-//              3) These classes may not be distributed as part of any other class library,
-//                 DLL, text (written or electronic), other than a complete distribution of
-//                 the wxWindows GUI development toolkit.
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 /*
 ///////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -80,7 +71,7 @@ ULONG lastTableID = 0;
 #endif
 
 
 #endif
 
 

-void csstrncpyt(char *target, const char *source, int n)
+void csstrncpyt(wxChar *target, const wxChar *source, int n)

 {
     while ( (*target++ = *source++) != '\0' && --n )
         ;
 {
     while ( (*target++ = *source++) != '\0' && --n )
         ;


@@ -104,14 +95,14 @@ bool wxDbColDef::Initialize()
     SqlCtype        = SQL_C_LONG;
     PtrDataObj      = NULL;
     SzDataObj       = 0;
     SqlCtype        = SQL_C_LONG;
     PtrDataObj      = NULL;
     SzDataObj       = 0;

-    KeyField        = FALSE;
-    Updateable      = FALSE;
-    InsertAllowed   = FALSE;
-    DerivedCol      = FALSE;
+    KeyField        = false;
+    Updateable      = false;
+    InsertAllowed   = false;
+    DerivedCol      = false;

     CbValue         = 0;
     CbValue         = 0;

-    Null = FALSE;
+    Null            = false;

 
 

-    return TRUE;
+    return true;

 }  // wxDbColDef::Initialize()
 
 
 }  // wxDbColDef::Initialize()
 
 


@@ -125,6 +116,7 @@ wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumn
 
 
 /***** DEPRECATED: use wxDbTable::wxDbTable() format above *****/
 
 
 /***** DEPRECATED: use wxDbTable::wxDbTable() format above *****/

+#if WXWIN_COMPATIBILITY_2_4

 wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
                     const wxChar *qryTblName, bool qryOnly, const wxString &tblPath)
 {
 wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
                     const wxChar *qryTblName, bool qryOnly, const wxString &tblPath)
 {


@@ -133,6 +125,7 @@ wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumn
     if (!initialize(pwxDb, tblName, numColumns, tempQryTblName, qryOnly, tblPath))
         cleanup();
 }  // wxDbTable::wxDbTable()
     if (!initialize(pwxDb, tblName, numColumns, tempQryTblName, qryOnly, tblPath))
         cleanup();
 }  // wxDbTable::wxDbTable()

+#endif // WXWIN_COMPATIBILITY_2_4

 
 
 /********** wxDbTable::~wxDbTable() **********/
 
 
 /********** wxDbTable::~wxDbTable() **********/


@@ -163,9 +156,9 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     where.Empty();                                  // Where clause
     orderBy.Empty();                                // Order By clause
     from.Empty();                                   // From clause
     where.Empty();                                  // Where clause
     orderBy.Empty();                                // Order By clause
     from.Empty();                                   // From clause

-    selectForUpdate     = FALSE;                    // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase
+    selectForUpdate     = false;                    // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase

     queryOnly           = qryOnly;
     queryOnly           = qryOnly;

-    insertable          = TRUE;
+    insertable          = true;

     tablePath.Empty();
     tableName.Empty();
     queryTableName.Empty();
     tablePath.Empty();
     tableName.Empty();
     queryTableName.Empty();


@@ -174,7 +167,7 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     wxASSERT(pDb);
 
     if (!pDb)
     wxASSERT(pDb);
 
     if (!pDb)

-        return FALSE;
+        return false;

 
     tableName = tblName;                        // Table Name
     if (tblPath.Length())
 
     tableName = tblName;                        // Table Name
     if (tblPath.Length())


@@ -271,7 +264,7 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
                 {
                     // Should never happen
                     pDb->GetNextError(henv, hdbc, hstmtInternal);
                 {
                     // Should never happen
                     pDb->GetNextError(henv, hdbc, hstmtInternal);

-                    return FALSE;
+                    return false;

                 }
             }
         }
                 }
             }
         }


@@ -300,11 +293,11 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     }
 
     // Make the default cursor the active cursor
     }
 
     // Make the default cursor the active cursor

-    hstmtDefault = GetNewCursor(FALSE,FALSE);
+    hstmtDefault = GetNewCursor(false,false);

     wxASSERT(hstmtDefault);
     hstmt = *hstmtDefault;
 
     wxASSERT(hstmtDefault);
     hstmt = *hstmtDefault;
 

-    return TRUE;
+    return true;

 
 }  // wxDbTable::initialize()
 
 
 }  // wxDbTable::initialize()
 


@@ -321,21 +314,20 @@ void wxDbTable::cleanup()
 #ifdef __WXDEBUG__
     if (tableID)
     {
 #ifdef __WXDEBUG__
     if (tableID)
     {

-        TablesInUse.DeleteContents(TRUE);
-        bool found = FALSE;
+        bool found = false;

 
 

-        wxNode *pNode;
-        pNode = TablesInUse.First();
+        wxList::compatibility_iterator pNode;
+        pNode = TablesInUse.GetFirst();

         while (pNode && !found)
         {
         while (pNode && !found)
         {

-            if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
+            if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)

             {
             {

-                found = TRUE;
-                if (!TablesInUse.DeleteNode(pNode))
-                    wxLogDebug (s,wxT("Unable to delete node!"));
+                found = true;
+                delete (wxTablesInUse *)pNode->GetData();
+                TablesInUse.Erase(pNode);

             }
             else
             }
             else

-                pNode = pNode->Next();
+                pNode = pNode->GetNext();

         }
         if (!found)
         {
         }
         if (!found)
         {


@@ -410,12 +402,52 @@ ODBC 3.0 says to use this form
 /***************************** PRIVATE FUNCTIONS *****************************/
 
 
 /***************************** PRIVATE FUNCTIONS *****************************/
 
 

+void wxDbTable::setCbValueForColumn(int columnIndex)
+{
+    switch(colDefs[columnIndex].DbDataType)
+    {
+        case DB_DATA_TYPE_VARCHAR:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = SQL_NTS;
+            break;
+        case DB_DATA_TYPE_INTEGER:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = 0;
+            break;
+        case DB_DATA_TYPE_FLOAT:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = 0;
+            break;
+        case DB_DATA_TYPE_DATE:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = 0;
+            break;
+        case DB_DATA_TYPE_BLOB:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                if (colDefs[columnIndex].SqlCtype == SQL_C_WXCHAR)
+                    colDefs[columnIndex].CbValue = SQL_NTS;
+                else
+                    colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);
+            break;
+    }
+}
+

 /********** wxDbTable::bindParams() **********/
 bool wxDbTable::bindParams(bool forUpdate)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 /********** wxDbTable::bindParams() **********/
 bool wxDbTable::bindParams(bool forUpdate)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     SWORD   fSqlType    = 0;
     SDWORD  precision   = 0;
 
     SWORD   fSqlType    = 0;
     SDWORD  precision   = 0;


@@ -445,19 +477,11 @@ bool wxDbTable::bindParams(bool forUpdate)
                 fSqlType = pDb->GetTypeInfVarchar().FsqlType;
                 precision = colDefs[i].SzDataObj;
                 scale = 0;
                 fSqlType = pDb->GetTypeInfVarchar().FsqlType;
                 precision = colDefs[i].SzDataObj;
                 scale = 0;

-                if (colDefs[i].Null)
-                    colDefs[i].CbValue = SQL_NULL_DATA;
-                else
-                    colDefs[i].CbValue = SQL_NTS;

                 break;
             case DB_DATA_TYPE_INTEGER:
                 fSqlType = pDb->GetTypeInfInteger().FsqlType;
                 precision = pDb->GetTypeInfInteger().Precision;
                 scale = 0;
                 break;
             case DB_DATA_TYPE_INTEGER:
                 fSqlType = pDb->GetTypeInfInteger().FsqlType;
                 precision = pDb->GetTypeInfInteger().Precision;
                 scale = 0;

-                if (colDefs[i].Null)
-                    colDefs[i].CbValue = SQL_NULL_DATA;
-                else
-                    colDefs[i].CbValue = 0;

                 break;
             case DB_DATA_TYPE_FLOAT:
                 fSqlType = pDb->GetTypeInfFloat().FsqlType;
                 break;
             case DB_DATA_TYPE_FLOAT:
                 fSqlType = pDb->GetTypeInfFloat().FsqlType;


@@ -468,30 +492,21 @@ bool wxDbTable::bindParams(bool forUpdate)
                 // I check for this here and set the scale = precision.
                 //if (scale < 0)
                 // scale = (short) precision;
                 // I check for this here and set the scale = precision.
                 //if (scale < 0)
                 // scale = (short) precision;

-                if (colDefs[i].Null)
-                    colDefs[i].CbValue = SQL_NULL_DATA;
-                else
-                    colDefs[i].CbValue = 0;

                 break;
             case DB_DATA_TYPE_DATE:
                 fSqlType = pDb->GetTypeInfDate().FsqlType;
                 precision = pDb->GetTypeInfDate().Precision;
                 scale = 0;
                 break;
             case DB_DATA_TYPE_DATE:
                 fSqlType = pDb->GetTypeInfDate().FsqlType;
                 precision = pDb->GetTypeInfDate().Precision;
                 scale = 0;

-                if (colDefs[i].Null)
-                    colDefs[i].CbValue = SQL_NULL_DATA;
-                else
-                    colDefs[i].CbValue = 0;

                 break;
             case DB_DATA_TYPE_BLOB:
                 fSqlType = pDb->GetTypeInfBlob().FsqlType;
                 break;
             case DB_DATA_TYPE_BLOB:
                 fSqlType = pDb->GetTypeInfBlob().FsqlType;

-                precision = -1;
+                precision = colDefs[i].SzDataObj;

                 scale = 0;
                 scale = 0;

-                if (colDefs[i].Null)
-                    colDefs[i].CbValue = SQL_NULL_DATA;
-                else
-                    colDefs[i].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[i].SzDataObj);

                 break;
         }
                 break;
         }

+
+        setCbValueForColumn(i);
+

         if (forUpdate)
         {
             if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
         if (forUpdate)
         {
             if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,


@@ -505,7 +520,7 @@ bool wxDbTable::bindParams(bool forUpdate)
         {
             if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
                                  fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,
         {
             if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
                                  fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,

-                                 precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
+                                 precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)

             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
             }
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
             }


@@ -513,7 +528,7 @@ bool wxDbTable::bindParams(bool forUpdate)
     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::bindParams()
 
 
 }  // wxDbTable::bindParams()
 


@@ -521,14 +536,14 @@ bool wxDbTable::bindParams(bool forUpdate)
 /********** wxDbTable::bindInsertParams() **********/
 bool wxDbTable::bindInsertParams(void)
 {
 /********** wxDbTable::bindInsertParams() **********/
 bool wxDbTable::bindInsertParams(void)
 {

-    return bindParams(FALSE);
+    return bindParams(false);

 }  // wxDbTable::bindInsertParams()
 
 
 /********** wxDbTable::bindUpdateParams() **********/
 bool wxDbTable::bindUpdateParams(void)
 {
 }  // wxDbTable::bindInsertParams()
 
 
 /********** wxDbTable::bindUpdateParams() **********/
 bool wxDbTable::bindUpdateParams(void)
 {

-    return bindParams(TRUE);
+    return bindParams(true);

 }  // wxDbTable::bindUpdateParams()
 
 
 }  // wxDbTable::bindUpdateParams()
 
 


@@ -548,7 +563,7 @@ bool wxDbTable::bindCols(HSTMT cursor)
     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::bindCols()
 
 
 }  // wxDbTable::bindCols()
 


@@ -568,7 +583,7 @@ bool wxDbTable::getRec(UWORD fetchType)
         if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         {
             if (retcode == SQL_NO_DATA_FOUND)
         if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         {
             if (retcode == SQL_NO_DATA_FOUND)

-                return(FALSE);
+                return false;

             else
                 return(pDb->DispAllErrors(henv, hdbc, hstmt));
         }
             else
                 return(pDb->DispAllErrors(henv, hdbc, hstmt));
         }


@@ -588,7 +603,7 @@ bool wxDbTable::getRec(UWORD fetchType)
         if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         {
             if (retcode == SQL_NO_DATA_FOUND)
         if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         {
             if (retcode == SQL_NO_DATA_FOUND)

-                return(FALSE);
+                return false;

             else
                 return(pDb->DispAllErrors(henv, hdbc, hstmt));
         }
             else
                 return(pDb->DispAllErrors(henv, hdbc, hstmt));
         }


@@ -603,7 +618,7 @@ bool wxDbTable::getRec(UWORD fetchType)
     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::getRec()
 
 
 }  // wxDbTable::getRec()
 


@@ -614,14 +629,14 @@ bool wxDbTable::execDelete(const wxString &pSqlStmt)
     RETCODE retcode;
 
     // Execute the DELETE statement
     RETCODE retcode;
 
     // Execute the DELETE statement

-    retcode = SQLExecDirect(hstmtDelete, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
+    retcode = SQLExecDirect(hstmtDelete, (SQLTCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);

 
     if (retcode == SQL_SUCCESS ||
         retcode == SQL_NO_DATA_FOUND ||
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record deleted successfully
 
     if (retcode == SQL_SUCCESS ||
         retcode == SQL_NO_DATA_FOUND ||
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record deleted successfully

-        return(TRUE);
+        return true;

     }
 
     // Problem deleting record
     }
 
     // Problem deleting record


@@ -636,19 +651,20 @@ bool wxDbTable::execUpdate(const wxString &pSqlStmt)
     RETCODE retcode;
 
     // Execute the UPDATE statement
     RETCODE retcode;
 
     // Execute the UPDATE statement

-    retcode = SQLExecDirect(hstmtUpdate, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
+    retcode = SQLExecDirect(hstmtUpdate, (SQLTCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);

 
     if (retcode == SQL_SUCCESS ||
         retcode == SQL_NO_DATA_FOUND ||
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record updated successfully
 
     if (retcode == SQL_SUCCESS ||
         retcode == SQL_NO_DATA_FOUND ||
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record updated successfully

-        return(TRUE);
+        return true;

     }
     else if (retcode == SQL_NEED_DATA)
     {
         PTR pParmID;
     }
     else if (retcode == SQL_NEED_DATA)
     {
         PTR pParmID;

-        while ((retcode = SQLParamData(hstmtUpdate, &pParmID) == SQL_NEED_DATA))
+        retcode = SQLParamData(hstmtUpdate, &pParmID);
+        while (retcode == SQL_NEED_DATA)

         {
             // Find the parameter
             int i;
         {
             // Find the parameter
             int i;


@@ -666,13 +682,14 @@ bool wxDbTable::execUpdate(const wxString &pSqlStmt)
                     break;
                 }
             }
                     break;
                 }
             }

+            retcode = SQLParamData(hstmtUpdate, &pParmID);

         }
         if (retcode == SQL_SUCCESS ||
             retcode == SQL_NO_DATA_FOUND ||
             retcode == SQL_SUCCESS_WITH_INFO)
         {
             // Record updated successfully
         }
         if (retcode == SQL_SUCCESS ||
             retcode == SQL_NO_DATA_FOUND ||
             retcode == SQL_SUCCESS_WITH_INFO)
         {
             // Record updated successfully

-            return(TRUE);
+            return true;

         }
     }
 
         }
     }
 


@@ -691,7 +708,7 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxStri
         // The user may wish to select for update, but the DBMS may not be capable
         selectForUpdate = CanSelectForUpdate();
     else
         // The user may wish to select for update, but the DBMS may not be capable
         selectForUpdate = CanSelectForUpdate();
     else

-        selectForUpdate = FALSE;
+        selectForUpdate = false;

 
     // Set the SQL SELECT string
     if (queryType != DB_SELECT_STATEMENT)               // A select statement was not passed in,
 
     // Set the SQL SELECT string
     if (queryType != DB_SELECT_STATEMENT)               // A select statement was not passed in,


@@ -702,16 +719,16 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxStri
 
     // Make sure the cursor is closed first
     if (!CloseCursor(hstmt))
 
     // Make sure the cursor is closed first
     if (!CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
     // Execute the SQL SELECT statement
     int retcode;
 
     // Execute the SQL SELECT statement
     int retcode;

-    retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt.c_str() : sqlStmt.c_str()), SQL_NTS);
+    retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt.c_str() : sqlStmt.c_str()), SQL_NTS);

     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
 
     // Completed successfully
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::query()
 
 
 }  // wxDbTable::query()
 


@@ -723,7 +740,7 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxStri
 bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
 {
     if (!pDb)
 bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
 {
     if (!pDb)

-        return FALSE;
+        return false;

 
     int i;
     wxString sqlStmt;
 
     int i;
     wxString sqlStmt;


@@ -762,7 +779,7 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
         // reliable!
         if (// *(pDb->dbInf.accessibleTables) == 'N' &&
             !pDb->TablePrivileges(tableName,wxT("SELECT"), pDb->GetUsername(), pDb->GetUsername(), tablePath))
         // reliable!
         if (// *(pDb->dbInf.accessibleTables) == 'N' &&
             !pDb->TablePrivileges(tableName,wxT("SELECT"), pDb->GetUsername(), pDb->GetUsername(), tablePath))

-            s = wxT("Current logged in user does not have sufficient privileges to access this table.\n");
+            s = wxT("Connecting user does not have sufficient privileges to access this table.\n");

     }
 
     if (!s.IsEmpty())
     }
 
     if (!s.IsEmpty())


@@ -777,7 +794,7 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
         p += s;
         pDb->LogError(p.GetData());
 
         p += s;
         pDb->LogError(p.GetData());
 

-        return(FALSE);
+        return false;

     }
 
     // Bind the member variables for field exchange between
     }
 
     // Bind the member variables for field exchange between


@@ -785,17 +802,17 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
     if (!queryOnly)
     {
         if (!bindInsertParams())                    // Inserts
     if (!queryOnly)
     {
         if (!bindInsertParams())                    // Inserts

-            return(FALSE);
+            return false;

 
         if (!bindUpdateParams())                    // Updates
 
         if (!bindUpdateParams())                    // Updates

-            return(FALSE);
+            return false;

     }
 
     if (!bindCols(*hstmtDefault))                   // Selects
     }
 
     if (!bindCols(*hstmtDefault))                   // Selects

-        return(FALSE);
+        return false;

 
     if (!bindCols(hstmtInternal))                   // Internal use only
 
     if (!bindCols(hstmtInternal))                   // Internal use only

-        return(FALSE);
+        return false;

 
      /*
      * Do NOT bind the hstmtCount cursor!!!
 
      /*
      * Do NOT bind the hstmtCount cursor!!!


@@ -804,7 +821,7 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
     // Build an insert statement using parameter markers
     if (!queryOnly && noCols > 0)
     {
     // Build an insert statement using parameter markers
     if (!queryOnly && noCols > 0)
     {

-        bool needComma = FALSE;
+        bool needComma = false;

         sqlStmt.Printf(wxT("INSERT INTO %s ("),
                        pDb->SQLTableName(tableName.c_str()).c_str());
         for (i = 0; i < noCols; i++)
         sqlStmt.Printf(wxT("INSERT INTO %s ("),
                        pDb->SQLTableName(tableName.c_str()).c_str());
         for (i = 0; i < noCols; i++)


@@ -815,9 +832,9 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
                 sqlStmt += wxT(",");
             sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
 //            sqlStmt += colDefs[i].ColName;
                 sqlStmt += wxT(",");
             sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
 //            sqlStmt += colDefs[i].ColName;

-            needComma = TRUE;
+            needComma = true;

         }
         }

-        needComma = FALSE;
+        needComma = false;

         sqlStmt += wxT(") VALUES (");
 
         int insertableCount = 0;
         sqlStmt += wxT(") VALUES (");
 
         int insertableCount = 0;


@@ -829,7 +846,7 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
             if (needComma)
                 sqlStmt += wxT(",");
             sqlStmt += wxT("?");
             if (needComma)
                 sqlStmt += wxT(",");
             sqlStmt += wxT("?");

-            needComma = TRUE;
+            needComma = true;

             insertableCount++;
         }
         sqlStmt += wxT(")");
             insertableCount++;
         }
         sqlStmt += wxT(")");


@@ -837,15 +854,15 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
         // Prepare the insert statement for execution
         if (insertableCount)
         {
         // Prepare the insert statement for execution
         if (insertableCount)
         {

-            if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+            if (SQLPrepare(hstmtInsert, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)

                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }
         else
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }
         else

-            insertable= FALSE;
+            insertable = false;

     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::Open()
 
 
 }  // wxDbTable::Open()
 


@@ -864,7 +881,7 @@ bool wxDbTable::QueryBySqlStmt(const wxString &pSqlStmt)
 {
     pDb->WriteSqlLog(pSqlStmt);
 
 {
     pDb->WriteSqlLog(pSqlStmt);
 

-    return(query(DB_SELECT_STATEMENT, FALSE, FALSE, pSqlStmt));
+    return(query(DB_SELECT_STATEMENT, false, false, pSqlStmt));

 
 }  // wxDbTable::QueryBySqlStmt()
 
 
 }  // wxDbTable::QueryBySqlStmt()
 


@@ -893,7 +910,7 @@ bool wxDbTable::GetPrev(void)
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("GetPrev()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("GetPrev()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));

-        return FALSE;
+        return false;

     }
     else
         return(getRec(SQL_FETCH_PRIOR));
     }
     else
         return(getRec(SQL_FETCH_PRIOR));


@@ -907,7 +924,7 @@ bool wxDbTable::operator--(int)
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("operator--:Backward scrolling cursors are not enabled for this instance of wxDbTable"));
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("operator--:Backward scrolling cursors are not enabled for this instance of wxDbTable"));

-        return FALSE;
+        return false;

     }
     else
         return(getRec(SQL_FETCH_PRIOR));
     }
     else
         return(getRec(SQL_FETCH_PRIOR));


@@ -921,7 +938,7 @@ bool wxDbTable::GetFirst(void)
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("GetFirst():Backward scrolling cursors are not enabled for this instance of wxDbTable"));
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("GetFirst():Backward scrolling cursors are not enabled for this instance of wxDbTable"));

-        return FALSE;
+        return false;

     }
     else
         return(getRec(SQL_FETCH_FIRST));
     }
     else
         return(getRec(SQL_FETCH_FIRST));


@@ -935,7 +952,7 @@ bool wxDbTable::GetLast(void)
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
     if (pDb->FwdOnlyCursors())
     {
         wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));

-        return FALSE;
+        return false;

     }
     else
         return(getRec(SQL_FETCH_LAST));
     }
     else
         return(getRec(SQL_FETCH_LAST));


@@ -981,7 +998,7 @@ void wxDbTable::BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxStrin
                 // Get the ROWID value.  If not successful retreiving the ROWID,
                 // simply fall down through the code and build the WHERE clause
                 // based on the key fields.
                 // Get the ROWID value.  If not successful retreiving the ROWID,
                 // simply fall down through the code and build the WHERE clause
                 // based on the key fields.

-                if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
+                if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)

                 {
                     pSqlStmt += wxT("ROWID = '");
                     pSqlStmt += rowid;
                 {
                     pSqlStmt += wxT("ROWID = '");
                     pSqlStmt += rowid;


@@ -1030,23 +1047,23 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
 
     // Was a FROM clause specified to join tables to the base table?
     // Available for ::Query() only!!!
 
     // Was a FROM clause specified to join tables to the base table?
     // Available for ::Query() only!!!

-    bool appendFromClause = FALSE;
+    bool appendFromClause = false;

 #if wxODBC_BACKWARD_COMPATABILITY
     if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))
 #if wxODBC_BACKWARD_COMPATABILITY
     if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))

-        appendFromClause = TRUE;
+        appendFromClause = true;

 #else
     if (typeOfSelect == DB_SELECT_WHERE && from.Length())
 #else
     if (typeOfSelect == DB_SELECT_WHERE && from.Length())

-        appendFromClause = TRUE;
+        appendFromClause = true;

 #endif
 
     // Add the column list
     int i;
 #endif
 
     // Add the column list
     int i;

-        wxString tStr;
+    wxString tStr;

     for (i = 0; i < noCols; i++)
     {
     for (i = 0; i < noCols; i++)
     {

-                 tStr = colDefs[i].ColName;
+        tStr = colDefs[i].ColName;

         // If joining tables, the base table column names must be qualified to avoid ambiguity
         // If joining tables, the base table column names must be qualified to avoid ambiguity

-        if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && !tStr.Find(wxT('.')))
+        if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && tStr.Find(wxT('.')) == wxNOT_FOUND)

         {
             pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
             pSqlStmt += wxT(".");
         {
             pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
             pSqlStmt += wxT(".");


@@ -1160,7 +1177,7 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
     wxString whereClause;
     whereClause.Empty();
 
     wxString whereClause;
     whereClause.Empty();
 

-    bool firstColumn = TRUE;
+    bool firstColumn = true;

 
     pSqlStmt.Printf(wxT("UPDATE %s SET "),
                     pDb->SQLTableName(tableName.c_str()).c_str());
 
     pSqlStmt.Printf(wxT("UPDATE %s SET "),
                     pDb->SQLTableName(tableName.c_str()).c_str());


@@ -1175,7 +1192,7 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
             if (!firstColumn)
                 pSqlStmt += wxT(",");
             else
             if (!firstColumn)
                 pSqlStmt += wxT(",");
             else

-                firstColumn = FALSE;
+                firstColumn = false;

 
             pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
 //            pSqlStmt += colDefs[i].ColName;
 
             pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
 //            pSqlStmt += colDefs[i].ColName;


@@ -1199,7 +1216,7 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
                 // Get the ROWID value.  If not successful retreiving the ROWID,
                 // simply fall down through the code and build the WHERE clause
                 // based on the key fields.
                 // Get the ROWID value.  If not successful retreiving the ROWID,
                 // simply fall down through the code and build the WHERE clause
                 // based on the key fields.

-                if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
+                if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)

                 {
                     pSqlStmt += wxT("ROWID = '");
                     pSqlStmt += rowid;
                 {
                     pSqlStmt += wxT("ROWID = '");
                     pSqlStmt += rowid;


@@ -1236,7 +1253,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
  *       They are not included as part of the where clause.
  */
 {
  *       They are not included as part of the where clause.
  */
 {

-    bool moreThanOneColumn = FALSE;
+    bool moreThanOneColumn = false;

     wxString colValue;
 
     // Loop through the columns building a where clause as you go
     wxString colValue;
 
     // Loop through the columns building a where clause as you go


@@ -1245,7 +1262,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
     {
         // Determine if this column should be included in the WHERE clause
         if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[colNo].KeyField) ||
     {
         // Determine if this column should be included in the WHERE clause
         if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[colNo].KeyField) ||

-             (typeOfWhere == DB_WHERE_MATCHING  && (!IsColNull(colNo))))
+             (typeOfWhere == DB_WHERE_MATCHING  && (!IsColNull((UWORD)colNo))))

         {
             // Skip over timestamp columns
             if (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP)
         {
             // Skip over timestamp columns
             if (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP)


@@ -1254,19 +1271,19 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
             if (moreThanOneColumn)
                 pWhereClause += wxT(" AND ");
             else
             if (moreThanOneColumn)
                 pWhereClause += wxT(" AND ");
             else

-                moreThanOneColumn = TRUE;
+                moreThanOneColumn = true;

 
             // Concatenate where phrase for the column
             wxString tStr = colDefs[colNo].ColName;
 
 
             // Concatenate where phrase for the column
             wxString tStr = colDefs[colNo].ColName;
 

-            if (qualTableName.Length() && !tStr.Find(wxT('.')))
+            if (qualTableName.Length() && tStr.Find(wxT('.')) == wxNOT_FOUND)

             {
                 pWhereClause += pDb->SQLTableName(qualTableName);
                 pWhereClause += wxT(".");
             }
             pWhereClause += pDb->SQLColumnName(colDefs[colNo].ColName);
 
             {
                 pWhereClause += pDb->SQLTableName(qualTableName);
                 pWhereClause += wxT(".");
             }
             pWhereClause += pDb->SQLColumnName(colDefs[colNo].ColName);
 

-            if (useLikeComparison && (colDefs[colNo].SqlCtype == SQL_C_CHAR))
+            if (useLikeComparison && (colDefs[colNo].SqlCtype == SQL_C_WXCHAR))

                 pWhereClause += wxT(" LIKE ");
             else
                 pWhereClause += wxT(" = ");
                 pWhereClause += wxT(" LIKE ");
             else
                 pWhereClause += wxT(" = ");


@@ -1274,14 +1291,18 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
             switch(colDefs[colNo].SqlCtype)
             {
                 case SQL_C_CHAR:
             switch(colDefs[colNo].SqlCtype)
             {
                 case SQL_C_CHAR:

+                case SQL_C_WCHAR:
+                //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR

                     colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[colNo].PtrDataObj);
                     break;
                     colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[colNo].PtrDataObj);
                     break;

+                case SQL_C_SHORT:

                 case SQL_C_SSHORT:
                     colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[colNo].PtrDataObj));
                     break;
                 case SQL_C_USHORT:
                     colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[colNo].PtrDataObj));
                     break;
                 case SQL_C_SSHORT:
                     colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[colNo].PtrDataObj));
                     break;
                 case SQL_C_USHORT:
                     colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[colNo].PtrDataObj));
                     break;

+                case SQL_C_LONG:

                 case SQL_C_SLONG:
                     colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[colNo].PtrDataObj));
                     break;
                 case SQL_C_SLONG:
                     colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[colNo].PtrDataObj));
                     break;


@@ -1294,6 +1315,14 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
                 case SQL_C_DOUBLE:
                     colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[colNo].PtrDataObj));
                     break;
                 case SQL_C_DOUBLE:
                     colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[colNo].PtrDataObj));
                     break;

+                default:
+                    {
+                        wxString strMsg;
+                        strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
+                                    colNo,colDefs[colNo].ColName);
+                        wxFAIL_MSG(strMsg.c_str());
+                    }
+                    break;

             }
             pWhereClause += colValue;
         }
             }
             pWhereClause += colValue;
         }


@@ -1335,7 +1364,7 @@ bool wxDbTable::CloseCursor(HSTMT cursor)
         return(pDb->DispAllErrors(henv, hdbc, cursor));
 
     // Completed successfully
         return(pDb->DispAllErrors(henv, hdbc, cursor));
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::CloseCursor()
 
 
 }  // wxDbTable::CloseCursor()
 


@@ -1344,7 +1373,7 @@ bool wxDbTable::CloseCursor(HSTMT cursor)
 bool wxDbTable::CreateTable(bool attemptDrop)
 {
     if (!pDb)
 bool wxDbTable::CreateTable(bool attemptDrop)
 {
     if (!pDb)

-        return FALSE;
+        return false;

 
     int i, j;
     wxString sqlStmt;
 
     int i, j;
     wxString sqlStmt;


@@ -1355,7 +1384,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
 
     // Drop table first
     if (attemptDrop && !DropTable())
 
     // Drop table first
     if (attemptDrop && !DropTable())

-        return FALSE;
+        return false;

 
     // Create the table
 #ifdef DBDEBUG_CONSOLE
 
     // Create the table
 #ifdef DBDEBUG_CONSOLE


@@ -1368,7 +1397,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         switch(colDefs[i].DbDataType)
         {
             case DB_DATA_TYPE_VARCHAR:
         switch(colDefs[i].DbDataType)
         {
             case DB_DATA_TYPE_VARCHAR:

-                cout << pDb->GetTypeInfVarchar().TypeName << wxT("(") << colDefs[i].SzDataObj << wxT(")");
+                cout << pDb->GetTypeInfVarchar().TypeName << wxT("(") << (int)(colDefs[i].SzDataObj / sizeof(wxChar)) << wxT(")");

                 break;
             case DB_DATA_TYPE_INTEGER:
                 cout << pDb->GetTypeInfInteger().TypeName;
                 break;
             case DB_DATA_TYPE_INTEGER:
                 cout << pDb->GetTypeInfInteger().TypeName;


@@ -1388,7 +1417,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
 #endif
 
     // Build a CREATE TABLE string from the colDefs structure.
 #endif
 
     // Build a CREATE TABLE string from the colDefs structure.

-    bool needComma = FALSE;
+    bool needComma = false;

 
     sqlStmt.Printf(wxT("CREATE TABLE %s ("),
                    pDb->SQLTableName(tableName.c_str()).c_str());
 
     sqlStmt.Printf(wxT("CREATE TABLE %s ("),
                    pDb->SQLTableName(tableName.c_str()).c_str());


@@ -1426,11 +1455,11 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         }
         // For varchars, append the size of the string
         if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR &&
         }
         // For varchars, append the size of the string
         if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR &&

-            (pDb->Dbms() != dbmsMY_SQL || pDb->GetTypeInfVarchar().TypeName != "text"))// ||
+            (pDb->Dbms() != dbmsMY_SQL || pDb->GetTypeInfVarchar().TypeName != _T("text")))// ||

 //            colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
         {
             wxString s;
 //            colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
         {
             wxString s;

-            s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+            s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));

             sqlStmt += s;
         }
 
             sqlStmt += s;
         }
 


@@ -1446,7 +1475,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             }
         }
 
             }
         }
 

-        needComma = TRUE;
+        needComma = true;

     }
     // If there is a primary key defined, include it in the create statement
     for (i = j = 0; i < noCols; i++)
     }
     // If there is a primary key defined, include it in the create statement
     for (i = j = 0; i < noCols; i++)


@@ -1457,9 +1486,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             break;
         }
     }
             break;
         }
     }

-    if (j && (pDb->Dbms() != dbmsDBASE) 
-                 && (pDb->Dbms() != dbmsXBASE_SEQUITER)
-          )  // Found a keyfield
+    if ( j && (pDb->Dbms() != dbmsDBASE)
+        && (pDb->Dbms() != dbmsXBASE_SEQUITER) )  // Found a keyfield

     {
         switch (pDb->Dbms())
         {
     {
         switch (pDb->Dbms())
         {


@@ -1505,7 +1533,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
                     colDefs[i].DbDataType ==  DB_DATA_TYPE_VARCHAR)
                 {
                     wxString s;
                     colDefs[i].DbDataType ==  DB_DATA_TYPE_VARCHAR)
                 {
                     wxString s;

-                    s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+                    s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));

                     sqlStmt += s;
                 }
             }
                     sqlStmt += s;
                 }
             }


@@ -1532,23 +1560,23 @@ bool wxDbTable::CreateTable(bool attemptDrop)
 #endif
 
     // Execute the CREATE TABLE statement
 #endif
 
     // Execute the CREATE TABLE statement

-    RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+    RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);

     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);

-        return(FALSE);
+        return false;

     }
 
     // Commit the transaction and close the cursor
     if (!pDb->CommitTrans())
     }
 
     // Commit the transaction and close the cursor
     if (!pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (!CloseCursor(hstmt))
     if (!CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
     // Database table created successfully
 
     // Database table created successfully

-    return(TRUE);
+    return true;

 
 } // wxDbTable::CreateTable()
 
 
 } // wxDbTable::CreateTable()
 


@@ -1556,7 +1584,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
 /********** wxDbTable::DropTable() **********/
 bool wxDbTable::DropTable()
 {
 /********** wxDbTable::DropTable() **********/
 bool wxDbTable::DropTable()
 {

-    // NOTE: This function returns TRUE if the Table does not exist, but
+    // NOTE: This function returns true if the Table does not exist, but

     //       only for identified databases.  Code will need to be added
     //       below for any other databases when those databases are defined
     //       to handle this situation consistently
     //       only for identified databases.  Code will need to be added
     //       below for any other databases when those databases are defined
     //       to handle this situation consistently


@@ -1572,7 +1600,7 @@ bool wxDbTable::DropTable()
     cout << endl << sqlStmt.c_str() << endl;
 #endif
 
     cout << endl << sqlStmt.c_str() << endl;
 #endif
 

-    RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+    RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);

     if (retcode != SQL_SUCCESS)
     {
         // Check for "Base table not found" error and ignore
     if (retcode != SQL_SUCCESS)
     {
         // Check for "Base table not found" error and ignore


@@ -1590,18 +1618,18 @@ bool wxDbTable::DropTable()
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
 //                CloseCursor(hstmt);
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
 //                CloseCursor(hstmt);

-                return(FALSE);
+                return false;

             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())
             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (! CloseCursor(hstmt))
     if (! CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
 

-    return(TRUE);
+    return true;

 }  // wxDbTable::DropTable()
 
 
 }  // wxDbTable::DropTable()
 
 


@@ -1613,7 +1641,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
 
     // Drop the index first
     if (attemptDrop && !DropIndex(idxName))
 
     // Drop the index first
     if (attemptDrop && !DropIndex(idxName))

-        return (FALSE);
+        return false;

 
     // MySQL (and possibly Sybase ASE?? - gt) require that any columns which are used as portions
     // of an index have the columns defined as "NOT NULL".  During initial table creation though,
 
     // MySQL (and possibly Sybase ASE?? - gt) require that any columns which are used as portions
     // of an index have the columns defined as "NOT NULL".  During initial table creation though,


@@ -1627,11 +1655,11 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
     {
         wxString sqlStmt;
         int i;
     {
         wxString sqlStmt;
         int i;

-        bool ok = TRUE;
+        bool ok = true;

         for (i = 0; i < noIdxCols && ok; i++)
         {
             int   j = 0;
         for (i = 0; i < noIdxCols && ok; i++)
         {
             int   j = 0;

-            bool  found = FALSE;
+            bool  found = false;

             // Find the column definition that has the ColName that matches the
             // index column name.  We need to do this to get the DB_DATA_TYPE of
             // the index column, as MySQL's syntax for the ALTER column requires
             // Find the column definition that has the ColName that matches the
             // index column name.  We need to do this to get the DB_DATA_TYPE of
             // the index column, as MySQL's syntax for the ALTER column requires


@@ -1639,7 +1667,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
             while (!found && (j < this->noCols))
             {
                 if (wxStrcmp(colDefs[j].ColName,pIdxDefs[i].ColName) == 0)
             while (!found && (j < this->noCols))
             {
                 if (wxStrcmp(colDefs[j].ColName,pIdxDefs[i].ColName) == 0)

-                    found = TRUE;
+                    found = true;

                 if (!found)
                     j++;
             }
                 if (!found)
                     j++;
             }


@@ -1647,27 +1675,30 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
             if (found)
             {
                 ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,
             if (found)
             {
                 ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,

-                                        colDefs[j].DbDataType, colDefs[j].SzDataObj,
+                                        colDefs[j].DbDataType, (int)(colDefs[j].SzDataObj / sizeof(wxChar)),

                                         wxT("NOT NULL"));
 
                 if (!ok)
                 {
                                         wxT("NOT NULL"));
 
                 if (!ok)
                 {

+                    #if 0
+                    // retcode is not used

                     wxODBC_ERRORS retcode;
                     // Oracle returns a DB_ERR_GENERAL_ERROR if the column is already
                     // defined to be NOT NULL, but reportedly MySQL doesn't mind.
                     // This line is just here for debug checking of the value
                     retcode = (wxODBC_ERRORS)pDb->DB_STATUS;
                     wxODBC_ERRORS retcode;
                     // Oracle returns a DB_ERR_GENERAL_ERROR if the column is already
                     // defined to be NOT NULL, but reportedly MySQL doesn't mind.
                     // This line is just here for debug checking of the value
                     retcode = (wxODBC_ERRORS)pDb->DB_STATUS;

+                    #endif

                 }
             }
             else
                 }
             }
             else

-                ok = FALSE;
+                ok = false;

         }
         if (ok)
             pDb->CommitTrans();
         else
         {
             pDb->RollbackTrans();
         }
         if (ok)
             pDb->CommitTrans();
         else
         {
             pDb->RollbackTrans();

-            return(FALSE);
+            return false;

         }
     }
 
         }
     }
 


@@ -1706,13 +1737,13 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
             if ( colDefs[j].DbDataType ==  DB_DATA_TYPE_VARCHAR)
             {
                 wxString s;
             if ( colDefs[j].DbDataType ==  DB_DATA_TYPE_VARCHAR)
             {
                 wxString s;

-                s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+                s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));

                 sqlStmt += s;
             }
         }
                 sqlStmt += s;
             }
         }

-        
+

         // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
         // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns

-        if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (strncmp(pDb->dbInf.dbmsVer,"07",2)==0)) &&
+        if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (wxStrncmp(pDb->dbInf.dbmsVer,_T("07"),2)==0)) &&

             !(pDb->Dbms() == dbmsPOSTGRES))
         {
             if (pIdxDefs[i].Ascending)
             !(pDb->Dbms() == dbmsPOSTGRES))
         {
             if (pIdxDefs[i].Ascending)


@@ -1721,7 +1752,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
                 sqlStmt += wxT(" DESC");
         }
         else
                 sqlStmt += wxT(" DESC");
         }
         else

-            wxASSERT_MSG(pIdxDefs[i].Ascending, "Datasource does not support DESCending index columns");
+            wxASSERT_MSG(pIdxDefs[i].Ascending, _T("Datasource does not support DESCending index columns"));

 
         if ((i + 1) < noIdxCols)
             sqlStmt += wxT(",");
 
         if ((i + 1) < noIdxCols)
             sqlStmt += wxT(",");


@@ -1737,22 +1768,22 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
 #endif
 
     // Execute the CREATE INDEX statement
 #endif
 
     // Execute the CREATE INDEX statement

-    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)

     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);
     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);

-        return(FALSE);
+        return false;

     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (! CloseCursor(hstmt))
     if (! CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
     // Index Created Successfully
 
     // Index Created Successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::CreateIndex()
 
 
 }  // wxDbTable::CreateIndex()
 


@@ -1760,7 +1791,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
 /********** wxDbTable::DropIndex() **********/
 bool wxDbTable::DropIndex(const wxString &idxName)
 {
 /********** wxDbTable::DropIndex() **********/
 bool wxDbTable::DropIndex(const wxString &idxName)
 {

-    // NOTE: This function returns TRUE if the Index does not exist, but
+    // NOTE: This function returns true if the Index does not exist, but

     //       only for identified databases.  Code will need to be added
     //       below for any other databases when those databases are defined
     //       to handle this situation consistently
     //       only for identified databases.  Code will need to be added
     //       below for any other databases when those databases are defined
     //       to handle this situation consistently


@@ -1774,7 +1805,7 @@ bool wxDbTable::DropIndex(const wxString &idxName)
                        pDb->SQLTableName(tableName.c_str()).c_str());
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
              (pDb->Dbms() == dbmsSYBASE_ASE) ||
                        pDb->SQLTableName(tableName.c_str()).c_str());
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
              (pDb->Dbms() == dbmsSYBASE_ASE) ||

-                        (pDb->Dbms() == dbmsXBASE_SEQUITER))
+             (pDb->Dbms() == dbmsXBASE_SEQUITER))

         sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
                        pDb->SQLTableName(tableName.c_str()).c_str(),
                        pDb->SQLTableName(idxName.c_str()).c_str());
         sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
                        pDb->SQLTableName(tableName.c_str()).c_str(),
                        pDb->SQLTableName(idxName.c_str()).c_str());


@@ -1788,7 +1819,7 @@ bool wxDbTable::DropIndex(const wxString &idxName)
     cout << endl << sqlStmt.c_str() << endl;
 #endif
 
     cout << endl << sqlStmt.c_str() << endl;
 #endif
 

-    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)

     {
         // Check for "Index not found" error and ignore
         pDb->GetNextError(henv, hdbc, hstmt);
     {
         // Check for "Index not found" error and ignore
         pDb->GetNextError(henv, hdbc, hstmt);


@@ -1808,18 +1839,18 @@ bool wxDbTable::DropIndex(const wxString &idxName)
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
                 CloseCursor(hstmt);
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
                 CloseCursor(hstmt);

-                return(FALSE);
+                return false;

             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())
             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (! CloseCursor(hstmt))
     if (! CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
 

-    return(TRUE);
+    return true;

 }  // wxDbTable::DropIndex()
 
 
 }  // wxDbTable::DropIndex()
 
 


@@ -1829,7 +1860,7 @@ bool wxDbTable::SetOrderByColNums(UWORD first, ... )
     int        colNo = first;  // using 'int' to be able to look for wxDB_NO_MORE_COLUN_NUMBERS
     va_list     argptr;
 
     int        colNo = first;  // using 'int' to be able to look for wxDB_NO_MORE_COLUN_NUMBERS
     va_list     argptr;
 

-    bool        abort = FALSE;
+    bool        abort = false;

     wxString    tempStr;
 
     va_start(argptr, first);     /* Initialize variable arguments. */
     wxString    tempStr;
 
     va_start(argptr, first);     /* Initialize variable arguments. */


@@ -1841,7 +1872,7 @@ bool wxDbTable::SetOrderByColNums(UWORD first, ... )
         // Valid columns are 0 thru noCols-1
         if (colNo >= noCols || colNo < 0)
         {
         // Valid columns are 0 thru noCols-1
         if (colNo >= noCols || colNo < 0)
         {

-            abort = TRUE;
+            abort = true;

             continue;
         }
 
             continue;
         }
 


@@ -1888,7 +1919,8 @@ int wxDbTable::Insert(void)
     if (retcode == SQL_NEED_DATA)
     {
         PTR pParmID;
     if (retcode == SQL_NEED_DATA)
     {
         PTR pParmID;

-        while ((retcode = SQLParamData(hstmtInsert, &pParmID) == SQL_NEED_DATA))
+        retcode = SQLParamData(hstmtInsert, &pParmID);
+        while (retcode == SQL_NEED_DATA)

         {
             // Find the parameter
             int i;
         {
             // Find the parameter
             int i;


@@ -1907,6 +1939,15 @@ int wxDbTable::Insert(void)
                     break;
                 }
             }
                     break;
                 }
             }

+            retcode = SQLParamData(hstmtInsert, &pParmID);
+            if (retcode != SQL_SUCCESS &&
+                retcode != SQL_SUCCESS_WITH_INFO)
+            {
+                // record was not inserted
+                pDb->DispNextError();
+                pDb->DispAllErrors(henv, hdbc, hstmtInsert);
+                return(DB_FAILURE);
+            }

         }
     }
 
         }
     }
 


@@ -1921,7 +1962,7 @@ bool wxDbTable::Update(void)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


@@ -1945,7 +1986,7 @@ bool wxDbTable::Update(const wxString &pSqlStmt)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     pDb->WriteSqlLog(pSqlStmt);
 
 
     pDb->WriteSqlLog(pSqlStmt);
 


@@ -1959,7 +2000,7 @@ bool wxDbTable::UpdateWhere(const wxString &pWhereClause)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


@@ -1983,7 +2024,7 @@ bool wxDbTable::Delete(void)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
     sqlStmt.Empty();
 
     wxString sqlStmt;
     sqlStmt.Empty();


@@ -2004,7 +2045,7 @@ bool wxDbTable::DeleteWhere(const wxString &pWhereClause)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
     sqlStmt.Empty();
 
     wxString sqlStmt;
     sqlStmt.Empty();


@@ -2025,7 +2066,7 @@ bool wxDbTable::DeleteMatching(void)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
     sqlStmt.Empty();
 
     wxString sqlStmt;
     sqlStmt.Empty();


@@ -2045,12 +2086,14 @@ bool wxDbTable::DeleteMatching(void)
 bool wxDbTable::IsColNull(UWORD colNo) const
 {
 /*
 bool wxDbTable::IsColNull(UWORD colNo) const
 {
 /*

-    This logic is just not right.  It would indicate TRUE
+    This logic is just not right.  It would indicate true

     if a numeric field were set to a value of 0.
 
     switch(colDefs[colNo].SqlCtype)
     {
         case SQL_C_CHAR:
     if a numeric field were set to a value of 0.
 
     switch(colDefs[colNo].SqlCtype)
     {
         case SQL_C_CHAR:

+        case SQL_C_WCHAR:
+        //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR

             return(((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0] == 0);
         case SQL_C_SSHORT:
             return((  *((SWORD *) colDefs[colNo].PtrDataObj))   == 0);
             return(((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0] == 0);
         case SQL_C_SSHORT:
             return((  *((SWORD *) colDefs[colNo].PtrDataObj))   == 0);


@@ -2068,11 +2111,11 @@ bool wxDbTable::IsColNull(UWORD colNo) const
             TIMESTAMP_STRUCT *pDt;
             pDt = (TIMESTAMP_STRUCT *) colDefs[colNo].PtrDataObj;
             if (pDt->year == 0 && pDt->month == 0 && pDt->day == 0)
             TIMESTAMP_STRUCT *pDt;
             pDt = (TIMESTAMP_STRUCT *) colDefs[colNo].PtrDataObj;
             if (pDt->year == 0 && pDt->month == 0 && pDt->day == 0)

-                return(TRUE);
+                return true;

             else
             else

-                return(FALSE);
+                return false;

         default:
         default:

-            return(TRUE);
+            return true;

     }
 */
     return (colDefs[colNo].Null);
     }
 */
     return (colDefs[colNo].Null);


@@ -2083,16 +2126,16 @@ bool wxDbTable::IsColNull(UWORD colNo) const
 bool wxDbTable::CanSelectForUpdate(void)
 {
     if (queryOnly)
 bool wxDbTable::CanSelectForUpdate(void)
 {
     if (queryOnly)

-        return FALSE;
+        return false;

 
     if (pDb->Dbms() == dbmsMY_SQL)
 
     if (pDb->Dbms() == dbmsMY_SQL)

-        return FALSE;
+        return false;

 
     if ((pDb->Dbms() == dbmsORACLE) ||
         (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE))
 
     if ((pDb->Dbms() == dbmsORACLE) ||
         (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE))

-        return(TRUE);
+        return true;

     else
     else

-        return(FALSE);
+        return false;

 
 }  // wxDbTable::CanSelectForUpdate()
 
 
 }  // wxDbTable::CanSelectForUpdate()
 


@@ -2101,15 +2144,15 @@ bool wxDbTable::CanSelectForUpdate(void)
 bool wxDbTable::CanUpdByROWID(void)
 {
 /*
 bool wxDbTable::CanUpdByROWID(void)
 {
 /*

- * NOTE: Returning FALSE for now until this can be debugged,
+ * NOTE: Returning false for now until this can be debugged,

  *        as the ROWID is not getting updated correctly
  */
  *        as the ROWID is not getting updated correctly
  */

-    return FALSE;
+    return false;

 /*
     if (pDb->Dbms() == dbmsORACLE)
 /*
     if (pDb->Dbms() == dbmsORACLE)

-        return(TRUE);
+        return true;

     else
     else

-        return(FALSE);
+        return false;

 */
 }  // wxDbTable::CanUpdByROWID()
 
 */
 }  // wxDbTable::CanUpdByROWID()
 


@@ -2118,9 +2161,9 @@ bool wxDbTable::CanUpdByROWID(void)
 bool wxDbTable::IsCursorClosedOnCommit(void)
 {
     if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)
 bool wxDbTable::IsCursorClosedOnCommit(void)
 {
     if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)

-        return(FALSE);
+        return false;

     else
     else

-        return(TRUE);
+        return true;

 
 }  // wxDbTable::IsCursorClosedOnCommit()
 
 
 }  // wxDbTable::IsCursorClosedOnCommit()
 


@@ -2134,6 +2177,8 @@ void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull)
     switch(colDefs[colNo].SqlCtype)
     {
         case SQL_C_CHAR:
     switch(colDefs[colNo].SqlCtype)
     {
         case SQL_C_CHAR:

+        case SQL_C_WCHAR:
+        //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR

             ((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0]    = 0;
             break;
         case SQL_C_SSHORT:
             ((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0]    = 0;
             break;
         case SQL_C_SSHORT:


@@ -2142,6 +2187,7 @@ void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull)
         case SQL_C_USHORT:
             *((UWORD*) colDefs[colNo].PtrDataObj)           = 0;
             break;
         case SQL_C_USHORT:
             *((UWORD*) colDefs[colNo].PtrDataObj)           = 0;
             break;

+        case SQL_C_LONG:

         case SQL_C_SLONG:
             *((SDWORD *) colDefs[colNo].PtrDataObj)         = 0;
             break;
         case SQL_C_SLONG:
             *((SDWORD *) colDefs[colNo].PtrDataObj)         = 0;
             break;


@@ -2179,7 +2225,7 @@ void wxDbTable::ClearMemberVars(bool setToNull)
 
     // Loop through the columns setting each member variable to zero
     for (i=0; i < noCols; i++)
 
     // Loop through the columns setting each member variable to zero
     for (i=0; i < noCols; i++)

-        ClearMemberVar(i,setToNull);
+        ClearMemberVar((UWORD)i,setToNull);

 
 }  // wxDbTable::ClearMemberVars()
 
 
 }  // wxDbTable::ClearMemberVars()
 


@@ -2197,7 +2243,7 @@ bool wxDbTable::SetQueryTimeout(UDWORD nSeconds)
         return(pDb->DispAllErrors(henv, hdbc, hstmtInternal));
 
     // Completed Successfully
         return(pDb->DispAllErrors(henv, hdbc, hstmtInternal));
 
     // Completed Successfully

-    return(TRUE);
+    return true;

 
 }  // wxDbTable::SetQueryTimeout()
 
 
 }  // wxDbTable::SetQueryTimeout()
 


@@ -2231,14 +2277,14 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
     colDefs[index].DbDataType       = dataType;
     colDefs[index].PtrDataObj       = pData;
     colDefs[index].SqlCtype         = cType;
     colDefs[index].DbDataType       = dataType;
     colDefs[index].PtrDataObj       = pData;
     colDefs[index].SqlCtype         = cType;

-    colDefs[index].SzDataObj        = size;
+    colDefs[index].SzDataObj        = size;  //TODO: glt ??? * sizeof(wxChar) ???

     colDefs[index].KeyField         = keyField;
     colDefs[index].DerivedCol       = derivedCol;
     // Derived columns by definition would NOT be "Insertable" or "Updateable"
     if (derivedCol)
     {
     colDefs[index].KeyField         = keyField;
     colDefs[index].DerivedCol       = derivedCol;
     // Derived columns by definition would NOT be "Insertable" or "Updateable"
     if (derivedCol)
     {

-        colDefs[index].Updateable       = FALSE;
-        colDefs[index].InsertAllowed    = FALSE;
+        colDefs[index].Updateable       = false;
+        colDefs[index].InsertAllowed    = false;

     }
     else
     {
     }
     else
     {


@@ -2246,7 +2292,7 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
         colDefs[index].InsertAllowed    = insAllow;
     }
 
         colDefs[index].InsertAllowed    = insAllow;
     }
 

-    colDefs[index].Null                 = FALSE;
+    colDefs[index].Null                 = false;

 
 }  // wxDbTable::SetColDefs()
 
 
 }  // wxDbTable::SetColDefs()
 


@@ -2269,13 +2315,13 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
             switch (pColInfs[index].dbDataType)
             {
                 case DB_DATA_TYPE_VARCHAR:
             switch (pColInfs[index].dbDataType)
             {
                 case DB_DATA_TYPE_VARCHAR:

-                   pColDataPtrs[index].PtrDataObj = new wxChar[pColInfs[index].bufferLength+1];
-                   pColDataPtrs[index].SzDataObj  = pColInfs[index].columnSize;
-                   pColDataPtrs[index].SqlCtype   = SQL_C_CHAR;
+                   pColDataPtrs[index].PtrDataObj = new wxChar[pColInfs[index].bufferSize+(1*sizeof(wxChar))];
+                   pColDataPtrs[index].SzDataObj  = pColInfs[index].bufferSize+(1*sizeof(wxChar));
+                   pColDataPtrs[index].SqlCtype   = SQL_C_WXCHAR;

                    break;
                 case DB_DATA_TYPE_INTEGER:
                     // Can be long or short
                    break;
                 case DB_DATA_TYPE_INTEGER:
                     // Can be long or short

-                    if (pColInfs[index].bufferLength == sizeof(long))
+                    if (pColInfs[index].bufferSize == sizeof(long))

                     {
                       pColDataPtrs[index].PtrDataObj = new long;
                       pColDataPtrs[index].SzDataObj  = sizeof(long);
                     {
                       pColDataPtrs[index].PtrDataObj = new long;
                       pColDataPtrs[index].SzDataObj  = sizeof(long);


@@ -2290,7 +2336,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                     break;
                 case DB_DATA_TYPE_FLOAT:
                     // Can be float or double
                     break;
                 case DB_DATA_TYPE_FLOAT:
                     // Can be float or double

-                    if (pColInfs[index].bufferLength == sizeof(float))
+                    if (pColInfs[index].bufferSize == sizeof(float))

                     {
                         pColDataPtrs[index].PtrDataObj = new float;
                         pColDataPtrs[index].SzDataObj  = sizeof(float);
                     {
                         pColDataPtrs[index].PtrDataObj = new float;
                         pColDataPtrs[index].SzDataObj  = sizeof(float);


@@ -2382,14 +2428,14 @@ ULONG wxDbTable::Count(const wxString &args)
     // Initialize the Count cursor if it's not already initialized
     if (!hstmtCount)
     {
     // Initialize the Count cursor if it's not already initialized
     if (!hstmtCount)
     {

-        hstmtCount = GetNewCursor(FALSE,FALSE);
+        hstmtCount = GetNewCursor(false,false);

         wxASSERT(hstmtCount);
         if (!hstmtCount)
             return(0);
     }
 
     // Execute the SQL statement
         wxASSERT(hstmtCount);
         if (!hstmtCount)
             return(0);
     }
 
     // Execute the SQL statement

-    if (SQLExecDirect(*hstmtCount, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(*hstmtCount, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)

     {
         pDb->DispAllErrors(henv, hdbc, *hstmtCount);
         return(0);
     {
         pDb->DispAllErrors(henv, hdbc, *hstmtCount);
         return(0);


@@ -2422,15 +2468,15 @@ ULONG wxDbTable::Count(const wxString &args)
 /********** wxDbTable::Refresh() **********/
 bool wxDbTable::Refresh(void)
 {
 /********** wxDbTable::Refresh() **********/
 bool wxDbTable::Refresh(void)
 {

-    bool result = TRUE;
+    bool result = true;

 
     // Switch to the internal cursor so any active cursors are not corrupted
     HSTMT currCursor = GetCursor();
     hstmt = hstmtInternal;
 #if wxODBC_BACKWARD_COMPATABILITY
     // Save the where and order by clauses
 
     // Switch to the internal cursor so any active cursors are not corrupted
     HSTMT currCursor = GetCursor();
     hstmt = hstmtInternal;
 #if wxODBC_BACKWARD_COMPATABILITY
     // Save the where and order by clauses

-    char *saveWhere = where;
-    char *saveOrderBy = orderBy;
+    wxChar *saveWhere = where;
+    wxChar *saveOrderBy = orderBy;

 #else
     wxString saveWhere = where;
     wxString saveOrderBy = orderBy;
 #else
     wxString saveWhere = where;
     wxString saveOrderBy = orderBy;


@@ -2443,12 +2489,12 @@ bool wxDbTable::Refresh(void)
     if (CanUpdByROWID())
     {
         SDWORD cb;
     if (CanUpdByROWID())
     {
         SDWORD cb;

-        wxChar   rowid[wxDB_ROWID_LEN+1];
+        wxChar rowid[wxDB_ROWID_LEN+1];

 
         // Get the ROWID value.  If not successful retreiving the ROWID,
         // simply fall down through the code and build the WHERE clause
         // based on the key fields.
 
         // Get the ROWID value.  If not successful retreiving the ROWID,
         // simply fall down through the code and build the WHERE clause
         // based on the key fields.

-        if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
+        if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)

         {
             whereClause += pDb->SQLTableName(queryTableName);
 //            whereClause += queryTableName;
         {
             whereClause += pDb->SQLTableName(queryTableName);
 //            whereClause += queryTableName;


@@ -2466,10 +2512,10 @@ bool wxDbTable::Refresh(void)
     where = whereClause;
     orderBy.Empty();
     if (!Query())
     where = whereClause;
     orderBy.Empty();
     if (!Query())

-        result = FALSE;
+        result = false;

 
     if (result && !GetNext())
 
     if (result && !GetNext())

-        result = FALSE;
+        result = false;

 
     // Switch back to original cursor
     SetCursor(&currCursor);
 
     // Switch back to original cursor
     SetCursor(&currCursor);


@@ -2494,14 +2540,14 @@ bool wxDbTable::SetColNull(UWORD colNo, bool set)
     {
         colDefs[colNo].Null = set;
         if (set)  // Blank out the values in the member variable
     {
         colDefs[colNo].Null = set;
         if (set)  // Blank out the values in the member variable

-        {
-           colDefs[colNo].CbValue = SQL_NULL_DATA; // SF PATCH#766404
-           ClearMemberVar(colNo,FALSE);  // Must call with FALSE, or infinite recursion will happen
-        }
-        return(TRUE);
+           ClearMemberVar(colNo, false);  // Must call with false here, or infinite recursion will happen
+
+        setCbValueForColumn(colNo);
+
+        return true;

     }
     else
     }
     else

-        return(FALSE);
+        return false;

 
 }  // wxDbTable::SetColNull()
 
 
 }  // wxDbTable::SetColNull()
 


@@ -2520,14 +2566,14 @@ bool wxDbTable::SetColNull(const wxString &colName, bool set)
     {
         colDefs[colNo].Null = set;
         if (set)  // Blank out the values in the member variable
     {
         colDefs[colNo].Null = set;
         if (set)  // Blank out the values in the member variable

-        {
-           colDefs[colNo].CbValue = SQL_NULL_DATA;  // SF PATCH#766404
-           ClearMemberVar(colNo,FALSE);  // Must call with FALSE, or infinite recursion will happen
-        }
-        return(TRUE);
+           ClearMemberVar((UWORD)colNo,false);  // Must call with false here, or infinite recursion will happen
+
+        setCbValueForColumn(colNo);
+
+        return true;

     }
     else
     }
     else

-        return(FALSE);
+        return false;

 
 }  // wxDbTable::SetColNull()
 
 
 }  // wxDbTable::SetColNull()
 


@@ -2574,7 +2620,7 @@ HSTMT *wxDbTable::GetNewCursor(bool setCursor, bool bindColumns)
 /********** wxDbTable::DeleteCursor() **********/
 bool wxDbTable::DeleteCursor(HSTMT *hstmtDel)
 {
 /********** wxDbTable::DeleteCursor() **********/
 bool wxDbTable::DeleteCursor(HSTMT *hstmtDel)
 {

-    bool result = TRUE;
+    bool result = true;

 
     if (!hstmtDel)  // Cursor already deleted
         return(result);
 
     if (!hstmtDel)  // Cursor already deleted
         return(result);


@@ -2587,7 +2633,7 @@ ODBC 3.0 says to use this form
     if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
     {
         pDb->DispAllErrors(henv, hdbc);
     if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
     {
         pDb->DispAllErrors(henv, hdbc);

-        result = FALSE;
+        result = false;

     }
 
     delete hstmtDel;
     }
 
     delete hstmtDel;


@@ -2604,7 +2650,7 @@ void wxDbTable::SetRowMode(const rowmode_t rowmode)
 {
     if (!m_hstmtGridQuery)
     {
 {
     if (!m_hstmtGridQuery)
     {

-        m_hstmtGridQuery = GetNewCursor(FALSE,FALSE);
+        m_hstmtGridQuery = GetNewCursor(false,false);

         if (!bindCols(*m_hstmtGridQuery))
             return;
     }
         if (!bindCols(*m_hstmtGridQuery))
             return;
     }


@@ -2627,7 +2673,7 @@ void wxDbTable::SetRowMode(const rowmode_t rowmode)
 wxVariant wxDbTable::GetCol(const int colNo) const
 {
     wxVariant val;
 wxVariant wxDbTable::GetCol(const int colNo) const
 {
     wxVariant val;

-    if ((colNo < noCols) && (!IsColNull(colNo)))
+    if ((colNo < noCols) && (!IsColNull((UWORD)colNo)))

     {
         switch (colDefs[colNo].SqlCtype)
         {
     {
         switch (colDefs[colNo].SqlCtype)
         {


@@ -2647,10 +2693,10 @@ wxVariant wxDbTable::GetCol(const int colNo) const
                 val = (long)(*(unsigned long *)(colDefs[colNo].PtrDataObj));
                 break;
             case SQL_C_TINYINT:
                 val = (long)(*(unsigned long *)(colDefs[colNo].PtrDataObj));
                 break;
             case SQL_C_TINYINT:

-                val = (long)(*(char *)(colDefs[colNo].PtrDataObj));
+                val = (long)(*(wxChar *)(colDefs[colNo].PtrDataObj));

                 break;
             case SQL_C_UTINYINT:
                 break;
             case SQL_C_UTINYINT:

-                val = (long)(*(unsigned char *)(colDefs[colNo].PtrDataObj));
+                val = (long)(*(wxChar *)(colDefs[colNo].PtrDataObj));

                 break;
             case SQL_C_USHORT:
                 val = (long)(*(UWORD *)(colDefs[colNo].PtrDataObj));
                 break;
             case SQL_C_USHORT:
                 val = (long)(*(UWORD *)(colDefs[colNo].PtrDataObj));


@@ -2680,7 +2726,7 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
     //FIXME: Add proper wxDateTime support to wxVariant..
     wxDateTime dateval;
 
     //FIXME: Add proper wxDateTime support to wxVariant..
     wxDateTime dateval;
 

-    SetColNull(colNo, val.IsNull());
+    SetColNull((UWORD)colNo, val.IsNull());

 
     if (!val.IsNull())
     {
 
     if (!val.IsNull())
     {


@@ -2690,16 +2736,16 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
         {
             //Returns null if invalid!
             if (!dateval.ParseDate(val.GetString()))
         {
             //Returns null if invalid!
             if (!dateval.ParseDate(val.GetString()))

-                SetColNull(colNo, TRUE);
+                SetColNull((UWORD)colNo, true);

         }
 
         switch (colDefs[colNo].SqlCtype)
         {
             case SQL_CHAR:
             case SQL_VARCHAR:
         }
 
         switch (colDefs[colNo].SqlCtype)
         {
             case SQL_CHAR:
             case SQL_VARCHAR:

-                csstrncpyt((char *)(colDefs[colNo].PtrDataObj),
+                csstrncpyt((wxChar *)(colDefs[colNo].PtrDataObj),

                            val.GetString().c_str(),
                            val.GetString().c_str(),

-                           colDefs[colNo].SzDataObj-1);
+                           colDefs[colNo].SzDataObj-1);  //TODO: glt ??? * sizeof(wxChar) ???

                 break;
             case SQL_C_LONG:
             case SQL_C_SLONG:
                 break;
             case SQL_C_LONG:
             case SQL_C_SLONG:


@@ -2707,19 +2753,19 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
                 break;
             case SQL_C_SHORT:
             case SQL_C_SSHORT:
                 break;
             case SQL_C_SHORT:
             case SQL_C_SSHORT:

-                *(short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
+                *(short *)(colDefs[colNo].PtrDataObj) = (short)val.GetLong();

                 break;
             case SQL_C_ULONG:
                 *(unsigned long *)(colDefs[colNo].PtrDataObj) = val.GetLong();
                 break;
             case SQL_C_TINYINT:
                 break;
             case SQL_C_ULONG:
                 *(unsigned long *)(colDefs[colNo].PtrDataObj) = val.GetLong();
                 break;
             case SQL_C_TINYINT:

-                *(char *)(colDefs[colNo].PtrDataObj) = val.GetChar();
+                *(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();

                 break;
             case SQL_C_UTINYINT:
                 break;
             case SQL_C_UTINYINT:

-                *(unsigned char *)(colDefs[colNo].PtrDataObj) = val.GetChar();
+                *(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();

                 break;
             case SQL_C_USHORT:
                 break;
             case SQL_C_USHORT:

-                *(unsigned short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
+                *(unsigned short *)(colDefs[colNo].PtrDataObj) = (unsigned short)val.GetLong();

                 break;
             //FIXME: Add proper wxDateTime support to wxVariant..
             case SQL_C_DATE:
                 break;
             //FIXME: Add proper wxDateTime support to wxVariant..
             case SQL_C_DATE:


@@ -2727,9 +2773,9 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
                     DATE_STRUCT *dataptr =
                         (DATE_STRUCT *)colDefs[colNo].PtrDataObj;
 
                     DATE_STRUCT *dataptr =
                         (DATE_STRUCT *)colDefs[colNo].PtrDataObj;
 

-                    dataptr->year   = dateval.GetYear();
-                    dataptr->month  = dateval.GetMonth()+1;
-                    dataptr->day    = dateval.GetDay();
+                    dataptr->year   = (SWORD)dateval.GetYear();
+                    dataptr->month  = (UWORD)(dateval.GetMonth()+1);
+                    dataptr->day    = (UWORD)dateval.GetDay();

                 }
                 break;
             case SQL_C_TIME:
                 }
                 break;
             case SQL_C_TIME:


@@ -2746,9 +2792,9 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
                 {
                     TIMESTAMP_STRUCT *dataptr =
                         (TIMESTAMP_STRUCT *)colDefs[colNo].PtrDataObj;
                 {
                     TIMESTAMP_STRUCT *dataptr =
                         (TIMESTAMP_STRUCT *)colDefs[colNo].PtrDataObj;

-                    dataptr->year   = dateval.GetYear();
-                    dataptr->month  = dateval.GetMonth()+1;
-                    dataptr->day    = dateval.GetDay();
+                    dataptr->year   = (SWORD)dateval.GetYear();
+                    dataptr->month  = (UWORD)(dateval.GetMonth()+1);
+                    dataptr->day    = (UWORD)dateval.GetDay();

 
                     dataptr->hour   = dateval.GetHour();
                     dataptr->minute = dateval.GetMinute();
 
                     dataptr->hour   = dateval.GetHour();
                     dataptr->minute = dateval.GetMinute();


@@ -2803,7 +2849,7 @@ void wxDbTable::SetKey(const GenericKey& k)
     {
         if (colDefs[i].KeyField)
         {
     {
         if (colDefs[i].KeyField)
         {

-            SetColNull(i, FALSE);
+            SetColNull((UWORD)i, false);

             memcpy(colDefs[i].PtrDataObj, blkptr, colDefs[i].SzDataObj);
             blkptr += colDefs[i].SzDataObj;
         }
             memcpy(colDefs[i].PtrDataObj, blkptr, colDefs[i].SzDataObj);
             blkptr += colDefs[i].SzDataObj;
         }