X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e616b1050e4aaa4b8468d82ddf5b85d46412a3c..dd3c394ae4e6f6a0041b69e036d4fdf0a085fe39:/include/wx/db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 190144804d..8d29a834e5 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -45,11 +45,9 @@
 extern "C" {
 #include <../iodbc/isql.h>
 #include <../iodbc/isqlext.h>
-#include <../iodbc/odbc_funcs.h>
-#include <../iodbc/odbc_types.h>
-
-typedef float   SFLOAT;
-typedef double  SDOUBLE;
+typedef float         SFLOAT;
+typedef double        SDOUBLE;
+typedef unsigned int  UINT;
 #define ULONG UDWORD
 
 }
@@ -224,7 +222,7 @@ typedef struct
 	short MaximumScale;
 } SqlTypeInfo;
 
-class CcolInf
+class WXDLLEXPORT CcolInf
 {
 public:
 	char tableName[DB_MAX_TABLE_NAME_LEN+1];
@@ -238,7 +236,7 @@ enum sqlLog
 	sqlLogON
 };
 
-class wxDB
+class WXDLLEXPORT wxDB
 {
 private:
 
@@ -263,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
@@ -365,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