hide tree root on wxMSW in wxHtmlHelpController

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

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 47e31c9f0003b74f8e85e4f5871a917f8759fb36..fcdbf3e1b42aa0d2a7b8a3640d4f6a00711c8fbb 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -35,7 +35,11 @@
 #endif
 
 #ifdef DBDEBUG_CONSOLE
 #endif
 
 #ifdef DBDEBUG_CONSOLE

-    #include "iostream.h"
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif

     #include "wx/ioswrap.h"
 #endif
 
     #include "wx/ioswrap.h"
 #endif
 


@@ -44,7 +48,9 @@
     #include "wx/object.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/object.h"
     #include "wx/list.h"
     #include "wx/utils.h"

-    #include "wx/msgdlg.h"
+    #if wxUSE_GUI
+        #include "wx/msgdlg.h"
+    #endif

     #include "wx/log.h"
 #endif
 #include "wx/filefn.h"
     #include "wx/log.h"
 #endif
 #include "wx/filefn.h"


@@ -91,14 +97,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()
 
 


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


@@ -161,21 +167,21 @@ 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())
         tablePath = tblPath;                    // Table Path - used for dBase files
     else
         tablePath.Empty();
 
     tableName = tblName;                        // Table Name
     if (tblPath.Length())
         tablePath = tblPath;                    // Table Path - used for dBase files
     else
         tablePath.Empty();

-    
+

     if (qryTblName.Length())                    // Name of the table/view to query
         queryTableName = qryTblName;
     else
         queryTableName = tblName;
     if (qryTblName.Length())                    // Name of the table/view to query
         queryTableName = qryTblName;
     else
         queryTableName = tblName;

-    
+

     pDb->incrementTableCount();
     pDb->incrementTableCount();

-    
+

     wxString s;
     tableID = ++lastTableID;
     s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"), tblName.c_str(), tableID, pDb);
     wxString s;
     tableID = ++lastTableID;
     s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"), tblName.c_str(), tableID, pDb);


@@ -188,17 +194,17 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     tableInUse->pDb       = pDb;
     TablesInUse.Append(tableInUse);
 #endif
     tableInUse->pDb       = pDb;
     TablesInUse.Append(tableInUse);
 #endif

-    
+

     pDb->WriteSqlLog(s);
     pDb->WriteSqlLog(s);

-    
+

     // Grab the HENV and HDBC from the wxDb object
     henv = pDb->GetHENV();
     hdbc = pDb->GetHDBC();
     // Grab the HENV and HDBC from the wxDb object
     henv = pDb->GetHENV();
     hdbc = pDb->GetHDBC();

-    
+

     // Allocate space for column definitions
     if (noCols)
         colDefs = new wxDbColDef[noCols];  // Points to the first column definition
     // Allocate space for column definitions
     if (noCols)
         colDefs = new wxDbColDef[noCols];  // Points to the first column definition

-    
+

     // Allocate statement handles for the table
     if (!queryOnly)
     {
     // Allocate statement handles for the table
     if (!queryOnly)
     {


@@ -215,12 +221,12 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     // Allocate a separate statement handle for internal use
     if (SQLAllocStmt(hdbc, &hstmtInternal) != SQL_SUCCESS)
         pDb->DispAllErrors(henv, hdbc);
     // Allocate a separate statement handle for internal use
     if (SQLAllocStmt(hdbc, &hstmtInternal) != SQL_SUCCESS)
         pDb->DispAllErrors(henv, hdbc);

-    
+

     // Set the cursor type for the statement handles
     cursorType = SQL_CURSOR_STATIC;
     // Set the cursor type for the statement handles
     cursorType = SQL_CURSOR_STATIC;

-    
+

     if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
     if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)

-    { 
+    {

         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);
         if (! wxStrcmp(pDb->sqlState, wxT("01S02")))  // Option Value Changed
         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);
         if (! wxStrcmp(pDb->sqlState, wxT("01S02")))  // Option Value Changed


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

                 }
             }
         }
                 }
             }
         }


@@ -272,7 +278,7 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     else
         cout << wxT("Cursor Type set to STATIC") << endl << endl;
 #endif
     else
         cout << wxT("Cursor Type set to STATIC") << endl << endl;
 #endif

-    
+

     if (!queryOnly)
     {
         // Set the cursor type for the INSERT statement handle
     if (!queryOnly)
     {
         // Set the cursor type for the INSERT statement handle


@@ -285,13 +291,13 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
         if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
             pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
     }
         if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
             pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
     }

