projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warning fixes for Cygwin
[wxWidgets.git]
/
include
/
wx
/
db.h
diff --git
a/include/wx/db.h
b/include/wx/db.h
index 63ab1a66c71e62905b5e735c13f383ff52f32ba6..2b66a88b4adcde49000e979a3606cd0fe52c4f67 100644
(file)
--- a/
include/wx/db.h
+++ b/
include/wx/db.h
@@
-26,7
+26,7
@@
#define _WX_DB_H_
#define _WX_DB_H_
-// BJO 20000503: introduce new GetColumns members which are more database independ
a
nt and
+// BJO 20000503: introduce new GetColumns members which are more database independ
e
nt and
// return columns in the order they were created
#define OLD_GETCOLUMNS 1
#define EXPERIMENTAL_WXDB_FUNCTIONS 1
// 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__
#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>
#endif
#else
#include <sql.h>
@@
-609,7
+613,7
@@
public:
wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
#endif
wxChar errorMsg[SQL_MAX_MESSAGE_LENGTH];
wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
#endif
wxChar errorMsg[SQL_MAX_MESSAGE_LENGTH];
- S
DWORD
nativeError;
+ S
QLINTEGER
nativeError;
wxChar sqlState[20];
#if wxODBC_BACKWARD_COMPATABILITY
wxChar sqlState[20];
#if wxODBC_BACKWARD_COMPATABILITY