applied patch 430452 (mingw32 compilation fixes)

[wxWidgets.git] / include / wx / db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 0248829126e724cedb1da86075ec58021f894ae4..84c8a3a9f7c921705577563797df929b12e8a5ed 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -280,10 +280,10 @@ class WXDLLEXPORT wxDbConnectInf
         bool freeHenvOnDestroy;
 
     public:
         bool freeHenvOnDestroy;
 
     public:

-           HENV Henv;
-           wxChar Dsn[SQL_MAX_DSN_LENGTH+1];                  // Data Source Name
-           wxChar Uid[SQL_MAX_USER_NAME_LEN+1];               // User ID
-           wxChar AuthStr[SQL_MAX_AUTHSTR_LEN+1];             // Authorization string (password)
+        HENV Henv;
+        wxChar Dsn[SQL_MAX_DSN_LENGTH+1];                  // Data Source Name
+        wxChar Uid[SQL_MAX_USER_NAME_LEN+1];               // User ID
+        wxChar AuthStr[SQL_MAX_AUTHSTR_LEN+1];             // Authorization string (password)

 
         wxString Description;                              // Not sure what the max length is
         wxString FileType;                                 // Not sure what the max length is
 
         wxString Description;                              // Not sure what the max length is
         wxString FileType;                                 // Not sure what the max length is


@@ -339,7 +339,7 @@ class WXDLLEXPORT wxDbConnectInf
 struct WXDLLEXPORT wxDbSqlTypeInfo
 {
     wxString    TypeName;
 struct WXDLLEXPORT wxDbSqlTypeInfo
 {
     wxString    TypeName;

-    int         FsqlType;
+    SWORD       FsqlType;

     long        Precision;
     short       CaseSensitive;
 //    short     MinimumScale;
     long        Precision;
     short       CaseSensitive;
 //    short     MinimumScale;


@@ -404,7 +404,7 @@ public:
     wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];
     wxChar      tableType[254+1];           // "TABLE" or "SYSTEM TABLE" etc.
     wxChar      tableRemarks[254+1];
     wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];
     wxChar      tableType[254+1];           // "TABLE" or "SYSTEM TABLE" etc.
     wxChar      tableRemarks[254+1];

-    int         numCols;                    // How many Columns does this Table have: GetColumnCount(..);
+    UWORD       numCols;                    // How many Columns does this Table have: GetColumnCount(..);

     wxDbColInf *pColInf;                    // pColInf = NULL ; User can later call GetColumns(..);
 
     wxDbTableInf();
     wxDbColInf *pColInf;                    // pColInf = NULL ; User can later call GetColumns(..);
 
     wxDbTableInf();


@@ -452,7 +452,8 @@ enum wxDBMS
     dbmsINFORMIX,
     dbmsVIRTUOSO,
     dbmsDB2,
     dbmsINFORMIX,
     dbmsVIRTUOSO,
     dbmsDB2,

-    dbmsINTERBASE
+    dbmsINTERBASE,
+    dbmsPERVASIVE_SQL

 };
 
 
 };
 
 


@@ -609,12 +610,12 @@ public:
     int          TranslateSqlState(const wxString &SQLState);
     wxDbInf     *GetCatalog(const wxChar *userID=NULL);
     bool         Catalog(const wxChar *userID=NULL, const wxString &fileName=SQL_CATALOG_FILENAME);
     int          TranslateSqlState(const wxString &SQLState);
     wxDbInf     *GetCatalog(const wxChar *userID=NULL);
     bool         Catalog(const wxChar *userID=NULL, const wxString &fileName=SQL_CATALOG_FILENAME);

-    int          GetKeyFields(const wxString &tableName, wxDbColInf* colInf, int nocols);
+    int          GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCols);

 
     wxDbColInf  *GetColumns(wxChar *tableName[], const wxChar *userID=NULL);
 
     wxDbColInf  *GetColumns(wxChar *tableName[], const wxChar *userID=NULL);

-    wxDbColInf  *GetColumns(const wxString &tableName, int *numCols, const wxChar *userID=NULL); 
+    wxDbColInf  *GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID=NULL); 

 
 

-    int             GetColumnCount(const wxString &tableName, const wxChar *userID=NULL);
+    UWORD           GetColumnCount(const wxString &tableName, const wxChar *userID=NULL);

     const wxChar   *GetDatabaseName(void)  {return dbInf.dbmsName;}
     const wxString &GetDataSource(void)    {return dsn;}
     const wxString &GetDatasourceName(void){return dsn;}
     const wxChar   *GetDatabaseName(void)  {return dbInf.dbmsName;}
     const wxString &GetDataSource(void)    {return dsn;}
     const wxString &GetDatasourceName(void){return dsn;}