X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..4c68a10264347cc04b1a6634000595f160792231:/include/wx/db.h?ds=sidebyside diff --git a/include/wx/db.h b/include/wx/db.h index 1b8e9acdaf..58843cf23e 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -43,7 +43,7 @@ #include "wx/version.h" -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "db.h" #endif @@ -52,7 +52,7 @@ #include "wx/defs.h" #include "wx/string.h" -#ifdef __VISUALC__ +#if defined(__VISUALC__) // we need to include standard Windows headers but we can't include // directly when using MFC because it includes it itself in a // different manner @@ -77,10 +77,19 @@ #include "sqlext.h" #include "odbcinst.h" #else - // Use the ones from the library + #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) ) + #include + #include "wx/msw/winundef.h" + #endif extern "C" { + #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC + // Use the ones from the library + #include "wx/isql.h" + #include "wx/isqlext.h" + #else #include #include + #endif } #endif @@ -90,6 +99,11 @@ typedef double SDOUBLE; typedef unsigned int UINT; #define ULONG UDWORD +// Not available in iODBC +#ifndef __WXMSW__ +typedef UCHAR SQLTCHAR; +#endif + #ifndef wxODBC_FWD_ONLY_CURSORS #define wxODBC_FWD_ONLY_CURSORS 1 #endif @@ -123,8 +137,8 @@ enum enumDummy {enumDum1}; */ const int wxDB_PATH_MAX = 254; -WXDLLIMPEXP_DATA_BASE(extern wxChar const *) SQL_LOG_FILENAME; -WXDLLIMPEXP_DATA_BASE(extern wxChar const *) SQL_CATALOG_FILENAME; +WXDLLIMPEXP_DATA_ODBC(extern wxChar const *) SQL_LOG_FILENAME; +WXDLLIMPEXP_DATA_ODBC(extern wxChar const *) SQL_CATALOG_FILENAME; // Database Globals const int DB_TYPE_NAME_LEN = 40; @@ -269,7 +283,7 @@ enum wxODBC_ERRORS #define SQL_MAX_AUTHSTR_LEN MAXNAME #endif -class WXDLLIMPEXP_BASE wxDbConnectInf +class WXDLLIMPEXP_ODBC wxDbConnectInf { private: bool freeHenvOnDestroy; @@ -331,7 +345,7 @@ class WXDLLIMPEXP_BASE wxDbConnectInf }; // class wxDbConnectInf -struct WXDLLIMPEXP_BASE wxDbSqlTypeInfo +struct WXDLLIMPEXP_ODBC wxDbSqlTypeInfo { wxString TypeName; SWORD FsqlType; @@ -342,7 +356,7 @@ struct WXDLLIMPEXP_BASE wxDbSqlTypeInfo }; -class WXDLLIMPEXP_BASE wxDbColFor +class WXDLLIMPEXP_ODBC wxDbColFor { public: wxString s_Field; // Formated String for Output @@ -361,7 +375,7 @@ public: }; -class WXDLLIMPEXP_BASE wxDbColInf +class WXDLLIMPEXP_ODBC wxDbColInf { public: wxChar catalog[128+1]; @@ -391,7 +405,7 @@ public: }; -class WXDLLIMPEXP_BASE wxDbTableInf // Description of a Table +class WXDLLIMPEXP_ODBC wxDbTableInf // Description of a Table { public: wxChar tableName[DB_MAX_TABLE_NAME_LEN+1]; @@ -407,7 +421,7 @@ public: }; -class WXDLLIMPEXP_BASE wxDbInf // Description of a Database +class WXDLLIMPEXP_ODBC wxDbInf // Description of a Database { public: wxChar catalog[128+1]; @@ -463,7 +477,7 @@ WXDLLIMPEXP_DATA_BASE(extern wxChar) DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; -class WXDLLIMPEXP_BASE wxDb +class WXDLLIMPEXP_ODBC wxDb { private: bool dbIsOpen; @@ -477,7 +491,7 @@ private: wxDBMS dbmsType; // Type of datasource - i.e. Oracle, dBase, SQLServer, etc // Private member functions - bool getDbInfo(void); + bool getDbInfo(bool failOnDataTypeUnsupported = TRUE); bool getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo); bool setConnectionOptions(void); void logError(const wxString &errMsg, const wxString &SQLState); @@ -702,15 +716,15 @@ class wxTablesInUse : public wxObject // The following routines allow a user to get new database connections, free them // for other code segments to use, or close all of them when the application has // completed. -wxDb WXDLLIMPEXP_BASE *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS); -bool WXDLLIMPEXP_BASE wxDbFreeConnection(wxDb *pDb); -void WXDLLIMPEXP_BASE wxDbCloseConnections(void); -int WXDLLIMPEXP_BASE wxDbConnectionsInUse(void); +wxDb WXDLLIMPEXP_ODBC *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS); +bool WXDLLIMPEXP_ODBC wxDbFreeConnection(wxDb *pDb); +void WXDLLIMPEXP_ODBC wxDbCloseConnections(void); +int WXDLLIMPEXP_ODBC wxDbConnectionsInUse(void); // Writes a message to the wxLog window (stdout usually) when an internal error // situation occurs. This function only works in DEBUG builds -const wxChar* WXDLLIMPEXP_BASE +const wxChar WXDLLIMPEXP_ODBC * wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb, const wxChar *ErrFile, @@ -718,7 +732,7 @@ wxDbLogExtendedErrorMsg(const wxChar *userText, // This function sets the sql log state for all open wxDb objects -bool WXDLLIMPEXP_BASE +bool WXDLLIMPEXP_ODBC wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME); @@ -732,7 +746,7 @@ int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString // for a list of available datasources. Call this routine // the first time using SQL_FETCH_FIRST. Continue to call it // using SQL_FETCH_NEXT until you've exhausted the list. -bool WXDLLIMPEXP_BASE +bool WXDLLIMPEXP_ODBC wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc, SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT); @@ -765,15 +779,15 @@ typedef wxTablesInUse CstructTablesInUse; #endif // Deprecated function names that are replaced by the function names listed above -wxDB WXDLLIMPEXP_BASE +wxDB WXDLLIMPEXP_ODBC *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS); -bool WXDLLIMPEXP_BASE FreeDbConnection(wxDB *pDb); -void WXDLLIMPEXP_BASE CloseDbConnections(void); -int WXDLLIMPEXP_BASE NumberDbConnectionsInUse(void); +bool WXDLLIMPEXP_ODBC FreeDbConnection(wxDB *pDb); +void WXDLLIMPEXP_ODBC CloseDbConnections(void); +int WXDLLIMPEXP_ODBC NumberDbConnectionsInUse(void); bool SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME); -bool WXDLLIMPEXP_BASE +bool WXDLLIMPEXP_ODBC GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);