Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -773,7 +773,7 @@ bool wxDb::Open(const wxString& inConnectStr, bool failOnDataTypeUnsupported)
|
|||||||
inConnectionStr = inConnectStr;
|
inConnectionStr = inConnectStr;
|
||||||
|
|
||||||
retcode = SQLDriverConnect(hdbc, NULL, (SQLTCHAR FAR *)inConnectionStr.c_str(),
|
retcode = SQLDriverConnect(hdbc, NULL, (SQLTCHAR FAR *)inConnectionStr.c_str(),
|
||||||
inConnectionStr.Length(), (SQLTCHAR FAR *)outConnectBuffer,
|
(SWORD)inConnectionStr.Length(), (SQLTCHAR FAR *)outConnectBuffer,
|
||||||
sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE );
|
sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE );
|
||||||
|
|
||||||
if ((retcode != SQL_SUCCESS) &&
|
if ((retcode != SQL_SUCCESS) &&
|
||||||
@@ -878,7 +878,7 @@ bool wxDb::Open(wxDb *copyDb)
|
|||||||
inConnectionStr = copyDb->GetConnectionInStr();
|
inConnectionStr = copyDb->GetConnectionInStr();
|
||||||
|
|
||||||
retcode = SQLDriverConnect(hdbc, NULL, (SQLTCHAR FAR *)inConnectionStr.c_str(),
|
retcode = SQLDriverConnect(hdbc, NULL, (SQLTCHAR FAR *)inConnectionStr.c_str(),
|
||||||
inConnectionStr.Length(), (SQLTCHAR FAR *)outConnectBuffer,
|
(SWORD)inConnectionStr.Length(), (SQLTCHAR FAR *)outConnectBuffer,
|
||||||
sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE);
|
sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE);
|
||||||
|
|
||||||
if ((retcode != SQL_SUCCESS) &&
|
if ((retcode != SQL_SUCCESS) &&
|
||||||
@@ -2191,7 +2191,7 @@ int wxDb::GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCo
|
|||||||
{
|
{
|
||||||
wxChar szPkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Primary key table name */
|
wxChar szPkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Primary key table name */
|
||||||
wxChar szFkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Foreign key table name */
|
wxChar szFkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Foreign key table name */
|
||||||
short iKeySeq;
|
SWORD iKeySeq;
|
||||||
// SQLSMALLINT iKeySeq;
|
// SQLSMALLINT iKeySeq;
|
||||||
wxChar szPkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Primary key column */
|
wxChar szPkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Primary key column */
|
||||||
wxChar szFkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Foreign key column */
|
wxChar szFkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Foreign key column */
|
||||||
@@ -3201,7 +3201,7 @@ wxDbInf *wxDb::GetCatalog(const wxChar *userID)
|
|||||||
// Query how many columns are in each table
|
// Query how many columns are in each table
|
||||||
for (noTab=0;noTab<pDbInf->numTables;noTab++)
|
for (noTab=0;noTab<pDbInf->numTables;noTab++)
|
||||||
{
|
{
|
||||||
(pDbInf->pTableInf+noTab)->numCols = GetColumnCount((pDbInf->pTableInf+noTab)->tableName,UserID);
|
(pDbInf->pTableInf+noTab)->numCols = (UWORD)GetColumnCount((pDbInf->pTableInf+noTab)->tableName,UserID);
|
||||||
}
|
}
|
||||||
|
|
||||||
return pDbInf;
|
return pDbInf;
|
||||||
|
Reference in New Issue
Block a user