-    
+

     // 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()
 


@@ -308,8 +314,8 @@ void wxDbTable::cleanup()
 #ifdef __WXDEBUG__
     if (tableID)
     {
 #ifdef __WXDEBUG__
     if (tableID)
     {

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

 
         wxNode *pNode;
         pNode = TablesInUse.First();
 
         wxNode *pNode;
         pNode = TablesInUse.First();


@@ -317,7 +323,7 @@ void wxDbTable::cleanup()
         {
             if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
             {
         {
             if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
             {

-                found = true;
+                found = TRUE;

                 if (!TablesInUse.DeleteNode(pNode))
                     wxLogDebug (s,wxT("Unable to delete node!"));
             }
                 if (!TablesInUse.DeleteNode(pNode))
                     wxLogDebug (s,wxT("Unable to delete node!"));
             }


@@ -402,12 +408,12 @@ bool wxDbTable::bindParams(bool forUpdate)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

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

     SWORD   fSqlType    = 0;
     UDWORD  precision   = 0;
     SWORD   scale       = 0;
     SWORD   fSqlType    = 0;
     UDWORD  precision   = 0;
     SWORD   scale       = 0;

-    
+

     // Bind each column of the table that should be bound
     // to a parameter marker
     int i;
     // Bind each column of the table that should be bound
     // to a parameter marker
     int i;


@@ -449,7 +455,7 @@ bool wxDbTable::bindParams(bool forUpdate)
             case DB_DATA_TYPE_FLOAT:
                 fSqlType = pDb->GetTypeInfFloat().FsqlType;
                 precision = pDb->GetTypeInfFloat().Precision;
             case DB_DATA_TYPE_FLOAT:
                 fSqlType = pDb->GetTypeInfFloat().FsqlType;
                 precision = pDb->GetTypeInfFloat().Precision;

-                scale = pDb->GetTypeInfFloat().MaximumScale;       
+                scale = pDb->GetTypeInfFloat().MaximumScale;

                 // SQL Sybase Anywhere v5.5 returned a negative number for the
                 // MaxScale.  This caused ODBC to kick out an error on ibscale.
                 // I check for this here and set the scale = precision.
                 // SQL Sybase Anywhere v5.5 returned a negative number for the
                 // MaxScale.  This caused ODBC to kick out an error on ibscale.
                 // I check for this here and set the scale = precision.


@@ -482,7 +488,7 @@ bool wxDbTable::bindParams(bool forUpdate)
         if (forUpdate)
         {
             if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
         if (forUpdate)
         {
             if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,

-                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
+                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,

                                  precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
                                  precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));


@@ -491,16 +497,16 @@ bool wxDbTable::bindParams(bool forUpdate)
         else
         {
             if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
         else
         {
             if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,

-                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
+                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,

                                  precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
             }
         }
     }
                                  precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
             }
         }
     }

-    
+

     // Completed successfully
     // Completed successfully

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

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


@@ -508,14 +514,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()
 
 


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

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

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


@@ -554,7 +560,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));
         }


@@ -574,7 +580,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));
         }


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

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

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


@@ -607,7 +613,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


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

     }
 
     // Problem updating record
     }
 
     // Problem updating record


@@ -647,7 +653,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,


@@ -658,16 +664,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
 
     // Execute the SQL SELECT statement

-    int retcode;     
+    int retcode;

     retcode = SQLExecDirect(hstmt, (UCHAR 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
     retcode = SQLExecDirect(hstmt, (UCHAR 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

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

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


@@ -679,7 +685,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;


@@ -711,12 +717,12 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
     else if (checkPrivileges)
     {
         // Verify the user has rights to access the table.
     else if (checkPrivileges)
     {
         // Verify the user has rights to access the table.

-        // Shortcut boolean evaluation to optimize out call to 
+        // Shortcut boolean evaluation to optimize out call to

         // TablePrivileges
         //
         // Unfortunately this optimization doesn't seem to be
         // reliable!
         // TablePrivileges
         //
         // Unfortunately this optimization doesn't seem to be
         // reliable!

-        if (// *(pDb->dbInf.accessibleTables) == 'N' && 
+        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");
     }
             !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");
     }


@@ -733,7 +739,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


@@ -741,17 +747,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!!!


@@ -760,18 +766,20 @@ 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;
-        sqlStmt.Printf(wxT("INSERT INTO %s ("), tableName.c_str());
+        bool needComma = FALSE;
+        sqlStmt.Printf(wxT("INSERT INTO %s ("),
+                       pDb->SQLTableName(tableName.c_str()).c_str());

         for (i = 0; i < noCols; i++)
         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)
                 sqlStmt += wxT(",");
         for (i = 0; i < noCols; i++)
         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)
                 sqlStmt += wxT(",");

-            sqlStmt += colDefs[i].ColName;
-            needComma = true;
+            sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//            sqlStmt += colDefs[i].ColName;
+            needComma = TRUE;

         }
         }

-        needComma = false;
+        needComma = FALSE;

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


@@ -783,23 +791,23 @@ 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(")");

-        
+

         // Prepare the insert statement for execution
         // Prepare the insert statement for execution

-        if (insertableCount)  
+        if (insertableCount)

         {
             if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }
         {
             if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }

-        else 
-            insertable= false;
+        else
+            insertable= FALSE;

     }
     }

