Renamed FWD_ONLY_CURSORS to wxODBC_FWD_ONLY_CURSORS to avoid conflicts with other...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 91f822b73663b11b1e95f8c8b5b66f09816dd794..a4e1776b9a25962e874deafa2e605e72db44afa9 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -182,7 +182,7 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 
        RETCODE retcode;
 
 
        RETCODE retcode;
 

-#ifndef FWD_ONLY_CURSORS
+#if wxODBC_FWD_ONLY_CURSORS

 
        // Specify that the ODBC cursor library be used, if needed.  This must be
        // specified before the connection is made.
 
        // Specify that the ODBC cursor library be used, if needed.  This must be
        // specified before the connection is made.

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 1ee5fb07eda4dfed86ba1a7123b5368d8fa1b74f..ba8833b035404a2fed3807d87396ced4be9ca90b 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -566,7 +566,8 @@ bool wxTable::getRec(UWORD fetchType)
 {
        RETCODE retcode;
 
 {
        RETCODE retcode;
 

-#ifndef FWD_ONLY_CURSORS
+#if wxODBC_FWD_ONLY_CURSORS
+

        // Fetch the NEXT, PREV, FIRST or LAST record, depending on fetchType
        UDWORD  cRowsFetched;
        UWORD   rowStatus;
        // Fetch the NEXT, PREV, FIRST or LAST record, depending on fetchType
        UDWORD  cRowsFetched;
        UWORD   rowStatus;


@@ -576,8 +577,8 @@ bool wxTable::getRec(UWORD fetchType)
                else
                        return(pDb->DispAllErrors(henv, hdbc, hstmt));
 #else
                else
                        return(pDb->DispAllErrors(henv, hdbc, hstmt));
 #else

-       // Fetch the next record from the record set

 
 

+       // Fetch the next record from the record set

        retcode = SQLFetch(hstmt);
        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
        {
        retcode = SQLFetch(hstmt);
        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
        {