AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More suitable data structure (in the process of making everything wxUSE_STL insensitive).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-08-02 17:52:12 +00:00
parent d679df70f0
commit 44420d2e50
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
demos/dbbrowse/doc.cpp
View File

@ -170,7 +170,7 @@ bool MainDoc::OnInitODBC()
//---------------------------------------------------------------------------------------
const char sep = 3; // separator character used in string between DSN ans DsDesc
wxStringList s_SortDSNList, s_SortDsDescList;
wxSortedArrayString s_SortDSNList, s_SortDsDescList;
// BJO-20000127
// In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
// The key will be removed after sorting
@ -183,31 +183,26 @@ bool MainDoc::OnInitODBC()
s_SortDSNList.Add(Dsn);
s_SortDsDescList.Add(KeyString);
}
s_SortDSNList.Sort(); //BJO
s_SortDsDescList.Sort(); //BJO
wxChar ** s_SortDSN = s_SortDSNList.ListToArray(); //BJO
wxChar ** s_SortDsDesc = s_SortDsDescList.ListToArray(); //BJO
//---------------------------------------------------------------------------------------
// Allocate n ODBC-DSN objects to hold the information
// Allocate n wxDatabase objects to hold the column information
p_DSN = new DSN[i_DSN]; //BJO
db_Br = new BrowserDB[i_DSN];
for (i=0;i<i_DSN;i++)
{
KeyString = s_SortDsDesc[i];
KeyString = s_SortDsDescList[i];
KeyString = KeyString.AfterFirst(sep);
wxStrcpy(s_SortDsDesc[i],KeyString.c_str());
(p_DSN+i)->Dsn = s_SortDSN[i];
(p_DSN+i)->Drv = s_SortDsDesc[i];
// ODBC-DSN object
(p_DSN+i)->Dsn = s_SortDSNList[i];
(p_DSN+i)->Drv = KeyString;
(p_DSN+i)->Usr = _T("");
(p_DSN+i)->Pas = _T("");
Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
wxLogMessage(Temp0);
}
//---------------------------------------------------------------------------------------
// Allocate n wxDatabase objects to hold the column information
db_Br = new BrowserDB[i_DSN];
for (i=0;i<i_DSN;i++)
{
// wxDataBase object
(db_Br+i)->p_LogWindow = p_LogWin;
(db_Br+i)->ODBCSource = (p_DSN+i)->Dsn;
(db_Br+i)->UserName = (p_DSN+i)->Usr;
@ -218,8 +213,6 @@ bool MainDoc::OnInitODBC()
DbConnectInf.FreeHenv();
delete [] s_SortDSN;
delete [] s_SortDsDesc;
//---------------------------------------------------------------------------------------
if (!i_DSN)
{

18
samples/db/dbtest.cpp
View File

@ -2227,21 +2227,17 @@ void CparameterDlg::FillDataSourceList()
{
wxChar Dsn[SQL_MAX_DSN_LENGTH + 1];
wxChar DsDesc[255];
wxStringList strList;
wxSortedArrayString strArr;
while (wxDbGetDataSource(wxGetApp().DbConnectInf->GetHenv(), Dsn,
SQL_MAX_DSN_LENGTH+1, DsDesc, 255))
strList.Add(Dsn);
strList.Sort();
strList.Add(wxT(""));
wxString current;
for (wxStringList::Node *node = strList.GetFirst(); node; node = node->GetNext() )
{
current = node->GetData();
if(!current.IsEmpty())
pParamODBCSourceList->Append(current.c_str());
strArr.Add(Dsn);
}
for (size_t i=0; i < strArr.GetCount(); i++ )
{
pParamODBCSourceList->Append(strArr[i].c_str());
}
} // CparameterDlg::FillDataSourceList()