-    
+

     // Completed successfully
     // Completed successfully

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

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


@@ -818,7 +826,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()
 


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


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


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


@@ -889,9 +897,9 @@ 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 
+    else

         return(getRec(SQL_FETCH_LAST));
 
 }  // wxDbTable::GetLast()
         return(getRec(SQL_FETCH_LAST));
 
 }  // wxDbTable::GetLast()


@@ -912,11 +920,13 @@ void wxDbTable::BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxStrin
     // delete all records from the database in this case.
     if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0))
     {
     // delete all records from the database in this case.
     if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0))
     {

-        pSqlStmt.Printf(wxT("DELETE FROM %s"), tableName.c_str());
+        pSqlStmt.Printf(wxT("DELETE FROM %s"),
+                        pDb->SQLTableName(tableName.c_str()).c_str());

         return;
     }
 
         return;
     }
 

-    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "), tableName.c_str());
+    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "),
+                    pDb->SQLTableName(tableName.c_str()).c_str());

 
     // Append the WHERE clause to the SQL DELETE statement
     switch(typeOfDel)
 
     // Append the WHERE clause to the SQL DELETE statement
     switch(typeOfDel)


@@ -982,13 +992,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


@@ -998,10 +1008,12 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
         // If joining tables, the base table column names must be qualified to avoid ambiguity
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
         // If joining tables, the base table column names must be qualified to avoid ambiguity
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {

-            pSqlStmt += queryTableName;
+            pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
+//            pSqlStmt += queryTableName;

             pSqlStmt += wxT(".");
         }
             pSqlStmt += wxT(".");
         }

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

         if (i + 1 < noCols)
             pSqlStmt += wxT(",");
     }
         if (i + 1 < noCols)
             pSqlStmt += wxT(",");
     }


@@ -1014,7 +1026,8 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
             pSqlStmt += wxT(",");
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
             pSqlStmt += wxT(",");

-            pSqlStmt += queryTableName;
+            pSqlStmt += pDb->SQLTableName(queryTableName);
+//            pSqlStmt += queryTableName;

             pSqlStmt += wxT(".ROWID");
         }
         else
             pSqlStmt += wxT(".ROWID");
         }
         else


@@ -1023,7 +1036,8 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
 
     // Append the FROM tablename portion
     pSqlStmt += wxT(" FROM ");
 
     // Append the FROM tablename portion
     pSqlStmt += wxT(" FROM ");

-    pSqlStmt += queryTableName;
+    pSqlStmt += pDb->SQLTableName(queryTableName);
+//    pSqlStmt += queryTableName;

 
     // Sybase uses the HOLDLOCK keyword to lock a record during query.
     // The HOLDLOCK keyword follows the table name in the from clause.
 
     // Sybase uses the HOLDLOCK keyword to lock a record during query.
     // The HOLDLOCK keyword follows the table name in the from clause.


@@ -1108,9 +1122,10 @@ 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 "), tableName.Upper().c_str());
+    pSqlStmt.Printf(wxT("UPDATE %s SET "),
+                    pDb->SQLTableName(tableName.c_str()).c_str());

 
     // Append a list of columns to be updated
     int i;
 
     // Append a list of columns to be updated
     int i;


@@ -1122,8 +1137,10 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
             if (!firstColumn)
                 pSqlStmt += wxT(",");
             else
             if (!firstColumn)
                 pSqlStmt += wxT(",");
             else

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

             pSqlStmt += wxT(" = ?");
         }
     }
             pSqlStmt += wxT(" = ?");
         }
     }


@@ -1181,7 +1198,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


