wxWindow::GetBestSize() added

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

diff --git a/include/wx/db.h b/include/wx/db.h
index 200fec58b406b3af68217569b582f89fcb98db01..4faa42317d49efd1ea01869cf37d7839ffb69e69 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -69,25 +69,31 @@
        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
 
-#if wxMAJOR_VERSION == 2
-       #include "utils.h"
-#else
-       #ifdef __UNIX__
-       #   ifndef strnicmp 
-       #      define strnicmp strncasecmp 
-       #   endif 
-       #   ifndef stricmp 
-       #      define stricmp strcasecmp 
-       #   endif 
-       #else 
-       #   include <io.h> 
-       #endif
+#ifdef __UNIX__ 
+#   ifndef strnicmp 
+#      define strnicmp strncasecmp 
+#   endif 
+#   ifndef stricmp 
+#      define stricmp strcasecmp 
+#   endif 
+#elif defined(__WXMAC__)
+#else 
+#   include <io.h> 
 #endif
 
 enum           enumDummy               {enumDum1};
@@ -432,7 +438,7 @@ struct DbList
 };
 
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
 #include "wx/object.h"
 class CstructTablesInUse : public wxObject
 {