//#endif
#include "odbcinst.h"
#else
- #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) )
+ #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) || defined (__DMC__))
#include "wx/msw/wrapwin.h"
#endif
extern "C" {
void FreeHenv();
// Accessors
- const HENV &GetHenv() { return Henv; };
+ const HENV &GetHenv() { return Henv; }
- const wxChar *GetDsn() { return Dsn; };
+ const wxChar *GetDsn() { return Dsn; }
- const wxChar *GetUid() { return Uid; };
- const wxChar *GetUserID() { return Uid; };
+ const wxChar *GetUid() { return Uid; }
+ const wxChar *GetUserID() { return Uid; }
- const wxChar *GetAuthStr() { return AuthStr; };
- const wxChar *GetPassword() { return AuthStr; };
+ const wxChar *GetAuthStr() { return AuthStr; }
+ const wxChar *GetPassword() { return AuthStr; }
- const wxChar *GetConnectionStr() { return ConnectionStr; };
- bool UseConnectionStr() { return useConnectionStr; };
+ const wxChar *GetConnectionStr() { return ConnectionStr; }
+ bool UseConnectionStr() { return useConnectionStr; }
- const wxChar *GetDescription() { return Description; };
- const wxChar *GetFileType() { return FileType; };
- const wxChar *GetDefaultDir() { return DefaultDir; };
+ const wxChar *GetDescription() { return Description; }
+ const wxChar *GetFileType() { return FileType; }
+ const wxChar *GetDefaultDir() { return DefaultDir; }
- void SetHenv(const HENV henv) { Henv = henv; };
+ void SetHenv(const HENV henv) { Henv = henv; }
void SetDsn(const wxString &dsn);
void SetUserID(const wxString &userID);
- void SetUid(const wxString &uid) { SetUserID(uid); };
+ void SetUid(const wxString &uid) { SetUserID(uid); }
void SetPassword(const wxString &password);
- void SetAuthStr(const wxString &authstr) { SetPassword(authstr); };
+ void SetAuthStr(const wxString &authstr) { SetPassword(authstr); }
void SetConnectionStr(const wxString &connectStr);
- void SetDescription(const wxString &desc) { Description = desc; };
- void SetFileType(const wxString &fileType) { FileType = fileType; };
- void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; };
+ void SetDescription(const wxString &desc) { Description = desc; }
+ void SetFileType(const wxString &fileType) { FileType = fileType; }
+ void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; }
}; // class wxDbConnectInf
bool getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo);
bool setConnectionOptions(void);
void logError(const wxString &errMsg, const wxString &SQLState);
- const wxChar *convertUserID(const wxChar *userID, wxString &UserID);
+ void convertUserID(const wxChar *userID, wxString &UserID);
bool determineDataTypes(bool failOnDataTypeUnsupported);
void initialize();
bool open(bool failOnDataTypeUnsupported=true);
public:
- void setCached(bool cached) { dbIsCached = cached; }; // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
- bool IsCached() { return dbIsCached; };
+ void setCached(bool cached) { dbIsCached = cached; } // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
+ bool IsCached() { return dbIsCached; }
bool GetDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo)
{ return getDataTypeInfo(fSqlType, structSQLTypeInfo); }