X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a144affed28cbd6828dfbe8c17b4cac989e7a6b3..ff8b6290e9b7d0c604c35ca938d87cbd1fd157ed:/src/common/db.cpp?ds=sidebyside

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 57b25f226d..d9ce256f6d 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -53,7 +53,9 @@
     #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"
@@ -1403,7 +1405,7 @@ void wxDb::Close(void)
         {
             s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
             s2.Printf(wxT("Orphaned found using pDb:[%p]"),this);
-            wxLogDebug (s,s2);
+            wxLogDebug (s.c_str(),s2.c_str());
         }
         pNode = pNode->Next();
     }
@@ -2757,7 +2759,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
 
 
 /********** wxDb::GetColumnCount() **********/
-UWORD wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
+int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
 /*
  * Returns a count of how many columns are in a table.
  * If an error occurs in computing the number of columns
@@ -3845,7 +3847,7 @@ int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const
 
 /********** wxDbGetDataSource() **********/
 bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
-                       SWORD DsDescMax, DWORD direction)
+                       SWORD DsDescMax, UWORD direction)
 /*
  * Dsn and DsDesc will contain the data source name and data source
  * description upon return