From: George Tasker Date: Thu, 20 Jan 2000 13:19:20 +0000 (+0000) Subject: Tweeked to use SQLHWND as a type rather than HWND, so that db/dbtable can use iodbc... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5d3cc7856fdb49493d9aeafa911839d9e7fae706 Tweeked to use SQLHWND as a type rather than HWND, so that db/dbtable can use iodbc rather than #include and its overhead git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/iodbc/connect.c b/src/iodbc/connect.c index bd803f7c0e..2bd934f6a2 100644 --- a/src/iodbc/connect.c +++ b/src/iodbc/connect.c @@ -742,7 +742,7 @@ SQLConnect ( RETCODE SQL_API SQLDriverConnect ( HDBC hdbc, - HWND hwnd, + SQLHWND hwnd, UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, diff --git a/src/iodbc/isql.h b/src/iodbc/isql.h index 5774241d4c..a1f406626d 100644 --- a/src/iodbc/isql.h +++ b/src/iodbc/isql.h @@ -37,6 +37,8 @@ typedef void *HWND; #endif +typedef void *SQLHWND; + typedef unsigned char UCHAR; typedef long int SDWORD; typedef short int SWORD; diff --git a/src/iodbc/isqlext.h b/src/iodbc/isqlext.h index c70c08ce17..414c300172 100644 --- a/src/iodbc/isqlext.h +++ b/src/iodbc/isqlext.h @@ -1073,13 +1073,13 @@ typedef unsigned long int BOOKMARK; extern "C" { #endif /* - * Level 1 function rototypes + * Level 1 function prototypes */ RETCODE SQL_API SQLColumns (HSTMT hstmt, UCHAR FAR * szTableQualifier, SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szColumnName, SWORD cbColumnName); -RETCODE SQL_API SQLDriverConnect (HDBC hdbc, HWND hwnd, +RETCODE SQL_API SQLDriverConnect (HDBC hdbc, SQLHWND hwnd, //glt UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut, SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion); RETCODE SQL_API SQLGetConnectOption (HDBC hdbc, UWORD fOption, PTR pvParam);