X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9b6d7964db3e5bdbf81f1469bf757c8f912ac75..bc55323bc3be2d9bd668bd5887b673d0f26c8212:/src/common/dbtable.cpp

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 03cedf85f3..56a496d843 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -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.
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -443,7 +443,7 @@ void wxDbTable::setCbValueForColumn(int columnIndex)
                 colDefs[columnIndex].CbValue = SQL_NULL_DATA;
             else
                 if (colDefs[columnIndex].SqlCtype == SQL_C_CHAR)
-                    colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(0);
+                    colDefs[columnIndex].CbValue = SQL_NTS;
                 else
                     colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);
             break;
@@ -1326,7 +1326,7 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
                         wxString strMsg;
                         strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
                                     colNo,colDefs[colNo].ColName);
-                        wxFAIL_MSG(wxT(strMsg));
+                        wxFAIL_MSG(strMsg.c_str());
                     }
                     break;
             }