Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile problems under MingW32 compiler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-06-12 17:20:10 +00:00
parent 4e5d213ac0
commit dba2120c77
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/db.h
View File

@@ -600,7 +600,7 @@ public:
wxDbColInf *GetColumns(wxChar *tableName[], const wxChar *userID=NULL); wxDbColInf *GetColumns(wxChar *tableName[], const wxChar *userID=NULL);
wxDbColInf *GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID=NULL); wxDbColInf *GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID=NULL);
UWORD GetColumnCount(const wxString &tableName, const wxChar *userID=NULL); int GetColumnCount(const wxString &tableName, const wxChar *userID=NULL);
const wxChar *GetDatabaseName(void) {return dbInf.dbmsName;} const wxChar *GetDatabaseName(void) {return dbInf.dbmsName;}
const wxString &GetDataSource(void) {return dsn;} const wxString &GetDataSource(void) {return dsn;}
const wxString &GetDatasourceName(void){return dsn;} const wxString &GetDatasourceName(void){return dsn;}
@@ -705,7 +705,7 @@ int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString
// the first time using SQL_FETCH_FIRST. Continue to call it // the first time using SQL_FETCH_FIRST. Continue to call it
// using SQL_FETCH_NEXT until you've exhausted the list. // using SQL_FETCH_NEXT until you've exhausted the list.
bool WXDLLEXPORT wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc, bool WXDLLEXPORT wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
SWORD DsDescMax, DWORD direction = SQL_FETCH_NEXT); SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
// Change this to 0 to remove use of all deprecated functions // Change this to 0 to remove use of all deprecated functions

6
src/common/db.cpp
View File

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