X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a144affed28cbd6828dfbe8c17b4cac989e7a6b3..7a5e53abb3f9ea13eba2880972306446e4e21e83:/include/wx/dbtable.h diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h index c23c72370d..b29c227731 100644 --- a/include/wx/dbtable.h +++ b/include/wx/dbtable.h @@ -12,12 +12,12 @@ // Notice: This class library and its intellectual design are free of charge for use, // modification, enhancement, debugging under the following conditions: // 1) These classes may only be used as part of the implementation of a -// wxWindows-based application -// 2) All enhancements and bug fixes are to be submitted back to the wxWindows -// user groups free of all charges for use with the wxWindows library. +// wxWidgets-based application +// 2) All enhancements and bug fixes are to be submitted back to the wxWidgets +// user groups free of all charges for use with the wxWidgets library. // 3) These classes may not be distributed as part of any other class library, // DLL, text (written or electronic), other than a complete distribution of -// the wxWindows GUI development toolkit. +// the wxWidgets GUI development toolkit. /////////////////////////////////////////////////////////////////////////////// /* @@ -30,7 +30,7 @@ #include "wx/version.h" -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dbtable.h" #endif @@ -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 WXDLLEXPORT wxDbColDef +class WXDLLIMPEXP_ODBC wxDbColDef { public: wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1]; // Column Name @@ -77,7 +77,7 @@ public: }; // wxDbColDef -class WXDLLEXPORT wxDbColDataPtr +class WXDLLIMPEXP_ODBC wxDbColDataPtr { public: void *PtrDataObj; @@ -87,7 +87,7 @@ public: // This structure is used when creating secondary indexes. -class WXDLLEXPORT wxDbIdxDef +class WXDLLIMPEXP_ODBC wxDbIdxDef { public: wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1]; @@ -95,7 +95,7 @@ public: }; // wxDbIdxDef -class WXDLLEXPORT wxDbTable +class WXDLLIMPEXP_ODBC wxDbTable { private: ULONG tableID; // Used for debugging. This can help to match up mismatched constructors/destructors @@ -109,6 +109,7 @@ private: const wxString &qryTblName, bool qryOnly, const wxString &tblPath); void cleanup(); + void setCbValueForColumn(int columnIndex); bool bindParams(bool forUpdate); // called by the other 'bind' functions bool bindInsertParams(void); bool bindUpdateParams(void); @@ -189,13 +190,13 @@ public: #endif // Public member functions wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns, - const wxString &qryTblName="", bool qryOnly = !wxDB_QUERY_ONLY, - const wxString &tblPath=""); + const wxString &qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY, + const wxString &tblPath=wxEmptyString); // DEPRECATED wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns, - const wxChar *qryTblName="", bool qryOnly = !wxDB_QUERY_ONLY, - const wxString &tblPath=""); + const wxChar *qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY, + const wxString &tblPath=wxEmptyString); virtual ~wxDbTable(); @@ -267,14 +268,14 @@ public: void BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool distinct); void BuildSelectStmt(wxChar *pSqlStmt, int typeOfSelect, bool distinct); - void BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause=""); - void BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause=""); + void BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause=wxEmptyString); + void BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause=wxEmptyString); - void BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxString &pWhereClause=""); - void BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause=""); + void BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxString &pWhereClause=wxEmptyString); + void BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause=wxEmptyString); - void BuildWhereClause(wxString &pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=FALSE); - void BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=FALSE); + void BuildWhereClause(wxString &pWhereClause, int typeOfWhere, const wxString &qualTableName=wxEmptyString, bool useLikeComparison=FALSE); + void BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName=wxEmptyString, bool useLikeComparison=FALSE); #if wxODBC_BACKWARD_COMPATABILITY // The following member functions are deprecated. You should use the BuildXxxxxStmt functions (above) @@ -311,7 +312,7 @@ public: HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE) { return GetNewCursor(setCursor,bindColumns); } #endif - ULONG Count(const wxString &args="*"); + ULONG Count(const wxString &args=_T("*")); int DB_STATUS(void) { return(pDb->DB_STATUS); } bool IsColNull(UWORD colNo) const; @@ -329,8 +330,8 @@ public: //TODO: Need to Document typedef enum { WX_ROW_MODE_QUERY , WX_ROW_MODE_INDIVIDUAL } rowmode_t; virtual void SetRowMode(const rowmode_t rowmode); - virtual wxVariant GetCol(const int Colno) const ; - virtual void SetCol(const int ColNo, const wxVariant value); + virtual wxVariant GetCol(const int colNo) const ; + virtual void SetCol(const int colNo, const wxVariant value); virtual GenericKey GetKey(void); virtual void SetKey(const GenericKey &key);