added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/db.h b/include/wx/db.h
index ecb4f3ab6af410c37f29fd411c7b1dd0db2ad430..1b8e9acdaf2a214e22cbfad5f9e668413b6ea129 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -76,16 +76,11 @@
     #include "sql.h"
     #include "sqlext.h"
     #include "odbcinst.h"
-#elif defined( __VMS )
-    // For OpenVMS use the ones from the library
+#else
+    // Use the ones from the library
     extern "C" {
-        #include <isql.h>
-        #include <isqlext.h>
-    }
-#else // !__VISUALC__, !__VMS
-    extern "C" {
-        #include "wx/isql.h"
-        #include "wx/isqlext.h"
+        #include <sql.h>
+        #include <sqlext.h>
     }
 #endif
 
@@ -128,8 +123,8 @@ enum enumDummy {enumDum1};
 */
 const int wxDB_PATH_MAX                 = 254;
 
-WXDLLEXPORT_DATA(extern wxChar const *) SQL_LOG_FILENAME;
-WXDLLEXPORT_DATA(extern wxChar const *) SQL_CATALOG_FILENAME;
+WXDLLIMPEXP_DATA_BASE(extern wxChar const *) SQL_LOG_FILENAME;
+WXDLLIMPEXP_DATA_BASE(extern wxChar const *) SQL_CATALOG_FILENAME;
 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;
@@ -274,7 +269,7 @@ enum wxODBC_ERRORS
 #define SQL_MAX_AUTHSTR_LEN MAXNAME
 #endif
 
-class WXDLLEXPORT wxDbConnectInf
+class WXDLLIMPEXP_BASE wxDbConnectInf
 {
     private:
         bool freeHenvOnDestroy;
@@ -336,7 +331,7 @@ class WXDLLEXPORT wxDbConnectInf
 };  // class wxDbConnectInf
 
 
-struct WXDLLEXPORT wxDbSqlTypeInfo
+struct WXDLLIMPEXP_BASE wxDbSqlTypeInfo
 {
     wxString    TypeName;
     SWORD       FsqlType;
@@ -347,7 +342,7 @@ struct WXDLLEXPORT wxDbSqlTypeInfo
 };
 
 
-class WXDLLEXPORT wxDbColFor
+class WXDLLIMPEXP_BASE wxDbColFor
 {
 public:
     wxString       s_Field;              // Formated String for Output
@@ -366,7 +361,7 @@ public:
 };
 
 
-class WXDLLEXPORT wxDbColInf
+class WXDLLIMPEXP_BASE wxDbColInf
 {
 public:
     wxChar       catalog[128+1];
@@ -396,7 +391,7 @@ public:
 };
 
 
-class WXDLLEXPORT wxDbTableInf        // Description of a Table
+class WXDLLIMPEXP_BASE wxDbTableInf        // Description of a Table
 {
 public:
     wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];
@@ -412,7 +407,7 @@ public:
 };
 
 
-class WXDLLEXPORT wxDbInf     // Description of a Database
+class WXDLLIMPEXP_BASE wxDbInf     // Description of a Database
 {
 public:
     wxChar        catalog[128+1];
@@ -464,10 +459,11 @@ enum wxDBMS
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.
 
-WXDLLEXPORT_DATA(extern wxChar) DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
+WXDLLIMPEXP_DATA_BASE(extern wxChar)
+    DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 
-class WXDLLEXPORT wxDb
+class WXDLLIMPEXP_BASE wxDb
 {
 private:
     bool             dbIsOpen;
@@ -706,22 +702,24 @@ 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  WXDLLEXPORT *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
-bool  WXDLLEXPORT  wxDbFreeConnection(wxDb *pDb);
-void  WXDLLEXPORT  wxDbCloseConnections(void);
-int   WXDLLEXPORT  wxDbConnectionsInUse(void);
+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);
 
 
 // Writes a message to the wxLog window (stdout usually) when an internal error
 // situation occurs.  This function only works in DEBUG builds
-const wxChar* WXDLLEXPORT wxDbLogExtendedErrorMsg(const wxChar *userText,
-                                                  wxDb *pDb,
-                                                  const wxChar *ErrFile,
-                                                  int ErrLine);
+const wxChar* WXDLLIMPEXP_BASE
+wxDbLogExtendedErrorMsg(const wxChar *userText,
+                        wxDb *pDb,
+                        const wxChar *ErrFile,
+                        int ErrLine);
 
 
 // This function sets the sql log state for all open wxDb objects
-bool  WXDLLEXPORT  wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
+bool WXDLLIMPEXP_BASE
+wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
 
 
 #if 0
@@ -734,8 +732,9 @@ 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 WXDLLEXPORT wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
-                                   SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
+bool WXDLLIMPEXP_BASE
+wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
+                  SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
 
 
 // Change this to 0 to remove use of all deprecated functions
@@ -766,15 +765,18 @@ typedef wxTablesInUse        CstructTablesInUse;
 #endif
 
 // Deprecated function names that are replaced by the function names listed above
-wxDB  WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
-bool  WXDLLEXPORT  FreeDbConnection(wxDB *pDb);
-void  WXDLLEXPORT  CloseDbConnections(void);
-int   WXDLLEXPORT  NumberDbConnectionsInUse(void);
+wxDB  WXDLLIMPEXP_BASE
+*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 SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME);
 
-bool WXDLLEXPORT GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
-                               UWORD direction = SQL_FETCH_NEXT);
+bool WXDLLIMPEXP_BASE
+GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
+              UWORD direction = SQL_FETCH_NEXT);
+
 #endif  // Deprecated structures/classes/functions
 
 #endif // _WX_DB_H_