Fixed __WXDEBUG__ references to use #ifdef rather than checking for it being greater...

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

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 4f9cd1dc4134def13bc628d0ec6efd2f8e6bfb0c..78b9dc7db5ba46b93c02541f59a12f64dc30605c 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -92,7 +92,7 @@
 
 DbList WXDLLEXPORT *PtrBegDbList = 0;
 
 
 DbList WXDLLEXPORT *PtrBegDbList = 0;
 

-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__

        extern wxList TablesInUse;
 #endif
 
        extern wxList TablesInUse;
 #endif
 


@@ -763,7 +763,7 @@ void wxDB::Close(void)
        // There should be zero Ctable objects still connected to this db object
        assert(nTables == 0);
 
        // There should be zero Ctable objects still connected to this db object
        assert(nTables == 0);
 

-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__

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

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 1381c8ff74961b02bc76d525e009566599a6a9bf..51ff59a1a292a7bf41bd4f0a09604f8d3a0d0410 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -95,7 +95,7 @@
 ULONG lastTableID = 0;
 
 
 ULONG lastTableID = 0;
 
 

-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__

        wxList TablesInUse;
 #endif
 
        wxList TablesInUse;
 #endif
 


@@ -144,7 +144,7 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
        tableID = ++lastTableID;
        sprintf(s, "wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb);
 
        tableID = ++lastTableID;
        sprintf(s, "wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb);
 

-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__

        CstructTablesInUse *tableInUse;
        tableInUse = new CstructTablesInUse();
        tableInUse->tableName = tblName;
        CstructTablesInUse *tableInUse;
        tableInUse = new CstructTablesInUse();
        tableInUse->tableName = tblName;


@@ -250,8 +250,7 @@ wxTable::~wxTable()
                pDb->WriteSqlLog(s);
        }
 
                pDb->WriteSqlLog(s);
        }
 

-#ifndef PROGRAM_FP4UPG
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__

        if (tableID)
        {
                bool found = FALSE;
        if (tableID)
        {
                bool found = FALSE;


@@ -276,7 +275,7 @@ wxTable::~wxTable()
                }
        }
 #endif
                }
        }
 #endif

-#endif
+

        // Decrement the wxDB table count
        if (pDb)
                pDb->nTables--;
        // Decrement the wxDB table count
        if (pDb)
                pDb->nTables--;