Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One more wxString change that I originally missed

Browse Source 
A few more Unicode changes I missed
Made one more param in the wxDb constructor be a const (like it should have been).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-02-04 15:56:59 +00:00
parent e7e5298cca
commit 6a71ee861c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/db.h
View File

@@ -284,9 +284,9 @@ class wxDbConnectInf
public: public:
wxDbConnectInf(); wxDbConnectInf();
wxDbConnectInf(HENV henv, const wxString &dsn, const wxString &userID="", wxDbConnectInf(HENV henv, const wxString &dsn, const wxString &userID=wxT(""),
const wxString &password="", const wxString &defaultDir="", const wxString &password=wxT(""), const wxString &defaultDir=wxT(""),
const wxString &description="", const wxString &fileType=""); const wxString &description=wxT(""), const wxString &fileType=wxT(""));
~wxDbConnectInf(); ~wxDbConnectInf();
@@ -296,8 +296,7 @@ class wxDbConnectInf
void FreeHenv(); void FreeHenv();
// Accessors // Accessors
const HENV GetHenv() { return Henv; }; const HENV &GetHenv() { return Henv; };
const HENV &GetHenvAddress() { return Henv; };
const wxChar *GetDsn() { return Dsn; }; const wxChar *GetDsn() { return Dsn; };
@@ -352,6 +351,7 @@ public:
wxDbColFor(); wxDbColFor();
~wxDbColFor(); ~wxDbColFor();
void Initialize();
int Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits); int Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits);
}; };
@@ -409,6 +409,8 @@ public:
wxDbInf(); wxDbInf();
~wxDbInf(); ~wxDbInf();
void Initialize();
}; };
@@ -565,10 +567,11 @@ public:
#endif #endif
// Public member functions // Public member functions
wxDb(HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS); wxDb(const HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
void Initialize(); void Initialize();
bool Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr); // Data Source Name, User ID, Password bool Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr); // Data Source Name, User ID, Password
bool Open(wxDbConnectInf *dbConnectInf);
bool Open(wxDb *copyDb); // pointer to a wxDb whose connection info should be copied rather than re-queried bool Open(wxDb *copyDb); // pointer to a wxDb whose connection info should be copied rather than re-queried
void Close(void); void Close(void);
bool CommitTrans(void); bool CommitTrans(void);
@@ -615,7 +618,7 @@ public:
wxDBMS Dbms(void); wxDBMS Dbms(void);
bool ModifyColumn(const wxString &tableName, const wxString &columnName, bool ModifyColumn(const wxString &tableName, const wxString &columnName,
int dataType, ULONG columnLength=0, int dataType, ULONG columnLength=0,
const wxString &optionalParam=""); const wxString &optionalParam=wxT(""));
bool FwdOnlyCursors(void) {return fwdOnlyCursors;} bool FwdOnlyCursors(void) {return fwdOnlyCursors;}
@@ -665,7 +668,7 @@ int WXDLLEXPORT wxDbConnectionsInUse(void);
// This function sets the sql log state for all open wxDb objects // This function sets the sql log state for all open wxDb objects
bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME); bool wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
#if 0 #if 0