Committing in .

[wxWidgets.git] / src / common / dbtable.cpp

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 3a11833ad83f36188f1602668121a91347031fd7..1113157d9028ab6076be760c361598f033d41673 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -81,6 +81,18 @@
        #include "wx/dbtable.h"
 #endif
 
+#ifdef __MWERKS__
+#ifdef __WXMSW__
+#define stricmp _stricmp
+#define strnicmp _strnicmp
+#else
+int strcasecmp(const char *str_1, const char *str_2) ;
+int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) ;
+#define stricmp strcasecmp
+#define strnicmp strncasecmp
+#endif
+#endif
+
 #ifdef __UNIX__
 // The HPUX preprocessor lines below were commented out on 8/20/97
 // because macros.h currently redefines DEBUG and is unneeded.
@@ -95,7 +107,7 @@
 ULONG lastTableID = 0;
 
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
        wxList TablesInUse;
 #endif
 
@@ -144,7 +156,7 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
        tableID = ++lastTableID;
        sprintf(s, "wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb);
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
        CstructTablesInUse *tableInUse;
        tableInUse = new CstructTablesInUse();
        tableInUse->tableName = tblName;
@@ -250,8 +262,7 @@ wxTable::~wxTable()
                pDb->WriteSqlLog(s);
        }
 
-#ifndef PROGRAM_FP4UPG
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
        if (tableID)
        {
                bool found = FALSE;
@@ -276,7 +287,7 @@ wxTable::~wxTable()
                }
        }
 #endif
-#endif
+
        // Decrement the wxDB table count
        if (pDb)
                pDb->nTables--;
@@ -566,12 +577,15 @@ bool wxTable::getRec(UWORD fetchType)
 {
        RETCODE retcode;
 
-#if wxODBC_FWD_ONLY_CURSORS
+#if !wxODBC_FWD_ONLY_CURSORS
 
        // Fetch the NEXT, PREV, FIRST or LAST record, depending on fetchType
        UDWORD  cRowsFetched;
        UWORD   rowStatus;
-       if ((retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus)) != SQL_SUCCESS)
+
+//     if ((retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus)) != SQL_SUCCESS)
+   retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus);
+   if (retcode  != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
                if (retcode == SQL_NO_DATA_FOUND)
                        return(FALSE);
                else