added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index 79d1f9b9dfddd8d67c793ae42462b2b41d20c348..576ee3a4874817a4cf7ed20fb5721292d452005b 100644 (file)
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -23,7 +23,11 @@
 
 #include "wx/defs.h"
 
-#if USE_ODBC
+#if wxUSE_ODBC
+
+#ifdef _MSC_VER
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
@@ -607,14 +611,14 @@ bool wxRecordSet::GetResultSet(void)
     curcol = cols.Append(name, col1);
     col1->SetName(name);
     col1->SetType(type);
-    col1->SetNullable(nullable);
+    col1->SetNullable((nullable != 0));
 
     wxQueryField *field1 = new wxQueryField;
     fetch = fetchbuf.Append(field1);
     field1->SetType(type);
     field1->SetSize(len);
     
-    SQLBindCol(hStmt, i+1, SQL_C_BINARY, field1->GetData(), field1->GetSize(), &trash);
+    SQLBindCol(hStmt, i+1, SQL_C_BINARY, (unsigned char*)field1->GetData(), field1->GetSize(), &trash);
   }
   
   switch (type) {
@@ -1827,4 +1831,8 @@ bool wxQueryField::IsDirty(void) {
   return dirty;
 }
 
-#endif // USE_ODBC
+#ifdef _MSC_VER
+    #pragma warning(default:4706)   // assignment within conditional expression
+#endif // VC++
+
+#endif // wxUSE_ODBC