X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e716b9bee14786f7a73da502fbd601c57ce03ebc..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index e27694b66d..68c723b5eb 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -31,10 +31,6 @@
 #define OLD_GETCOLUMNS 1
 #define EXPERIMENTAL_WXDB_FUNCTIONS 1
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "db.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/string.h"
 
@@ -84,11 +80,18 @@
           #endif
         #endif
     #else
+      #if defined( __WXMOTIF__ ) && defined( __VMS )
+       // solves a type definition mismatch between IODBC and MOTIF on OpenVMS
+      #define BOOL int
+      #endif
         #include <sql.h>
         #include <sqlext.h>
         //#if wxUSE_UNICODE
         //    #include <sqlucode.h>
         //#endif
+      #if defined( __WXMOTIF__ ) && defined( __VMS )
+      #undef BOOL
+      #endif
     #endif
     }
 #endif
@@ -162,6 +165,7 @@ const int DB_DATA_TYPE_INTEGER        = 2;
 const int DB_DATA_TYPE_FLOAT          = 3;
 const int DB_DATA_TYPE_DATE           = 4;
 const int DB_DATA_TYPE_BLOB           = 5;
+const int DB_DATA_TYPE_MEMO           = 6;
 
 const int DB_SELECT_KEYFIELDS         = 1;
 const int DB_SELECT_WHERE             = 2;
@@ -380,10 +384,10 @@ struct WXDLLIMPEXP_ODBC wxDbSqlTypeInfo
 class WXDLLIMPEXP_ODBC wxDbColFor
 {
 public:
-    wxString       s_Field;              // Formated String for Output
-    wxString       s_Format[7];          // Formated Objects - TIMESTAMP has the biggest (7)
-    wxString       s_Amount[7];          // Formated Objects - amount of things that can be formatted
-    int            i_Amount[7];          // Formated Objects - TT MM YYYY HH MM SS m
+    wxString       s_Field;              // Formatted String for Output
+    wxString       s_Format[7];          // Formatted Objects - TIMESTAMP has the biggest (7)
+    wxString       s_Amount[7];          // Formatted Objects - amount of things that can be formatted
+    int            i_Amount[7];          // Formatted Objects - TT MM YYYY HH MM SS m
     int            i_Nation;             // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
     int            i_dbDataType;         // conversion of the 'sqlDataType' to the generic data type used by these classes
     SWORD          i_sqlDataType;
@@ -559,6 +563,7 @@ private:
     wxDbSqlTypeInfo typeInfFloat;
     wxDbSqlTypeInfo typeInfDate;
     wxDbSqlTypeInfo typeInfBlob;
+    wxDbSqlTypeInfo typeInfMemo;
 #endif
 
 public:
@@ -698,6 +703,7 @@ public:
     wxDbSqlTypeInfo GetTypeInfFloat()      {return typeInfFloat;}
     wxDbSqlTypeInfo GetTypeInfDate()       {return typeInfDate;}
     wxDbSqlTypeInfo GetTypeInfBlob()       {return typeInfBlob;}
+    wxDbSqlTypeInfo GetTypeInfMemo()       {return typeInfMemo;}
 
     // tableName can refer to a table, view, alias or synonym
     bool         TableExists(const wxString &tableName, const wxChar *userID=NULL,