More contrib compilation fixes & makefiles

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

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 47e31c9f0003b74f8e85e4f5871a917f8759fb36..234c9c72a5db6e596c629c5d468527ee4d9b81c9 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -91,14 +91,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 +150,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,7 +161,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())


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

                 }
             }
         }
                 }
             }
         }


@@ -287,11 +287,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()
 


@@ -308,8 +308,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 +317,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,7 +402,7 @@ bool wxDbTable::bindParams(bool forUpdate)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

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

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


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

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

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


@@ -508,14 +508,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 +534,7 @@ bool wxDbTable::bindCols(HSTMT cursor)
     }
 
     // Completed successfully
     }
 
     // Completed successfully

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

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


@@ -554,7 +554,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 +574,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 +589,7 @@ bool wxDbTable::getRec(UWORD fetchType)
     }
 
     // Completed successfully
     }
 
     // Completed successfully

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

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


@@ -607,7 +607,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 +629,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 +647,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,7 +658,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;     


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


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


@@ -733,7 +733,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 +741,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,7 +760,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 ("), tableName.c_str());
         for (i = 0; i < noCols; i++)
         {
         sqlStmt.Printf(wxT("INSERT INTO %s ("), tableName.c_str());
         for (i = 0; i < noCols; i++)
         {


@@ -769,9 +769,9 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
             if (needComma)
                 sqlStmt += wxT(",");
             sqlStmt += colDefs[i].ColName;
             if (needComma)
                 sqlStmt += wxT(",");
             sqlStmt += colDefs[i].ColName;

-            needComma = true;
+            needComma = TRUE;

         }
         }

-        needComma = false;
+        needComma = FALSE;

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


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


@@ -795,11 +795,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()
 


@@ -818,7 +818,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 +847,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 +861,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 +875,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,7 +889,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));


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


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


@@ -1122,7 +1122,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 += colDefs[i].ColName;
             pSqlStmt += wxT(" = ?");
         }
             pSqlStmt += colDefs[i].ColName;
             pSqlStmt += wxT(" = ?");
         }


@@ -1181,7 +1181,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,7 +1199,7 @@ 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())
             {


@@ -1275,7 +1275,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 +1284,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 +1295,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,7 +1328,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 ("), tableName.c_str());
 
     for (i = 0; i < noCols; i++)
     sqlStmt.Printf(wxT("CREATE TABLE %s ("), tableName.c_str());
 
     for (i = 0; i < noCols; i++)


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


@@ -1460,17 +1460,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,7 +1478,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


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


@@ -1537,7 +1537,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 +1551,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,7 +1563,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++;
             }


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

         }
     }
     
         }
     }
     


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


@@ -1703,18 +1703,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 +1724,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 +1736,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 +1791,7 @@ bool wxDbTable::Update(void)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)
 {
     wxASSERT(!queryOnly);
     if (queryOnly)

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

 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 


@@ -1815,7 +1815,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 +1829,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 +1853,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 +1874,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 +1895,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 +1915,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 +1938,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 +1953,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 +1971,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 +1988,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 +2067,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()
 


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


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


@@ -2329,10 +2329,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 +2357,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 +2380,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 +2431,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);


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


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


@@ -2555,7 +2555,7 @@ void wxDbTable::SetCol(const int col, const wxVariant val)
         {
             //Returns null if invalid!
             if (!dateval.ParseDate(val.GetString()))
         {
             //Returns null if invalid!
             if (!dateval.ParseDate(val.GetString()))

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

         }               
 
         switch (colDefs[col].SqlCtype)
         }               
 
         switch (colDefs[col].SqlCtype)


@@ -2668,7 +2668,7 @@ void wxDbTable::SetKey(const GenericKey& k)
     {
         if (colDefs[i].KeyField)
         {
     {
         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;
         }