Moved print dialog data conversion code

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

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index a34a07fa41c2006bb39b3ebfe0017a775c43c2cb..c6bc966f6d01c065e12e937e1a9b1194ab789dc1 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

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


@@ -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,18 +314,17 @@ void wxDbTable::cleanup()
 #ifdef __WXDEBUG__
     if (tableID)
     {
 #ifdef __WXDEBUG__
     if (tableID)
     {

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

 
 

-        wxNode *pNode;
+        wxList::compatibility_iterator pNode;

         pNode = TablesInUse.GetFirst();
         while (pNode && !found)
         {
             if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
             {
         pNode = TablesInUse.GetFirst();
         while (pNode && !found)
         {
             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
                 pNode = pNode->GetNext();
             }
             else
                 pNode = pNode->GetNext();


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

-bool wxDbTable::setCbValueForColumn(int columnIndex)
+void wxDbTable::setCbValueForColumn(int columnIndex)

 {
     switch(colDefs[columnIndex].DbDataType)
     {
 {
     switch(colDefs[columnIndex].DbDataType)
     {


@@ -442,10 +434,8 @@ bool wxDbTable::setCbValueForColumn(int columnIndex)
             if (colDefs[columnIndex].Null)
                 colDefs[columnIndex].CbValue = SQL_NULL_DATA;
             else
             if (colDefs[columnIndex].Null)
                 colDefs[columnIndex].CbValue = SQL_NULL_DATA;
             else

-                if (colDefs[columnIndex].SqlCtype == SQL_C_BINARY)
-                    colDefs[columnIndex].CbValue = 0;
-                else if (colDefs[columnIndex].SqlCtype == SQL_C_CHAR)
-                    colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(0);
+                if (colDefs[columnIndex].SqlCtype == SQL_C_CHAR)
+                    colDefs[columnIndex].CbValue = SQL_NTS;

                 else
                     colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);
             break;
                 else
                     colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);
             break;


@@ -457,7 +447,7 @@ bool wxDbTable::bindParams(bool forUpdate)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

-        return(FALSE);
+        return false;

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


@@ -510,7 +500,7 @@ bool wxDbTable::bindParams(bool forUpdate)
                 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;
                 break;
         }
                 scale = 0;
                 break;
         }


@@ -530,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));
             }


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

-    return(TRUE);
+    return true;

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


@@ -546,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()
 
 


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

-    return(TRUE);
+    return true;

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


@@ -593,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));
         }


@@ -613,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));
         }


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

-    return(TRUE);
+    return true;

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


@@ -646,7 +636,7 @@ bool wxDbTable::execDelete(const wxString &pSqlStmt)
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record deleted successfully
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record deleted successfully

-        return(TRUE);
+        return true;

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


@@ -668,7 +658,7 @@ bool wxDbTable::execUpdate(const wxString &pSqlStmt)
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record updated successfully
         retcode == SQL_SUCCESS_WITH_INFO)
     {
         // Record updated successfully

-        return(TRUE);
+        return true;

     }
     else if (retcode == SQL_NEED_DATA)
     {
     }
     else if (retcode == SQL_NEED_DATA)
     {


@@ -692,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;

         }
     }
 
         }
     }
 


@@ -717,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,


@@ -728,7 +719,7 @@ 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;


@@ -737,7 +728,7 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxStri
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
 
     // Completed successfully
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
 
     // Completed successfully

-    return(TRUE);
+    return true;

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


@@ -749,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;


@@ -803,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


@@ -811,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!!!


@@ -830,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++)


@@ -841,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;


@@ -855,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(")");


@@ -867,11 +858,11 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
                 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()
 


@@ -890,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()
 


@@ -919,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));


@@ -933,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));


@@ -947,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));


@@ -961,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));


@@ -1056,13 +1047,13 @@ 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
 #endif
 
     // Add the column list


@@ -1072,7 +1063,7 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
     {
         tStr = colDefs[i].ColName;
         // If joining tables, the base table column names must be qualified to avoid ambiguity
     {
         tStr = colDefs[i].ColName;
         // 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(".");


@@ -1186,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());


@@ -1201,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;


@@ -1262,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


@@ -1271,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)


@@ -1280,12 +1271,12 @@ 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->SQLTableName(qualTableName);
                 pWhereClause += wxT(".");


@@ -1327,7 +1318,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
                         wxString strMsg;
                         strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
                                     colNo,colDefs[colNo].ColName);
                         wxString strMsg;
                         strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
                                     colNo,colDefs[colNo].ColName);

-                        wxFAIL_MSG(wxT(strMsg));
+                        wxFAIL_MSG(strMsg.c_str());

                     }
                     break;
             }
                     }
                     break;
             }


