Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 5e2daec0ad58ad8abbf58222c2ba287959e2b9fe..5d27927e2a2f1425d5fe50295ff91b21683447d8 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -194,7 +194,10 @@ public:
        void  SetColDefs (int index, const char *fieldName, int dataType, void *pData, int cType,
                                                        int size, bool keyField = FALSE, bool upd = TRUE,
                                                        bool insAllow = TRUE, bool derivedCol = FALSE);
        void  SetColDefs (int index, const char *fieldName, int dataType, void *pData, int cType,
                                                        int size, bool keyField = FALSE, bool upd = TRUE,
                                                        bool insAllow = TRUE, bool derivedCol = FALSE);

-       bool    SetColDefs (wxColInf *colInfs, ULONG numCols, wxColDataPtr *pColDataPtrs);
+       // BJO20000121 : new prototype
+       //      bool    SetColDefs (wxColInf *colInfs, ULONG numCols, wxColDataPtr *pColDataPtrs);
+       wxColDataPtr*   SetColDefs (wxColInf *colInfs, ULONG numCols);
+

        HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE);
        bool    DeleteCursor(HSTMT *hstmtDel);
        void    SetCursor(HSTMT *hstmtActivate = (void **) DEFAULT_CURSOR);
        HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE);
        bool    DeleteCursor(HSTMT *hstmtDel);
        void    SetCursor(HSTMT *hstmtActivate = (void **) DEFAULT_CURSOR);