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 9edfae366ad3ab377b3a542a3115827524a31c63..fd2f4c1ad8c6fda8ef9262b282a8e7e75de42330 100644 (file)
--- a/include/wx/isql.h
+++ b/include/wx/isql.h
@@ -26,14 +26,7 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
-#if defined(__WIN16__)
-
-#define SQL_API EXPORT CALLBACK
-#ifndef EXPORT
-#define EXPORT _export
-#endif
-
-#elif defined(WIN32)
+#if defined(WIN32)
 #define SQL_API                                __stdcall
 
 #ifndef FAR
@@ -55,8 +48,10 @@
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
 
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
 
 typedef void *SQLHWND;