From 2889677e28f1c9207b1f191f754c94b2d99e40dc Mon Sep 17 00:00:00 2001
From: George Tasker <gtasker@allenbrook.com>
Date: Mon, 14 Mar 2005 14:40:05 +0000
Subject: [PATCH] Fixed unicode builds that were not on MSW Added dbmsFutureX
 to the database enumerations to allow for adding support for new databases
 between releases of wxWidgets

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/db.h | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/include/wx/db.h b/include/wx/db.h
index fe4d25b045..8c05a2aae3 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -65,6 +65,9 @@
     //
     #include "sql.h"
     #include "sqlext.h"
+    //#if wxUSE_UNICODE
+    //    #include <sqlucode.h>
+    //#endif
     #include "odbcinst.h"
 #else
     #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) )
@@ -76,9 +79,16 @@
         // Use the ones from the library
         #include "wx/isql.h"
         #include "wx/isqlext.h"
+        // Not available in v2.x of iODBC
+        #ifndef __WXMSW__
+            typedef wxChar SQLTCHAR;
+        #endif
     #else
         #include <sql.h>
         #include <sqlext.h>
+        //#if wxUSE_UNICODE
+        //    #include <sqlucode.h>
+        //#endif
     #endif
     }
 #endif
@@ -94,11 +104,6 @@ typedef double SDOUBLE;
 typedef unsigned int UINT;
 #define ULONG UDWORD
 
-// Not available in iODBC
-#ifndef __WXMSW__
-typedef UCHAR SQLTCHAR;
-#endif
-
 #ifndef wxODBC_FWD_ONLY_CURSORS
 #define wxODBC_FWD_ONLY_CURSORS 1
 #endif
@@ -461,7 +466,18 @@ enum wxDBMS
     dbmsINTERBASE,
     dbmsPERVASIVE_SQL,
     dbmsXBASE_SEQUITER,
-    dbmsFIREBIRD
+    dbmsFIREBIRD,
+    dbmsMAXDB,
+    dbmsFuture1,
+    dbmsFuture2,
+    dbmsFuture3,
+    dbmsFuture4,
+    dbmsFuture5,
+    dbmsFuture6,
+    dbmsFuture7,
+    dbmsFuture8,
+    dbmsFuture9,
+    dbmsFuture10
 };
 
 
-- 
2.45.2