Made wxWindowBase's variables protected again and such.

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

diff --git a/include/wx/db.h b/include/wx/db.h
index de294f32c9799b52559cc1e789f04218626e2127..8d29a834e5f055785becc2bb7a88ee258d758ab8 100644 (file)
--- 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
 
 }
@@ -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