Applied patch [ 758687 ] RegisterHotkey implemented

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

diff --git a/include/wx/db.h b/include/wx/db.h
index dfe2ca17b6dbe05e90d842966caf8979df68b932..1b8e9acdaf2a214e22cbfad5f9e668413b6ea129 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -123,8 +123,8 @@ enum enumDummy {enumDum1};
 */
 const int wxDB_PATH_MAX                 = 254;
 
 */
 const int wxDB_PATH_MAX                 = 254;
 

-WXDLLEXPORT_DATA_BASE(extern wxChar const *) SQL_LOG_FILENAME;
-WXDLLEXPORT_DATA_BASE(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;
 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;


@@ -269,7 +269,7 @@ enum wxODBC_ERRORS
 #define SQL_MAX_AUTHSTR_LEN MAXNAME
 #endif
 
 #define SQL_MAX_AUTHSTR_LEN MAXNAME
 #endif
 

-class WXDLLEXPORT_BASE wxDbConnectInf
+class WXDLLIMPEXP_BASE wxDbConnectInf

 {
     private:
         bool freeHenvOnDestroy;
 {
     private:
         bool freeHenvOnDestroy;


@@ -331,7 +331,7 @@ class WXDLLEXPORT_BASE wxDbConnectInf
 };  // class wxDbConnectInf
 
 
 };  // class wxDbConnectInf
 
 

-struct WXDLLEXPORT_BASE wxDbSqlTypeInfo
+struct WXDLLIMPEXP_BASE wxDbSqlTypeInfo

 {
     wxString    TypeName;
     SWORD       FsqlType;
 {
     wxString    TypeName;
     SWORD       FsqlType;


@@ -342,7 +342,7 @@ struct WXDLLEXPORT_BASE wxDbSqlTypeInfo
 };
 
 
 };
 
 

-class WXDLLEXPORT_BASE wxDbColFor
+class WXDLLIMPEXP_BASE wxDbColFor

 {
 public:
     wxString       s_Field;              // Formated String for Output
 {
 public:
     wxString       s_Field;              // Formated String for Output


@@ -361,7 +361,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT_BASE wxDbColInf
+class WXDLLIMPEXP_BASE wxDbColInf

 {
 public:
     wxChar       catalog[128+1];
 {
 public:
     wxChar       catalog[128+1];


@@ -391,7 +391,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT_BASE wxDbTableInf        // Description of a Table
+class WXDLLIMPEXP_BASE wxDbTableInf        // Description of a Table

 {
 public:
     wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];
 {
 public:
     wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];


@@ -407,7 +407,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT_BASE wxDbInf     // Description of a Database
+class WXDLLIMPEXP_BASE wxDbInf     // Description of a Database

 {
 public:
     wxChar        catalog[128+1];
 {
 public:
     wxChar        catalog[128+1];


@@ -459,11 +459,11 @@ enum wxDBMS
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.
 
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.
 

-WXDLLEXPORT_DATA_BASE(extern wxChar)
+WXDLLIMPEXP_DATA_BASE(extern wxChar)

     DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 
     DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 

-class WXDLLEXPORT_BASE wxDb
+class WXDLLIMPEXP_BASE wxDb

 {
 private:
     bool             dbIsOpen;
 {
 private:
     bool             dbIsOpen;


@@ -702,15 +702,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.
 // 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_BASE *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
-bool  WXDLLEXPORT_BASE  wxDbFreeConnection(wxDb *pDb);
-void  WXDLLEXPORT_BASE  wxDbCloseConnections(void);
-int   WXDLLEXPORT_BASE  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
 
 
 // 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_BASE
+const wxChar* WXDLLIMPEXP_BASE

 wxDbLogExtendedErrorMsg(const wxChar *userText,
                         wxDb *pDb,
                         const wxChar *ErrFile,
 wxDbLogExtendedErrorMsg(const wxChar *userText,
                         wxDb *pDb,
                         const wxChar *ErrFile,


@@ -718,7 +718,7 @@ wxDbLogExtendedErrorMsg(const wxChar *userText,
 
 
 // This function sets the sql log state for all open wxDb objects
 
 
 // This function sets the sql log state for all open wxDb objects

-bool WXDLLEXPORT_BASE
+bool WXDLLIMPEXP_BASE

 wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
 
 
 wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
 
 


@@ -732,7 +732,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.
 // 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_BASE
+bool WXDLLIMPEXP_BASE

 wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
                   SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
 
 wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
                   SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
 


@@ -765,15 +765,15 @@ typedef wxTablesInUse        CstructTablesInUse;
 #endif
 
 // Deprecated function names that are replaced by the function names listed above
 #endif
 
 // Deprecated function names that are replaced by the function names listed above

-wxDB  WXDLLEXPORT_BASE
+wxDB  WXDLLIMPEXP_BASE

 *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
 *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);

-bool  WXDLLEXPORT_BASE  FreeDbConnection(wxDB *pDb);
-void  WXDLLEXPORT_BASE  CloseDbConnections(void);
-int   WXDLLEXPORT_BASE  NumberDbConnectionsInUse(void);
+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 SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME);
 

-bool WXDLLEXPORT_BASE
+bool WXDLLIMPEXP_BASE

 GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
               UWORD direction = SQL_FETCH_NEXT);
 
 GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
               UWORD direction = SQL_FETCH_NEXT);