@@ -1199,14 +1216,16 @@ 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
             if (qualTableName.Length())
             {
             // Concatenate where phrase for the column
             if (qualTableName.Length())
             {

-                pWhereClause += qualTableName;
+                pWhereClause += pDb->SQLTableName(qualTableName);
+//                pWhereClause += qualTableName;

                 pWhereClause += wxT(".");
             }
                 pWhereClause += wxT(".");
             }

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

             if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
                 pWhereClause += wxT(" LIKE ");
             else
             if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
                 pWhereClause += wxT(" LIKE ");
             else


@@ -1275,7 +1294,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()
 


@@ -1284,7 +1303,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;


@@ -1295,7 +1314,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


@@ -1328,8 +1347,10 @@ 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;
-    sqlStmt.Printf(wxT("CREATE TABLE %s ("), tableName.c_str());
+    bool needComma = FALSE;
+
+    sqlStmt.Printf(wxT("CREATE TABLE %s ("),
+                   pDb->SQLTableName(tableName.c_str()).c_str());

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


@@ -1340,7 +1361,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         if (needComma)
             sqlStmt += wxT(",");
         // Column Name
         if (needComma)
             sqlStmt += wxT(",");
         // Column Name

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

         sqlStmt += wxT(" ");
         // Column Type
         switch(colDefs[i].DbDataType)
         sqlStmt += wxT(" ");
         // Column Type
         switch(colDefs[i].DbDataType)


@@ -1381,8 +1403,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
                 sqlStmt += wxT(" NOT NULL");
             }
         }
                 sqlStmt += wxT(" NOT NULL");
             }
         }

-        
-        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++)


@@ -1397,6 +1419,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
     {
         switch (pDb->Dbms())
         {
     {
         switch (pDb->Dbms())
         {

+            case dbmsACCESS:

             case dbmsINFORMIX:
             case dbmsSYBASE_ASA:
             case dbmsSYBASE_ASE:
             case dbmsINFORMIX:
             case dbmsSYBASE_ASA:
             case dbmsSYBASE_ASE:


@@ -1413,10 +1436,12 @@ bool wxDbTable::CreateTable(bool attemptDrop)
                 if (pDb->Dbms() == dbmsDB2)
                 {
                     wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
                 if (pDb->Dbms() == dbmsDB2)
                 {
                     wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));

-                    sqlStmt += tableName.substr(0, 13);
+                    sqlStmt += pDb->SQLTableName(tableName.substr(0, 13).c_str());
+//                    sqlStmt += tableName.substr(0, 13);

                 }
                 else
                 }
                 else

-                    sqlStmt += tableName;
+                    sqlStmt += pDb->SQLTableName(tableName.c_str());
+//                    sqlStmt += tableName;

 
                 sqlStmt += wxT("_PIDX PRIMARY KEY (");
                 break;
 
                 sqlStmt += wxT("_PIDX PRIMARY KEY (");
                 break;


@@ -1430,7 +1455,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             {
                 if (j++) // Multi part key, comma separate names
                     sqlStmt += wxT(",");
             {
                 if (j++) // Multi part key, comma separate names
                     sqlStmt += wxT(",");

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

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


@@ -1440,7 +1466,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             pDb->Dbms() == dbmsSYBASE_ASE)
         {
             sqlStmt += wxT(" CONSTRAINT ");
             pDb->Dbms() == dbmsSYBASE_ASE)
         {
             sqlStmt += wxT(" CONSTRAINT ");

-            sqlStmt += tableName;
+            sqlStmt += pDb->SQLTableName(tableName);
+//            sqlStmt += tableName;

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


@@ -1460,17 +1487,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()
 


@@ -1478,14 +1505,15 @@ 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
 
     wxString sqlStmt;
 
     //       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
 
     wxString sqlStmt;
 

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

 
     pDb->WriteSqlLog(sqlStmt);
 
 
     pDb->WriteSqlLog(sqlStmt);
 


@@ -1493,39 +1521,36 @@ 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);
     if (retcode != SQL_SUCCESS)
     {
         // Check for "Base table not found" error and ignore
     RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
     if (retcode != SQL_SUCCESS)
     {
         // Check for "Base table not found" error and ignore

-        pDb->GetNextError(henv, hdbc, hstmt);   
+        pDb->GetNextError(henv, hdbc, hstmt);

         if (wxStrcmp(pDb->sqlState, wxT("S0002")) /*&&
         if (wxStrcmp(pDb->sqlState, wxT("S0002")) /*&&

-            wxStrcmp(pDb->sqlState, wxT("S1000"))*/)  // "Base table not found" 
+            wxStrcmp(pDb->sqlState, wxT("S1000"))*/)  // "Base table not found"

         {
             // Check for product specific error codes
             if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000")))   ||  // 5.x (and lower?)
         {
             // Check for product specific error codes
             if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000")))   ||  // 5.x (and lower?)

-                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000")))   ||   
+                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000")))   ||

                   (pDb->Dbms() == dbmsPERVASIVE_SQL && !wxStrcmp(pDb->sqlState,wxT("S1000")))   ||  // Returns an S1000 then an S0002
                   (pDb->Dbms() == dbmsPERVASIVE_SQL && !wxStrcmp(pDb->sqlState,wxT("S1000")))   ||  // Returns an S1000 then an S0002

-                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))     
+                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))

             {
                 pDb->DispNextError();
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
 //                CloseCursor(hstmt);
             {
                 pDb->DispNextError();
                 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()
 
 


@@ -1537,7 +1562,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,


@@ -1551,11 +1576,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


@@ -1563,11 +1588,11 @@ 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++;
             }

-            
+

             if (found)
             {
                 ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,
             if (found)
             {
                 ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,


@@ -1584,33 +1609,36 @@ 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);

         }
     }
         }
     }

