Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

[wxWidgets.git] / include / wx / db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 979f566ae77cf95ed58f61dc8a27054addc6e91f..4faa42317d49efd1ea01869cf37d7839ffb69e69 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -53,7 +53,7 @@
 #include <windows.h>
 #endif
 
-#ifdef _IODBC_
+#ifdef __UNIX__
 #if wxMAJOR_VERSION == 2
        extern "C" {
        #include "../../src/iodbc/isql.h"
@@ -69,19 +69,29 @@
        typedef double SDOUBLE; 
        typedef unsigned int UINT;
        #define ULONG UDWORD
+#elif defined(__WXMAC__)
+       extern "C" {
+       #include "../../src/iodbc/isql.h"
+       #include "../../src/iodbc/isqlext.h"
+       }
+       typedef float SFLOAT; 
+       typedef double SDOUBLE; 
+       typedef unsigned int UINT;
+       #define ULONG UDWORD
 #else  // msw
        #define ODBCVER 0x0250
        #include <sql.h>
        #include <sqlext.h>
 #endif
 
-#ifdef __UNIX__
+#ifdef __UNIX__ 
 #   ifndef strnicmp 
 #      define strnicmp strncasecmp 
 #   endif 
 #   ifndef stricmp 
 #      define stricmp strcasecmp 
 #   endif 
+#elif defined(__WXMAC__)
 #else 
 #   include <io.h> 
 #endif
@@ -428,7 +438,8 @@ struct DbList
 };
 
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
+#include "wx/object.h"
 class CstructTablesInUse : public wxObject
 {
        public:
@@ -442,7 +453,7 @@ class CstructTablesInUse : public wxObject
 // for other code segments to use, or close all of them when the application has
 // completed.
 
-wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff);
+wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff);
 bool  WXDLLEXPORT FreeDbConnection(wxDB *pDb);
 void  WXDLLEXPORT CloseDbConnections(void);
 int   WXDLLEXPORT NumberDbConnectionsInUse(void);