Tweeked to use SQLHWND as a type rather than HWND, so that db/dbtable can use iodbc...

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 bd803f7c0e12c7363637dabaf70811ddabe2569f..2bd934f6a2464b237672daf20763f8a1c727aac4 100644 (file)
--- a/src/iodbc/connect.c
+++ b/src/iodbc/connect.c
@@ -742,7 +742,7 @@ SQLConnect (
 RETCODE SQL_API 
 SQLDriverConnect (
     HDBC hdbc,
 RETCODE SQL_API 
 SQLDriverConnect (
     HDBC hdbc,

-    HWND hwnd,
+    SQLHWND hwnd,

     UCHAR FAR * szConnStrIn,
     SWORD cbConnStrIn,
     UCHAR FAR * szConnStrOut,
     UCHAR FAR * szConnStrIn,
     SWORD cbConnStrIn,
     UCHAR FAR * szConnStrOut,

diff --git a/src/iodbc/isql.h b/src/iodbc/isql.h
index 5774241d4c0b272a4547f485ed507a1c56f39d39..a1f406626dc0b7550911455df57909cac85b7c6c 100644 (file)
--- a/src/iodbc/isql.h
+++ b/src/iodbc/isql.h
@@ -37,6 +37,8 @@
 typedef void *HWND;
 #endif
 
 typedef void *HWND;
 #endif
 

+typedef void *SQLHWND;
+

 typedef unsigned char UCHAR;
 typedef long int SDWORD;
 typedef short int SWORD;
 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 c70c08ce17f63ca66b7e33bffe5b7e08ac1bc7bb..414c30017257f55a209907995b83fa694b0bb3fc 100644 (file)
--- a/src/iodbc/isqlext.h
+++ b/src/iodbc/isqlext.h
@@ -1073,13 +1073,13 @@ typedef unsigned long int       BOOKMARK;
 extern "C" {
 #endif
 /*
 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 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);
     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);