-    
+

     // Build a CREATE INDEX statement
     sqlStmt = wxT("CREATE ");
     if (unique)
         sqlStmt += wxT("UNIQUE ");
     // Build a CREATE INDEX statement
     sqlStmt = wxT("CREATE ");
     if (unique)
         sqlStmt += wxT("UNIQUE ");

-    
+

     sqlStmt += wxT("INDEX ");
     sqlStmt += wxT("INDEX ");

-    sqlStmt += idxName;
+    sqlStmt += pDb->SQLTableName(idxName);

     sqlStmt += wxT(" ON ");
     sqlStmt += wxT(" ON ");

-    sqlStmt += tableName;
+
+    sqlStmt += pDb->SQLTableName(tableName);
+//    sqlStmt += tableName;

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

-    
+

     // Append list of columns making up index
     int i;
     for (i = 0; i < noIdxCols; i++)
     {
     // Append list of columns making up index
     int i;
     for (i = 0; i < noIdxCols; i++)
     {

-        sqlStmt += pIdxDefs[i].ColName;
+        sqlStmt += pDb->SQLColumnName(pIdxDefs[i].ColName);
+//        sqlStmt += pIdxDefs[i].ColName;

 
         // 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)) &&
 
         // 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)) &&


@@ -1627,7 +1655,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
         if ((i + 1) < noIdxCols)
             sqlStmt += wxT(",");
     }
         if ((i + 1) < noIdxCols)
             sqlStmt += wxT(",");
     }

-    
+

     // Append closing parentheses
     sqlStmt += wxT(")");
 
     // Append closing parentheses
     sqlStmt += wxT(")");
 


@@ -1643,17 +1671,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()
 


@@ -1661,7 +1689,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


@@ -1670,12 +1698,17 @@ bool wxDbTable::DropIndex(const wxString &idxName)
 
     if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
         pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
 
     if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
         pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)

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

     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
              (pDb->Dbms() == dbmsSYBASE_ASE))
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
              (pDb->Dbms() == dbmsSYBASE_ASE))

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

     else
     else

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

 
     pDb->WriteSqlLog(sqlStmt);
 
 
     pDb->WriteSqlLog(sqlStmt);
 


@@ -1703,18 +1736,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()
 
 


@@ -1724,7 +1757,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. */


@@ -1736,7 +1769,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;
         }
 


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

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

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


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


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

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

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


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


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


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


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


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


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


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


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


@@ -2067,7 +2100,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()
 


@@ -2082,12 +2115,15 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
 
     if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
     {
 
     if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
     {

-        int assertColumnNameTooLong = 0;

         wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
         colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;
         wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
         colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;

+
+#ifdef __WXDEBUG__

         wxString tmpMsg;
         wxString tmpMsg;

-        tmpMsg.Printf("Column name '%s' is too long. Truncated to '%s'.",fieldName.c_str(),colDefs[index].ColName);
-        wxASSERT_MSG(assertColumnNameTooLong,tmpMsg.c_str());
+        tmpMsg.Printf(_T("Column name '%s' is too long. Truncated to '%s'."),
+                      fieldName.c_str(),colDefs[index].ColName);
+        wxFAIL_MSG(tmpMsg);
+#endif // __WXDEBUG__

     }
     else
         wxStrcpy(colDefs[index].ColName, fieldName);
     }
     else
         wxStrcpy(colDefs[index].ColName, fieldName);


