*** empty log message ***

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

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 6f9c399bff8e144bae49bd7d06a53f3974c42edf..073e09d2523ef49cb822f9e88fa7d1a125cee1e4 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -57,6 +57,7 @@
        #ifndef WX_PRECOMP
                #include  "wx/string.h"
        #endif //WX_PRECOMP
+       #include "wx/filefn.h"
 #endif
 
 #if wxMAJOR_VERSION == 1
@@ -83,9 +84,15 @@
        #include "wx/db.h"
 #endif
 
-DbList* WXDLLEXPORT PtrBegDbList = 0;
+DbList WXDLLEXPORT *PtrBegDbList = 0;
 
 #if __WXDEBUG__ > 0
+        #if   wxMAJOR_VERSION == 2
+                #include "wx/object.h"
+                #include "wx/list.h"
+                #include "wx/utils.h"
+                #include "wx/msgdlg.h"
+       #endif
        extern wxList TablesInUse;
 #endif
 
@@ -767,8 +774,8 @@ void wxDB::Close(void)
                tiu = (CstructTablesInUse *)pNode->Data();
                if (tiu->pDb == this)
                {
-                       sprintf(s, "(%-20s)     tableID:[%6lu]     pDb:[%lu]", tiu->tableName,tiu->tableID,tiu->pDb);
-                       sprintf(s2,"Orphaned found using pDb:[%lu]",this);
+                       sprintf(s, "(%-20s)     tableID:[%6lu]     pDb:[%p]", tiu->tableName,tiu->tableID,tiu->pDb);
+                       sprintf(s2,"Orphaned found using pDb:[%p]",this);
                        wxMessageBox (s,s2);
                }
                pNode = pNode->Next();
@@ -776,7 +783,8 @@ void wxDB::Close(void)
 #endif
 
        // Copy the error messages to a global variable
-       for (int i = 0; i < DB_MAX_ERROR_HISTORY; i++)
+       int i;
+       for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
                strcpy(DBerrorList[i],errorList[i]);
 
 } // wxDB::Close()
@@ -1709,7 +1717,7 @@ DBMS wxDB::Dbms(void)
                return(dbmsMS_SQL_SERVER);
        if (!stricmp(dbInf.dbmsName,"MySQL"))
                return(dbmsMY_SQL);
-       if (!stricmp(dbInf.dbmsName,"PostgresSQL"))  // v6.5.0
+       if (!stricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
                return(dbmsPOSTGRES);
        if (!stricmp(dbInf.dbmsName,"ACCESS"))
                return(dbmsACCESS);
@@ -1721,7 +1729,7 @@ DBMS wxDB::Dbms(void)
 
 
 /********** GetDbConnection() **********/
-wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)
+wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff)
 {
        DbList *pList;