1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/isql.h b/include/wx/isql.h
index e971f02468c1ac970e7cf2614d9a92217c095c4d..fd2f4c1ad8c6fda8ef9262b282a8e7e75de42330 100644 (file)
--- a/include/wx/isql.h
+++ b/include/wx/isql.h
@@ -6,8 +6,8 @@
  *  iODBC defines
  *
  *  The iODBC driver manager.
- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -26,18 +26,20 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
-#if defined(__WIN16__)
+#if defined(WIN32)
+#define SQL_API                                __stdcall
 
-#define SQL_API EXPORT CALLBACK
-#ifndef EXPORT
-#define EXPORT _export
+#ifndef FAR
+#define FAR
 #endif
 
-#elif defined(WIN32)
-#define SQL_API                                __stdcall
+#elif defined(__OS2__)
+#define SQL_API                                _Optlink
 
-#ifndef FAR  
-#define FAR 
+#ifndef FAR
+#define FAR
+#define EXPORT
+#define CALLBACK
 #endif
 
 #else
@@ -46,8 +48,10 @@
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
 
 typedef void *SQLHWND;