@@ -2101,8 +2137,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
     {


@@ -2110,8 +2146,8 @@ 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()
 
 


@@ -2124,7 +2160,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
     if (pColInfs)
     {
         UWORD index;
     if (pColInfs)
     {
         UWORD index;

-       
+

         pColDataPtrs = new wxDbColDataPtr[numCols+1];
 
         for (index = 0; index < numCols; index++)
         pColDataPtrs = new wxDbColDataPtr[numCols+1];
 
         for (index = 0; index < numCols; index++)


@@ -2165,7 +2201,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                         pColDataPtrs[index].PtrDataObj = new double;
                         pColDataPtrs[index].SzDataObj  = sizeof(double);
                         pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
                         pColDataPtrs[index].PtrDataObj = new double;
                         pColDataPtrs[index].SzDataObj  = sizeof(double);
                         pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;

-                    }  
+                    }

                     break;
                 case DB_DATA_TYPE_DATE:
                     pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;
                     break;
                 case DB_DATA_TYPE_DATE:
                     pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;


@@ -2173,8 +2209,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                     pColDataPtrs[index].SqlCtype   = SQL_C_TIMESTAMP;
                     break;
                 case DB_DATA_TYPE_BLOB:
                     pColDataPtrs[index].SqlCtype   = SQL_C_TIMESTAMP;
                     break;
                 case DB_DATA_TYPE_BLOB:

-                    int notSupportedYet = 0;
-                    wxASSERT_MSG(notSupportedYet, wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
+                    wxFAIL_MSG(wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));

                     pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
                     pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
                     pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;
                     pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
                     pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
                     pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;


@@ -2184,7 +2219,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                 SetColDefs (index,pColInfs[index].colName,pColInfs[index].dbDataType, pColDataPtrs[index].PtrDataObj, pColDataPtrs[index].SqlCtype, pColDataPtrs[index].SzDataObj);
             else
             {
                 SetColDefs (index,pColInfs[index].colName,pColInfs[index].dbDataType, pColDataPtrs[index].PtrDataObj, pColDataPtrs[index].SqlCtype, pColDataPtrs[index].SzDataObj);
             else
             {

-                // Unable to build all the column definitions, as either one of 
+                // Unable to build all the column definitions, as either one of

                 // the calls to "new" failed above, or there was a BLOB field
                 // to have a column definition for.  If BLOBs are to be used,
                 // the other form of ::SetColDefs() must be used, as it is impossible
                 // the calls to "new" failed above, or there was a BLOB field
                 // to have a column definition for.  If BLOBs are to be used,
                 // the other form of ::SetColDefs() must be used, as it is impossible


@@ -2222,7 +2257,8 @@ ULONG wxDbTable::Count(const wxString &args)
     sqlStmt  = wxT("SELECT COUNT(");
     sqlStmt += args;
     sqlStmt += wxT(") FROM ");
     sqlStmt  = wxT("SELECT COUNT(");
     sqlStmt += args;
     sqlStmt += wxT(") FROM ");

-    sqlStmt += queryTableName;
+    sqlStmt += pDb->SQLTableName(queryTableName);
+//    sqlStmt += queryTableName;

 #if wxODBC_BACKWARD_COMPATABILITY
     if (from && wxStrlen(from))
 #else
 #if wxODBC_BACKWARD_COMPATABILITY
     if (from && wxStrlen(from))
 #else


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


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


@@ -2314,7 +2350,8 @@ bool wxDbTable::Refresh(void)
         // based on the key fields.
         if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
         {
         // based on the key fields.
         if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
         {

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

             whereClause += wxT(".ROWID = '");
             whereClause += rowid;
             whereClause += wxT("'");
             whereClause += wxT(".ROWID = '");
             whereClause += rowid;
             whereClause += wxT("'");


@@ -2329,10 +2366,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);


@@ -2357,11 +2394,11 @@ 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, or infinite recursion will happen
-        return(true);
+            ClearMemberVar(colNo,FALSE);  // Must call with FALSE, or infinite recursion will happen
+        return(TRUE);

     }
     else
     }
     else

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

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


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

-            ClearMemberVar(i,false);  // Must call with false, or infinite recursion will happen
-        return(true);
+            ClearMemberVar(i,FALSE);  // Must call with FALSE, or infinite recursion will happen
+        return(TRUE);

     }
     else
     }
     else

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

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


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


