X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc5dd6f8eb590992150b3998266fb50dfaab227..764a3a49068a94d1edb96f299b10c155d101c1b0:/include/wx/db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 25edff65da..8d29a834e5 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -39,56 +39,73 @@
 #include <windows.h>
 #endif
 
+
+#ifdef __WXGTK__
+
+extern "C" {
+#include <../iodbc/isql.h>
+#include <../iodbc/isqlext.h>
+typedef float         SFLOAT;
+typedef double        SDOUBLE;
+typedef unsigned int  UINT;
+#define ULONG UDWORD
+
+}
+
+#else
+
 #define ODBCVER 0x0250
 #include <sql.h>
 #include <sqlext.h>
 
+#endif
+
 enum		enumDummy		{enumDum1};
 
 #define SQL_C_BOOLEAN (sizeof(int) == 2 ? SQL_C_USHORT : SQL_C_ULONG)
 #define SQL_C_ENUM (sizeof(enumDummy) == 2 ? SQL_C_USHORT : SQL_C_ULONG)    //glt 2-21-97
 
 // Database Globals
-const DB_TYPE_NAME_LEN						= 40;
-const DB_MAX_STATEMENT_LEN					= 2048;
-const DB_MAX_WHERE_CLAUSE_LEN				= 1024;
-const DB_MAX_ERROR_MSG_LEN					= 512;
-const DB_MAX_ERROR_HISTORY					= 5;
-const DB_MAX_TABLE_NAME_LEN				= 128;
-const DB_MAX_COLUMN_NAME_LEN				= 128;
-
-const DB_DATA_TYPE_VARCHAR					= 1;
-const DB_DATA_TYPE_INTEGER					= 2;
-const DB_DATA_TYPE_FLOAT					= 3;
-const	DB_DATA_TYPE_DATE						= 4;
-
-const DB_SELECT_KEYFIELDS					= 1;
-const DB_SELECT_WHERE						= 2;
-const DB_SELECT_MATCHING					= 3;
-const DB_SELECT_STATEMENT					= 4;
-
-const DB_UPD_KEYFIELDS						= 1;
-const DB_UPD_WHERE							= 2;
-
-const DB_DEL_KEYFIELDS						= 1;
-const DB_DEL_WHERE							= 2;
-const DB_DEL_MATCHING						= 3;
-
-const DB_WHERE_KEYFIELDS					= 1;
-const DB_WHERE_MATCHING						= 2;
-
-const DB_CURSOR0								= 0;
-const DB_CURSOR1								= 1;
-const DB_CURSOR2								= 2;
-//const DB_CURSOR3							= 3;
-//const DB_CURSOR4							= 4;
-//const DB_CURSOR5							= 5;
-
-const DB_GRANT_SELECT						= 1;
-const DB_GRANT_INSERT						= 2;
-const DB_GRANT_UPDATE						= 4;
-const DB_GRANT_DELETE						= 8;
-const DB_GRANT_ALL							= DB_GRANT_SELECT | DB_GRANT_INSERT | DB_GRANT_UPDATE | DB_GRANT_DELETE;
+const int DB_TYPE_NAME_LEN						= 40;
+const int DB_MAX_STATEMENT_LEN					= 2048;
+const int DB_MAX_WHERE_CLAUSE_LEN				= 1024;
+const int DB_MAX_ERROR_MSG_LEN					= 512;
+const int DB_MAX_ERROR_HISTORY					= 5;
+const int DB_MAX_TABLE_NAME_LEN				= 128;
+const int DB_MAX_COLUMN_NAME_LEN				= 128;
+
+const int DB_DATA_TYPE_VARCHAR					= 1;
+const int DB_DATA_TYPE_INTEGER					= 2;
+const int DB_DATA_TYPE_FLOAT					= 3;
+const int DB_DATA_TYPE_DATE						= 4;
+
+const int DB_SELECT_KEYFIELDS					= 1;
+const int DB_SELECT_WHERE						= 2;
+const int DB_SELECT_MATCHING					= 3;
+const int DB_SELECT_STATEMENT					= 4;
+
+const int DB_UPD_KEYFIELDS						= 1;
+const int DB_UPD_WHERE							= 2;
+
+const int DB_DEL_KEYFIELDS						= 1;
+const int DB_DEL_WHERE							= 2;
+const int DB_DEL_MATCHING						= 3;
+
+const int DB_WHERE_KEYFIELDS					= 1;
+const int DB_WHERE_MATCHING						= 2;
+
+const int DB_CURSOR0								= 0;
+const int DB_CURSOR1								= 1;
+const int DB_CURSOR2								= 2;
+//const int DB_CURSOR3							= 3;
+//const int DB_CURSOR4							= 4;
+//const int DB_CURSOR5							= 5;
+
+const int DB_GRANT_SELECT						= 1;
+const int DB_GRANT_INSERT						= 2;
+const int DB_GRANT_UPDATE						= 4;
+const int DB_GRANT_DELETE						= 8;
+const int DB_GRANT_ALL							= DB_GRANT_SELECT | DB_GRANT_INSERT | DB_GRANT_UPDATE | DB_GRANT_DELETE;
 
 // ODBC Error codes (derived from ODBC SqlState codes)
 enum ODBC_ERRORS
@@ -205,7 +222,7 @@ typedef struct
 	short MaximumScale;
 } SqlTypeInfo;
 
-class CcolInf
+class WXDLLEXPORT CcolInf
 {
 public:
 	char tableName[DB_MAX_TABLE_NAME_LEN+1];
@@ -219,7 +236,7 @@ enum sqlLog
 	sqlLogON
 };
 
-class wxDB
+class WXDLLEXPORT wxDB
 {
 private:
 
@@ -244,12 +261,12 @@ public:
 	struct
 	{
 		char   dbmsName[40];								// Name of the dbms product
-		char   dbmsVer[20];								// Version # of the dbms product
+		char   dbmsVer[40];								// Version # of the dbms product
 		char   driverName[40];							// Driver name
-		char   odbcVer[20];								// ODBC version of the driver
-		char   drvMgrOdbcVer[20];						// ODBC version of the driver manager
-		char   driverVer[40];							// Driver version
-		char   serverName[40];							// Server Name, typically a connect string
+		char   odbcVer[60];								// ODBC version of the driver
+		char   drvMgrOdbcVer[60];						// ODBC version of the driver manager
+		char   driverVer[60];							// Driver version
+		char   serverName[80];							// Server Name, typically a connect string
 		char	 databaseName[128];						// Database filename
 		char   outerJoins[2];							// Indicates whether the data source supports outer joins
 		char	 procedureSupport[2];					// Indicates whether the data source supports stored procedures
@@ -346,16 +363,16 @@ struct DbList
 // for other code segments to use, or close all of them when the application has
 // completed.
 
-wxDB  *GetDbConnection(DbStuff *pDbStuff);
-bool  FreeDbConnection(wxDB *pDb);
-void  CloseDbConnections(void);
-int	NumberDbConnectionsInUse(void);
+wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff);
+bool  WXDLLEXPORT FreeDbConnection(wxDB *pDb);
+void  WXDLLEXPORT CloseDbConnections(void);
+int   WXDLLEXPORT NumberDbConnectionsInUse(void);
 
 // This routine allows you to query a driver manager
 // 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 GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
+bool WXDLLEXPORT GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
 						 UWORD direction = SQL_FETCH_NEXT);
 
 #endif