Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 08587be677a3006e11575f55d88a2ca84f33dc4a..d55fe5a14b5ffd8bbd385be10a6a98f1786a213e 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -20,23 +20,22 @@
 #ifndef _WX_ODBCH__
 #define _WX_ODBCH__
 
 #ifndef _WX_ODBCH__
 #define _WX_ODBCH__
 

-#ifdef __WXMSW__
-#include <windows.h>
-#endif
+//#ifdef __WXMSW__
+//#include <windows.h>
+//#endif

 
 
 #ifdef __UNIX__
 extern "C"
 {
 
 
 #ifdef __UNIX__
 extern "C"
 {

-    #include "../../src/iodbc/isql.h"
-    #include "../../src/iodbc/isqlext.h"
-    #include "../../src/iodbc/odbc_funcs.h"
-    #include "../../src/iodbc/odbc_types.h"
+    #include "wx/isql.h"
+    #include "wx/isqlext.h"

 
     typedef float   SFLOAT;
     typedef double  SDOUBLE;
 
     #define ULONG UDWORD
 
     typedef float   SFLOAT;
     typedef double  SDOUBLE;
 
     #define ULONG UDWORD

+    #define SQL_SQLSTATE_SIZE 5

 }
 #else // !Unix
     #include <sqlext.h>
 }
 #else // !Unix
     #include <sqlext.h>