X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..c96faa7c9b1926d63a2fff32ac4508d3138a7bee:/include/wx/odbc.h

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 0f6756adcc..90fcbaea0c 100644
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -11,16 +11,33 @@
 
 #include "wx/setup.h"
 
-#if USE_ODBC
+#if wxUSE_ODBC
 
-#ifndef __ODBCH__
-#define __ODBCH__
+#ifdef __GNUG__
+#pragma interface "odbc.h"
+#endif
+
+#ifndef _WX_ODBCH__
+#define _WX_ODBCH__
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 #endif
 
+
+#ifdef __WXGTK__
+extern "C" {
+#include <../iodbc/isql.h>
+#include <../iodbc/isqlext.h>
+#include <../iodbc/odbc_funcs.h>
+#include <../iodbc/odbc_types.h>
+typedef float   SFLOAT;
+typedef double  SDOUBLE;
+#define ULONG UDWORD
+}
+#else
 #include <sqlext.h>
+#endif
 
 #include "wx/defs.h"
 #include "wx/list.h"
@@ -66,7 +83,7 @@ class WXDLLEXPORT wxDatabase: public wxObject
   bool err_occured;
 
   wxList recordSets; // Record sets: Added by JACS
-
+  
  public:
   wxDatabase(void);
   ~wxDatabase(void);
@@ -319,4 +336,4 @@ class WXDLLEXPORT wxRecordSet: public wxObject
 
 #endif
 
-#endif  // USE_ODBC
+#endif  // wxUSE_ODBC