Fixes for wxPopupTransientWindow for wxMSW. Includes Patch #1181190,

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

diff --git a/include/wx/db.h b/include/wx/db.h
index 63ab1a66c71e62905b5e735c13f383ff52f32ba6..827e35cdbcf7a68384aebe7e33e115b04f430986 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -26,7 +26,7 @@
 #define _WX_DB_H_
 
 
-// BJO 20000503: introduce new GetColumns members which are more database independant and
+// BJO 20000503: introduce new GetColumns members which are more database independent and
 //               return columns in the order they were created
 #define OLD_GETCOLUMNS 1
 #define EXPERIMENTAL_WXDB_FUNCTIONS 1
@@ -77,7 +77,11 @@
         #include "wx/isqlext.h"
         // Not available in v2.x of iODBC
         #ifndef __WXMSW__
-            typedef wxChar SQLTCHAR;
+          #if wxUSE_UNICODE
+          typedef wxChar SQLTCHAR;
+          #else
+          typedef UCHAR SQLTCHAR;
+          #endif
         #endif
     #else
         #include <sql.h>