Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 934e46270b606180155b554ce3132b916f9f7388..2ade1bae75d717f15cdbe51292c37c70c7ddf7f3 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -11,20 +11,33 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if USE_ODBC
+#if wxUSE_ODBC

 
 #ifdef __GNUG__
 #pragma interface "odbc.h"
 #endif
 
 
 #ifdef __GNUG__
 #pragma interface "odbc.h"
 #endif
 

-#ifndef __ODBCH__
-#define __ODBCH__
+#ifndef _WX_ODBCH__
+#define _WX_ODBCH__

 
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

+
+#ifdef __WXGTK__
+extern "C" {
+#include "../../src/iodbc/isql.h"
+#include "../../src/iodbc/isqlext.h"
+#include "../../src/iodbc/odbc_funcs.h"
+#include "../../src/iodbc/odbc_types.h"
+typedef float   SFLOAT;
+typedef double  SDOUBLE;
+#define ULONG UDWORD
+}
+#else

 #include <sqlext.h>
 #include <sqlext.h>

+#endif

 
 #include "wx/defs.h"
 #include "wx/list.h"
 
 #include "wx/defs.h"
 #include "wx/list.h"


@@ -70,7 +83,7 @@ class WXDLLEXPORT wxDatabase: public wxObject
   bool err_occured;
 
   wxList recordSets; // Record sets: Added by JACS
   bool err_occured;
 
   wxList recordSets; // Record sets: Added by JACS

-
+  

  public:
   wxDatabase(void);
   ~wxDatabase(void);
  public:
   wxDatabase(void);
   ~wxDatabase(void);


@@ -323,4 +336,4 @@ class WXDLLEXPORT wxRecordSet: public wxObject
 
 #endif
 
 
 #endif
 

-#endif  // USE_ODBC
+#endif  // wxUSE_ODBC