Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved DB classes into wxODBC library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-02 19:14:54 +00:00
parent fd938b1177
commit bb41dcbe3a
53 changed files with 2220 additions and 1204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/wx/db.h
View File

@@ -127,8 +127,8 @@ enum enumDummy {enumDum1};
*/
const int wxDB_PATH_MAX = 254;
WXDLLIMPEXP_DATA_BASE(extern wxChar const *) SQL_LOG_FILENAME;
WXDLLIMPEXP_DATA_BASE(extern wxChar const *) SQL_CATALOG_FILENAME;
WXDLLIMPEXP_DATA_ODBC(extern wxChar const *) SQL_LOG_FILENAME;
WXDLLIMPEXP_DATA_ODBC(extern wxChar const *) SQL_CATALOG_FILENAME;
// Database Globals
const int DB_TYPE_NAME_LEN = 40;
@@ -273,7 +273,7 @@ enum wxODBC_ERRORS
#define SQL_MAX_AUTHSTR_LEN MAXNAME
#endif
class WXDLLIMPEXP_BASE wxDbConnectInf
class WXDLLIMPEXP_ODBC wxDbConnectInf
{
private:
bool freeHenvOnDestroy;
@@ -335,7 +335,7 @@ class WXDLLIMPEXP_BASE wxDbConnectInf
}; // class wxDbConnectInf
struct WXDLLIMPEXP_BASE wxDbSqlTypeInfo
struct WXDLLIMPEXP_ODBC wxDbSqlTypeInfo
{
wxString TypeName;
SWORD FsqlType;
@@ -346,7 +346,7 @@ struct WXDLLIMPEXP_BASE wxDbSqlTypeInfo
};
class WXDLLIMPEXP_BASE wxDbColFor
class WXDLLIMPEXP_ODBC wxDbColFor
{
public:
wxString s_Field; // Formated String for Output
@@ -365,7 +365,7 @@ public:
};
class WXDLLIMPEXP_BASE wxDbColInf
class WXDLLIMPEXP_ODBC wxDbColInf
{
public:
wxChar catalog[128+1];
@@ -395,7 +395,7 @@ public:
};
class WXDLLIMPEXP_BASE wxDbTableInf // Description of a Table
class WXDLLIMPEXP_ODBC wxDbTableInf // Description of a Table
{
public:
wxChar tableName[DB_MAX_TABLE_NAME_LEN+1];
@@ -411,7 +411,7 @@ public:
};
class WXDLLIMPEXP_BASE wxDbInf // Description of a Database
class WXDLLIMPEXP_ODBC wxDbInf // Description of a Database
{
public:
wxChar catalog[128+1];
@@ -467,7 +467,7 @@ WXDLLIMPEXP_DATA_BASE(extern wxChar)
DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
class WXDLLIMPEXP_BASE wxDb
class WXDLLIMPEXP_ODBC wxDb
{
private:
bool dbIsOpen;
@@ -706,15 +706,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.
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);
wxDb WXDLLIMPEXP_ODBC *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
bool WXDLLIMPEXP_ODBC wxDbFreeConnection(wxDb *pDb);
void WXDLLIMPEXP_ODBC wxDbCloseConnections(void);
int WXDLLIMPEXP_ODBC 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* WXDLLIMPEXP_BASE
const wxChar* WXDLLIMPEXP_ODBC
wxDbLogExtendedErrorMsg(const wxChar *userText,
wxDb *pDb,
const wxChar *ErrFile,
@@ -722,7 +722,7 @@ wxDbLogExtendedErrorMsg(const wxChar *userText,
// This function sets the sql log state for all open wxDb objects
bool WXDLLIMPEXP_BASE
bool WXDLLIMPEXP_ODBC
wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
@@ -736,7 +736,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.
bool WXDLLIMPEXP_BASE
bool WXDLLIMPEXP_ODBC
wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
@@ -769,15 +769,15 @@ typedef wxTablesInUse CstructTablesInUse;
#endif
// Deprecated function names that are replaced by the function names listed above
wxDB WXDLLIMPEXP_BASE
wxDB WXDLLIMPEXP_ODBC
*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 WXDLLIMPEXP_ODBC FreeDbConnection(wxDB *pDb);
void WXDLLIMPEXP_ODBC CloseDbConnections(void);
int WXDLLIMPEXP_ODBC NumberDbConnectionsInUse(void);
bool SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME);
bool WXDLLIMPEXP_BASE
bool WXDLLIMPEXP_ODBC
GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
UWORD direction = SQL_FETCH_NEXT);

8
include/wx/dbgrid.h
View File

@@ -33,7 +33,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray);
static const int wxUSE_QUERY = -1;
class WXDLLIMPEXP_ADV wxDbGridColInfoBase
class WXDLLIMPEXP_ODBC wxDbGridColInfoBase
{
public:
//Default ctor
@@ -60,7 +60,7 @@ public:
};
class WXDLLIMPEXP_ADV wxDbGridColInfo
class WXDLLIMPEXP_ODBC wxDbGridColInfo
{
public:
wxDbGridColInfo(int colNo,
@@ -98,7 +98,7 @@ public:
};
class WXDLLIMPEXP_ADV wxDbGridCellAttrProvider : public wxGridCellAttrProvider
class WXDLLIMPEXP_ODBC wxDbGridCellAttrProvider : public wxGridCellAttrProvider
{
public:
wxDbGridCellAttrProvider();
@@ -114,7 +114,7 @@ private:
};
class WXDLLIMPEXP_ADV wxDbGridTableBase : public wxGridTableBase
class WXDLLIMPEXP_ODBC wxDbGridTableBase : public wxGridTableBase
{
public:
wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,

8
include/wx/dbtable.h
View File

@@ -56,7 +56,7 @@ const int wxDB_NO_MORE_COLUMN_NUMBERS = -1;
// wxDbTable class which allows it to create a table in the data
// source, exchange data between the data source and the C++
// object, and so on.
class WXDLLIMPEXP_BASE wxDbColDef
class WXDLLIMPEXP_ODBC wxDbColDef
{
public:
wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1]; // Column Name
@@ -77,7 +77,7 @@ public:
}; // wxDbColDef
class WXDLLIMPEXP_BASE wxDbColDataPtr
class WXDLLIMPEXP_ODBC wxDbColDataPtr
{
public:
void *PtrDataObj;
@@ -87,7 +87,7 @@ public:
// This structure is used when creating secondary indexes.
class WXDLLIMPEXP_BASE wxDbIdxDef
class WXDLLIMPEXP_ODBC wxDbIdxDef
{
public:
wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1];
@@ -95,7 +95,7 @@ public:
}; // wxDbIdxDef
class WXDLLIMPEXP_BASE wxDbTable
class WXDLLIMPEXP_ODBC wxDbTable
{
private:
ULONG tableID; // Used for debugging. This can help to match up mismatched constructors/destructors

12
include/wx/defs.h
View File

@@ -400,6 +400,7 @@ typedef int wxWindowID;
#define WXMAKINGDLL_NET
#define WXMAKINGDLL_CORE
#define WXMAKINGDLL_ADV
#define WXMAKINGDLL_ODBC
#define WXMAKINGDLL_HTML
#define WXMAKINGDLL_XML
#endif // WXMAKINGDLL
@@ -450,6 +451,17 @@ typedef int wxWindowID;
#define WXDLLIMPEXP_DATA_ADV(type) type
#endif
#ifdef WXMAKINGDLL_ODBC
#define WXDLLIMPEXP_ODBC WXEXPORT
#define WXDLLIMPEXP_DATA_ODBC(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_ODBC WXIMPORT
#define WXDLLIMPEXP_DATA_ODBC(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_ODBC
#define WXDLLIMPEXP_DATA_ODBC(type) type
#endif
#ifdef WXMAKINGDLL_HTML
#define WXDLLIMPEXP_HTML WXEXPORT
#define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type