wxSetlocale() doesn't always return NULL

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

diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index 576ee3a4874817a4cf7ed20fb5721292d452005b..103fdda8afd42ec29b96d1b119d28743d9213115 100644 (file)
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -2,12 +2,12 @@
 // Name:        odbc.cpp
 // Purpose:     ODBC implementation
 // Author:      Julian Smart, Olaf Klein (oklein@smallo.ruhr.de),
-//               Patrick Halke (patrick@zaphod.ruhr.de)
-// Modified by:        
+//              Patrick Halke (patrick@zaphod.ruhr.de)
+// Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -23,9 +23,13 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_ODBC
+// this code is old and shouldn't be used - use the new ODBC classes in db.cpp
+// and dbtable.cpp instead
+#define wxUSE_OLD_ODBC 0
 
-#ifdef _MSC_VER
+#if wxUSE_OLD_ODBC
+
+#ifdef __VISUALC__
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
@@ -443,7 +447,7 @@ float wxDatabase::GetODBCVersionFloat(bool implementation)
   if (retcode == SQL_ERROR)
     return 0.0;
   else
-    return atof(buf);
+    return (float)atof(buf);
 }
 
 /*
@@ -1831,8 +1835,8 @@ bool wxQueryField::IsDirty(void) {
   return dirty;
 }
 
-#ifdef _MSC_VER
+#ifdef __VISUALC__
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 
-#endif // wxUSE_ODBC
+#endif // wxUSE_OLD_ODBC