@@ -1371,7 +1362,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()
 


@@ -1380,7 +1371,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;


@@ -1391,7 +1382,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


@@ -1424,7 +1415,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());


@@ -1482,7 +1473,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++)


@@ -1573,17 +1564,17 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         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;

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

-    return(TRUE);
+    return true;

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


@@ -1591,7 +1582,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


@@ -1625,18 +1616,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()
 
 


@@ -1648,7 +1639,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,


@@ -1662,11 +1653,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


@@ -1674,7 +1665,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++;
             }


@@ -1698,14 +1689,14 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
                 }
             }
             else
                 }
             }
             else

-                ok = FALSE;
+                ok = false;

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

-            return(FALSE);
+            return false;

         }
     }
 
         }
     }
 


@@ -1748,7 +1739,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
                 sqlStmt += s;
             }
         }
                 sqlStmt += s;
             }
         }

-        
+

         // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
         if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (wxStrncmp(pDb->dbInf.dbmsVer,_T("07"),2)==0)) &&
             !(pDb->Dbms() == dbmsPOSTGRES))
         // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
         if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (wxStrncmp(pDb->dbInf.dbmsVer,_T("07"),2)==0)) &&
             !(pDb->Dbms() == dbmsPOSTGRES))


@@ -1780,17 +1771,17 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
         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()
 


@@ -1798,7 +1789,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


@@ -1846,18 +1837,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()
 
 


@@ -1867,7 +1858,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. */


@@ -1879,7 +1870,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;
         }
 


@@ -1946,6 +1937,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);
+            }

         }
     }
 
         }
     }
 


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

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


@@ -1984,7 +1984,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);
 


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

-        return(FALSE);
+        return false;

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


@@ -2022,7 +2022,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();


@@ -2043,7 +2043,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();


@@ -2064,7 +2064,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();


@@ -2084,7 +2084,7 @@ 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)
     if a numeric field were set to a value of 0.
 
     switch(colDefs[colNo].SqlCtype)


@@ -2107,11 +2107,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);


@@ -2122,16 +2122,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()
 


@@ -2140,15 +2140,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()
 


@@ -2157,9 +2157,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()
 


@@ -2181,6 +2181,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;


@@ -2218,7 +2219,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()
 


@@ -2236,7 +2237,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()
 


@@ -2276,8 +2277,8 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
     // Derived columns by definition would NOT be "Insertable" or "Updateable"
     if (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
     {


@@ -2285,7 +2286,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()
 


@@ -2421,7 +2422,7 @@ 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);
         wxASSERT(hstmtCount);
         if (!hstmtCount)
             return(0);


@@ -2461,7 +2462,7 @@ 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();
 
     // Switch to the internal cursor so any active cursors are not corrupted
     HSTMT currCursor = GetCursor();


@@ -2505,10 +2506,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);


@@ -2533,14 +2534,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

-           ClearMemberVar(colNo, FALSE);  // Must call with FALSE here, or infinite recursion will happen
+           ClearMemberVar(colNo, false);  // Must call with false here, or infinite recursion will happen

 
 

-        setCbValueForColumn(i);
+        setCbValueForColumn(colNo);

 
 

-        return(TRUE);
+        return true;

     }
     else
     }
     else

-        return(FALSE);
+        return false;

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


@@ -2559,14 +2560,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

-           ClearMemberVar(colNo,FALSE);  // Must call with FALSE here, or infinite recursion will happen
+           ClearMemberVar((UWORD)colNo,false);  // Must call with false here, or infinite recursion will happen

 
 

-        setCbValueForColumn(i);
+        setCbValueForColumn(colNo);

 
 

-        return(TRUE);
+        return true;

     }
     else
     }
     else

-        return(FALSE);
+        return false;

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


@@ -2613,7 +2614,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);


@@ -2626,7 +2627,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;


@@ -2643,7 +2644,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;
     }


@@ -2666,7 +2667,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)
         {


@@ -2719,7 +2720,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())
     {


@@ -2729,7 +2730,7 @@ 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)
         }
 
         switch (colDefs[colNo].SqlCtype)


@@ -2746,7 +2747,7 @@ 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_ULONG:
                 *(unsigned long *)(colDefs[colNo].PtrDataObj) = val.GetLong();


@@ -2758,7 +2759,7 @@ void wxDbTable::SetCol(const int colNo, const wxVariant val)
                 *(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();
                 break;
             case SQL_C_USHORT:
                 *(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();
                 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:


@@ -2766,9 +2767,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:


@@ -2785,9 +2786,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();


@@ -2842,7 +2843,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;
         }