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

Cleanup of formatting of text

Browse Source 
Added Initialize() functions to a couple of the helper classes
More code changed to reflect new class methods that are now available.


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

48
src/common/db.cpp
View File

@@ -251,6 +251,18 @@ void wxDbConnectInf::SetPassword(const wxString &password)
/********** wxDbColFor Constructor **********/ /********** wxDbColFor Constructor **********/
wxDbColFor::wxDbColFor() wxDbColFor::wxDbColFor()
{
Initialize();
} // wxDbColFor::wxDbColFor()
wxDbColFor::~wxDbColFor()
{
} // wxDbColFor::~wxDbColFor()
/********** wxDbColFor::Initialize() **********/
void wxDbColFor::Initialize()
{ {
s_Field.Empty(); s_Field.Empty();
int i; int i;
@@ -264,12 +276,7 @@ wxDbColFor::wxDbColFor()
i_dbDataType = 0; i_dbDataType = 0;
i_sqlDataType = 0; i_sqlDataType = 0;
Format(1,DB_DATA_TYPE_VARCHAR,0,0,0); // the Function that does the work Format(1,DB_DATA_TYPE_VARCHAR,0,0,0); // the Function that does the work
} // wxDbColFor::wxDbColFor() } // wxDbColFor::Initialize()
wxDbColFor::~wxDbColFor()
{
} // wxDbColFor::~wxDbColFor()
/********** wxDbColFor::Format() **********/ /********** wxDbColFor::Format() **********/
@@ -358,6 +365,7 @@ int wxDbColFor::Format(int Nation, int dbDataType, SWORD sqlDataType,
} // wxDbColFor::Format() } // wxDbColFor::Format()
/********** wxDbColInf Constructor **********/ /********** wxDbColInf Constructor **********/
wxDbColInf::wxDbColInf() wxDbColInf::wxDbColInf()
{ {
@@ -414,11 +422,8 @@ wxDbTableInf::~wxDbTableInf()
/********** wxDbInf Constructor *************/ /********** wxDbInf Constructor *************/
wxDbInf::wxDbInf() wxDbInf::wxDbInf()
{ {
catalog[0] = 0; Initialize();
schema[0] = 0; } // wxDbInf::wxDbInf()
numTables = 0;
pTableInf = NULL;
} // wxDbInf::wxDbFor()
/********** wxDbInf Destructor *************/ /********** wxDbInf Destructor *************/
@@ -430,8 +435,18 @@ wxDbInf::~wxDbInf()
} // wxDbInf::~wxDbInf() } // wxDbInf::~wxDbInf()
/********** wxDbInf::Initialize() *************/
void wxDbInf::Initialize()
{
catalog[0] = 0;
schema[0] = 0;
numTables = 0;
pTableInf = NULL;
} // wxDbInf::Initialize()
/********** wxDb Constructors **********/ /********** wxDb Constructors **********/
wxDb::wxDb(HENV &aHenv, bool FwdOnlyCursors) wxDb::wxDb(const HENV &aHenv, bool FwdOnlyCursors)
{ {
// Copy the HENV into the db class // Copy the HENV into the db class
henv = aHenv; henv = aHenv;
@@ -708,6 +723,13 @@ bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthSt
} // wxDb::Open() } // wxDb::Open()
bool wxDb::Open(wxDbConnectInf *dbConnectInf)
{
return Open(dbConnectInf->GetDsn(), dbConnectInf->GetUserID(),
dbConnectInf->GetPassword());
} // wxDb::Open()
bool wxDb::Open(wxDb *copyDb) bool wxDb::Open(wxDb *copyDb)
{ {
dsn = copyDb->GetDatasourceName(); dsn = copyDb->GetDatasourceName();
@@ -3491,7 +3513,7 @@ wxDb WXDLLEXPORT *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCurso
pList->Uid = pDbConfig->GetUserID(); pList->Uid = pDbConfig->GetUserID();
pList->AuthStr = pDbConfig->GetPassword(); pList->AuthStr = pDbConfig->GetPassword();
pList->PtrDb = new wxDb((HENV)pDbConfig->GetHenvAddress(),FwdOnlyCursors); pList->PtrDb = new wxDb(pDbConfig->GetHenv(), FwdOnlyCursors);
bool opened = FALSE; bool opened = FALSE;