@@ -2439,12 +2476,12 @@ bool wxDbTable::DeleteCursor(HSTMT *hstmtDel)
 /*
 ODBC 3.0 says to use this form
     if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
 /*
 ODBC 3.0 says to use this form
     if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)

-    
+

 */
     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;


@@ -2461,7 +2498,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;
     }


@@ -2481,48 +2518,48 @@ void wxDbTable::SetRowMode(const rowmode_t rowmode)
 }  // wxDbTable::SetRowMode()
 
 
 }  // wxDbTable::SetRowMode()
 
 

-wxVariant wxDbTable::GetCol(const int col) const
+wxVariant wxDbTable::GetCol(const int colNo) const

 {
     wxVariant val;
 {
     wxVariant val;

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

     {
     {

-        switch (colDefs[col].SqlCtype)
+        switch (colDefs[colNo].SqlCtype)

         {
             case SQL_CHAR:
             case SQL_VARCHAR:
         {
             case SQL_CHAR:
             case SQL_VARCHAR:

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

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

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

                 break;
             case SQL_C_SHORT:
             case SQL_C_SSHORT:
                 break;
             case SQL_C_SHORT:
             case SQL_C_SSHORT:

-                val = (long int )(*(short *)(colDefs[col].PtrDataObj));
+                val = (long int )(*(short *)(colDefs[colNo].PtrDataObj));

                 break;
             case SQL_C_ULONG:
                 break;
             case SQL_C_ULONG:

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

                 break;
             case SQL_C_TINYINT:
                 break;
             case SQL_C_TINYINT:

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

                 break;
             case SQL_C_UTINYINT:
                 break;
             case SQL_C_UTINYINT:

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

                 break;
             case SQL_C_USHORT:
                 break;
             case SQL_C_USHORT:

-                val = (long)(*(UWORD *)(colDefs[col].PtrDataObj));
+                val = (long)(*(UWORD *)(colDefs[colNo].PtrDataObj));

                 break;
             case SQL_C_DATE:
                 break;
             case SQL_C_DATE:

-                val = (DATE_STRUCT *)(colDefs[col].PtrDataObj);
+                val = (DATE_STRUCT *)(colDefs[colNo].PtrDataObj);

                 break;
             case SQL_C_TIME:
                 break;
             case SQL_C_TIME:

-                val = (TIME_STRUCT *)(colDefs[col].PtrDataObj);
+                val = (TIME_STRUCT *)(colDefs[colNo].PtrDataObj);

                 break;
             case SQL_C_TIMESTAMP:
                 break;
             case SQL_C_TIMESTAMP:

-                val = (TIMESTAMP_STRUCT *)(colDefs[col].PtrDataObj);
+                val = (TIMESTAMP_STRUCT *)(colDefs[colNo].PtrDataObj);

                 break;
             case SQL_C_DOUBLE:
                 break;
             case SQL_C_DOUBLE:

-                val = *(double *)(colDefs[col].PtrDataObj);
+                val = *(double *)(colDefs[colNo].PtrDataObj);

                 break;
             default:
                 assert(0);
                 break;
             default:
                 assert(0);


@@ -2540,58 +2577,58 @@ void csstrncpyt(char *s, const char *t, int n)
     *s = '\0';
 }
 
     *s = '\0';
 }
 

-void wxDbTable::SetCol(const int col, const wxVariant val)
+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(col, val.IsNull());
+    SetColNull(colNo, val.IsNull());

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

-        if ((colDefs[col].SqlCtype == SQL_C_DATE) 
-            || (colDefs[col].SqlCtype == SQL_C_TIME)
-            || (colDefs[col].SqlCtype == SQL_C_TIMESTAMP))
+        if ((colDefs[colNo].SqlCtype == SQL_C_DATE)
+            || (colDefs[colNo].SqlCtype == SQL_C_TIME)
+            || (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP))

         {
             //Returns null if invalid!
             if (!dateval.ParseDate(val.GetString()))
         {
             //Returns null if invalid!
             if (!dateval.ParseDate(val.GetString()))

-                SetColNull(col,true);
-        }               
+                SetColNull(colNo, TRUE);
+        }

 
 

-        switch (colDefs[col].SqlCtype)
+        switch (colDefs[colNo].SqlCtype)

         {
             case SQL_CHAR:
             case SQL_VARCHAR:
         {
             case SQL_CHAR:
             case SQL_VARCHAR:

-                csstrncpyt((char *)(colDefs[col].PtrDataObj),
-                           val.GetString().c_str(), 
-                           colDefs[col].SzDataObj-1);
+                csstrncpyt((char *)(colDefs[colNo].PtrDataObj),
+                           val.GetString().c_str(),
+                           colDefs[colNo].SzDataObj-1);

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

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

                 break;
             case SQL_C_SHORT:
             case SQL_C_SSHORT:
                 break;
             case SQL_C_SHORT:
             case SQL_C_SSHORT:

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

                 break;
             case SQL_C_ULONG:
                 break;
             case SQL_C_ULONG:

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

                 break;
             case SQL_C_TINYINT:
                 break;
             case SQL_C_TINYINT:

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

                 break;
             case SQL_C_UTINYINT:
                 break;
             case SQL_C_UTINYINT:

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

                 break;
             case SQL_C_USHORT:
                 break;
             case SQL_C_USHORT:

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

                 break;
             //FIXME: Add proper wxDateTime support to wxVariant..
             case SQL_C_DATE:
                 {
                     DATE_STRUCT *dataptr =
                 break;
             //FIXME: Add proper wxDateTime support to wxVariant..
             case SQL_C_DATE:
                 {
                     DATE_STRUCT *dataptr =

-                        (DATE_STRUCT *)colDefs[col].PtrDataObj;
-                
+                        (DATE_STRUCT *)colDefs[colNo].PtrDataObj;
+

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


@@ -2600,8 +2637,8 @@ void wxDbTable::SetCol(const int col, const wxVariant val)
             case SQL_C_TIME:
                 {
                     TIME_STRUCT *dataptr =
             case SQL_C_TIME:
                 {
                     TIME_STRUCT *dataptr =

-                        (TIME_STRUCT *)colDefs[col].PtrDataObj;
-                
+                        (TIME_STRUCT *)colDefs[colNo].PtrDataObj;
+

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


@@ -2610,18 +2647,18 @@ void wxDbTable::SetCol(const int col, const wxVariant val)
             case SQL_C_TIMESTAMP:
                 {
                     TIMESTAMP_STRUCT *dataptr =
             case SQL_C_TIMESTAMP:
                 {
                     TIMESTAMP_STRUCT *dataptr =

-                        (TIMESTAMP_STRUCT *)colDefs[col].PtrDataObj;
+                        (TIMESTAMP_STRUCT *)colDefs[colNo].PtrDataObj;

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

-                
+

                     dataptr->hour   = dateval.GetHour();
                     dataptr->minute = dateval.GetMinute();
                     dataptr->second = dateval.GetSecond();
                 }
                 break;
             case SQL_C_DOUBLE:
                     dataptr->hour   = dateval.GetHour();
                     dataptr->minute = dateval.GetMinute();
                     dataptr->second = dateval.GetSecond();
                 }
                 break;
             case SQL_C_DOUBLE:

-                *(double *)(colDefs[col].PtrDataObj) = val;
+                *(double *)(colDefs[colNo].PtrDataObj) = val;

                 break;
             default:
                 assert(0);
                 break;
             default:
                 assert(0);


@@ -2633,11 +2670,11 @@ void wxDbTable::SetCol(const int col, const wxVariant val)
 GenericKey wxDbTable::GetKey()
 {
     void *blk;
 GenericKey wxDbTable::GetKey()
 {
     void *blk;

-    char *blkptr;
-    
+    wxChar *blkptr;
+

     blk = malloc(m_keysize);
     blk = malloc(m_keysize);

-    blkptr = (char *) blk;
-    
+    blkptr = (wxChar *) blk;
+

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


@@ -2657,18 +2694,18 @@ GenericKey wxDbTable::GetKey()
 
 void wxDbTable::SetKey(const GenericKey& k)
 {
 
 void wxDbTable::SetKey(const GenericKey& k)
 {

-    void *blk;
-    char *blkptr;
-    
+    void    *blk;
+    wxChar  *blkptr;
+

     blk = k.GetBlk();
     blk = k.GetBlk();

-    blkptr = (char *)blk;
+    blkptr = (wxChar *)blk;

 
     int i;
     for (i=0; i < noCols; i++)
     {
         if (colDefs[i].KeyField)
         {
 
     int i;
     for (i=0; i < noCols; i++)
     {
         if (colDefs[i].KeyField)
         {

-            SetColNull(i, false);
+            SetColNull(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;
         }